diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index 77248a98d35b3a662e3f84ab23a14062e553f082..9d93f1adf9ff6c4c939810f149808f61a49d2641 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,3 +1,3 @@
 #This file is generated by ADITO designer. Do NOT delete or modify!
-#Tue Jun 18 13:20:50 CEST 2019
-version=5.1.17
+#Thu Jun 27 07:34:31 CEST 2019
+version=5.1.18
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTE.xml b/.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTE.xml
similarity index 99%
rename from .liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTE.xml
rename to .liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTE.xml
index ccbf6e85d419fe80105542b309ed4156a3daa85f..60d66a0bdaf743edf78de1eef253b2d00b7c40eb 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTE.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTE.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="3e8ccb05-1f0b-4de4-894a-bbb1d07975f0">
-    <delete tableName="AB_ATTRIBUTE"/>
     <insert tableName="AB_ATTRIBUTE">
       <column name="AB_ATTRIBUTEID" value="bae6db6b-259a-4f36-9112-4516b7f8cfeb"/>
       <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTEUSAGE.xml b/.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTEUSAGE.xml
similarity index 99%
rename from .liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTEUSAGE.xml
rename to .liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTEUSAGE.xml
index 799b0a9c91f04ceb1cf67f35f2f7031f16d76030..97d385d676be03f04ed8321adac32646f2e623b1 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTEUSAGE.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTEUSAGE.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="97e51aa3-5472-4700-8702-d0b0720eb313">
-    <delete tableName="AB_ATTRIBUTEUSAGE"/>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="48e9320b-b2b4-4523-bb34-e68749fe1465"/>
       <column name="AB_ATTRIBUTE_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
index 2ff3b8fd1ecb165d9de36d7f41ec455b5083729c..c76020a5b1a97d67a9725995fa037b5619ff5a1c 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
@@ -163,4 +163,7 @@
     <include relativeToChangelogFile="true" file="DSGVO/update_comm_medium.xml"/>
     
     <include relativeToChangelogFile="true" file="AditoBasic/init_UnlinkedMail.xml"/>
+
+    <include relativeToChangelogFile="true" file="Attributes/AB_ATTRIBUTE.xml"/>
+    <include relativeToChangelogFile="true" file="Attributes/AB_ATTRIBUTEUSAGE.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/changelog.xml b/.liquibase/Data_alias/basic/_demoData/changelog.xml
index 5825a83e765ef8e2225fce4443dff7ddd454927d..fadb02846c3c9b2c3402abe2501f5451e8006cba 100644
--- a/.liquibase/Data_alias/basic/_demoData/changelog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/changelog.xml
@@ -1,10 +1,7 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <include relativeToChangelogFile="true" file="generatedData/AB_ATTRIBUTE.xml"/>
     <include relativeToChangelogFile="true" file="generatedData/AB_ATTRIBUTERELATION.xml"/>
-    <include relativeToChangelogFile="true" file="generatedData/AB_ATTRIBUTEUSAGE.xml"/>
     <include relativeToChangelogFile="true" file="generatedData/AB_OBJECTRELATION.xml"/>
-    <include relativeToChangelogFile="true" file="generatedData/AB_OBJECTRELATIONTYPE.xml"/>
     <include relativeToChangelogFile="true" file="generatedData/ACTIVITY.xml"/>
     <include relativeToChangelogFile="true" file="generatedData/ACTIVITYLINK.xml"/>
     <include relativeToChangelogFile="true" file="generatedData/ADDRESS.xml"/>
@@ -25,7 +22,6 @@
     <include relativeToChangelogFile="true" file="generatedData/MEMBER.xml"/>
     <include relativeToChangelogFile="true" file="generatedData/SALESPROJECT_MILESTONE.xml"/>
     <include relativeToChangelogFile="true" file="generatedData/SALESPROJECT_SOURCE.xml"/>
-    <include relativeToChangelogFile="true" file="generatedData/SALUTATION.xml"/>
     <include relativeToChangelogFile="true" file="generatedData/TASK.xml"/>
     <include relativeToChangelogFile="true" file="generatedData/TASKLINK.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml
index f76dac9dddb7339e4490e1cad17f2d080271cc0e..430546f14d6d56f5a60a360f3404e5b1faa0453c 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="a2f47e80-5bcb-4e8d-8899-9b5f6189ba36">
-    <delete tableName="AB_ATTRIBUTERELATION"/>
     <insert tableName="AB_ATTRIBUTERELATION">
       <column name="AB_ATTRIBUTERELATIONID" value="d4a3c8a0-2050-4147-abad-43a1f35ccbf0"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_OBJECTRELATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/AB_OBJECTRELATION.xml
index 49d2bf8936f4050ade116404738cd72220af42e5..3e9351ef4262234335e9b8e5af9548b2c2bc958e 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_OBJECTRELATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/AB_OBJECTRELATION.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="66131cd5-2545-4116-8e29-2a226aaea231">
-    <delete tableName="AB_OBJECTRELATION"/>
     <insert tableName="AB_OBJECTRELATION">
       <column name="AB_OBJECTRELATIONID" value="63ecd05d-f2e5-4957-a496-96a87451a78f"/>
       <column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_OBJECTRELATIONTYPE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/AB_OBJECTRELATIONTYPE.xml
deleted file mode 100644
index 214acdd7f1d981bb57b439ceb493251b481c251b..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_OBJECTRELATIONTYPE.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="af776278-fd10-40ce-954c-1a42d530d119">
-    <delete tableName="AB_OBJECTRELATIONTYPE"/>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
-      <column name="HIERARCHY" valueNumeric="1"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="parent company"/>
-      <column name="RELATION_TYPE" value="a054875d-b9a2-499d-877b-ccec31358324"/>
-      <column name="SIDE" valueNumeric="1"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
-      <column name="HIERARCHY" valueNumeric="1"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="subsidiary"/>
-      <column name="RELATION_TYPE" value="a054875d-b9a2-499d-877b-ccec31358324"/>
-      <column name="SIDE" valueNumeric="2"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="c74ad02c-1db9-4f47-8691-aba349dbe316"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="parent of"/>
-      <column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
-      <column name="SIDE" valueNumeric="1"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="child of"/>
-      <column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
-      <column name="SIDE" valueNumeric="2"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="3d2808bf-397b-4220-a563-36b066b5c9a9"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="supports"/>
-      <column name="RELATION_TYPE" value="5ab4d256-4220-4c28-88d6-1db01e2f4667"/>
-      <column name="SIDE" valueNumeric="1"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="a51e23c0-d44a-4e39-a79b-7a357fb79cc2"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="supported by"/>
-      <column name="RELATION_TYPE" value="5ab4d256-4220-4c28-88d6-1db01e2f4667"/>
-      <column name="SIDE" valueNumeric="2"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="b96a36ff-bc43-4159-a6e7-3d53cba67189"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="supervisor of"/>
-      <column name="RELATION_TYPE" value="4df4160d-6efc-43b3-9b02-710ab3d0228c"/>
-      <column name="SIDE" valueNumeric="1"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="0a47c346-9b6f-4cdd-8c38-77800d7012f5"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="reports to"/>
-      <column name="RELATION_TYPE" value="4df4160d-6efc-43b3-9b02-710ab3d0228c"/>
-      <column name="SIDE" valueNumeric="2"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="solicits"/>
-      <column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
-      <column name="SIDE" valueNumeric="1"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="e397b595-38ae-4365-908e-75ee388838eb"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="promotion target of"/>
-      <column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
-      <column name="SIDE" valueNumeric="2"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="competitor"/>
-      <column name="RELATION_TYPE" value="032ebe0a-7204-4eec-82a2-cb13b65850d7"/>
-      <column name="SIDE" valueNumeric="1"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="society"/>
-      <column name="RELATION_TYPE" value="9f65f915-2767-40c4-9e7b-e818e915648f"/>
-      <column name="SIDE" valueNumeric="1"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="member"/>
-      <column name="RELATION_TYPE" value="9f65f915-2767-40c4-9e7b-e818e915648f"/>
-      <column name="SIDE" valueNumeric="2"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="acquainted with"/>
-      <column name="RELATION_TYPE" value="84120fad-e7a2-4961-8c29-d00da41efe48"/>
-      <column name="SIDE" valueNumeric="1"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="RELATION_TITLE" value="collaboration with"/>
-      <column name="RELATION_TYPE" value="091d866f-67e8-4fd6-afdc-e40d0f2be224"/>
-      <column name="SIDE" valueNumeric="1"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="39e73949-c8d9-46a2-a0b5-18be95e7ba11"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="grandparents of"/>
-      <column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
-      <column name="SIDE" valueNumeric="1"/>
-    </insert>
-    <insert tableName="AB_OBJECTRELATIONTYPE">
-      <column name="AB_OBJECTRELATIONTYPEID" value="a2296f93-2371-4ab8-9f29-ef0795d1e9b2"/>
-      <column name="HIERARCHY" valueNumeric="0"/>
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="RELATION_TITLE" value="ankle of"/>
-      <column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
-      <column name="SIDE" valueNumeric="2"/>
-    </insert>
-  </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml
index 0faeba098dbd90c2014e45c1c974d51353c8de42..b1d262706df9bf12edf9bcce0040c7a6f4a550f1 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="f0f5bb59-9d56-4b3c-ad63-9d848f30d08a">
-    <delete tableName="ACTIVITY"/>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
       <column name="CATEGORY" value="ONLINE-MEETING"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITYLINK.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITYLINK.xml
index b2de4a7f93662a43ff0755c948b8f2bbebff7b25..85e8b25f4d1c81f92d9572ddd3e7b7fbae7c8a21 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITYLINK.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITYLINK.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="72e2f2ed-ecc0-41e5-87d2-426d989a024d">
-    <delete tableName="ACTIVITYLINK"/>
     <insert tableName="ACTIVITYLINK">
       <column name="ACTIVITYLINKID" value="7f9cbd45-7ff0-4d7d-9412-58db6245f400"/>
       <column name="ACTIVITY_ID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml
index 81eed0ef0cb5d2435e4ca18dd0cdbc3457482b68..1c6edf7f001f3d117f664da2732ca6f845e17d65 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="d2e11022-b07b-4bc2-a6b3-0c2dc922f6e6">
-    <delete tableName="ADDRESS"/>
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Spresstrasse"/>
       <column name="ADDRESSID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml
index 9adf78a594378b7f1044744801cd1b165c960ac5..1cde603c964a9f2bf741c05e9844206528ebe438 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="c65e668b-1ab5-4166-88f4-d65e0f36325e">
-    <delete tableName="COMMUNICATION"/>
     <insert tableName="COMMUNICATION">
       <column name="ADDR" value="tadmin@meine-firma.de"/>
       <column name="COMMUNICATIONID" value="3ccc54d5-dfb0-4da9-a0a0-472025f65994"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml
index 3336281524ec4bc6c4cb33f7995f2c083bf6fe02..b976d26396755e4c3e7828b9afd50bfcbab2da5a 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml
@@ -1,16 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="d1193964-e9b4-4f15-bbde-1512168c57a6">
-    <delete tableName="CONTACT"/>
-    <insert tableName="CONTACT">
-      <column name="ADDRESS_ID" value="0                                   "/>
-      <column name="CONTACTID" value="0                                   "/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="LANGUAGE" value="deu"/>
-      <column name="ORGANISATION_ID" value="0                                   "/>
-      <column name="STATUS" value="CONTACTSTATACTIVE"/>
-      <column name="USER_NEW" value="Admin"/>
-    </insert>
     <insert tableName="CONTACT">
       <column name="ADDRESS_ID" value="14d03432-985b-4efe-a634-da71ae482907"/>
       <column name="CONTACTID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml
index 55e7b7c0a8edcc11fd9077483a901271b87fcb54..b1002527a8c6ed393cbba7a28d175a4d1b2716ea 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="e80a27d2-2ebf-470c-a0a3-ac41eb9bf30f">
-    <delete tableName="CONTRACT"/>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="CONTRACTCODE" value="1000"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml
index c10eddbb98a501a44fffcc0b50339f9bb19bf819..25f71603c87de7fb9198c6e8ee02e9cb891b4755 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="6bbd2406-6a0d-4181-a3af-a0bf75eced39">
-    <delete tableName="DOCUMENTTEMPLATE"/>
     <insert tableName="DOCUMENTTEMPLATE">
       <column name="DATE_NEW" valueDate="2019-05-24"/>
       <column name="DOCUMENTTEMPLATEID" value="f032c593-f108-47dd-9fc2-357c14757a9d"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml
index d4f41b3d0622d99678b51814e73916dfed1a3f45..2e8147844f8d7ae49d8b7e4d943c6cde52e074a5 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml
@@ -3,7 +3,6 @@
   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" 
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="4dd98257-1230-490f-bbe3-5122bd40ace4">
-    <delete tableName="FORECAST"/>
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2019-05-17T02:00:00"/>
       <column name="GROUPCODE" value="PRODUCTGROUP3"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml
index ef913148dac322e74fe2273d2dfd0dd4f890e988..3c65f994e289f4a10bb660d47fe7e5a05a1cd6cc 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml
@@ -3,7 +3,6 @@
   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" 
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="9830be31-7d74-46f8-a006-06d25b8229eb">
-    <delete tableName="MEMBER"/>
     <insert tableName="MEMBER">
       <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml
index 40205da6d9d71232a5fd6351f56c157825c1094f..3e526eb45e64283012ae02094f22f72f02ea8bac 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml
@@ -3,7 +3,6 @@
   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" 
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="25f7045d-e9e6-4a1b-b71a-9e6743a92cd8">
-    <delete tableName="OFFER"/>
     <insert tableName="OFFER">
       <column name="ADDRESS" value="Industrial Steel AG&#10;Stahlstraße 24&#10;20095 Hamburg"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml
index 2047f483d9fb0a0604837261606a147f306f8502..3b0c49b7d816ade70647101a032d8a6d174d284a 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="ed3c0518-7df4-4d57-a72e-2a74f75f374a">
-    <delete tableName="OFFERITEM"/>
     <insert tableName="OFFERITEM">
       <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
index df4508e305ddbfde1432c5d968a2f1831767c70f..c8e0ccf77f2cf09dde719e882b6dc9432c0589bb 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="f0d90697-92a1-4772-aed3-a63f555e65d0">
-    <delete tableName="ORGANISATION"/>
     <insert tableName="ORGANISATION">
       <column name="CUSTOMERCODE" value="1234"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T01:56:19"/>
@@ -147,13 +146,6 @@
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
-    <insert tableName="ORGANISATION">
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="NAME" value="privat"/>
-      <column name="ORGANISATIONID" value="0                                   "/>
-      <column name="TYPE" value="ORGCUTOMER"/>
-      <column name="USER_NEW" value="Admin"/>
-    </insert>
     <insert tableName="ORGANISATION">
       <column name="CUSTOMERCODE" value="0001"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:35:38"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON.xml
index 7cfd926ae9cf19c750e7b3a072beebf3a64dcd7f..efcac7a727bc99595508b68a9ab3106076dbcf4f 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="dd776383-55a6-412b-b7a9-50df698029d4">
-    <delete tableName="PERSON"/>
     <insert tableName="PERSON">
       <column name="DATEOFBIRTH" valueDate="1991-02-01"/>
       <column name="DATE_EDIT" valueDate="2019-05-29T04:02:01"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
index 863a7e50edf77754af8b868e0a2f02456d3ae8e8..d17b83d957a2a8e6454bde2c62835aef181192d5 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="61c9b746-b9ac-4521-a846-20d0361c0023">
-    <delete tableName="PRODUCT"/>
     <insert tableName="PRODUCT">
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T11:13:33"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml
index a0dbd2165bbd7fdc3ff48451210aa33bff3c3432..97cb34c3f225bd9dcf66cfad73bc9d8d0a2b6410 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="1498715a-2292-43ab-ba21-adabe92795f2">
-    <delete tableName="PRODUCTPRICE"/>
     <insert tableName="PRODUCTPRICE">
       <column name="BUYSELL" value="SP"/>
       <column name="CURRENCY" value="EUR                                 "/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
index 089b4a45a14d20c4337cead71bec7e744ae15599..c31392d80602cfce21f1add32f068ce48eddebc2 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="d36d2933-8630-41dd-adba-b340e7d91024">
-    <delete tableName="SALESORDER"/>
     <insert tableName="SALESORDER">
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
       <column name="CURRENCY" value="EUR                                 "/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml
index 79a8a2edd879ee1764e9035fd402d8c9642a18fd..27e204d4605622485d0bb4de51e7ec3092f1764a 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="6179af3a-4596-4389-b0d9-824b5c059006">
-    <delete tableName="SALESORDERITEM"/>
     <insert tableName="SALESORDERITEM">
       <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml
index 260013b8567e15beddf48f6b6602a52423edfb09..7f9edcfca85b80eef78a6716a8b31e861daa3277 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="301fa7a0-f5a7-4bc1-a53b-cb6a4a6dae35">
-    <delete tableName="SALESPROJECT"/>
     <insert tableName="SALESPROJECT">
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="ENDDATE" valueDate="2020-05-16T02:00:00"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
index 2327b4f26414adcea4e22c3bc1145a1ab8ef4378..9abc91ea7ec148390d6c05ff14fa954866be37b0 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="39eb990c-b75c-4bc2-bd52-4c91c01430fc">
-    <delete tableName="SALESPROJECT_MILESTONE"/>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_END" valueDate="2019-05-23T10:18:10"/>
       <column name="DATE_START" valueDate="2019-05-16T01:34:58"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml
