diff --git a/phoss-directory-indexer/src/main/java/com/helger/pd/indexer/storage/PDStoredBusinessEntity.java b/phoss-directory-indexer/src/main/java/com/helger/pd/indexer/storage/PDStoredBusinessEntity.java
index 261e4a01..326bbdea 100644
--- a/phoss-directory-indexer/src/main/java/com/helger/pd/indexer/storage/PDStoredBusinessEntity.java
+++ b/phoss-directory-indexer/src/main/java/com/helger/pd/indexer/storage/PDStoredBusinessEntity.java
@@ -81,18 +81,18 @@ public final class PDStoredBusinessEntity
   protected PDStoredBusinessEntity ()
   {}
 
-  public void setParticipantID (@Nonnull final IParticipantIdentifier aParticipantID)
-  {
-    ValueEnforcer.notNull (aParticipantID, "ParticipantID");
-    m_aParticipantID = aParticipantID;
-  }
-
   @Nonnull
   public IParticipantIdentifier getParticipantID ()
   {
     return m_aParticipantID;
   }
 
+  public void setParticipantID (@Nonnull final IParticipantIdentifier aParticipantID)
+  {
+    ValueEnforcer.notNull (aParticipantID, "ParticipantID");
+    m_aParticipantID = aParticipantID;
+  }
+
   @Nonnull
   @ReturnsMutableObject
   public ICommonsList <PDStoredMLName> names ()
@@ -100,11 +100,6 @@ public ICommonsList <PDStoredMLName> names ()
     return m_aNames;
   }
 
-  public void setCountryCode (@Nullable final String sCountryCode)
-  {
-    m_sCountryCode = sCountryCode;
-  }
-
   @Nullable
   public String getCountryCode ()
   {
@@ -116,9 +111,9 @@ public boolean hasCountryCode ()
     return StringHelper.hasText (m_sCountryCode);
   }
 
-  public void setGeoInfo (@Nullable final String sGeoInfo)
+  public void setCountryCode (@Nullable final String sCountryCode)
   {
-    m_sGeoInfo = sGeoInfo;
+    m_sCountryCode = sCountryCode;
   }
 
   @Nullable
@@ -132,6 +127,11 @@ public boolean hasGeoInfo ()
     return StringHelper.hasText (m_sGeoInfo);
   }
 
+  public void setGeoInfo (@Nullable final String sGeoInfo)
+  {
+    m_sGeoInfo = sGeoInfo;
+  }
+
   @Nonnull
   @ReturnsMutableObject
   public ICommonsList <PDStoredIdentifier> identifiers ()
@@ -153,11 +153,6 @@ public ICommonsList <PDStoredContact> contacts ()
     return m_aContacts;
   }
 
-  public void setAdditionalInformation (@Nullable final String sAdditionalInformation)
-  {
-    m_sAdditionalInformation = sAdditionalInformation;
-  }
-
   @Nonnull
   public String getAdditionalInformation ()
   {
@@ -169,9 +164,9 @@ public boolean hasAdditionalInformation ()
     return StringHelper.hasText (m_sAdditionalInformation);
   }
 
-  public void setRegistrationDate (@Nullable final LocalDate aRegistrationDate)
+  public void setAdditionalInformation (@Nullable final String sAdditionalInformation)
   {
-    m_aRegistrationDate = aRegistrationDate;
+    m_sAdditionalInformation = sAdditionalInformation;
   }
 
   @Nullable
@@ -185,6 +180,11 @@ public boolean hasRegistrationDate ()
     return m_aRegistrationDate != null;
   }
 
+  public void setRegistrationDate (@Nullable final LocalDate aRegistrationDate)
+  {
+    m_aRegistrationDate = aRegistrationDate;
+  }
+
   @Nonnull
   @ReturnsMutableObject
   public ICommonsList <IDocumentTypeIdentifier> documentTypeIDs ()
@@ -204,14 +204,14 @@ public void setMetaData (@Nonnull final PDStoredMetaData aMetaData)
     m_aMetaData = aMetaData;
   }
 
-  public void setDeleted (final boolean bDeleted)
+  public boolean isDeleted ()
   {
-    m_bDeleted = bDeleted;
+    return m_bDeleted;
   }
 
-  public boolean isDeleted ()
+  public void setDeleted (final boolean bDeleted)
   {
-    return m_bDeleted;
+    m_bDeleted = bDeleted;
   }
 
   /**