diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 7dbdc322dd8571d519e1a8ad63879107ce63f702..2d98f184a834218b478c7483cfa6b2ee07a69277 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -1,313 +1,314 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
-  <name>Address_entity</name>
-  <title>Addresses</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <grantCreate v="false" />
-  <grantCreateProcess>%aditoprj%/entity/Address_entity/grantCreateProcess.js</grantCreateProcess>
-  <grantUpdate v="false" />
-  <grantUpdateProcess>%aditoprj%/entity/Address_entity/grantUpdateProcess.js</grantUpdateProcess>
-  <grantDelete v="false" />
-  <grantDeleteProcess>%aditoprj%/entity/Address_entity/grantDeleteProcess.js</grantDeleteProcess>
-  <recordContainerType>DB</recordContainerType>
-  <alias>Data_alias</alias>
-  <conditionProcess>%aditoprj%/entity/Address_entity/conditionProcess.js</conditionProcess>
-  <recordContainer>db</recordContainer>
-  <linkInformation>
-    <linkInformation>
-      <name>a0278c8c-4d5a-4ac9-b0eb-fec72f9e8576</name>
-      <tableName>ADDRESS</tableName>
-      <primaryKey>ADDRESSID</primaryKey>
-      <isUIDTable v="true" />
-    </linkInformation>
-  </linkInformation>
-  <entityFields>
-    <entityField>
-      <name>ADDRESS</name>
-      <title>Address</title>
-      <tableName>ADDRESS</tableName>
-      <columnName>ADDRESS</columnName>
-      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
-      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/address/stateProcess.js</stateProcess>
-    </entityField>
-    <entityField>
-      <name>ADDRESSADDITION</name>
-      <tableName>ADDRESS</tableName>
-      <columnName>ADDRESSADDITION</columnName>
-      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/addressaddition/stateProcess.js</stateProcess>
-    </entityField>
-    <entityField>
-      <name>ADDRESSID</name>
-      <tableName>ADDRESS</tableName>
-      <columnName>ADDRESSID</columnName>
-    </entityField>
-    <entityField>
-      <name>ADDRIDENTIFIER</name>
-      <tableName>ADDRESS</tableName>
-      <columnName>ADDRIDENTIFIER</columnName>
-      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/addridentifier/stateProcess.js</stateProcess>
-    </entityField>
-    <entityField>
-      <name>ADDR_TYPE</name>
-      <title>Addresstype</title>
-      <tableName>ADDRESS</tableName>
-      <columnName>ADDR_TYPE</columnName>
-      <possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js</possibleItemsProcess>
-      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/stateProcess.js</stateProcess>
-    </entityField>
-    <entityField>
-      <name>BUILDINGNO</name>
-      <title>House number</title>
-      <tableName>ADDRESS</tableName>
-      <columnName>BUILDINGNO</columnName>
-      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/buildingno/stateProcess.js</stateProcess>
-    </entityField>
-    <entityField>
-      <name>CITY</name>
-      <title>City</title>
-      <tableName>ADDRESS</tableName>
-      <columnName>CITY</columnName>
-      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/city/mandatoryProcess.js</mandatoryProcess>
-      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/city/stateProcess.js</stateProcess>
-    </entityField>
-    <entityField>
-      <name>COUNTRY</name>
-      <title>Country</title>
-      <tableName>ADDRESS</tableName>
-      <columnName>COUNTRY</columnName>
-      <mandatory v="true" />
-      <outgoingField>Countries_dfo</outgoingField>
-      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/country/stateProcess.js</stateProcess>
-    </entityField>
-    <entityField>
-      <name>DATE_EDIT</name>
-      <tableName>ADDRESS</tableName>
-      <columnName>DATE_EDIT</columnName>
-    </entityField>
-    <entityField>
-      <name>DATE_NEW</name>
-      <tableName>ADDRESS</tableName>
-      <columnName>DATE_NEW</columnName>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>DISTRICT</name>
-      <title>District</title>
-      <tableName>ADDRESS</tableName>
-      <columnName>DISTRICT</columnName>
-      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/district/stateProcess.js</stateProcess>
-    </entityField>
-    <entityField>
-      <name>REGION</name>
-      <title>Region</title>
-      <tableName>ADDRESS</tableName>
-      <columnName>REGION</columnName>
-      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/region/stateProcess.js</stateProcess>
-    </entityField>
-    <entityField>
-      <name>RELATION_ID</name>
-      <tableName>ADDRESS</tableName>
-      <columnName>RELATION_ID</columnName>
-      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/relation_id/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>STATE</name>
-      <title>State</title>
-      <tableName>ADDRESS</tableName>
-      <columnName>STATE</columnName>
-      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/state/mandatoryProcess.js</mandatoryProcess>
-      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/state/stateProcess.js</stateProcess>
-    </entityField>
-    <entityField>
-      <name>USER_EDIT</name>
-      <tableName>ADDRESS</tableName>
-      <columnName>USER_EDIT</columnName>
-    </entityField>
-    <entityField>
-      <name>USER_NEW</name>
-      <tableName>ADDRESS</tableName>
-      <columnName>USER_NEW</columnName>
-      <state>READONLY</state>
-      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>ZIP</name>
-      <title>postcode</title>
-      <tableName>ADDRESS</tableName>
-      <columnName>ZIP</columnName>
-      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess>
-      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/zip/stateProcess.js</stateProcess>
-      <onValidation>%aditoprj%/entity/Address_entity/entityfields/zip/onValidation.js</onValidation>
-    </entityField>
-    <entityIncomingField>
-      <name>OrgAddress_dfi</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
-          <entityName>Org_entity</entityName>
-          <fieldName>OrgAddress_dfo</fieldName>
-          <isOutgoing v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>aa44f6ec-2b9b-43f8-902d-92490480413f</name>
-          <entityName>Pers_entity</entityName>
-          <fieldName>OrgAddress_dfo</fieldName>
-          <isOutgoing v="false" />
-        </entityDependency>
-      </dependencies>
-      <children>
-        <entityParameter>
-          <name>AllowModifyingCoreData_param</name>
-          <code>%aditoprj%/entity/Address_entity/entityfields/orgaddress_dfi/children/allowmodifyingcoredata_param/code.js</code>
-        </entityParameter>
-      </children>
-    </entityIncomingField>
-    <entityParameter>
-      <name>RelId_param</name>
-      <expose v="true" />
-      <description>PARAMETER</description>
-    </entityParameter>
-    <entityIncomingField>
-      <name>PersAddress_dfi</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <recordContainer>db</recordContainer>
-      <dependencies>
-        <entityDependency>
-          <name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
-          <entityName>Pers_entity</entityName>
-          <fieldName>PersAddress_dfo</fieldName>
-          <isOutgoing v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityIncomingField>
-    <entityParameter>
-      <name>StandardAddressId_param</name>
-      <expose v="true" />
-      <description>TODO: add description</description>
-    </entityParameter>
-    <entityField>
-      <name>IS_STANDARD</name>
-      <title>Standard</title>
-      <contentType>BOOLEAN</contentType>
-      <possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard/possibleItemsProcess.js</possibleItemsProcess>
-      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard/valueProcess.js</valueProcess>
-      <onValueChangeTypes>
-        <element>MASK</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityIncomingField>
-      <name>#INCOMING</name>
-    </entityIncomingField>
-    <entityParameter>
-      <name>AddressLineFieldsState_param</name>
-      <code>%aditoprj%/entity/Address_entity/entityfields/addresslinefieldsstate_param/code.js</code>
-      <expose v="false" />
-      <mandatory v="false" />
-      <description>Specifies the FieldState of all AddressLine-Fields (e.g. ZIP, COUNTRY, etc.)
-This is needed because you want to modify the record itself for setting the standard address but no other content.</description>
-    </entityParameter>
-    <entityParameter>
-      <name>AllowModifyingCoreData_param</name>
-      <code>%aditoprj%/entity/Address_entity/entityfields/allowmodifyingcoredata_param/code.js</code>
-      <description>Specified if it&amp;apos;s allowed to modify the address core data.
-If this is &amp;quot;false&amp;quot;, you cannot create od delete records or change the actual address-data, e.g. zip-code, address, buildingno, etc.</description>
-    </entityParameter>
-    <entityOutgoingField>
-      <name>Countries_dfo</name>
-      <fieldType>DEPENDENCY_OUT</fieldType>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Countries_Entity</entityName>
-        <fieldName>ISO2_NAME</fieldName>
-      </dependency>
-    </entityOutgoingField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <conditionProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <linkInformation>
-        <linkInformation>
-          <name>6a0005cc-c64b-4044-9712-c9d00f02d7a8</name>
-          <tableName>ADDRESS</tableName>
-          <primaryKey>ADDRESSID</primaryKey>
-          <isUIDTable v="true" />
-        </linkInformation>
-      </linkInformation>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>ADDRESS.value</name>
-          <value>ADDRESS.ADDRESS</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CITY.value</name>
-          <value>ADDRESS.CITY</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ADDRESSADDITION.value</name>
-          <value>ADDRESS.ADDRESSADDITION</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>COUNTRY.value</name>
-          <value>ADDRESS.COUNTRY</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ADDRESSID.value</name>
-          <value>ADDRESS.ADDRESSID</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_EDIT.value</name>
-          <value>ADDRESS.DATE_EDIT</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ADDRIDENTIFIER.value</name>
-          <value>ADDRESS.ADDRIDENTIFIER</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <value>ADDRESS.DATE_NEW</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ADDR_TYPE.value</name>
-          <value>ADDRESS.ADDR_TYPE</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DISTRICT.value</name>
-          <value>ADDRESS.DISTRICT</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>BUILDINGNO.value</name>
-          <value>ADDRESS.BUILDINGNO</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>REGION.value</name>
-          <value>ADDRESS.REGION</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>RELATION_ID.value</name>
-          <value>ADDRESS.RELATION_ID</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>STATE.value</name>
-          <value>ADDRESS.STATE</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_EDIT.value</name>
-          <value>ADDRESS.USER_EDIT</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <value>ADDRESS.USER_NEW</value>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ZIP.value</name>
-          <value>ADDRESS.ZIP</value>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.5">
+  <name>Address_entity</name>
+  <title>Addresses</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <grantCreate v="false" />
+  <grantCreateProcess>%aditoprj%/entity/Address_entity/grantCreateProcess.js</grantCreateProcess>
+  <grantUpdate v="false" />
+  <grantUpdateProcess>%aditoprj%/entity/Address_entity/grantUpdateProcess.js</grantUpdateProcess>
+  <grantDelete v="false" />
+  <grantDeleteProcess>%aditoprj%/entity/Address_entity/grantDeleteProcess.js</grantDeleteProcess>
+  <recordContainerType>DB</recordContainerType>
+  <alias>Data_alias</alias>
+  <conditionProcess>%aditoprj%/entity/Address_entity/conditionProcess.js</conditionProcess>
+  <recordContainer>db</recordContainer>
+  <linkInformation>
+    <linkInformation>
+      <name>a0278c8c-4d5a-4ac9-b0eb-fec72f9e8576</name>
+      <tableName>ADDRESS</tableName>
+      <primaryKey>ADDRESSID</primaryKey>
+      <isUIDTable v="true" />
+    </linkInformation>
+  </linkInformation>
+  <entityFields>
+    <entityField>
+      <name>ADDRESS</name>
+      <title>Address</title>
+      <tableName>ADDRESS</tableName>
+      <columnName>ADDRESS</columnName>
+      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
+      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/address/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>ADDRESSADDITION</name>
+      <tableName>ADDRESS</tableName>
+      <columnName>ADDRESSADDITION</columnName>
+      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/addressaddition/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>ADDRESSID</name>
+      <tableName>ADDRESS</tableName>
+      <columnName>ADDRESSID</columnName>
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/addressid/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ADDRIDENTIFIER</name>
+      <tableName>ADDRESS</tableName>
+      <columnName>ADDRIDENTIFIER</columnName>
+      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/addridentifier/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>ADDR_TYPE</name>
+      <title>Addresstype</title>
+      <tableName>ADDRESS</tableName>
+      <columnName>ADDR_TYPE</columnName>
+      <possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js</possibleItemsProcess>
+      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>BUILDINGNO</name>
+      <title>House number</title>
+      <tableName>ADDRESS</tableName>
+      <columnName>BUILDINGNO</columnName>
+      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/buildingno/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>CITY</name>
+      <title>City</title>
+      <tableName>ADDRESS</tableName>
+      <columnName>CITY</columnName>
+      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/city/mandatoryProcess.js</mandatoryProcess>
+      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/city/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>COUNTRY</name>
+      <title>Country</title>
+      <tableName>ADDRESS</tableName>
+      <columnName>COUNTRY</columnName>
+      <mandatory v="true" />
+      <outgoingField>Countries_dfo</outgoingField>
+      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/country/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>DATE_EDIT</name>
+      <tableName>ADDRESS</tableName>
+      <columnName>DATE_EDIT</columnName>
+    </entityField>
+    <entityField>
+      <name>DATE_NEW</name>
+      <tableName>ADDRESS</tableName>
+      <columnName>DATE_NEW</columnName>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>DISTRICT</name>
+      <title>District</title>
+      <tableName>ADDRESS</tableName>
+      <columnName>DISTRICT</columnName>
+      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/district/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>REGION</name>
+      <title>Region</title>
+      <tableName>ADDRESS</tableName>
+      <columnName>REGION</columnName>
+      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/region/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>RELATION_ID</name>
+      <tableName>ADDRESS</tableName>
+      <columnName>RELATION_ID</columnName>
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/relation_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>STATE</name>
+      <title>State</title>
+      <tableName>ADDRESS</tableName>
+      <columnName>STATE</columnName>
+      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/state/mandatoryProcess.js</mandatoryProcess>
+      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/state/stateProcess.js</stateProcess>
+    </entityField>
+    <entityField>
+      <name>USER_EDIT</name>
+      <tableName>ADDRESS</tableName>
+      <columnName>USER_EDIT</columnName>
+    </entityField>
+    <entityField>
+      <name>USER_NEW</name>
+      <tableName>ADDRESS</tableName>
+      <columnName>USER_NEW</columnName>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ZIP</name>
+      <title>postcode</title>
+      <tableName>ADDRESS</tableName>
+      <columnName>ZIP</columnName>
+      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess>
+      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/zip/stateProcess.js</stateProcess>
+      <onValidation>%aditoprj%/entity/Address_entity/entityfields/zip/onValidation.js</onValidation>
+    </entityField>
+    <entityIncomingField>
+      <name>OrgAddress_dfi</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
+          <entityName>Org_entity</entityName>
+          <fieldName>OrgAddress_dfo</fieldName>
+          <isOutgoing v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>aa44f6ec-2b9b-43f8-902d-92490480413f</name>
+          <entityName>Pers_entity</entityName>
+          <fieldName>OrgAddress_dfo</fieldName>
+          <isOutgoing v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>AllowModifyingCoreData_param</name>
+          <code>%aditoprj%/entity/Address_entity/entityfields/orgaddress_dfi/children/allowmodifyingcoredata_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityIncomingField>
+    <entityParameter>
+      <name>RelId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityIncomingField>
+      <name>PersAddress_dfi</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
+          <entityName>Pers_entity</entityName>
+          <fieldName>PersAddress_dfo</fieldName>
+          <isOutgoing v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityIncomingField>
+    <entityParameter>
+      <name>StandardAddressId_param</name>
+      <expose v="true" />
+      <description>TODO: add description</description>
+    </entityParameter>
+    <entityField>
+      <name>IS_STANDARD</name>
+      <title>Standard</title>
+      <contentType>BOOLEAN</contentType>
+      <possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard/possibleItemsProcess.js</possibleItemsProcess>
+      <valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard/valueProcess.js</valueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityIncomingField>
+      <name>#INCOMING</name>
+    </entityIncomingField>
+    <entityParameter>
+      <name>AddressLineFieldsState_param</name>
+      <code>%aditoprj%/entity/Address_entity/entityfields/addresslinefieldsstate_param/code.js</code>
+      <expose v="false" />
+      <mandatory v="false" />
+      <description>Specifies the FieldState of all AddressLine-Fields (e.g. ZIP, COUNTRY, etc.)
+This is needed because you want to modify the record itself for setting the standard address but no other content.</description>
+    </entityParameter>
+    <entityParameter>
+      <name>AllowModifyingCoreData_param</name>
+      <code>%aditoprj%/entity/Address_entity/entityfields/allowmodifyingcoredata_param/code.js</code>
+      <description>Specified if it&amp;apos;s allowed to modify the address core data.
+If this is &amp;quot;false&amp;quot;, you cannot create od delete records or change the actual address-data, e.g. zip-code, address, buildingno, etc.</description>
+    </entityParameter>
+    <entityOutgoingField>
+      <name>Countries_dfo</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Countries_Entity</entityName>
+        <fieldName>ISO2_NAME</fieldName>
+      </dependency>
+    </entityOutgoingField>
+  </entityFields>
+  <recordContainers>
+    <dbRecordContainer>
+      <name>db</name>
+      <alias>Data_alias</alias>
+      <conditionProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <linkInformation>
+        <linkInformation>
+          <name>6a0005cc-c64b-4044-9712-c9d00f02d7a8</name>
+          <tableName>ADDRESS</tableName>
+          <primaryKey>ADDRESSID</primaryKey>
+          <isUIDTable v="true" />
+        </linkInformation>
+      </linkInformation>
+      <recordFieldMappings>
+        <dbRecordFieldMapping>
+          <name>ADDRESS.value</name>
+          <value>ADDRESS.ADDRESS</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CITY.value</name>
+          <value>ADDRESS.CITY</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDRESSADDITION.value</name>
+          <value>ADDRESS.ADDRESSADDITION</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>COUNTRY.value</name>
+          <value>ADDRESS.COUNTRY</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDRESSID.value</name>
+          <value>ADDRESS.ADDRESSID</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+          <value>ADDRESS.DATE_EDIT</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDRIDENTIFIER.value</name>
+          <value>ADDRESS.ADDRIDENTIFIER</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <value>ADDRESS.DATE_NEW</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ADDR_TYPE.value</name>
+          <value>ADDRESS.ADDR_TYPE</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISTRICT.value</name>
+          <value>ADDRESS.DISTRICT</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>BUILDINGNO.value</name>
+          <value>ADDRESS.BUILDINGNO</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>REGION.value</name>
+          <value>ADDRESS.REGION</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>RELATION_ID.value</name>
+          <value>ADDRESS.RELATION_ID</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>STATE.value</name>
+          <value>ADDRESS.STATE</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_EDIT.value</name>
+          <value>ADDRESS.USER_EDIT</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>USER_NEW.value</name>
+          <value>ADDRESS.USER_NEW</value>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ZIP.value</name>
+          <value>ADDRESS.ZIP</value>
+        </dbRecordFieldMapping>
+      </recordFieldMappings>
+    </dbRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/Address_entity/entityfields/addressid/valueProcess.js b/entity/Address_entity/entityfields/addressid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5a28fc848e4523331a600ba984ba1570e814c68
--- /dev/null
+++ b/entity/Address_entity/entityfields/addressid/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/is_standard/valueProcess.js b/entity/Address_entity/entityfields/is_standard/valueProcess.js
index cfac8d06fc2385a5bbce8e68059a1d2897c7a611..ba5b9904fae411a741614074309eb315af27266a 100644
--- a/entity/Address_entity/entityfields/is_standard/valueProcess.js
+++ b/entity/Address_entity/entityfields/is_standard/valueProcess.js
@@ -1,4 +1,8 @@
+import("system.neon");
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$param.StandardAddressId_param") == vars.get("$field.ADDRESSID"));
\ No newline at end of file
+if(vars.exists("$param.StandardAddressId_param") && vars.get("$param.StandardAddressId_param") != null && vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW && vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_EDIT)
+  result.string(vars.get("$param.StandardAddressId_param") == vars.get("$field.ADDRESSID"));
+else
+    result.string(false);
\ No newline at end of file