index cf63a8b5430e047a4bfa7faa86f2e4a7ed5e86f8..234622c0aa677b4aec5d0a74bb6ef57271e40648 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="a4a96fc2-81cb-41a6-ac45-e935fe7378db">
-    <delete tableName="SALESPROJECT_SOURCE"/>
     <insert tableName="SALESPROJECT_SOURCE">
       <column name="ENTRYDATE" valueDate="2019-05-17T08:22:56"/>
       <column name="INFO" value="Kontakt über die Webseite"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALUTATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALUTATION.xml
deleted file mode 100644
index 7fef3dced60ff663e1df7abe4ef178ede67eddbd..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALUTATION.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="autogenerated" id="89286386-04d2-4854-8cc7-09910b328e47">
-    <delete tableName="SALUTATION"/>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Herr {fn} {ln}"/>
-      <column name="LANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrter Herr {ln}"/>
-      <column name="SALUTATION" value="Herr"/>
-      <column name="SALUTATIONID" value="c98c8644-9e00-4715-a775-827a364f5cef"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="1"/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Herr Bürgermeister {fn} - {ln}"/>
-      <column name="LANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrter Herr Bürgermeister"/>
-      <column name="SALUTATION" value="Herr"/>
-      <column name="SALUTATIONID" value="8feaf27b-1fae-4d8c-a742-9cd023f46409"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="2"/>
-      <column name="TITLE" value="Bürgermeister"/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Frau {fn} {ln}"/>
-      <column name="LANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrte Frau {ln}"/>
-      <column name="SALUTATION" value="Frau"/>
-      <column name="SALUTATIONID" value="cbcc2c2b-9b64-442b-a6be-aaf8e462128c"/>
-      <column name="SEX" value="f                                   "/>
-      <column name="SORT" valueNumeric="3"/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="LANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrte Dameng und Herreng"/>
-      <column name="SALUTATIONID" value="6b835563-5d3e-4c4c-807b-63c5bdb82e68"/>
-      <column name="SORT" valueNumeric="4"/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="{ti} {fn} {ln}"/>
-      <column name="LANGUAGE" value="eng"/>
-      <column name="LETTERSALUTATION" value="Dear Dr.  {ln}"/>
-      <column name="SALUTATION" value="Mr."/>
-      <column name="SALUTATIONID" value="f9135efb-ebd4-4c9f-bfa1-3beedb647009"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="5"/>
-      <column name="TITLE" value="Dr."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Dr. {fn} {ln}"/>
-      <column name="LANGUAGE" value="eng"/>
-      <column name="LETTERSALUTATION" value="Dear Dr. {ln}"/>
-      <column name="SALUTATION" value="Mrs."/>
-      <column name="SALUTATIONID" value="0b9a3d9b-a56c-47e9-a984-e88cface58db"/>
-      <column name="SEX" value="f                                   "/>
-      <column name="SORT" valueNumeric="6"/>
-      <column name="TITLE" value="Dr."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="LANGUAGE" value="fra"/>
-      <column name="LETTERSALUTATION" value="Madame, Monsieur"/>
-      <column name="SALUTATIONID" value="ff97826d-a8ea-45e5-b426-2a27f4fa9201"/>
-      <column name="SORT" valueNumeric="7"/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Monsieur {fn} {ln}"/>
-      <column name="LANGUAGE" value="fra"/>
-      <column name="LETTERSALUTATION" value="Monsieur"/>
-      <column name="SALUTATION" value="Monsieur"/>
-      <column name="SALUTATIONID" value="c1095e86-38d6-4329-a388-4cfabab10eae"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="8"/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Frau Dr. {fn} {ln}"/>
-      <column name="LANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrte Frau Dr. {ln}"/>
-      <column name="SALUTATION" value="Frau"/>
-      <column name="SALUTATIONID" value="6b35b8c5-920c-408b-b172-453a506aa775"/>
-      <column name="SEX" value="f                                   "/>
-      <column name="SORT" valueNumeric="9"/>
-      <column name="TITLE" value="Dr."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Monsieur Prof.{fn} {ln}"/>
-      <column name="LANGUAGE" value="fra"/>
-      <column name="LETTERSALUTATION" value="Monsieur Prof."/>
-      <column name="SALUTATION" value="Monsieur"/>
-      <column name="SALUTATIONID" value="67fa73ae-a739-44fd-9244-28a49bc0d01d"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="10"/>
-      <column name="TITLE" value="Prof."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Monsieur Dr.{fn} {ln}"/>
-      <column name="LANGUAGE" value="fra"/>
-      <column name="LETTERSALUTATION" value="Monsieur Dr."/>
-      <column name="SALUTATION" value="Monsieur"/>
-      <column name="SALUTATIONID" value="516b740d-b932-4a64-b611-af0ea69f6bd0"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="11"/>
-      <column name="TITLE" value="Dr."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Herr Professor {fn} {ln}"/>
-      <column name="LANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
-      <column name="SALUTATION" value="Herr"/>
-      <column name="SALUTATIONID" value="5d9ad542-27b8-4dec-bcbd-a2c7d223f012"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="12"/>
-      <column name="TITLE" value="Professor"/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Herr Dr. {fn} {ln}"/>
-      <column name="LANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrter Herr Dr. {ln}"/>
-      <column name="SALUTATION" value="Herr"/>
-      <column name="SALUTATIONID" value="76fe57c0-cf68-4240-ba6d-eb7d52f46317"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="13"/>
-      <column name="TITLE" value="Dr."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Herr Präsident {fn} {ln}"/>
-      <column name="LANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrter Herr Präsident"/>
-      <column name="SALUTATION" value="Herr"/>
-      <column name="SALUTATIONID" value="4b9af3f4-f34a-4170-a28c-ffdbca80c4d3"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="14"/>
-      <column name="TITLE" value="Präsident"/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Herr Prof. Dr. {fn} {ln}"/>
-      <column name="LANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
-      <column name="SALUTATION" value="Herr"/>
-      <column name="SALUTATIONID" value="1f19ba34-8346-4620-a10e-fb39fdd0be9b"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="15"/>
-      <column name="TITLE" value="Prof. Dr."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Mr. {fn} {ln}"/>
-      <column name="LANGUAGE" value="eng"/>
-      <column name="LETTERSALUTATION" value="Dear Mr. {ln}"/>
-      <column name="SALUTATION" value="Mr."/>
-      <column name="SALUTATIONID" value="801efd2a-41ce-4a5d-8ed5-c2db7fedb4e8"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="16"/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Professor {fn} {ln}"/>
-      <column name="LANGUAGE" value="eng"/>
-      <column name="LETTERSALUTATION" value="Dear Professor {ln}"/>
-      <column name="SALUTATION" value="Mr."/>
-      <column name="SALUTATIONID" value="ce348b08-c1bf-4e76-8272-6d6b32ecdd6a"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="17"/>
-      <column name="TITLE" value="Professor"/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Mrs. {fn} {ln}"/>
-      <column name="LANGUAGE" value="eng"/>
-      <column name="LETTERSALUTATION" value="Dear Mrs. {ln}"/>
-      <column name="SALUTATION" value="Mrs."/>
-      <column name="SALUTATIONID" value="11816f93-f6e9-427f-af68-fbf29c3e3544"/>
-      <column name="SEX" value="f                                   "/>
-      <column name="SORT" valueNumeric="18"/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Madame {fn} {ln}"/>
-      <column name="LANGUAGE" value="fra"/>
-      <column name="LETTERSALUTATION" value="Madame"/>
-      <column name="SALUTATION" value="Madame"/>
-      <column name="SALUTATIONID" value="2360e24d-1784-47b8-b0e9-3b57bd704e8a"/>
-      <column name="SEX" value="f                                   "/>
-      <column name="SORT" valueNumeric="19"/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="LANGUAGE" value="eng"/>
-      <column name="LETTERSALUTATION" value="Dear Sir or Madame"/>
-      <column name="SALUTATIONID" value="f7b3c876-366d-438a-a1e6-f17ceb641f36"/>
-      <column name="SORT" valueNumeric="20"/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Herr Prof. {fn} {ln}"/>
-      <column name="LANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
-      <column name="SALUTATION" value="Herr"/>
-      <column name="SALUTATIONID" value="75f4f04f-1877-425d-8d5d-56604d0040b2"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="21"/>
-      <column name="TITLE" value="Prof."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Monsieur Prof.Dr.{fn} {ln}"/>
-      <column name="LANGUAGE" value="fra"/>
-      <column name="LETTERSALUTATION" value="Monsieur Prof.Dr."/>
-      <column name="SALUTATION" value="Monsieur"/>
-      <column name="SALUTATIONID" value="2d8ec97f-38d7-45a8-9c45-ed672f4b035d"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="22"/>
-      <column name="TITLE" value="Prof.Dr."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Madame Dr.{fn} {ln}"/>
-      <column name="LANGUAGE" value="fra"/>
-      <column name="LETTERSALUTATION" value="Madame Dr."/>
-      <column name="SALUTATION" value="Madame"/>
-      <column name="SALUTATIONID" value="4e76c69b-ee75-49e5-8581-2a808b29a117"/>
-      <column name="SEX" value="f                                   "/>
-      <column name="SORT" valueNumeric="23"/>
-      <column name="TITLE" value="Dr."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Monsieur Dr. Ing. {fn} {ln}"/>
-      <column name="LANGUAGE" value="fra"/>
-      <column name="LETTERSALUTATION" value="Monsieur Dr. Ing. {ln}"/>
-      <column name="SALUTATION" value="Monsieur"/>
-      <column name="SALUTATIONID" value="f3ea547a-d744-4ce8-815a-126d9697e037"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="24"/>
-      <column name="TITLE" value="Dr. Ing."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Madame Dr. Ing. {fn} {ln}"/>
-      <column name="LANGUAGE" value="fra"/>
-      <column name="LETTERSALUTATION" value="Madame Dr. Ing. {ln}"/>
-      <column name="SALUTATION" value="Madame"/>
-      <column name="SALUTATIONID" value="e8e001ab-b200-480f-917b-33d57e2a8734"/>
-      <column name="SEX" value="f                                   "/>
-      <column name="SORT" valueNumeric="25"/>
-      <column name="TITLE" value="Dr. Ing."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Frau Dr. Ing. {fn} {ln}"/>
-      <column name="LANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrte Frau Dr. Ing. {ln}"/>
-      <column name="SALUTATION" value="Frau"/>
-      <column name="SALUTATIONID" value="0e719a2a-1018-49e0-b056-c90779955bf9"/>
-      <column name="SEX" value="f                                   "/>
-      <column name="SORT" valueNumeric="26"/>
-      <column name="TITLE" value="Dr. Ing."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Herr Dr. Ing. {fn} {ln}"/>
-      <column name="LANGUAGE" value="deu"/>
-      <column name="LETTERSALUTATION" value="Sehr geehrter Herr Dr. Ing. {ln}"/>
-      <column name="SALUTATION" value="Herr"/>
-      <column name="SALUTATIONID" value="0500939e-5820-457d-a95f-6835b9501df9"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="27"/>
-      <column name="TITLE" value="Dr. Ing."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Mr. Dr. Ing. {fn} {ln}"/>
-      <column name="LANGUAGE" value="eng"/>
-      <column name="LETTERSALUTATION" value="Dear Dr. Ing. {ln}"/>
-      <column name="SALUTATION" value="Mr."/>
-      <column name="SALUTATIONID" value="5260f79c-1001-41dc-b3ff-28b4ce7091b9"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="28"/>
-      <column name="TITLE" value="Dr. Ing."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Señor Dr. Ing. {fn} {ln}"/>
-      <column name="LANGUAGE" value="spa"/>
-      <column name="LETTERSALUTATION" value="Estimado Dr. Ing. {ln}"/>
-      <column name="SALUTATION" value="Señor"/>
-      <column name="SALUTATIONID" value="7617a199-82b7-40ef-b2f7-0e85d32fad64"/>
-      <column name="SEX" value="m                                   "/>
-      <column name="SORT" valueNumeric="29"/>
-      <column name="TITLE" value="Dr. Ing."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Señora Dr. Ing. {fn} {ln}"/>
-      <column name="LANGUAGE" value="spa"/>
-      <column name="LETTERSALUTATION" value="Estimado Dr. Ing. {ln}"/>
-      <column name="SALUTATION" value="Señora"/>
-      <column name="SALUTATIONID" value="25b28c87-edb5-4686-a3c4-92a5136aadc0"/>
-      <column name="SEX" value="f                                   "/>
-      <column name="SORT" valueNumeric="30"/>
-      <column name="TITLE" value="Dr. Ing."/>
-    </insert>
-    <insert tableName="SALUTATION">
-      <column name="HEADLINE" value="Mrs. Dr. Ing. {fn} {ln}"/>
-      <column name="LANGUAGE" value="eng"/>
-      <column name="LETTERSALUTATION" value="Dear Dr. Ing. {ln}"/>
-      <column name="SALUTATION" value="Mrs."/>
-      <column name="SALUTATIONID" value="4505783d-8a9f-4a18-ba2e-091794db3812"/>
-      <column name="SEX" value="f                                   "/>
-      <column name="SORT" valueNumeric="31"/>
-      <column name="TITLE" value="Dr. Ing."/>
-    </insert>
-  </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
index 8c72cc9c83ea3a7a39494f8b9531eea3f2106b1e..aeb8b84043ae3f7d5b4b2be615cb69da6dcc6a61 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="08f2d3ea-72db-4aad-b18e-d3f36eb83ee0">
-    <delete tableName="TASK"/>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Zu offenen Opportunities den Forecast anpassen"/>
       <column name="MATURITY_DATE" valueDate="2019-05-24T09:34:00"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/TASKLINK.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/TASKLINK.xml
index d92a45fe48eec05d589344f0fa14e8d0b6c25ad0..4d1b838bff9f5a502d7a931c75f8117480ecf927 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/TASKLINK.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/TASKLINK.xml
@@ -1,7 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
   <changeSet author="autogenerated" id="a7e29a35-f91f-4de3-a7f1-3fe9f1617a8c">
-    <delete tableName="TASKLINK"/>
     <insert tableName="TASKLINK">
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
index b3953edcbdba55a383ccbf7336ed9493f7c79617..2ffeb89a270aad2faa93e843109cfcd93defb5e9 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
@@ -1,27 +1,27 @@
-import("system.SQLTYPES");
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.db");
-import("Sql_lib");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sqlQuery, sqlHelper, queryCondition, affectedIds;
-queryCondition = "";
-if (vars.exists("$local.idvalue")) {
-    affectedIds = vars.get("$local.idvalue");
-    queryCondition = "where OFFERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
-    //TODO: refactor this for incremental indexer (injections?)
-}
-sqlHelper = new SqlMaskingUtils();
-sqlQuery = "select SALESORDERID, " 
-    + sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesorderState(), "SALESORDER.STATUS")], " | ")
-    + " as TITLECOLUMN, " 
-    + sqlHelper.concat(["ORGANISATION.NAME"], " | ") 
-    + " as DESCCOLUMN, SALESORDERCODE, ORGANISATION.NAME, CUSTOMERCODE "
-    + " from SALESORDER "
-    + " join CONTACT on SALESORDER.CONTACT_ID = CONTACTID "
-    + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID "
-    + queryCondition + " order by SALESORDERCODE ";
+import("system.SQLTYPES");
+import("system.result");
+import("system.vars");
+import("system.calendars");
+import("system.db");
+import("Sql_lib");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sqlQuery, sqlHelper, queryCondition, affectedIds;
+queryCondition = "";
+if (vars.exists("$local.idvalue")) {
+    affectedIds = vars.get("$local.idvalue");
+    queryCondition = "where SALESORDERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
+    //TODO: refactor this for incremental indexer (injections?) ----> use SqlCondition Lib
+}
+sqlHelper = new SqlMaskingUtils();
+sqlQuery = "select SALESORDERID, " 
+    + sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesorderState(), "SALESORDER.STATUS")], " | ")
+    + " as TITLECOLUMN, " 
+    + sqlHelper.concat(["ORGANISATION.NAME"], " | ") 
+    + " as DESCCOLUMN, SALESORDERCODE, ORGANISATION.NAME, CUSTOMERCODE "
+    + " from SALESORDER "
+    + " join CONTACT on SALESORDER.CONTACT_ID = CONTACTID "
+    + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID "
+    + queryCondition + " order by SALESORDERCODE ";
 result.string(sqlQuery);
\ No newline at end of file
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 3d70d6ee97d9fad9d50ae254009eee019596c633..584dc12334a37636f3b25a5676d6bd356616a600 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>360Degree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>360 Degree</title>
@@ -166,14 +166,26 @@
       <isFilterable v="true" />
       <isRequireContainerFiltering v="false" />
       <contentProcess>%aditoprj%/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>TARGET_ID.value</element>
-        <element>TARGET_CONTEXT.value</element>
-        <element>TITLE.value</element>
-        <element>DATE.value</element>
-        <element>ACTIVE.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TARGET_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TARGET_CONTEXT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TITLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DATE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ACTIVE.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
index 2fd7cd5c9882122a55934ae57599384bedbeba61..357494dd61670f70bd6bc10c72650a47e22e4e92 100644
--- a/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
-result.object(["Salesproject", "Offer", "Contract", "Campaign"]);
\ No newline at end of file
+import("system.vars");
+import("system.result");
+
+result.object(["Salesproject", "Offer", "Contract", "Campaign", "Order"]);
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
index 1af59e612029614a514ac91e1262b33b9850b423..2004dbd1cf970659a1d350fda68c4115067eec71 100644
--- a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
-result.object(["Offer", "Contract", "Campaign"]);
\ No newline at end of file
+import("system.vars");
+import("system.result");
+
+result.object(["Offer", "Contract", "Campaign", "Order"]);
\ No newline at end of file
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 79528f384bb8b92da89b10d828e3c63bd5b478b0..6d9fd655952dac6c48f48057ccad236704cee9d2 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>ActivityLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Connection</title>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index c53e18db55e60af81e1a347105067378e0771e77..40b966dcea0559b9cd6e9e2ab6d84db718f9db5d 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Activity_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index c8d3a2cb7b160f5398b1f041b76901835cfd5f85..fe5d656979506eac23575b14454c5607cc843196 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>AddressType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <contentTitleProcess>%aditoprj%/entity/AddressType_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index c45c994d0c67aa20e81788f929ca307c3dc631cc..2f0920361f2a176bce413f95eb4144e859a111d7 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>AddressValidation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <contentTitleProcess>%aditoprj%/entity/AddressValidation_entity/contentTitleProcess.js</contentTitleProcess>
@@ -139,23 +139,53 @@
       <isFilterable v="true" />
       <isRequireContainerFiltering v="true" />
       <contentProcess>%aditoprj%/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>UID.displayValue</element>
-        <element>ZIP.value</element>
-        <element>CITY.value</element>
-        <element>CITYEXT.value</element>
-        <element>COUNTRY.value</element>
-        <element>DISTRICT.value</element>
-        <element>REGION.value</element>
-        <element>STATE.value</element>
-        <element>STREET.value</element>
-        <element>FROM_BN.value</element>
-        <element>TO_BN.value</element>
-        <element>LON.value</element>
-        <element>LAT.value</element>
-        <element>VALUE.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>UID.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ZIP.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CITY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CITYEXT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>COUNTRY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DISTRICT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>REGION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>STATE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>STREET.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>FROM_BN.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TO_BN.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>LON.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>LAT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>VALUE.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 7693958037a0ab5a4896deea5fbf03d80074f9d1..b3663c0babe234eebf06c53be06ba7df764c5d54 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Address_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index 6658661779bf92d385590e5425de5bb2e199a973..9fceab95b2942693fd36b49d8ddd3b04c3e078df 100644
--- a/entity/Analyses_entity/Analyses_entity.aod
+++ b/entity/Analyses_entity/Analyses_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Analyses_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:GRID_BIG_O</icon>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 7c98fe14a763e4978957c60582c69a45d7c5d1e3..90faf37d0fccbe3b57c34ff21701cc448cdceddf 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>AnyContact_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 0d3f96d9815525dd2ad3e764f0b12916c231f11c..bef164a5e520892a1c6e8098013dc32f07334c83 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>AppointmentLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <recordContainer>db</recordContainer>
@@ -85,7 +85,6 @@
     </entityConsumer>
     <entityActionField>
       <name>opencontext</name>
-      <onActionProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js</onActionProcess>
     </entityActionField>
     <entityParameter>
       <name>LinkedObjectId_param</name>
diff --git a/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js b/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index ac66605041672527f5bffc2aa36a386187f7dcdc..7bd09fc91bc3500e041fc30bcfd3dc00216e7d1f 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Appointment_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
@@ -29,6 +29,7 @@
     </entityField>
     <entityField>
       <name>BEGIN</name>
+      <title>Begin</title>
       <contentType>DATE</contentType>
       <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
       <selectionMode>SINGLE</selectionMode>
@@ -36,6 +37,7 @@
     </entityField>
     <entityField>
       <name>END</name>
+      <title>End</title>
       <contentType>DATE</contentType>
       <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
       <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
@@ -55,6 +57,7 @@
     </entityField>
     <entityField>
       <name>LOCATION</name>
+      <title>Location</title>
     </entityField>
     <entityField>
       <name>REMINDER_CHECK</name>
@@ -221,30 +224,74 @@
       <onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onDelete.js</onDelete>
       <title>jdito</title>
       <description></description>
-      <recordFields>
-        <element>UID.value</element>
-        <element>ATTENDEESLENGTH.value</element>
-        <element>BEGIN.value</element>
-        <element>END.value</element>
-        <element>SUMMARY.value</element>
-        <element>ORGANIZER.value</element>
-        <element>ATTENDEES.value</element>
-        <element>STATUS.value</element>
-        <element>LINKS.value</element>
-        <element>DESCRIPTION.value</element>
-        <element>LOCATION.value</element>
-        <element>ICON.value</element>
-        <element>CLASSIFICATION.value</element>
-        <element>TRANSPARENCY.value</element>
-        <element>CATEGORIES.value</element>
-        <element>REMINDER.value</element>
-        <element>REMINDER_CHECK.value</element>
-        <element>RRULE.value</element>
-        <element>RECURRENCEID.value</element>
-        <element>SAFESCOPEFIELD.value</element>
-        <element>MASTERBEGIN.value</element>
-        <element>MASTEREND.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ATTENDEESLENGTH.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>BEGIN.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>END.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>SUMMARY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ORGANIZER.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ATTENDEES.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>STATUS.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>LINKS.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>LOCATION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ICON.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TRANSPARENCY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CATEGORIES.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>REMINDER.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>REMINDER_CHECK.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>RRULE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>RECURRENCEID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>SAFESCOPEFIELD.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>MASTERBEGIN.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>MASTEREND.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 745b6f08a500e5a4b8fe86efd73f1bf1dde537de..dcef8fd3aa56ebe122326604c6368ba072e8ae7a 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -1,9 +1,8 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>AttributeRelation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Attribute</title>
-  <onValidation>%aditoprj%/entity/AttributeRelation_entity/onValidation.js</onValidation>
   <titlePlural>Attributes</titlePlural>
   <recordContainer>jdito</recordContainer>
   <entityFields>
@@ -85,14 +84,6 @@
           <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js</valueProcess>
           <expose v="false" />
         </entityParameter>
-        <entityParameter>
-          <name>AttributeId_param</name>
-          <expose v="false" />
-        </entityParameter>
-        <entityParameter>
-          <name>IsNew_param</name>
-          <expose v="false" />
-        </entityParameter>
       </children>
     </entityProvider>
     <entityField>
@@ -224,10 +215,6 @@
           <name>GetTree_param</name>
           <expose v="false" />
         </entityParameter>
-        <entityParameter>
-          <name>AttributeId_param</name>
-          <expose v="false" />
-        </entityParameter>
       </children>
     </entityProvider>
     <entityField>
@@ -270,14 +257,26 @@
       <onInsert>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
       <onDelete>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>PARENT_ID.value</element>
-        <element>VALUE.value</element>
-        <element>VALUE.displayValue</element>
-        <element>AB_ATTRIBUTE_ID.value</element>
-        <element>AB_ATTRIBUTE_ID.displayValue</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PARENT_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>VALUE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>VALUE.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>AB_ATTRIBUTE_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>AB_ATTRIBUTE_ID.displayValue</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/AttributeRelation_entity/onValidation.js b/entity/AttributeRelation_entity/onValidation.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
index 1022a93cb39ee6d5c4abffc812b8c4b2aa824629..82afab12a9f65c35207a6cbb1352a38c984cd0b8 100644
--- a/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
@@ -42,6 +42,8 @@ else if (showEmpty || rowId)
     
     if (showEmpty)
     {
+        let filtered = vars.exists("$param.FilteredAttributeIds_param") && vars.getString("$param.FilteredAttributeIds_param");
+        
         let possibleAttributes = AttributeUtil.getPossibleAttributes(objectType);
         sqlCondition.andIn("AB_ATTRIBUTE.AB_ATTRIBUTEID", possibleAttributes);
     }
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 5a78d2334bfb3e4b7f7139c4b48ca8f6f3983b14..662efb9736c50b4cc22f354b991cf9f36f447502 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>AttributeUsage_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/AttributeUsage_entity/documentation.adoc</documentation>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 6621605971acd7e190fdb9fafe91923b55186190..b92d13c588da45cc74bcc88c91c91097333279af 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Attribute_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
@@ -336,19 +336,41 @@
       <onInsert>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
       <onDelete>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>ATTRIBUTE_PARENT_ID.value</element>
-        <element>ATTRIBUTE_ACTIVE.value</element>
-        <element>DROPDOWNDEFINITION.value</element>
-        <element>SORTING.value</element>
-        <element>ATTRIBUTE_TYPE.value</element>
-        <element>ATTRIBUTE_TYPE.displayValue</element>
-        <element>USAGELIST.value</element>
-        <element>ATTRIBUTE_NAME.value</element>
-        <element>ATTRIBUTE_PARENT_ID.displayValue</element>
-        <element>FULL_ATTRIBUTE_NAME.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ATTRIBUTE_PARENT_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ATTRIBUTE_ACTIVE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DROPDOWNDEFINITION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>SORTING.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ATTRIBUTE_TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ATTRIBUTE_TYPE.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>USAGELIST.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ATTRIBUTE_NAME.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ATTRIBUTE_PARENT_ID.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>FULL_ATTRIBUTE_NAME.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index 6058bdc2e8a7c7ba7c3d21c8f073630a8a8db5f7..ea8b88f1fb7aa2ee350f5e64697677bc12792974 100644
--- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>BulkMailRecipient_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Recipient</title>
@@ -100,7 +100,6 @@
       <alias>Data_alias</alias>
       <fromClauseProcess>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
       <conditionProcess>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
-      <orderClauseProcess>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
       <linkInformation>
         <linkInformation>
           <name>6cfe0097-5d5a-4ca1-a0fc-021ffb47013a</name>
diff --git a/entity/BulkMailRecipient_entity/recordcontainers/db/orderClauseProcess.js b/entity/BulkMailRecipient_entity/recordcontainers/db/orderClauseProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index 523ee2fa24a80669a6b326ada1242efc3cb05163..74ebbd65688fbe4493efc63f7f8033f59a190ba6 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>BulkMail_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:ENVELOPES</icon>
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 84f549db4a81ff69e3572a152c2a2115f7d27e5f..18fb280b72fab322c87f8cf5c305a757ad601e9e 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>CampaignAddParticipants_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Add participants to Campaign</title>
@@ -90,16 +90,6 @@
         <entityName>CampaignAnalysis_entity</entityName>
         <fieldName>#PROVIDER</fieldName>
       </dependency>
-      <children>
-        <entityParameter>
-          <name>campaignParticipants_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignparticipants_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>campaignStepId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignstepid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
     </entityConsumer>
     <entityField>
       <name>campaignStepCurrentParticipantCount</name>
@@ -121,9 +111,11 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <onInsert>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <recordFields>
-        <element>UID.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignparticipants_param/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignparticipants_param/valueProcess.js
deleted file mode 100644
index 15cd7f0e5db1eb1c0ac68bde896c552d9fd7ff01..0000000000000000000000000000000000000000
--- a/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignparticipants_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$param.campaignParticipants_param"));
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignstepid_param/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignstepid_param/valueProcess.js
deleted file mode 100644
index c082bd783cf9b494980ed91f842fc666d31c0e9c..0000000000000000000000000000000000000000
--- a/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignstepid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CAMPAIGNSTEP_ID"));
\ No newline at end of file
diff --git a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
index 69cb219cfd312afc22b9cea0fb43b0c6eed8826e..7347292e45c364c42da2befcab3de6624ffcdd65 100644
--- a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
+++ b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>CampaignAnalysis_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <recordContainer>jdito</recordContainer>
@@ -102,9 +102,11 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/CampaignAnalysis_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
index f7a27c33ac15ae5eb0c9161aaea372531cd17dfc..4a136d8ba1460daa0fe74ceae6eeed5e67bd39ff 100644
--- a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
+++ b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>CampaignCostChart_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <recordContainer>jdito</recordContainer>
@@ -43,13 +43,23 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/CampaignCostChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>PARENT.value</element>
-        <element>X.value</element>
-        <element>X.displayValue</element>
-        <element>Y.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PARENT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>X.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>X.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>Y.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod b/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
index 1bace191a21df6819ecf6e85dd26e426793faf89..21ee34366ada71acb960cc4c41fdf883b33f25d2 100644
--- a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
+++ b/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>CampaignCost_entitiy</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <afterOperatingState>%aditoprj%/entity/CampaignCost_entitiy/afterOperatingState.js</afterOperatingState>
diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod
index c50f744a3c5d9eb96cc95685de523c0a2361c059..a68dc16e28bc79b9e8491d07675a241dd8bec758 100644
--- a/entity/CampaignCost_entity/CampaignCost_entity.aod
+++ b/entity/CampaignCost_entity/CampaignCost_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>CampaignCost_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <afterOperatingState>%aditoprj%/entity/CampaignCost_entity/afterOperatingState.js</afterOperatingState>
diff --git a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
index f30172a7deac43064afd53df1323901e7e26dd43..bc742975b43623a41fda613ec77e8bf348be511b 100644
--- a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
+++ b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>CampaignParticipantChart_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <recordContainer>jdito</recordContainer>
@@ -43,14 +43,26 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>CATEGORY.value</element>
-        <element>CATEGORY.displayValue</element>
-        <element>X.value</element>
-        <element>X.displayValue</element>
-        <element>Y.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CATEGORY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CATEGORY.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>X.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>X.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>Y.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 8415479efcab29b2fd7a0304154ec135c9578f50..407905797b72320c618c4f22a5cd785c1d6c7de6 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>CampaignParticipant_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Participant</title>
@@ -191,12 +191,6 @@
         <entityName>CommRestriction_Entity</entityName>
         <fieldName>PersonsCommRestriction</fieldName>
       </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
     </entityConsumer>
   </entityFields>
   <recordContainers>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 80f03f5a37a44f9d51299501c93bed89c1dd448b..ef2febe8a8f29bf0892d9aba16e17b517226215e 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>CampaignStep_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>NEON:GROUP_APPOINTMENT</icon>
@@ -56,7 +56,6 @@
       <inputFormat>dd.MM.yyyy</inputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js</valueProcess>
-      <onValueChange>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>DATE_END</name>
diff --git a/entity/CampaignStep_entity/entityfields/date_end/onValidation.js b/entity/CampaignStep_entity/entityfields/date_end/onValidation.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/CampaignStep_entity/entityfields/date_start/onValidation.js b/entity/CampaignStep_entity/entityfields/date_start/onValidation.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/CampaignStep_entity/entityfields/date_start/onValueChange.js b/entity/CampaignStep_entity/entityfields/date_start/onValueChange.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 328e9a0af0deb7ba95f8b76e0cf6f90bbf1cf606..bf4ddf2880b333ef0a914438cfb843e428e637ec 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Campaign_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:GROUP</icon>
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index b42f3d43475016789581492e3cf7c11af77ab6b7..326346715cc5967f7a68b33e831ec57b126b9603 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>ClassificationAdmin_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:LIST_OL</icon>
@@ -145,18 +145,38 @@
       <onInsert>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
       <onDelete>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>CLASSIFICATIONID.value</element>
-        <element>CLASSIFICATIONGROUP.value</element>
-        <element>CLASSIFICATIONSCORE_ID.value</element>
-        <element>CLASSIFICATIONTYPEID.value</element>
-        <element>CLASSIFICATIONTYPE_ID.value</element>
-        <element>OBJECT_TYPE.value</element>
-        <element>OBJECT_ROWID.value</element>
-        <element>SCORETYPE.value</element>
-        <element>CLASSIFICATIONTYPE.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONGROUP.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONSCORE_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONTYPEID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONTYPE_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECT_ROWID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>SCORETYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONTYPE.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 810874d91a119469eaa6ebc521bf45d28331bf7d..1b996284bf944955cf5c8e468904e7accb178afa 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>ClassificationScore_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Possible Value</title>
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index 33db4fa7f5461f87b68cbfc30ab7c0636f173539..814bc382af73e23d1528386c2993f3371d9a2dd5 100644
--- a/entity/ClassificationType_entity/ClassificationType_entity.aod
+++ b/entity/ClassificationType_entity/ClassificationType_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>ClassificationType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <entityFields>
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index 41ecaaf9d7ec40aeeab5edf7ab6b2213842efd25..c491ad8e7c2359cafb7f3edd36b5614b19a7e1e2 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Classification_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Classification</title>
@@ -164,19 +164,41 @@
       <isRequireContainerFiltering v="true" />
       <contentProcess>%aditoprj%/entity/Classification_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <onUpdate>%aditoprj%/entity/Classification_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
-      <recordFields>
-        <element>UID.value</element>
-        <element>CLASSIFICATIONID.value</element>
-        <element>CLASSIFICATIONGROUP.value</element>
-        <element>CLASSIFICATIONSCORE_ID.value</element>
-        <element>CLASSIFICATIONTYPEID.value</element>
-        <element>CLASSIFICATIONTYPE_ID.value</element>
-        <element>OBJECT_ROWID.value</element>
-        <element>OBJECT_TYPE.value</element>
-        <element>SCORETYPE.value</element>
-        <element>CLASSIFICATIONTYPE.value</element>
-        <element>SCORE_RESULTS.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONGROUP.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONSCORE_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONTYPEID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONTYPE_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECT_ROWID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECT_TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>SCORETYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CLASSIFICATIONTYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>SCORE_RESULTS.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/CommRestriction_Entity/CommRestriction_Entity.aod b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
index ef0e6d0b71796f32427d09c76681e6ae5cf13ebd..ee86df91fc3100ddf4a3585854665c29be1080ba 100644
--- a/entity/CommRestriction_Entity/CommRestriction_Entity.aod
+++ b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>CommRestriction_Entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Advertising ban</title>
@@ -19,7 +19,6 @@
       <title>Advertising ban</title>
       <consumer>CommRestrictionMedium</consumer>
       <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/CommRestriction_Entity/entityfields/medium/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/CommRestriction_Entity/entityfields/medium/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
diff --git a/entity/CommRestriction_Entity/entityfields/medium/valueProcess.js b/entity/CommRestriction_Entity/entityfields/medium/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 39af552b0f331027b89b35f390e78db421b355a9..06cb4ddca331f8e1e21604233486d20652098924 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Communication_entity</name>
   <description>former Comm</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index 8d1b7c6bd8b95a044b221fa7736f329489cc8eb6..045f6308acf939f3cdd8047bc9624b1ad3bc5646 100644
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Competition_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Competition</title>
@@ -74,12 +74,6 @@
         <entityName>Organisation_entity</entityName>
         <fieldName>WithPersonIdFilter</fieldName>
       </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <expose v="true" />
-        </entityParameter>
-      </children>
     </entityConsumer>
     <entityConsumer>
       <name>Organisations</name>
@@ -225,10 +219,6 @@
           <name>DisplaySimpleName_param</name>
           <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
         </entityParameter>
-        <entityParameter>
-          <name>FilteredAttributes_param</name>
-          <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js</valueProcess>
-        </entityParameter>
       </children>
     </entityConsumer>
     <entityField>
diff --git a/entity/Competition_entity/conditionProcess.js b/entity/Competition_entity/conditionProcess.js
deleted file mode 100644
index 06351bcd091229f24464069f37205e1f35a7c5ee..0000000000000000000000000000000000000000
--- a/entity/Competition_entity/conditionProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = new SqlCondition();
-cond.andPrepareVars("COMPETITION.OBJECT_ROWID", "$param.ObjectRowId_param");
-
-//TODO: use a preparedCondition when available #1030812 #1034026
-result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js b/entity/Competition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
deleted file mode 100644
index 4c3c4db34af5e5049ddd9303f9fb7d53a835809b..0000000000000000000000000000000000000000
--- a/entity/Competition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-
-result.object([
-    '8af37871-d407-4414-98ad-e64dbaa5794a', // Price politics
-    '558419b2-6113-4060-b88d-cc6324754765', // Strength
-    '71226196-2812-4d70-b90f-c3e2c14fd4d1' // Weakness
-]);
\ No newline at end of file
diff --git a/entity/Competition_entity/fromClauseProcess.js b/entity/Competition_entity/fromClauseProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index c03d2f2816f42fa855a010247046ba8c9315152b..b35fefad6f321819237e8732e75d8c8a3e8dfbc2 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Contact_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index d0893562e2044051c534d795f2ac6655a11ccedd..b7ac9888dcecf6a52d77d0f9c5aa99f852faead9 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Context_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
@@ -134,11 +134,17 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/Context_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>UID.displayValue</element>
-        <element>CONTEXT_NAME.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>UID.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CONTEXT_NAME.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 8a808064792cd913e1b49a847d3fe01324475527..2426e1820b9599084c69a69860e07f3db940cb20 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Contract_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
@@ -37,7 +37,6 @@
       <resolution>DAY</resolution>
       <outputFormat>dd.MM.yyyy</outputFormat>
       <inputFormat>dd.MM.yyyy</inputFormat>
-      <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractend/valueProcess.js</valueProcess>
       <onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
diff --git a/entity/Contract_entity/entityfields/contractend/valueProcess.js b/entity/Contract_entity/entityfields/contractend/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 3c4da9d1e85cd7b0effe440b4e7a30455616d4a8..dc86698dd70aab037843ed798192a6372f9c9b37 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Countries_Entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Countries_Entity/documentation.adoc</documentation>
diff --git a/entity/DSGVO_entity/recordcontainers/db/onDBInsert.js b/entity/DSGVO_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..09754cf5860927f9a6380fa0a8dad7fa1c185b87
--- /dev/null
+++ b/entity/DSGVO_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,43 @@
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("system.util");
+
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    var cols = ["USER_NEW" , "USER_EDIT" , "DSGVOID" , "ROW_ID" , "DATE_NEW" , 
+        "TABLENAME" , "DATE_EDIT" , "RIGHT" , "VALID_TO" , "CONTACT_ID" , "USE"];
+    
+    var vals = [vars.get("$sys.user"), null, util.getNewUUID(), 
+        vars.get("$field.ROW_ID"), vars.get("$sys.date"), vars.get("$field.TABLENAME"),
+        null,  KeywordUtils. vars.get("$field.RIGHT").valueOf(), vars.get("$field.VALID_TO"), 
+        vars.get("$field.CONTACT_ID"), vars.get("$field.USE").valueOf()];
+    // KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.DSGVOUse(), "DSGVO.USE");
+    db.insertData("DSGVO", cols, null, vals);
+}
+    // TODO Eintrag in DSGVO Tabelle
+    
+    /*
+     * 
+     var InputMapping = {
+        "OFFERITEM": {
+            condition: "OFFER_ID = '" + pSourceOfferId + "' order by ITEMSORT",
+            ValueMapping: {
+                "OFFER_ID" : pTargetOfferId
+            }
+        }
+    };
+    CopyModuleUtils.copyModule(InputMapping);
+    
+    var oiUtils = new OfferItemUtils(pTargetOfferId);
+    
+    //update order price
+    cols = ["NET", "VAT"];
+    var vals = oiUtils.getNetAndVat();
+    
+    db.updateData("OFFER", cols, null, vals, SqlCondition.equals("OFFER.OFFERID", pTargetOfferId, "1 = 2"));
+     * 
+     */
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index 6f4ab549ba6c4dd42e4d6edd3ce3fe6f963b70ed..6a491c23091c4c4b4e83b255fe85fb0479cd9ac3 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>DocumentTemplateLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Attachment</title>
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index 35f0c344adee45cf3eeb9bacc714671322a7c1cb..a576a623618aa0a2f4243e4fb106b4ca76105fd9 100644
--- a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>DocumentTemplateTypeCategory_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <contentTitleProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 3b8bcc92f0429cc34ae54a105b72f1bef40cca44..3bf1f40c2ac5c981506510e5b1f1ee853bae8ed1 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>DocumentTemplate_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:FILE_FONT</icon>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index c9316e69006fff9e898478648ed1f4e7a69481d1..077b4c5f163f836e2c73402d2ee1f48ea69531ca 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Document_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Document</title>
@@ -294,16 +294,32 @@
       <onInsert>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
       <onDelete>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>NAME.value</element>
-        <element>SIZE.value</element>
-        <element>DATE_EDIT.value</element>
-        <element>PREVIEW_IMAGE.value</element>
-        <element>TYPE.value</element>
-        <element>DESCRIPTION.value</element>
-        <element>KEYWORD.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>NAME.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>SIZE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DATE_EDIT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PREVIEW_IMAGE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>KEYWORD.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index 214f3a2f015256651be7a635a63b2b8adf302d6a..c45b600f1c015372e4a807209082aac10d41205e 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Email_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <recordContainer>jdito</recordContainer>
@@ -68,9 +68,11 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <onInsert>%aditoprj%/entity/Email_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <recordFields>
-        <element>UID.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index 46fae34883dddaadb7d684fb29e9270a129507f6..4598f76d646cc4b59d7be29b8a4e885d7e813769 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>EmployeeRole_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Role</title>
@@ -50,10 +50,14 @@
       <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
       <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>ROLE.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ROLE.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
index 8b4643f84045e446ead30a64539332cf5b910359..7ccec7d4b583c7ad36bce344a5046d9a34cd7976 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
@@ -10,7 +10,7 @@ if (userTitle && tools.existUsers(userTitle))
     var user = tools.getUser(userTitle);
     var roles = tools.getRoles(userTitle);
     var roleObj = {};
-    roles = [role].concat(roles)
+    roles = [newRole].concat(roles)
         .filter(function (role) 
         {
             var exists = role in this;
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 2b6f9ac045ba7bc7d67d1493f38b7abf4a716865..0e50e826a992efa788f2b6f283746d33de7e0970 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Employee_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Employee</title>
@@ -292,20 +292,44 @@
       <onInsert>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
       <onDelete>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>TITLE.value</element>
-        <element>ISACTIVE.value</element>
-        <element>FIRSTNAME.value</element>
-        <element>LASTNAME.value</element>
-        <element>EMAIL_ADDRESS.value</element>
-        <element>EMAIL_ADDRESS.displayValue</element>
-        <element>DESCRIPTION.value</element>
-        <element>CONTACT_ID.value</element>
-        <element>CONTACT_ID.displayValue</element>
-        <element>DEPARTMENT.value</element>
-        <element>CONFIRM_PASSWORD.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TITLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ISACTIVE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>FIRSTNAME.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>LASTNAME.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>EMAIL_ADDRESS.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>EMAIL_ADDRESS.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CONTACT_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CONTACT_ID.displayValue</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DEPARTMENT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CONFIRM_PASSWORD.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index 093a7112c79901472998ab645af4588eabf0033c..d1a1f37a0865833eeca85678a7076ad20acd551d 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Forecast_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>${FORECAST_ENGLISH}</title>
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 810415127d19efe204101c65be4b833234baeb8d..2045dff5574c837d4c4796ace4c0c7d3a571db20 100644
--- a/entity/Gender_keyword/Gender_keyword.aod
+++ b/entity/Gender_keyword/Gender_keyword.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Gender_keyword</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <contentTitleProcess>%aditoprj%/entity/Gender_keyword/contentTitleProcess.js</contentTitleProcess>
@@ -28,10 +28,14 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/Gender_keyword/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>VALUE.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>VALUE.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/IndexSearchEntity/IndexSearchEntity.aod b/entity/IndexSearchEntity/IndexSearchEntity.aod
index 1dddc5b340cf1762f94ade04d8de8c2805b60887..51910085670d39b5823ae7dd1483852d109136e7 100644
--- a/entity/IndexSearchEntity/IndexSearchEntity.aod
+++ b/entity/IndexSearchEntity/IndexSearchEntity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>IndexSearchEntity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <entityFields>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index cb4c9ac863324c6b391b749314298c191441d6ad..84f9c5720eb1c754bee538b7c5fb2a20b79fe71c 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>KeywordAttributeRelation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/documentation.adoc</documentation>
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index e49e6791888f9cb63814b16164abcc8be77a9958..018b5024766fc57a3aa60db58d7ca80143ece010 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>KeywordAttribute_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/KeywordAttribute_entity/documentation.adoc</documentation>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 98018ec2348332a1edaf806f74a257146764dbd6..ae3f89af92614f9f30f1e4984f2bb6fb58b32cd9 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>KeywordEntry_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index e2e65cf810e2c82b788bd7fc9dbcc2fcf614b6fc..89843a7e0ba6731d6a87a98ae3ec8a13691cc0ce 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Language_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <contentTitleProcess>%aditoprj%/entity/Language_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index 3b7ae585372f79da24c7dd54b8b4efa987dbecbe..9072a38f2626faf291f243a471a82889db7b5b4c 100644
--- a/entity/Letter_entity/Letter_entity.aod
+++ b/entity/Letter_entity/Letter_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Letter_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <recordContainer>jdito</recordContainer>
@@ -40,9 +40,11 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <onInsert>%aditoprj%/entity/Letter_entity/recordcontainers/jdito/onInsert.js</onInsert>
-      <recordFields>
-        <element>UID.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index d68c31fbc8107a5ecffb9e8fab549f4340d552c1..1d22e132fd9fac9c2c726daf8230c3ad7f57ebdc 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>LogHistory_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Log</title>
@@ -126,12 +126,20 @@
       <isFilterable v="true" />
       <isSortable v="false" />
       <contentProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>DATE_NEW.value</element>
-        <element>USER_NEW.value</element>
-        <element>DESCRIPTION.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>USER_NEW.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 0921bcc6d1d675e6e93f0e44013aa8dbd67f34e0..5321c15518ddcc0f0f7dfe87fae68944d24a509b 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Member_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>${SALESPROJECT_MEMBER}</title>
diff --git a/entity/Member_entity/conditionProcess.js b/entity/Member_entity/conditionProcess.js
deleted file mode 100644
index e0f35ab06bb292e7e57bc2b43d44d96612dcfb55..0000000000000000000000000000000000000000
--- a/entity/Member_entity/conditionProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = new SqlCondition();
-cond.andPrepareVars("MEMBER.OBJECT_ROWID", "$param.ObjectRowId_param")
-cond.andPrepareVars("MEMBER.OBJECT_TYPE", "$param.ObjectType_param");
-
-//TODO: use a preparedCondition when available #1030812 #1034026
-result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Member_entity/fromClauseProcess.js b/entity/Member_entity/fromClauseProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 23d46663cc5e67af385e3a170299439d62afe753..04d6372a08d4b79170921e669e5669767658c428 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>ModuleTree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>History</title>
@@ -78,15 +78,29 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>TYPE.value</element>
-        <element>PARENT_ID.value</element>
-        <element>PARENT_CONTEXT.value</element>
-        <element>TITLE.value</element>
-        <element>DESCRIPTION.value</element>
-        <element>ICON.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PARENT_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PARENT_CONTEXT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TITLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ICON.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index b850f824fefd1c0fe7974e6ba16f5d398ae21a0f..3447b25df1c4974dc03b8b53fec5968f90a1ac7f 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Notification_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Notifications</title>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 4e6a3a747400563d12bb8a3162c112024a0379ae..c0256f7726f90bd860a30fe4f38c637e82adac93 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>ObjectRelationType_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:SPLIT</icon>
@@ -138,22 +138,50 @@
       <onInsert>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
       <onDelete>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>SOURCE_RELATION_TITLE.value</element>
-        <element>RELATION_TYPE.value</element>
-        <element>DIRECTION.value</element>
-        <element>HIERARCHY.value</element>
-        <element>DEST_OBJECT_TYPE.value</element>
-        <element>SOURCE_OBJECT_TYPE.value</element>
-        <element>AB_OBJECTRELATIONTYPE1.value</element>
-        <element>AB_OBJECTRELATIONTYPE2.value</element>
-        <element>SIDE.value</element>
-        <element>DEST_OBJECTRELATIONTYPEID.value</element>
-        <element>DEST_RELATION_TITLE.value</element>
-        <element>Type2Enabled_proxy.value</element>
-        <element>ICON.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>SOURCE_RELATION_TITLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>RELATION_TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DIRECTION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>HIERARCHY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DEST_OBJECT_TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>SOURCE_OBJECT_TYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>AB_OBJECTRELATIONTYPE1.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>AB_OBJECTRELATIONTYPE2.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>SIDE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DEST_OBJECTRELATIONTYPEID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DEST_RELATION_TITLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>Type2Enabled_proxy.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ICON.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 86c2a7ccef3c75ebb521469752ca4f1f5fcbdeac..2b92a0a54fc1cc432fee2186e752e4f801894865 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>ObjectTree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Object relation</title>
@@ -193,17 +193,35 @@
       <onInsert>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
       <onDelete>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>TITLE.value</element>
-        <element>PARENT_ID.value</element>
-        <element>EXPANDED.value</element>
-        <element>TARGET_ID.value</element>
-        <element>TARGET_CONTEXT.value</element>
-        <element>INFO.value</element>
-        <element>OBJECTRELATIONTYPEID.value</element>
-        <element>ICON.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TITLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PARENT_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>EXPANDED.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TARGET_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TARGET_CONTEXT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>INFO.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECTRELATIONTYPEID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ICON.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/ObjectTree_entity/grantUpdateProcess.js b/entity/ObjectTree_entity/grantUpdateProcess.js
index 105ebb440b8a5084799523a1615266a7727dcab4..33e0143ce68d08588f4cebe46478e398844793f2 100644
--- a/entity/ObjectTree_entity/grantUpdateProcess.js
+++ b/entity/ObjectTree_entity/grantUpdateProcess.js
@@ -13,14 +13,7 @@ if (vars.exists("$sys.selection") && vars.getString("$sys.selection"))
         isObjectRelationNode = typeof uid[2] == "string";
     }  
 
-    if (isObjectRelationNode)
-    {
-        result.string(true)
-    }
-    else
-    {
-        result.string(false)
-    }
+    result.object(isObjectRelationNode)
 }
 else
-    result.string(false)
\ No newline at end of file
+    result.object(false)
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 61c1821ac6f24d9f33c04c76148aa2e4411d887d..a2911d79d55daef5e53fc2974a2e590dee06abe7 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -82,8 +82,8 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
                     // use always reverse-type
                     relationTypeData = ObjectRelationUtils.getRelationType(relationTypeData[8]);
                     currentObjectId = _getRootID(currentObjectId, relationTypeData);
-                }
-                                                                                                                 // true to enable the insert button always --v
+                } 
+                                                                                                                                      // true to enable the insert button always --v
                 let uids = _insertEntry(tree, [[currentObjectId, "", "", "", "", relationTypeData[7]]], pNodeId, pLayer, pObjectType, selectedRelationType, relationTypeData[12], true)
                 for (let i = 0; i < uids.length; i++) 
                 {                    
@@ -252,6 +252,8 @@ function _getRelationTypes(pObjectType)
  * @param {Integer} pLayer layernumber
  * @param {String} pObjectType
  * @param {String} pNewRelationTypeId the RelationType, a new relation should have, if this node is selected.
+ * @param {String} pIcon the icon which should be added to the entry
+ * @param {Boolean} pHierarchy add if hierarchy is enabled or not for this entry
  * @param {Integer} [pNum=undefined] optional number added to the key. Needed, if the key would not be unique.
  * 
  * @return {Array[][]} the uids of the inserted data. Consists of [ObjectId, pEntryData-Index, AB_OBJECTRELATIONTYPEID, pObjectType (from param), pNodeId, objecttype (from entryId), objectrelationid, hierarchy]
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 38aacf3ee882ff4d486bfe6003ae052abab84d94..5e21c9b652b57091193307494b5f0919130a7729 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Object_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation>
@@ -241,10 +241,14 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/Object_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>TITLE.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TITLE.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index b83566310c0b892a02ff9f9d8f90e8f65007e355..8a4ea740f6357914c4bd084a6a523b202cf91599 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1,9 +1,10 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Offer_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
   <title>Offer</title>
+  <grantUpdateProcess>%aditoprj%/entity/Offer_entity/grantUpdateProcess.js</grantUpdateProcess>
   <contentTitleProcess>%aditoprj%/entity/Offer_entity/contentTitleProcess.js</contentTitleProcess>
   <afterUiInit>%aditoprj%/entity/Offer_entity/afterUiInit.js</afterUiInit>
   <iconId>VAADIN:CART</iconId>
@@ -65,7 +66,6 @@
       <title>Status</title>
       <consumer>KeywordOfferStates</consumer>
       <mandatory v="true" />
-      <state>EDITABLE</state>
       <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
     </entityField>
@@ -223,6 +223,7 @@
     <entityConsumer>
       <name>Documents</name>
       <selectionMode>MULTI</selectionMode>
+      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/stateProcess.js</stateProcess>
       <dependency>
         <name>dependency</name>
         <entityName>Document_entity</entityName>
@@ -390,10 +391,6 @@
           <name>ContactId_param</name>
           <expose v="true" />
         </entityParameter>
-        <entityParameter>
-          <name>SalesprojectId_param</name>
-          <expose v="false" />
-        </entityParameter>
         <entityParameter>
           <name>OfferLanguage_param</name>
           <expose v="false" />
@@ -560,6 +557,7 @@
     </entityField>
     <entityConsumer>
       <name>Attributes</name>
+      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/stateProcess.js</stateProcess>
       <onValidation>%aditoprj%/entity/Offer_entity/entityfields/attributes/onValidation.js</onValidation>
       <dependency>
         <name>dependency</name>
diff --git a/entity/Offer_entity/entityfields/attributes/stateProcess.js b/entity/Offer_entity/entityfields/attributes/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8225159ab271d45cf061f4e302b1eac50adada28
--- /dev/null
+++ b/entity/Offer_entity/entityfields/attributes/stateProcess.js
@@ -0,0 +1,15 @@
+import("Offer_lib");
+import("Sql_lib");
+import("system.vars");
+import("system.db");
+import("system.neon");
+import("system.result");
+
+if (OfferUtils.isEditable(vars.get("$field.STATUS"))) 
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_READONLY);
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documents/stateProcess.js b/entity/Offer_entity/entityfields/documents/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4c5360f5be4a89227e57e90bb98bdcaed69d6786
--- /dev/null
+++ b/entity/Offer_entity/entityfields/documents/stateProcess.js
@@ -0,0 +1,14 @@
+import("system.logging");
+import("system.vars");
+import("Offer_lib");
+import("system.result");
+import("system.neon");
+
+if (OfferUtils.isEditable(vars.get("$field.STATUS"))) 
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_READONLY);
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/maindocuments/stateProcess.js b/entity/Offer_entity/entityfields/maindocuments/stateProcess.js
index 5c640c079ddca224a84ea8fe108d10d39d0f926c..d80ff786571df619cb3388194ac84777938acbff 100644
--- a/entity/Offer_entity/entityfields/maindocuments/stateProcess.js
+++ b/entity/Offer_entity/entityfields/maindocuments/stateProcess.js
@@ -1,14 +1,22 @@
+import("Offer_lib");
 import("system.result");
 import("system.db");
 import("system.vars");
 import("system.neon");
 import("Sql_lib");
 
-if (0 == db.getBinaryCount("OFFER", "DOCUMENT", vars.get("$sys.uid"), SqlUtils.getSystemAlias(), "MAINDOCUMENT"))
+if (OfferUtils.isEditable(vars.get("$field.STATUS"))) 
 {
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
+    if (0 == db.getBinaryCount("OFFER", "DOCUMENT", vars.get("$sys.uid"), SqlUtils.getSystemAlias(), "MAINDOCUMENT"))
+    {
+        result.string(neon.COMPONENTSTATE_INVISIBLE);
+    }
+    else
+    {
+        result.string(neon.COMPONENTSTATE_EDITABLE);
+    }
 }
 else
 {
-    result.string(neon.COMPONENTSTATE_EDITABLE);
+    result.string(neon.COMPONENTSTATE_READONLY);
 }
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index d65c83bfe0c264e1f3be07ff335a483bfc93287f..d18aaea766801725e30d896e611a47c9003a8102 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -1,9 +1,10 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Offeritem_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
   <title>Offeritem</title>
+  <grantUpdateProcess>%aditoprj%/entity/Offeritem_entity/grantUpdateProcess.js</grantUpdateProcess>
   <afterOperatingState>%aditoprj%/entity/Offeritem_entity/afterOperatingState.js</afterOperatingState>
   <titlePlural>Offeritems</titlePlural>
   <recordContainer>db</recordContainer>
diff --git a/entity/Options_Entity/Options_Entity.aod b/entity/Options_Entity/Options_Entity.aod
index b93f25bcf77fd8ddb95eb8ebb0640ff931220f6e..06cefae57d57b9dcd99243de1369081fd7b73e93 100644
--- a/entity/Options_Entity/Options_Entity.aod
+++ b/entity/Options_Entity/Options_Entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Options_Entity</name>
   <description></description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
@@ -38,13 +38,23 @@
       <name>jdito</name>
       <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/Options_Entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>Option1.value</element>
-        <element>Option2.value</element>
-        <element>Option3.value</element>
-        <element>Option4.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>Option1.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>Option2.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>Option3.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>Option4.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 1359fed760eaf1ed8505495aaaf396b8ce070c39..55d9f1bbd66fc7525298e84f0d016a6e9f70aed5 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Order_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 85977e91be06a4f902992ebee12798910ead511c..209d380fd9b7aced54336d6d6aa1552fcff259fa 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Orderitem_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 6e972007abfc1da3fa302a4c352ec4cb6b2f41e6..ed96a1cac03b6aec0ee3dc3c4c1b425a2085e5d8 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Organisation_entity</name>
   <description>former Org</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
@@ -372,22 +372,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityConsumer>
-      <name>ObjectRelations</name>
-      <dependency>
-        <name>dependency</name>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectRowid_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
     <entityConsumer>
       <name>KeywordContactStates</name>
       <dependency>
diff --git a/entity/Organisation_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js b/entity/Organisation_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js
deleted file mode 100644
index 59af8506d7c8ff241823ba185c646366667521c0..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CONTACTID"));//TODO: CONTACTID/ORGANISATIONID: review if this should be the CONTACTID or the ORGANISATIONID
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js b/entity/Organisation_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js
deleted file mode 100644
index 008915f61deac19ccdd40fff81701de63eb3b6a2..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index c85bbb5bfeea2d8dcf8bcb6770807962cd0261e3..51fd4d719ee0751975616e41d5e2aa1db779227a 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>PermissionDetail_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Permission Detail</title>
@@ -172,17 +172,35 @@
       <onInsert>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
       <onDelete>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>ENTITY.value</element>
-        <element>ROLE.value</element>
-        <element>FIELD.value</element>
-        <element>CONDITION.value</element>
-        <element>ACTION.value</element>
-        <element>ACCESSTYPE.value</element>
-        <element>CONDTYPE.value</element>
-        <element>PARENT.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ENTITY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ROLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>FIELD.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CONDITION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ACTION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ACCESSTYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CONDTYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PARENT.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index 0a4fc544a9a1bb2e8bef0b77475806db2ec7e2b6..43c67864629fb09ef39ade95969d78adbfb10fbe 100644
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>PermissionMetaData_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:CONNECT</icon>
@@ -89,12 +89,20 @@
       <isPageable v="false" />
       <isFilterable v="true" />
       <contentProcess>%aditoprj%/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>TITLE.value</element>
-        <element>DESCRIPTION.value</element>
-        <element>USEPERMISSION.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TITLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DESCRIPTION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>USEPERMISSION.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index ac436c852402ed3b34168c1016a343fc81b875ee..c16477d891a091665df4ee26517ef98d8f36bfe4 100644
--- a/entity/PermissionOverview_entity/PermissionOverview_entity.aod
+++ b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>PermissionOverview_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Permission Overview</title>
@@ -84,15 +84,29 @@
       <name>jDito</name>
       <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>ENTITY.value</element>
-        <element>ACTION_VIEW.value</element>
-        <element>ACTION_CREATE.value</element>
-        <element>ACTION_READ.value</element>
-        <element>ACTION_EDIT.value</element>
-        <element>ACTION_DELETE.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ENTITY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ACTION_VIEW.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ACTION_CREATE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ACTION_READ.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ACTION_EDIT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ACTION_DELETE.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index bbf332dd89cddbc0c874632a0d4acd9de71dd112..d59edee620c510478d04343e60ca17e7e84f09de 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Person_entity</name>
   <description>former Pers</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
@@ -446,22 +446,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
       <tooltip>New activity</tooltip>
       <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
     </entityActionField>
-    <entityConsumer>
-      <name>ObjectRelations</name>
-      <dependency>
-        <name>dependency</name>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ObjectType_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js</valueProcess>
-        </entityParameter>
-        <entityParameter>
-          <name>ObjectRowid_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
     <entityConsumer>
       <name>KeywordGenders</name>
       <dependency>
diff --git a/entity/Person_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js b/entity/Person_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js
deleted file mode 100644
index 7b6137b4d105e9ba592cf8ef6e796fb838a32b09..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js b/entity/Person_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js
deleted file mode 100644
index 008915f61deac19ccdd40fff81701de63eb3b6a2..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index e7e2b6362f099256302d0fde50550f5cd73fa09f..63a7816bbe839fa69fa802663c320bbf79785872 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Prod2prod_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation>
@@ -130,17 +130,35 @@
       <contentProcess>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <onInsert>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onDelete>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js</onDelete>
-      <recordFields>
-        <element>UID.value</element>
-        <element>SOURCE_ID.value</element>
-        <element>DEST_ID.value</element>
-        <element>QUANTITY.value</element>
-        <element>PRODUCTCODE.value</element>
-        <element>PRODUCTID.value</element>
-        <element>PROD2PRODID.value</element>
-        <element>OPTIONAL.value</element>
-        <element>TAKEPRICE.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>SOURCE_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DEST_ID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>QUANTITY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PRODUCTCODE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PRODUCTID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PROD2PRODID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OPTIONAL.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TAKEPRICE.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index eb95bd1a677a88d5454600e586044a60cec80ab5..8adc4776543990ecd11199ac501e64bc7176529a 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Product_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Product_entity/documentation.adoc</documentation>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index e85fa3d4f251f41a2f073fe09c3a6b3ab0f93d9c..365ab1e964aa772acaa354036fb6e707d432266d 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Productprice_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index 3ff601b2a139f8ba3a1ac486dc21e4033bb8038d..9d09bd1aa18c49150ce2cf1504acefac0390280f 100644
--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Role_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:USER_CHECK</icon>
@@ -76,13 +76,23 @@
       <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
       <isFilterable v="true" />
       <contentProcess>%aditoprj%/entity/Role_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>ROLETITLE.value</element>
-        <element>ROLETYPE.value</element>
-        <element>ROLEDESCRIPTION.value</element>
-        <element>USERCOUNT.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ROLETITLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ROLETYPE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ROLEDESCRIPTION.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>USERCOUNT.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index 6f1edfeb29534e11941f27cd63779633e43944fc..3d3a0fd06a389f3b31802eb3a5a567de9619f881 100644
--- a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
+++ b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>SalesprojectAnalyses_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
@@ -59,12 +59,20 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>X_PHASE.value</element>
-        <element>Y_COUNT.value</element>
-        <element>SORTING.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>X_PHASE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>Y_COUNT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>SORTING.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
index 08b05153f37a910cb6c95f53527a8fb09109b4a2..d852b21489b5bde6928567a20974318fbbb9ef2d 100644
--- a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
+++ b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>SalesprojectMilestone_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title></title>
diff --git a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
index 20d329a42037cbec6fdae0ee7c1c625af9c54ad2..ef583549d67921890ca9c1b35d265af872c307c0 100644
--- a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
+++ b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>SalesprojectPhase_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Phase</title>
@@ -43,12 +43,20 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/SalesprojectPhase_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>STATE.value</element>
-        <element>TITLE.value</element>
-        <element>ICON.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>STATE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TITLE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ICON.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 14acacd2cf6da566da0ed23528aad86abd6a2864..3f3260e7d79664dc886fd53f7bd99f5375815786 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>SalesprojectSource_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Touchpoint</title>
@@ -40,6 +40,7 @@
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
       <outputFormat>dd.MM.yyyy</outputFormat>
+      <inputFormat>dd.MM.yyyy</inputFormat>
       <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/entrydate/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 2885c8c71d50dadbc3a4dfe136ecefa1ef01e84c..fdec7622dd51198b674b0af2a745b9177c24a5e8 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Salesproject_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Salesproject</title>
@@ -286,12 +286,6 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
-    <entityConsumer>
-      <name>ObjectRelations</name>
-      <dependency>
-        <name>dependency</name>
-      </dependency>
-    </entityConsumer>
     <entityField>
       <name>TIMETRACKINGSUM</name>
       <title>Time expenses</title>
@@ -382,19 +376,6 @@
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityConsumer>
-      <name>KeywordPhases</name>
-      <dependency>
-        <name>dependency</name>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordphases/children/containername_param/valueProcess.js</valueProcess>
-          <expose v="false" />
-        </entityParameter>
-      </children>
-    </entityConsumer>
     <entityActionField>
       <name>newActivity</name>
       <title>New activity</title>
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index 0a6a256317f22fd7de2b5b8d62e88096003d13f1..2337c9d7b47718f219998adc2f803a24217015de 100644
--- a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
+++ b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>SalutationDistinct_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <contentTitleProcess>%aditoprj%/entity/SalutationDistinct_entity/contentTitleProcess.js</contentTitleProcess>
@@ -31,9 +31,11 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
index 40fc7c5802eecae6db4771dd50266ac372c66080..6da4e3129f1d6f48a5ccd18234289047285edd13 100644
--- a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
+++ b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>SalutationTitleDistinct_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <contentTitleProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/contentTitleProcess.js</contentTitleProcess>
@@ -40,9 +40,11 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod
index 2520d3835bd2fe79017253f489a093b57e25d285..2fc87ff2fb333fe58e8f5f9fd8df464e97a51cca 100644
--- a/entity/Salutation_entity/Salutation_entity.aod
+++ b/entity/Salutation_entity/Salutation_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Salutation_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Salutation</title>
@@ -38,7 +38,6 @@
       <consumer>KeywordGenders</consumer>
       <valueProcess>%aditoprj%/entity/Salutation_entity/entityfields/sex/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Salutation_entity/entityfields/sex/displayValueProcess.js</displayValueProcess>
-      <onValidation>%aditoprj%/entity/Salutation_entity/entityfields/sex/onValidation.js</onValidation>
     </entityField>
     <entityField>
       <name>SORT</name>
diff --git a/entity/Salutation_entity/entityfields/sex/onValidation.js b/entity/Salutation_entity/entityfields/sex/onValidation.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index 475990d3b8f7eac3b1c8e26f0514ab17acd6031d..7fa651a361aa15335541bde805e3f32fb8450dce 100644
--- a/entity/Social_entity/Social_entity.aod
+++ b/entity/Social_entity/Social_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Social_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Social Media</title>
@@ -26,6 +26,7 @@
       <name>Account_param</name>
       <title>Benutzer</title>
       <expose v="true" />
+      <mandatory v="true" />
       <description>Benutzer</description>
     </entityParameter>
     <entityProvider>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index 9ab05b379c2dff4ae500cdc65982f9b7fa9ebd35..ee7f97d0599d81e2f98bede87d73ba0a7aa01a52 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Stock_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Stock_entity/documentation.adoc</documentation>
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 08adea4cbaa470d073794b819146c2689ff69861..cfb5e2f208ebc097a37f1142fda6c9a3c916a89d 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>SupportTicket_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Supportticket</title>
@@ -18,7 +18,6 @@
       <searchable v="false" />
       <state>DISABLED</state>
       <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/code/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/code/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>TASK_SUBJECT</name>
diff --git a/entity/SupportTicket_entity/entityfields/code/displayValueProcess.js b/entity/SupportTicket_entity/entityfields/code/displayValueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 6dc922046ed88d48468525fca0e7a6f6a0784c26..d6a4e934688ecabf08ae5748f2a3ea5b19306154 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>TaskLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Connection</title>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 6d0c4a3d13bab8ef705543135be0d1c092573eae..42f7c04df52352d564827aa3922d03f924d78824 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Task_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
@@ -104,7 +104,6 @@
       <children>
         <entityParameter>
           <name>OnlyActives_param</name>
-          <valueProcess>%aditoprj%/entity/Task_entity/entityfields/contacteditors/children/onlyactives_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
     </entityConsumer>
diff --git a/entity/Task_entity/entityfields/contacteditors/children/onlyactives_param/valueProcess.js b/entity/Task_entity/entityfields/contacteditors/children/onlyactives_param/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Task_entity/entityfields/linkedobjects/children/presettype_param/valueProcess.js b/entity/Task_entity/entityfields/linkedobjects/children/presettype_param/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index cd6526511adeb5213171bc485c955ab5a8230ae7..f4153595caebfd2d8635831eb0dd9fd8f710703b 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Timetracking_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Timetracking</title>
diff --git a/entity/TurnoverTree_entity/TurnoverTree_entity.aod b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
index 11425f028190fd30ae2f1777e03b39e949f81629..43fb7d7a47a73e6cef7734f99179a1a163013bfd 100644
--- a/entity/TurnoverTree_entity/TurnoverTree_entity.aod
+++ b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>TurnoverTree_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Tree</title>
@@ -99,17 +99,35 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/TurnoverTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>PARENT.value</element>
-        <element>GROUP.value</element>
-        <element>CATEGORY.value</element>
-        <element>TURNOVERPRICE.value</element>
-        <element>FORECASTPRICE.value</element>
-        <element>YEAR.value</element>
-        <element>MONTH.value</element>
-        <element>LAYER.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PARENT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>GROUP.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CATEGORY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>TURNOVERPRICE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>FORECASTPRICE.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>YEAR.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>MONTH.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>LAYER.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index bba34957576b61de1172c2b203ce7ba5cf131253..24617feeaf7405503c77e98e2b729300e72b4dfc 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -1,5 +1,5 @@
 <?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.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
   <name>Turnover_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Turnover_entity/documentation.adoc</documentation>
@@ -122,13 +122,23 @@
       <name>jdito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
-      <recordFields>
-        <element>UID.value</element>
-        <element>PARENT.value</element>
-        <element>CATEGORY.value</element>
-        <element>X.value</element>
-        <element>Y.value</element>
-      </recordFields>
+      <recordFieldMappings>
+        <jDitoRecordFieldMapping>
+          <name>UID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PARENT.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>CATEGORY.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>X.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>Y.value</name>
+        </jDitoRecordFieldMapping>
+      </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index ce3e097e8c52c26b9a051bfb89fa275d4a26e9f1..a8c3c421bdef4f17adf9d09278ff446ce9ff37eb 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -4431,6 +4431,9 @@
     <entry>
       <key>USER_NEW_CONTACT</key>
     </entry>
+    <entry>
+      <key>Linked Appointments</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 3ebd381347b74ae52e333df98d8bdc52f3c817ef..2b0b8d4c42eac355d3ff2a6920179b44fde74b79 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1005,6 +1005,10 @@
     <entry>
       <key>0 %</key>
     </entry>
+    <entry>
+      <key>Location</key>
+      <value>Ort</value>
+    </entry>
     <entry>
       <key>75 %</key>
       <value></value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 92b81f800932982b7e8823eb0c402ded2487c4db..fe2f84a688a4761263b6c8641fc602a3bfca9e54 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -4480,6 +4480,9 @@
     <entry>
       <key>USER_NEW_CONTACT</key>
     </entry>
+    <entry>
+      <key>Linked Appointments</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
index f6813451bfa56d60bcbddaed22287a8268901cb9..fdb73689f7125bba3697070f7d8e1876cc43e65b 100644
--- a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
+++ b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonDashboard xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonDashboard/1.1.0">
-  <name>Vertriebsdashboard</name>
-  <title>Salesdashboard</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>VAADIN:CHART_GRID</icon>
-  <dashboardType>PUBLIC</dashboardType>
-  <editRoles>
-    <element>INTERNAL_ADMINISTRATOR</element>
-    <element>INTERNAL_DASHBOARDSTOREADMIN</element>
-  </editRoles>
-  <defaultDashlets>
-    <neonDashlet>
-      <name>Dashlet</name>
-      <viewName>SalesprojectScoreCard_view</viewName>
-      <configName>KeyFigures</configName>
-      <uiConfiguration>
-        <name>uiConfiguration</name>
-        <xPos v="1" />
-        <yPos v="0" />
-        <colspan v="1" />
-        <rowspan v="5" />
-      </uiConfiguration>
-    </neonDashlet>
-    <neonDashlet>
-      <name>Dashlet4</name>
-      <viewName>OrganisationFilter_view</viewName>
-      <configName>AllOrgsDashlet</configName>
-      <uiConfiguration>
-        <name>uiConfiguration</name>
-        <xPos v="2" />
-        <yPos v="0" />
-        <colspan v="1" />
-        <rowspan v="5" />
-      </uiConfiguration>
-    </neonDashlet>
-    <neonDashlet>
-      <name>Dashlet5</name>
-      <viewName>TurnoverChart_view</viewName>
-      <configName>TurnoverDashlet</configName>
-      <uiConfiguration>
-        <name>uiConfiguration</name>
-        <xPos v="0" />
-        <yPos v="0" />
-        <colspan v="1" />
-        <rowspan v="5" />
-      </uiConfiguration>
-    </neonDashlet>
-    <neonDashlet>
-      <name>Dashlet2</name>
-      <viewName>SalesprojectFilter_view</viewName>
-      <configName>OpenSalesprojectsDashlet</configName>
-      <uiConfiguration>
-        <name>uiConfiguration</name>
-        <xPos v="1" />
-        <yPos v="5" />
-        <colspan v="2" />
-        <rowspan v="5" />
-      </uiConfiguration>
-    </neonDashlet>
-    <neonDashlet>
-      <name>Dashlet3</name>
-      <viewName>SalesprojectPhases_view</viewName>
-      <configName>Salesproject phases</configName>
-      <uiConfiguration>
-        <name>uiConfiguration</name>
-        <xPos v="0" />
-        <yPos v="5" />
-        <colspan v="1" />
-        <rowspan v="5" />
-      </uiConfiguration>
-    </neonDashlet>
-  </defaultDashlets>
-</neonDashboard>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonDashboard xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonDashboard/1.1.0">
+  <name>Vertriebsdashboard</name>
+  <title>Salesdashboard</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <icon>VAADIN:CHART_GRID</icon>
+  <dashboardType>PUBLIC</dashboardType>
+  <editRoles>
+    <element>INTERNAL_ADMINISTRATOR</element>
+    <element>INTERNAL_DASHBOARDSTOREADMIN</element>
+  </editRoles>
+  <defaultDashlets>
+    <neonDashlet>
+      <name>Dashlet</name>
+      <viewName>SalesprojectScoreCard_view</viewName>
+      <configName>KeyFigures</configName>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="1" />
+        <yPos v="0" />
+        <colspan v="1" />
+        <rowspan v="5" />
+      </uiConfiguration>
+    </neonDashlet>
+    <neonDashlet>
+      <name>Dashlet4</name>
+      <viewName>OrganisationFilter_view</viewName>
+      <configName>AllOrgsDashlet</configName>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="2" />
+        <yPos v="0" />
+        <colspan v="1" />
+        <rowspan v="5" />
+      </uiConfiguration>
+    </neonDashlet>
+    <neonDashlet>
+      <name>Dashlet5</name>
+      <viewName>TurnoverChart_view</viewName>
+      <configName>TurnoverDashlet</configName>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="0" />
+        <yPos v="0" />
+        <colspan v="1" />
+        <rowspan v="5" />
+      </uiConfiguration>
+    </neonDashlet>
+    <neonDashlet>
+      <name>Dashlet2</name>
+      <viewName>SalesprojectFilter_view</viewName>
+      <configName>OpenSalesprojectsDashlet</configName>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="1" />
+        <yPos v="5" />
+        <colspan v="2" />
+        <rowspan v="5" />
+      </uiConfiguration>
+    </neonDashlet>
+    <neonDashlet>
+      <name>Dashlet3</name>
+      <viewName>SalesprojectPhases_view</viewName>
+      <configName>SalesprojectPhases</configName>
+      <uiConfiguration>
+        <name>uiConfiguration</name>
+        <xPos v="0" />
+        <yPos v="5" />
+        <colspan v="1" />
+        <rowspan v="5" />
+      </uiConfiguration>
+    </neonDashlet>
+  </defaultDashlets>
+</neonDashboard>
diff --git a/neonView/AppointmentFilter_view/AppointmentFilter_view.aod b/neonView/AppointmentFilter_view/AppointmentFilter_view.aod
index f915869f301ee679131a13fd39d98e6dcbd11679..f47a495b14bb34fad0111e5ed9ba30b96229931a 100644
--- a/neonView/AppointmentFilter_view/AppointmentFilter_view.aod
+++ b/neonView/AppointmentFilter_view/AppointmentFilter_view.aod
@@ -3,7 +3,7 @@
   <name>AppointmentFilter_view</name>
   <title>Linked Appointments</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
+  <filterable v="false" />
   <layout>
     <drawerLayout>
       <name>layout</name>
diff --git a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
index 4951de3ef21be0e5b516f934ac1c8cbfdb3c4204..a4f171e1b1fd64ff9103066758398fd2c0f4824d 100644
--- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
+++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
@@ -4,9 +4,10 @@
   <title>relations</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
-    <noneLayout>
+    <drawerLayout>
       <name>layout</name>
-    </noneLayout>
+      <layoutCaption>Connections</layoutCaption>
+    </drawerLayout>
   </layout>
   <children>
     <tableViewTemplate>
diff --git a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
index 54910b2f0d67400e84a6f29334e0a87d2809641f..a617140741df8b4536a270b848e191e5921e1122 100644
--- a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
+++ b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
@@ -20,6 +20,10 @@
       <name>Generic</name>
       <entityField>#ENTITY</entityField>
       <fields>
+        <entityFieldLink>
+          <name>28c1e091-0fea-4324-8fb8-1893388354b7</name>
+          <entityField>STATUS</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>edbeea4d-019f-4661-b0d7-c07468e747cc</name>
           <entityField>DOCUMENTTEMPLATE_ID</entityField>
diff --git a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
index d32ae264479187b9de8b7fcb5e17d422352e88b0..f1532797bae5223a9a18aa516327ea275aee1d51 100644
--- a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
+++ b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
@@ -16,8 +16,6 @@
       <descriptionField>DESCRIPTION</descriptionField>
       <uidField>CAMPAIGNSTEPID</uidField>
       <stepPredecessorIdField>PREDECESSORSTEP_ID</stepPredecessorIdField>
-      <groupedProjectIdField>CAMPAIGN_ID</groupedProjectIdField>
-      <groupedProjectNameField>CampaignName</groupedProjectNameField>
       <entityField>#ENTITY</entityField>
       <isCreatable v="true" />
       <isEditable v="true" />
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index 69377e72e04144fa89ddecd65702009958fb8989..4c400a23a307e0af070bae6b64f470ac67c2465d 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -14,11 +14,6 @@
       <entityField>#ENTITY</entityField>
       <view>PersonPreview_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>e7b8c90f-dc8d-40f1-b4db-1493f845026f</name>
-      <entityField>360DegreeObjects</entityField>
-      <view>360DegreeFilter_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>b531300d-eb3c-4a87-bd46-486e77d12e6c</name>
       <entityField>#ENTITY</entityField>
@@ -29,6 +24,11 @@
       <entityField>Activities</entityField>
       <view>ActivityFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>e7b8c90f-dc8d-40f1-b4db-1493f845026f</name>
+      <entityField>360DegreeObjects</entityField>
+      <view>360DegreeFilter_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>573d2b77-f948-47bc-bac1-621dd824c697</name>
       <entityField>Tasks</entityField>
diff --git a/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod b/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
index c4de8f137b681cd664e873800f2cafad6ce4c5ee..d902ff8f1ef411a43224704c8c994ca5281d57b4 100644
--- a/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
+++ b/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>SalesprojectPhases_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <dashletConfigurations>
-    <neonDashletConfiguration>
-      <name>Salesproject phases</name>
-      <title>Salesproject phases</title>
-      <description>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </description>
-      <fragment>SalesprojectAnalyses/full</fragment>
-      <singleton v="true" />
-      <icon>VAADIN:FUNNEL</icon>
-      <categories>
-        <neonDashletCategory>
-          <name>salesproject</name>
-          <title>Salesproject</title>
-        </neonDashletCategory>
-        <neonDashletCategory>
-          <name>chart</name>
-          <title>Chart</title>
-        </neonDashletCategory>
-      </categories>
-    </neonDashletConfiguration>
-  </dashletConfigurations>
-  <layout>
-    <groupLayout>
-      <name>layout</name>
-    </groupLayout>
-  </layout>
-  <children>
-    <singleDataChartViewTemplate>
-      <name>PhaseFunnelChart</name>
-      <chartType>FUNNEL</chartType>
-      <xAxis>X_PHASE</xAxis>
-      <yAxis>Y_COUNT</yAxis>
-      <parentField></parentField>
-      <entityField>#ENTITY</entityField>
-    </singleDataChartViewTemplate>
-    <singleDataChartViewTemplate>
-      <name>PhasePieChart</name>
-      <chartType>PIE</chartType>
-      <xAxis>X_PHASE</xAxis>
-      <yAxis>Y_COUNT</yAxis>
-      <parentField></parentField>
-      <entityField>#ENTITY</entityField>
-    </singleDataChartViewTemplate>
-    <singleDataChartViewTemplate>
-      <name>PhasePyramidChart</name>
-      <chartType>PYRAMID</chartType>
-      <xAxis>X_PHASE</xAxis>
-      <yAxis>Y_COUNT</yAxis>
-      <entityField>#ENTITY</entityField>
-    </singleDataChartViewTemplate>
-  </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>SalesprojectPhases_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <dashletConfigurations>
+    <neonDashletConfiguration>
+      <name>SalesprojectPhases</name>
+      <title>Salesproject phases</title>
+      <description>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </description>
+      <fragment>SalesprojectAnalyses/full</fragment>
+      <singleton v="true" />
+      <icon>VAADIN:FUNNEL</icon>
+      <categories>
+        <neonDashletCategory>
+          <name>salesproject</name>
+          <title>Salesproject</title>
+        </neonDashletCategory>
+        <neonDashletCategory>
+          <name>chart</name>
+          <title>Chart</title>
+        </neonDashletCategory>
+      </categories>
+    </neonDashletConfiguration>
+  </dashletConfigurations>
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <singleDataChartViewTemplate>
+      <name>PhaseFunnelChart</name>
+      <chartType>FUNNEL</chartType>
+      <xAxis>X_PHASE</xAxis>
+      <yAxis>Y_COUNT</yAxis>
+      <parentField></parentField>
+      <entityField>#ENTITY</entityField>
+    </singleDataChartViewTemplate>
+    <singleDataChartViewTemplate>
+      <name>PhasePieChart</name>
+      <chartType>PIE</chartType>
+      <xAxis>X_PHASE</xAxis>
+      <yAxis>Y_COUNT</yAxis>
+      <parentField></parentField>
+      <entityField>#ENTITY</entityField>
+    </singleDataChartViewTemplate>
+    <singleDataChartViewTemplate>
+      <name>PhasePyramidChart</name>
+      <chartType>PYRAMID</chartType>
+      <xAxis>X_PHASE</xAxis>
+      <yAxis>Y_COUNT</yAxis>
+      <entityField>#ENTITY</entityField>
+    </singleDataChartViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
index 8f6b586e22b0d72969f305bd0e39fcb1aed3408e..4c982fe16e2ae41df4acf27a9555b59b28edae84 100644
--- a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
+++ b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
@@ -14,7 +14,7 @@
       <icon>VAADIN:TASKS</icon>
       <categories>
         <neonDashletCategory>
-          <name>tasks</name>
+          <name>tickets</name>
           <title>Tickets</title>
         </neonDashletCategory>
       </categories>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 851c4203a5376e2a7406113ce7330c75fb630658..df2303ee517fad7b4699cb8ae55060d7fe4f1bd2 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -113,5 +113,13 @@
       <name>dsgvo.deletionTimeMonths</name>
       <description>When no history entry exists within that duration to today a delete flag is set</description>
     </customDurationProperty>
+    <customBooleanProperty>
+      <name>osm.enable</name>
+      <property v="true" />
+    </customBooleanProperty>
+    <customStringProperty>
+      <name>osm.url</name>
+      <property>https://nominatim.openstreetmap.org/search</property>
+    </customStringProperty>
   </customProperties>
 </preferences>
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 07375e5e5e697211bcaa5b96d23bbae459433932..36b69c7ea52e0544c18732c86b7b81f20019cdfd 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -66,8 +66,9 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFi
     }
 
     if (!pIncludeGroups)
-        attrCond.and("ATTRIBUTE_TYPE != '" + $AttributeTypes.GROUP + "'");
+        attrCond.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.GROUP, "# != ?");
     
+    attrCond.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# != ?");
     var attributes = db.array(db.COLUMN, attrCond.buildSql(attrSql));
     
     return attributes;
@@ -161,7 +162,7 @@ AttributeUtil.getAllChildren = function (pAttributeIds)
     while (pAttributeIds.length > 0)
     {
         pAttributeIds = db.array(db.COLUMN, SqlCondition.begin()
-            .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + pAttributeIds.join("','") + "')")
+            .andIn("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeIds)
             .buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
         );
         if (pAttributeIds.length > 0)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index f07f6a3eee6cb52af5e36d193f7bce48bc32d646..1bec33e710bf9e3396cbef4005e1d374ac018527 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -378,7 +378,7 @@ ContextUtils.getSelectMap  = function()
                                        .setJoinExpression("join CONTACT on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null")
                                        .setCondition(SqlCondition.begin().and("ORGANISATION.ORGANISATIONID != '0'"))
                                        .setSubContexts({
-                                           "Person": ["select CONTACTID from CONTACT where PERSON_ID is not null and", "CONTACT.ORGANISATION_ID", '', ["Offer", "Contract"]]
+                                           "Person": ["select CONTACTID from CONTACT where PERSON_ID is not null and", "CONTACT.ORGANISATION_ID", '', ["Offer", "Order", "Contract"]]
                                        })
             ,"Person": ContextSelector.create("CONTACT", "CONTACTID")
                                       .setTitleExpression(maskingUtils.concat([
@@ -434,7 +434,9 @@ ContextUtils.getSelectMap  = function()
                                                         maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
                                                         ], "", false))
                                      .setContactIdField("CONTACT_ID")
-                                     .setCreationDateField("ORDERDATE")
+                                     .setCreationDateField("SALESORDERDATE")
+                                     .setStateField("STATUS")
+                                     .setActiveStates([])
             ,"Product": ContextSelector.create("PRODUCT", "PRODUCTID")
                                        .setTitleExpression(maskingUtils.concat([
                                             "PRODUCTCODE",
diff --git a/process/ImporterMappingFunctions_lib/process.js b/process/ImporterMappingFunctions_lib/process.js
index 05c4aa930bda24e17fd357797301b67bd8fce6d3..5500aa69c906c58d13b2580312cca6114070a43d 100644
--- a/process/ImporterMappingFunctions_lib/process.js
+++ b/process/ImporterMappingFunctions_lib/process.js
@@ -943,7 +943,7 @@ function iDecode(pObject)
 *
 * @example [(iGlobalVar {Value: "{3}", Name: "importLogin"} )     -->  $global.importLogin]
 *
-* @return {void}
+* @return {Boolean}
 */
 function iGlobalVar(pObject)
 {
@@ -957,6 +957,8 @@ function iGlobalVar(pObject)
     if(pObject.Value != undefined) value = this.resolveSymbol(pObject, pObject.Value);
     if(pObject.Name != undefined) name = pObject.Name;
     vars.getString("$global." + name, value);
+    
+    return false;
 }
 
 
diff --git a/process/Importer_lib/process.js b/process/Importer_lib/process.js
index fe2913476193d23a48cf7eef1dc743a965d00756..ab241b91420723ab309c943e79039116de38b806 100644
--- a/process/Importer_lib/process.js
+++ b/process/Importer_lib/process.js
@@ -1497,7 +1497,6 @@ function batchCsvLoad(pCurrentBatchNum, pBatchSize)
     var dataStr = "";
     var fn = this.Config.DataFile;
     var bs = pBatchSize;
-    var process = this.Config.Processname;
     if (!fileIO.exists(fn))
         throw new Error(translate.withArguments("file '%0' does not exist or you have got no permission on this file", [fn]));
     else if (!fileIO.canRead(fn))
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 4ae8ec56335afe3a93a21abe003f446d07a8f45d..2290c97e85027ccef8131c7e606f69eae5992100 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -33,6 +33,9 @@ $KeywordRegistry.contactStatus$active = function(){return "CONTACTSTATACTIVE";};
 $KeywordRegistry.currency = function(){return "Currency";};
 $KeywordRegistry.productGroupcode = function(){return "ProductGroupcode";};
 $KeywordRegistry.offerStatus = function(){return "OfferStatus";};
+$KeywordRegistry.offerStatus$sent = function(){return "OFFERSTATSENT                       ";};
+$KeywordRegistry.offerStatus$won = function(){return "OFFERSTATWON                        ";};
+$KeywordRegistry.offerStatus$lost = function(){return "OFFERSTATLOST                       ";};
 
 $KeywordRegistry.organisationType = function(){return "OrganisationType";};
 $KeywordRegistry.organisationType$manufacturer = function(){return "ORGMANUF";};
diff --git a/process/Neon_lib/process.js b/process/Neon_lib/process.js
index 65e019d7c4c2bc5f6789467daf8e527f652eccab..037de6882493598ffab3c553f2efa866a9f37c68 100644
--- a/process/Neon_lib/process.js
+++ b/process/Neon_lib/process.js
@@ -1,3 +1,4 @@
+import("Date_lib");
 import("system.vars");
 import("system.datetime");
 import("system.util");
diff --git a/process/Notification_lib/process.js b/process/Notification_lib/process.js
index 31db73ecfdc83ea1e38849c4f6b3eb6999daa893..5be0287f6d618a49ff4a52a6d0a30112122229f5 100644
--- a/process/Notification_lib/process.js
+++ b/process/Notification_lib/process.js
@@ -1,6 +1,4 @@
-
-
-
+import("system.notification");
 
 function NotificationUtil(){}
 
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 8c1b20917651296cd102d431e245ac22ddc283d3..09d10a01ebdd2ff2b36dcbd6e7ebfe3d44660c48 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
 import("system.vars");
 import("system.util");
 import("system.datetime");
@@ -59,10 +60,9 @@ OfferUtils.getOfferNumberValidationFailString = function() {
 }
     
 OfferUtils.isEditable = function(status) {
-    // TODO: Administrator darf immer �ndern, warten auf neue Berechtigungslogik?
-
+    // TODO: Administrator darf immer ändern, warten auf neue Berechtigungslogik?
     // Offer should be editable if offer state not equals "Sent", "Won" or "Lost"
-    return status != "2" && status != "3" && status != "4";
+    return status != $KeywordRegistry.offerStatus$sent() && status != $KeywordRegistry.offerStatus$won() && status != $KeywordRegistry.offerStatus$lost();
 }
 
 /**
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index 818de7d7027bb5c0994fe4ae5743764e5a69c31f..fe4915c08ac0d696a17e7ffbbc2e4c6de2d41d8f 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -1,3 +1,4 @@
+import("Neon_lib");
 import("system.vars");
 import("system.util");
 import("system.datetime");
diff --git a/process/Timetracking_lib/process.js b/process/Timetracking_lib/process.js
index d2128cd195542977845b87086fe6bc0da1f74520..9cefd34b87c6f7bc5f432d4f084158fd36b288f3 100644
--- a/process/Timetracking_lib/process.js
+++ b/process/Timetracking_lib/process.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
 import("system.db");
 import("system.neon");
 import("Context_lib");
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index 84e45bd713f4c658fd57c46ced08076cc21a6749..e59e0829e23ab23e0b294600c8ee1fa69db19bc9 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -15,12 +15,14 @@ import("system.util");
  * @param {String} pParamName name used by the webservice
  * @param {String} pWebserviceName name of the webservice. Used to find the correct webservice configuraation
  * @param {Function} pProcessResultCallback function for processing Webservice-result to the return value
+ * @param {Function} pProcessRequestCallback function for processing Webservice-request
  */
-function WsValidationType(pKey, pParamName, pWebserviceName, pProcessResultCallback) 
+function WsValidationType(pKey, pParamName, pWebserviceName, pProcessResultCallback, pProcessRequestCallback) 
 {
     this.key = pKey;
     this.paramName = pParamName;
     this.processResultCallback = pProcessResultCallback;
+    this.processRequestCallback = pProcessRequestCallback;
     this.webserviceName = pWebserviceName;
 }
 
@@ -35,12 +37,12 @@ WsValidationType.get = function(pKey)
     if (!this._cache)
         this._cache = {
             // Address lookups
-            TYPE_ADDRESS: new WsValidationType("TYPE_ADDRESS", "search", "addressValidation", _processAllAddressLookup),
-            TYPE_ZIP: new WsValidationType("TYPE_ZIP", "zip", "zipCityValidation", _processAddressLookup),
-            TYPE_CITY: new WsValidationType("TYPE_CITY", "city", "zipCityValidation", _processAddressLookup),
+            TYPE_ADDRESS: new WsValidationType("TYPE_ADDRESS", "search", "addressValidation", _processAllAddressLookup, _customRequest),
+            TYPE_ZIP: new WsValidationType("TYPE_ZIP", "zip", "zipCityValidation", _processAddressLookup, _customRequest),
+            TYPE_CITY: new WsValidationType("TYPE_CITY", "city", "zipCityValidation", _processAddressLookup, _customRequest),
             
             // Communication validation
-            TYPE_PHONE: new WsValidationType("TYPE_PHONE", "Number", "phoneValidation", _processCommunicationValidation)
+            TYPE_PHONE: new WsValidationType("TYPE_PHONE", "Number", "phoneValidation", _processCommunicationValidation, _customRequest)
         }
     
     if (pKey)
@@ -161,6 +163,51 @@ WsValidationType.get = function(pKey)
             return pValue;
         }
     }
+    
+    /**
+     * request using a custom webservice
+     */
+    function _customRequest(pValue, pCountry) {
+        if (WsValidationUtils.isWsEnabled(this))
+        {
+            var userName = project.getPreferenceValue("custom." + this.webserviceName + ".user");
+            var pw = project.getPreferenceValue("custom." + this.webserviceName + ".pw");
+            var url = project.getPreferenceValue("custom." + this.webserviceName + ".url");
+            var countryParamName = project.getPreferenceValue("custom." + this.webserviceName + ".countryParamName");
+
+            if (!userName || !pw || !url || !countryParamName)
+            {
+                throw new Error("if the webservice " + this.key + " is enabled, you have to provide also userName, pw, url and countryParamName")
+            }
+
+            var actionType = "GET";
+
+            if (pValue)
+            {
+                // fill params
+                var parameters = {};
+                if (pCountry)
+                {
+                    parameters[countryParamName] = pCountry;
+                }
+                parameters[this.paramName] = pValue;
+
+                // call webservice
+                var ret = JSON.parse(net.callRestWebserviceBasicAuth(url, actionType, parameters, null, null, "text/plain", "text/plain", util.DATA_TEXT, util.DATA_TEXT, userName, pw, true));
+
+                // if error, log the error. But also process the result and let the callback generate the correct default value
+                if (WsValidationUtils._isError(ret))
+                {
+                    logging.log(translate.withArguments("${WEBSERVICE_ERROR} url:%0 status:%1", [url, (ret.hasHttpSuccessStatusCode ? " StatusCode: " + ret.httpStatusCode : "")]));
+                    logging.log("Params: " + parameters.toSource());
+                }
+
+                // different handling of the result per type
+                return this.processResultCallback.call(this, ret, pValue);
+            }
+        }
+        return this.processResultCallback.call(this, null, pValue);
+    }
 }
 
 /**
@@ -186,47 +233,7 @@ WsValidationUtils.validate = function(pValue, pType, pCountry)
     if (typeof pType == "string")
         pType = WsValidationType.get(pType);
     
-    if (WsValidationUtils.isWsEnabled(pType))
-    {
-
-        var userName = project.getPreferenceValue("custom." + pType.webserviceName + ".user");
-        var pw = project.getPreferenceValue("custom." + pType.webserviceName + ".pw");
-        var url = project.getPreferenceValue("custom." + pType.webserviceName + ".url");
-        var countryParamName = project.getPreferenceValue("custom." + pType.webserviceName + ".countryParamName");
-
-        if (!userName || !pw || !url || !countryParamName)
-        {
-            throw new Error("if the webservice " + pType.key + " is enabled, you have to provide also userName, pw, url and countryParamName")
-        }
-
-        var actionType = "GET";
-
-        if (pValue && pType)
-        {
-            // fill params
-            var parameters = {};
-            if (pCountry)
-            {
-                parameters[countryParamName] = pCountry;
-            }
-            parameters[pType.paramName] = pValue;
-
-            // call webservice
-            var ret = JSON.parse(net.callRestWebserviceBasicAuth(url, actionType, parameters, null, null, "text/plain", "text/plain", util.DATA_TEXT, util.DATA_TEXT, userName, pw, true));
-
-            // if error, log the error. But also process the result and let the callback generate the correct default value
-            if (WsValidationUtils._isError(ret))
-            {
-                logging.log(translate.withArguments("${WEBSERVICE_ERROR} url:%0 status:%1", [url, (ret.hasHttpSuccessStatusCode ? " StatusCode: " + ret.httpStatusCode : "")]));
-                logging.log("Params: " + parameters.toSource());
-            }
-
-            // different handling of the result per type
-            return pType.processResultCallback(ret, pValue);
-        }
-    }
-    
-    return pType.processResultCallback(null, pValue);
+    return pType.processRequestCallback.call(pType, pValue, pCountry)
 }
 
 /**
diff --git a/process/getDocxDocument_serverProcess/process.js b/process/getDocxDocument_serverProcess/process.js
index 675a783ead8e82230e4b7f88fa96c0cc11dcdddc..ba89d5b72fe127a05af388ffdd0cb0cb3803c612 100644
--- a/process/getDocxDocument_serverProcess/process.js
+++ b/process/getDocxDocument_serverProcess/process.js
@@ -3,6 +3,7 @@ import("system.vars");
 import("system.swing");
 import("system.fileIO");
 import("system.util");
+import("system.result");
 
 /* This is a serverprocess to improve the performance
  * This Process has 13k lines of code since 2 js-libs are included (ress in about 420KB)
@@ -134,7 +135,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 function initJsZip()
 {
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.JSZip = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-'use strict';
 var DataReader = require('./dataReader');
 
 function ArrayReader(data) {
@@ -187,7 +187,6 @@ ArrayReader.prototype.readData = function(size) {
 module.exports = ArrayReader;
 
 },{"./dataReader":6}],2:[function(require,module,exports){
-'use strict';
 // private property
 var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
 
@@ -259,7 +258,6 @@ exports.decode = function(input, utf8) {
 };
 
 },{}],3:[function(require,module,exports){
-'use strict';
 function CompressedObject() {
     this.compressedSize = 0;
     this.uncompressedSize = 0;
@@ -289,7 +287,6 @@ CompressedObject.prototype = {
 module.exports = CompressedObject;
 
 },{}],4:[function(require,module,exports){
-'use strict';
 exports.STORE = {
     magic: "\x00\x00",
     compress: function(content, compressionOptions) {
@@ -304,7 +301,6 @@ exports.STORE = {
 exports.DEFLATE = require('./flate');
 
 },{"./flate":9}],5:[function(require,module,exports){
-'use strict';
 
 var utils = require('./utils');
 
@@ -408,7 +404,7 @@ module.exports = function crc32(input, crc) {
 // vim: set shiftwidth=4 softtabstop=4:
 
 },{"./utils":22}],6:[function(require,module,exports){
-'use strict';
+
 var utils = require('./utils');
 
 function DataReader(data) {
@@ -518,7 +514,6 @@ DataReader.prototype = {
 module.exports = DataReader;
 
 },{"./utils":22}],7:[function(require,module,exports){
-'use strict';
 exports.base64 = false;
 exports.binary = false;
 exports.dir = false;
@@ -531,7 +526,6 @@ exports.unixPermissions = null;
 exports.dosPermissions = null;
 
 },{}],8:[function(require,module,exports){
-'use strict';
 var utils = require('./utils');
 
 /**
@@ -638,7 +632,6 @@ exports.isRegExp = function (object) {
 
 
 },{"./utils":22}],9:[function(require,module,exports){
-'use strict';
 var USE_TYPEDARRAY = (typeof Uint8Array !== 'undefined') && (typeof Uint16Array !== 'undefined') && (typeof Uint32Array !== 'undefined');
 
 var pako = require("pako");
@@ -656,7 +649,6 @@ exports.uncompress =  function(input) {
 };
 
 },{"pako":25}],10:[function(require,module,exports){
-'use strict';
 
 var base64 = require('./base64');
 
@@ -737,7 +729,6 @@ JSZip.compressions = require('./compressions');
 module.exports = JSZip;
 
 },{"./base64":2,"./compressions":4,"./defaults":7,"./deprecatedPublicUtils":8,"./load":11,"./object":14,"./support":18}],11:[function(require,module,exports){
-'use strict';
 var base64 = require('./base64');
 var utf8 = require('./utf8');
 var utils = require('./utils');
@@ -779,7 +770,6 @@ module.exports = function(data, options) {
 
 },{"./base64":2,"./utf8":21,"./utils":22,"./zipEntries":23}],12:[function(require,module,exports){
 (function (Buffer){
-'use strict';
 module.exports = function(data, encoding){
     return new Buffer(data, encoding);
 };
@@ -789,7 +779,6 @@ module.exports.test = function(b){
 
 }).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
 },{}],13:[function(require,module,exports){
-'use strict';
 var Uint8ArrayReader = require('./uint8ArrayReader');
 
 function NodeBufferReader(data) {
@@ -812,7 +801,7 @@ NodeBufferReader.prototype.readData = function(size) {
 module.exports = NodeBufferReader;
 
 },{"./uint8ArrayReader":19}],14:[function(require,module,exports){
-'use strict';
+
 var support = require('./support');
 var utils = require('./utils');
 var crc32 = require('./crc32');
@@ -1684,7 +1673,7 @@ var out = {
 module.exports = out;
 
 },{"./base64":2,"./compressedObject":3,"./compressions":4,"./crc32":5,"./defaults":7,"./nodeBuffer":12,"./signature":15,"./stringWriter":17,"./support":18,"./uint8ArrayWriter":20,"./utf8":21,"./utils":22}],15:[function(require,module,exports){
-'use strict';
+
 exports.LOCAL_FILE_HEADER = "PK\x03\x04";
 exports.CENTRAL_FILE_HEADER = "PK\x01\x02";
 exports.CENTRAL_DIRECTORY_END = "PK\x05\x06";
@@ -1693,7 +1682,7 @@ exports.ZIP64_CENTRAL_DIRECTORY_END = "PK\x06\x06";
 exports.DATA_DESCRIPTOR = "PK\x07\x08";
 
 },{}],16:[function(require,module,exports){
-'use strict';
+
 var DataReader = require('./dataReader');
 var utils = require('./utils');
 
@@ -1732,7 +1721,7 @@ StringReader.prototype.readData = function(size) {
 module.exports = StringReader;
 
 },{"./dataReader":6,"./utils":22}],17:[function(require,module,exports){
-'use strict';
+
 
 var utils = require('./utils');
 
@@ -1765,7 +1754,7 @@ module.exports = StringWriter;
 
 },{"./utils":22}],18:[function(require,module,exports){
 (function (Buffer){
-'use strict';
+
 exports.base64 = true;
 exports.array = true;
 exports.string = true;
@@ -1802,7 +1791,7 @@ else {
 
 }).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
 },{}],19:[function(require,module,exports){
-'use strict';
+
 var ArrayReader = require('./arrayReader');
 
 function Uint8ArrayReader(data) {
@@ -1830,7 +1819,7 @@ Uint8ArrayReader.prototype.readData = function(size) {
 module.exports = Uint8ArrayReader;
 
 },{"./arrayReader":1}],20:[function(require,module,exports){
-'use strict';
+
 
 var utils = require('./utils');
 
@@ -1868,7 +1857,7 @@ Uint8ArrayWriter.prototype = {
 module.exports = Uint8ArrayWriter;
 
 },{"./utils":22}],21:[function(require,module,exports){
-'use strict';
+
 
 var utils = require('./utils');
 var support = require('./support');
@@ -2077,7 +2066,7 @@ exports.utf8decode = function utf8decode(buf) {
 // vim: set shiftwidth=4 softtabstop=4:
 
 },{"./nodeBuffer":12,"./support":18,"./utils":22}],22:[function(require,module,exports){
-'use strict';
+
 var support = require('./support');
 var compressions = require('./compressions');
 var nodeBuffer = require('./nodeBuffer');
@@ -2423,7 +2412,7 @@ exports.extend = function() {
 
 
 },{"./compressions":4,"./nodeBuffer":12,"./support":18}],23:[function(require,module,exports){
-'use strict';
+
 var StringReader = require('./stringReader');
 var NodeBufferReader = require('./nodeBufferReader');
 var Uint8ArrayReader = require('./uint8ArrayReader');
@@ -2705,7 +2694,7 @@ ZipEntries.prototype = {
 module.exports = ZipEntries;
 
 },{"./arrayReader":1,"./nodeBufferReader":13,"./object":14,"./signature":15,"./stringReader":16,"./support":18,"./uint8ArrayReader":19,"./utils":22,"./zipEntry":24}],24:[function(require,module,exports){
-'use strict';
+
 var StringReader = require('./stringReader');
 var utils = require('./utils');
 var CompressedObject = require('./compressedObject');
@@ -3027,7 +3016,7 @@ module.exports = ZipEntry;
 
 },{"./compressedObject":3,"./object":14,"./stringReader":16,"./support":18,"./utils":22}],25:[function(require,module,exports){
 // Top level file is just a mixin of submodules & constants
-'use strict';
+
 
 var assign    = require('./lib/utils/common').assign;
 
@@ -3042,7 +3031,7 @@ assign(pako, deflate, inflate, constants);
 module.exports = pako;
 
 },{"./lib/deflate":26,"./lib/inflate":27,"./lib/utils/common":28,"./lib/zlib/constants":31}],26:[function(require,module,exports){
-'use strict';
+
 
 
 var zlib_deflate = require('./zlib/deflate');
@@ -3444,7 +3433,7 @@ exports.deflateRaw = deflateRaw;
 exports.gzip = gzip;
 
 },{"./utils/common":28,"./utils/strings":29,"./zlib/deflate":33,"./zlib/messages":38,"./zlib/zstream":40}],27:[function(require,module,exports){
-'use strict';
+
 
 
 var zlib_inflate = require('./zlib/inflate');
@@ -3864,7 +3853,7 @@ exports.inflateRaw = inflateRaw;
 exports.ungzip  = inflate;
 
 },{"./utils/common":28,"./utils/strings":29,"./zlib/constants":31,"./zlib/gzheader":34,"./zlib/inflate":36,"./zlib/messages":38,"./zlib/zstream":40}],28:[function(require,module,exports){
-'use strict';
+
 
 
 var TYPED_OK =  (typeof Uint8Array !== 'undefined') &&
@@ -3969,7 +3958,7 @@ exports.setTyped(TYPED_OK);
 
 },{}],29:[function(require,module,exports){
 // String encode/decode helpers
-'use strict';
+
 
 
 var utils = require('./common');
@@ -4155,7 +4144,7 @@ exports.utf8border = function (buf, max) {
 };
 
 },{"./common":28}],30:[function(require,module,exports){
-'use strict';
+
 
 // Note: adler32 takes 12% for level 0 and 2% for level 6.
 // It doesn't worth to make additional optimizationa as in original.
@@ -4189,7 +4178,7 @@ function adler32(adler, buf, len, pos) {
 module.exports = adler32;
 
 },{}],31:[function(require,module,exports){
-'use strict';
+
 
 
 module.exports = {
@@ -4241,7 +4230,7 @@ module.exports = {
 };
 
 },{}],32:[function(require,module,exports){
-'use strict';
+
 
 // Note: we can't get significant speed boost here.
 // So write code to minimize size - no pregenerated tables
@@ -4284,7 +4273,7 @@ function crc32(crc, buf, len, pos) {
 module.exports = crc32;
 
 },{}],33:[function(require,module,exports){
-'use strict';
+
 
 var utils   = require('../utils/common');
 var trees   = require('./trees');
@@ -6141,7 +6130,7 @@ exports.deflateTune = deflateTune;
 */
 
 },{"../utils/common":28,"./adler32":30,"./crc32":32,"./messages":38,"./trees":39}],34:[function(require,module,exports){
-'use strict';
+
 
 
 function GZheader() {
@@ -6183,7 +6172,7 @@ function GZheader() {
 module.exports = GZheader;
 
 },{}],35:[function(require,module,exports){
-'use strict';
+
 
 // See state defs from inflate.js
 var BAD = 30;       /* got a data error -- remain here until reset */
@@ -6511,7 +6500,7 @@ module.exports = function inflate_fast(strm, start) {
 };
 
 },{}],36:[function(require,module,exports){
-'use strict';
+
 
 
 var utils         = require('../utils/common');
@@ -8051,7 +8040,7 @@ exports.inflateUndermine = inflateUndermine;
 */
 
 },{"../utils/common":28,"./adler32":30,"./crc32":32,"./inffast":35,"./inftrees":37}],37:[function(require,module,exports){
-'use strict';
+
 
 
 var utils = require('../utils/common');
@@ -8380,7 +8369,7 @@ module.exports = function inflate_table(type, lens, lens_index, codes, table, ta
 };
 
 },{"../utils/common":28}],38:[function(require,module,exports){
-'use strict';
+
 
 module.exports = {
   2:      'need dictionary',     /* Z_NEED_DICT       2  */
@@ -8395,7 +8384,7 @@ module.exports = {
 };
 
 },{}],39:[function(require,module,exports){
-'use strict';
+
 
 
 var utils = require('../utils/common');
@@ -9599,7 +9588,7 @@ exports._tr_tally = _tr_tally;
 exports._tr_align = _tr_align;
 
 },{"../utils/common":28}],40:[function(require,module,exports){
-'use strict';
+
 
 
 function ZStream() {
@@ -9631,7 +9620,7 @@ module.exports = ZStream;
 
 },{}]},{},[10])(10)
 });
-};
+}
 
 
 //templater
@@ -9654,7 +9643,7 @@ function initTemplater()
     initJsZip();
 
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Docxtemplater = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-"use strict";
+
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -9846,7 +9835,7 @@ DocUtils.getLeft = function (parsed, element, index) {
 
 module.exports = DocUtils;
 },{"./errors":2,"./memoize":5,"xmldom":19}],2:[function(require,module,exports){
-"use strict";
+
 
 function XTError(message) {
 	this.name = "GenericError";
@@ -9884,7 +9873,7 @@ module.exports = {
 	XTScopeParserError: XTScopeParserError
 };
 },{}],3:[function(require,module,exports){
-"use strict";
+
 
 var loopModule = require("./modules/loop");
 var spacePreserveModule = require("./modules/space-preserve");
@@ -9929,7 +9918,7 @@ module.exports = {
 	pptx: PptXFileTypeConfig
 };
 },{"./modules/expand-pair-trait":8,"./modules/loop":9,"./modules/rawxml":10,"./modules/render":11,"./modules/space-preserve":12}],4:[function(require,module,exports){
-"use strict";
+
 
 var Errors = require("./errors");
 var DocUtils = require("./doc-utils");
@@ -10172,7 +10161,7 @@ module.exports = {
 	}
 };
 },{"./doc-utils":1,"./errors":2}],5:[function(require,module,exports){
-"use strict";
+
 
 function memoize(func) {
 	var stringifyJson = JSON.stringify,
@@ -10186,7 +10175,7 @@ function memoize(func) {
 
 module.exports = memoize;
 },{}],6:[function(require,module,exports){
-"use strict";
+
 
 function getMinFromArrays(arrays, state) {
 	var minIndex = -1;
@@ -10230,7 +10219,7 @@ module.exports = function (arrays) {
 	return resArray;
 };
 },{}],7:[function(require,module,exports){
-"use strict";
+
 
 function emptyFun() {}
 function identity(i) {
@@ -10257,7 +10246,7 @@ module.exports = function (module) {
 	return module;
 };
 },{}],8:[function(require,module,exports){
-"use strict";
+
 
 var traitName = "expandPair";
 var mergeSort = require("../mergesort");
@@ -10388,7 +10377,7 @@ module.exports = function () {
 	return wrapper(expandPairTrait);
 };
 },{"../doc-utils":1,"../errors":2,"../mergesort":6,"../module-wrapper":7,"../traits":16}],9:[function(require,module,exports){
-"use strict";
+
 
 var DocUtils = require("../doc-utils");
 var dashInnerRegex = /^-([^\s]+)\s(.+)$/;
@@ -10451,7 +10440,7 @@ module.exports = function () {
 	return wrapper(loopModule);
 };
 },{"../doc-utils":1,"../module-wrapper":7}],10:[function(require,module,exports){
-"use strict";
+
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
@@ -10542,7 +10531,7 @@ module.exports = function () {
 	return wrapper(new RawXmlModule());
 };
 },{"../doc-utils":1,"../errors":2,"../module-wrapper":7}],11:[function(require,module,exports){
-"use strict";
+
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
@@ -10586,7 +10575,7 @@ module.exports = function () {
 	return wrapper(new Render());
 };
 },{"../module-wrapper":7}],12:[function(require,module,exports){
-"use strict";
+
 
 var wrapper = require("../module-wrapper");
 var spacePreserve = {
@@ -10621,7 +10610,7 @@ module.exports = function () {
 	return wrapper(spacePreserve);
 };
 },{"../module-wrapper":7}],13:[function(require,module,exports){
-"use strict";
+
 
 var DocUtils = require("./doc-utils");
 
@@ -10687,7 +10676,7 @@ var parser = {
 
 module.exports = parser;
 },{"./doc-utils":1}],14:[function(require,module,exports){
-"use strict";
+
 
 var ScopeManager = require("./scope-manager");
 var DocUtils = require("./doc-utils");
@@ -10731,7 +10720,7 @@ function render(options) {
 
 module.exports = render;
 },{"./doc-utils":1,"./scope-manager":15}],15:[function(require,module,exports){
-"use strict";
+
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
@@ -10858,7 +10847,7 @@ ScopeManager.createBaseScopeManager = function (_ref) {
 
 module.exports = ScopeManager;
 },{"./errors":2}],16:[function(require,module,exports){
-"use strict";
+
 
 var DocUtils = require("./doc-utils");
 var Errors = require("./errors");
@@ -10979,7 +10968,7 @@ module.exports = {
 	getExpandToDefault: getExpandToDefault
 };
 },{"./doc-utils":1,"./errors":2}],17:[function(require,module,exports){
-"use strict";
+
 // res class responsibility is to parse the XML.
 
 var DocUtils = require("./doc-utils");
@@ -11057,7 +11046,7 @@ module.exports = function (content, tagsXmlArray) {
 	return DocUtils.cloneDeep(memoized(content, tagsXmlArray));
 };
 },{"./doc-utils":1,"./memoize":5}],18:[function(require,module,exports){
-"use strict";
+
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
@@ -11442,7 +11431,7 @@ function _extends(Class,Super){
 		pt.__proto__ = ppt;
 	}
 	if(!(pt instanceof Super)){
-		function t(){};
+		function t(){}
 		t.prototype = Super.prototype;
 		t = new t();
 		copy(pt,t);
@@ -11504,7 +11493,7 @@ function DOMException(code, message) {
 	error.code = code;
 	if(message) this.message = this.message + ": " + message;
 	return error;
-};
+}
 DOMException.prototype = Error.prototype;
 copy(ExceptionCode,DOMException)
 /**
@@ -11513,7 +11502,7 @@ copy(ExceptionCode,DOMException)
  * The items in the NodeList are accessible via an integral index, starting from 0.
  */
 function NodeList() {
-};
+}
 NodeList.prototype = {
 	/**
 	 * The number of nodes in the list. The range of valid child node indices is 0 to length-1 inclusive.
@@ -11566,7 +11555,7 @@ _extends(LiveNodeList,NodeList);
  * used for attributes or DocumentType entities
  */
 function NamedNodeMap() {
-};
+}
 
 function _findNodeIndex(list,node){
 	var i = list.length;
@@ -11683,7 +11672,7 @@ function DOMImplementation(/* Object */ features) {
 			 this._features = features[feature];
 		}
 	}
-};
+}
 
 DOMImplementation.prototype = {
 	hasFeature: function(/* string */ feature, /* string */ version) {
@@ -11732,7 +11721,7 @@ DOMImplementation.prototype = {
  */
 
 function Node() {
-};
+}
 
 Node.prototype = {
 	firstChild : null,
@@ -12134,7 +12123,7 @@ _extends(Document,Node);
 
 function Element() {
 	this._nsMap = {};
-};
+}
 Element.prototype = {
 	nodeType : ELEMENT_NODE,
 	hasAttribute : function(name){
@@ -12227,13 +12216,13 @@ Document.prototype.getElementsByTagNameNS = Element.prototype.getElementsByTagNa
 
 _extends(Element,Node);
 function Attr() {
-};
+}
 Attr.prototype.nodeType = ATTRIBUTE_NODE;
 _extends(Attr,Node);
 
 
 function CharacterData() {
-};
+}
 CharacterData.prototype = {
 	data : '',
 	substringData : function(offset, count) {
@@ -12264,7 +12253,7 @@ CharacterData.prototype = {
 }
 _extends(CharacterData,Node);
 function Text() {
-};
+}
 Text.prototype = {
 	nodeName : "#text",
 	nodeType : TEXT_NODE,
@@ -12283,7 +12272,7 @@ Text.prototype = {
 }
 _extends(Text,CharacterData);
 function Comment() {
-};
+}
 Comment.prototype = {
 	nodeName : "#comment",
 	nodeType : COMMENT_NODE
@@ -12291,7 +12280,7 @@ Comment.prototype = {
 _extends(Comment,CharacterData);
 
 function CDATASection() {
-};
+}
 CDATASection.prototype = {
 	nodeName : "#cdata-section",
 	nodeType : CDATA_SECTION_NODE
@@ -12300,27 +12289,27 @@ _extends(CDATASection,CharacterData);
 
 
 function DocumentType() {
-};
+}
 DocumentType.prototype.nodeType = DOCUMENT_TYPE_NODE;
 _extends(DocumentType,Node);
 
 function Notation() {
-};
+}
 Notation.prototype.nodeType = NOTATION_NODE;
 _extends(Notation,Node);
 
 function Entity() {
-};
+}
 Entity.prototype.nodeType = ENTITY_NODE;
 _extends(Entity,Node);
 
 function EntityReference() {
-};
+}
 EntityReference.prototype.nodeType = ENTITY_REFERENCE_NODE;
 _extends(EntityReference,Node);
 
 function DocumentFragment() {
-};
+}
 DocumentFragment.prototype.nodeName =	"#document-fragment";
 DocumentFragment.prototype.nodeType =	DOCUMENT_FRAGMENT_NODE;
 _extends(DocumentFragment,Node);
@@ -13274,7 +13263,7 @@ function _set_proto_(thiz,parent){
 }
 if(!(_set_proto_({},_set_proto_.prototype) instanceof _set_proto_)){
 	_set_proto_ = function(thiz,parent){
-		function p(){};
+		function p(){}
 		p.prototype = parent;
 		p = new p();
 		for(parent in thiz){
@@ -13300,7 +13289,7 @@ exports.XMLReader = XMLReader;
 
 
 },{}],"/src/js/docxtemplater.js":[function(require,module,exports){
-"use strict";
+
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();