diff --git a/.liquibase/Data_alias/basic/2021.0.3/Bulkmail/AddBulkmailStatus.xml b/.liquibase/Data_alias/basic/2021.0.3/Bulkmail/AddBulkmailStatus.xml
index 4b54ddabd2a1777757f964e588df9e4be00e43ee..b16135cdcef372bc1000c1806faffaa8a665e329 100644
--- a/.liquibase/Data_alias/basic/2021.0.3/Bulkmail/AddBulkmailStatus.xml
+++ b/.liquibase/Data_alias/basic/2021.0.3/Bulkmail/AddBulkmailStatus.xml
@@ -23,5 +23,17 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+          <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="89a525b1-c479-4b54-82dc-6e2a8283f25e"/>
+          <column name="AB_KEYWORD_ATTRIBUTE_ID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
+          <column name="AB_KEYWORD_ENTRY_ID" value="a7d5d212-f99f-4200-8872-b24e7de2cc37"/>
+          <column name="CHAR_VALUE" value="VAADIN:ENVELOPE_OPEN"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+          <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="1f257472-bf37-4c66-972d-8bbb5ffcd883"/>
+          <column name="AB_KEYWORD_ATTRIBUTE_ID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
+          <column name="AB_KEYWORD_ENTRY_ID" value="1f257472-bf37-4c66-972d-8bbb5ffcd883"/>
+          <column name="CHAR_VALUE" value="VAADIN:ENVELOPE_OPEN"/>
+        </insert>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/Bulkmail/changelog.xml b/.liquibase/Data_alias/basic/2021.0.3/Bulkmail/changelog.xml
index 2453f645af3dea1fee40c51ddedc5b32196d829d..60465db554d1dc4f1fc0805902154a683bd0a206 100644
--- a/.liquibase/Data_alias/basic/2021.0.3/Bulkmail/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.0.3/Bulkmail/changelog.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include relativeToChangelogFile="true" file="createLinkClicks.xml"/>
     <include relativeToChangelogFile="true" file="AlterBulkmail.xml"/>
-    <include relativeToChangelogFile="true" file="AddBulkmailStatus"/>
+    <include relativeToChangelogFile="true" file="AddBulkmailStatus.xml"/>
     <include relativeToChangelogFile="true" file="createMailLog.xml"/>
     <include relativeToChangelogFile="true" file="createMailRun.xml"/>
     <include relativeToChangelogFile="true" file="createBulkMailTestRecipient.xml"/>
diff --git a/.liquibase/Data_alias/basic/2021.0.3/Checklists/alter_checklistentryvalue.xml b/.liquibase/Data_alias/basic/2021.0.3/Checklists/alter_checklistentryvalue.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f62b23a4c538ec2657020161d42c683aa39b2c75
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.3/Checklists/alter_checklistentryvalue.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="p.neub" id="4aa51e9d-499d-42e8-9cfe-dda36abaa5d0">
+        <addColumn tableName="CHECKLISTENTRYVALUE">
+            <column name="DONEUSER" type="VARCHAR(63)"/>
+        </addColumn>
+        <addColumn tableName="CHECKLISTENTRYVALUE">
+            <column name="DONEDATE" type="TIMESTAMP"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/Checklists/alter_salesproject_phase.xml b/.liquibase/Data_alias/basic/2021.0.3/Checklists/alter_salesproject_phase.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7f258a8afe937102296271003abab10fb3df85fc
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.3/Checklists/alter_salesproject_phase.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="p.neub" id="eba94911-c6d4-4b26-8466-1a811d380908">
+        <addColumn tableName="SALESPROJECTPHASEDEFINITION">
+            <column name="AUTOPROBABILITY" type="DECIMAL(6, 2)"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/Checklists/changelog.xml b/.liquibase/Data_alias/basic/2021.0.3/Checklists/changelog.xml
index 15bb01b42ab844870300a7b407ddbbea116bcf92..b4a899dadbbb5ed2b7523648bb367755a61ac04c 100644
--- a/.liquibase/Data_alias/basic/2021.0.3/Checklists/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.0.3/Checklists/changelog.xml
@@ -8,4 +8,6 @@
     <include relativeToChangelogFile="true" file="update_keyword.xml"/>
     <include relativeToChangelogFile="true" file="update_ab_attributeusage_salesprojectorigin.xml"/>
     <include relativeToChangelogFile="true" file="change_phase_translation.xml"/>
+    <include relativeToChangelogFile="true" file="alter_salesproject_phase.xml"/>
+    <include relativeToChangelogFile="true" file="alter_checklistentryvalue.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/Checklists/update_phase.xml b/.liquibase/Data_alias/basic/2021.0.3/Checklists/update_phase.xml
index 837a9380da71b2d37b0cf7dbde31e6cca57d9313..b5d99df603e2ed8f62d9d704d123e51c5a2a97e6 100644
--- a/.liquibase/Data_alias/basic/2021.0.3/Checklists/update_phase.xml
+++ b/.liquibase/Data_alias/basic/2021.0.3/Checklists/update_phase.xml
@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <changeSet author="p.neub" id="d204fc4f-f670-4df6-86ae-8a57a1fce5ae">
+    <changeSet author="p.neub" id="b7fced70-0fae-4589-8bbf-c7139ebeb783">
         <delete tableName="SALESPROJECTPHASEDEFINITION"/>
         <delete tableName="CHECKLIST"/>
 
@@ -10,7 +10,7 @@
             <column name="PHASE" value="SALPROJPHASECONTACT"/>
             <column name="CHECKLIST_ID" value="179dcc0d-e6fa-411d-b5ee-cb25b9735dbe"/>
             <column name="DATE_EDIT"/>
-            <column name="DESCRIPTION" value="Voraussetzungen für die Phase: 'Contact'."/>
+            <column name="DESCRIPTION" value="Aufgaben für die Phase: 'Contact'."/>
             <column name="USER_EDIT"/>
             <column name="USER_NEW" value="Admin"/>
             <column name="SALESPROJECTPHASEDEFINITIONID" value="176e43db-1665-49b9-9c35-5c5c0aa135f3"/>
@@ -28,7 +28,7 @@
             <column name="PHASE" value="SALPROJPHASELEAD"/>
             <column name="CHECKLIST_ID" value="3d0f1d25-cee8-4b83-a0de-3fded83ff9c4"/>
             <column name="DATE_EDIT"/>
-            <column name="DESCRIPTION" value="Voraussetzungen für die Phase: 'Lead'."/>
+            <column name="DESCRIPTION" value="Aufgaben für die Phase: 'Lead'."/>
             <column name="USER_EDIT"/>
             <column name="USER_NEW" value="Admin"/>
             <column name="SALESPROJECTPHASEDEFINITIONID" value="d29dcde8-24b4-470a-8189-1e2b0d812daa"/>
@@ -46,7 +46,7 @@
             <column name="PHASE" value="SALPROJPHASEPROS"/>
             <column name="CHECKLIST_ID" value="ecf50252-e0c2-4e7a-8cc6-078b5978d2c5"/>
             <column name="DATE_EDIT"/>
-            <column name="DESCRIPTION" value="Voraussetzungen für die Phase: 'Prospect'."/>
+            <column name="DESCRIPTION" value="Aufgaben für die Phase: 'Prospect'."/>
             <column name="USER_EDIT"/>
             <column name="USER_NEW" value="Admin"/>
             <column name="SALESPROJECTPHASEDEFINITIONID" value="d9605427-ba6b-42b2-8376-51e4ef654814"/>
@@ -64,7 +64,7 @@
             <column name="PHASE" value="SALPROJPHASEOFFER"/>
             <column name="CHECKLIST_ID" value="0f95ce44-3b0d-417b-969f-f84897868558"/>
             <column name="DATE_EDIT"/>
-            <column name="DESCRIPTION" value="Voraussetzungen für die Phase: 'Offer'."/>
+            <column name="DESCRIPTION" value="Aufgaben für die Phase: 'Offer'."/>
             <column name="USER_EDIT"/>
             <column name="USER_NEW" value="Admin"/>
             <column name="SALESPROJECTPHASEDEFINITIONID" value="e8ff463f-692c-40a7-bafa-d168886700fd"/>
@@ -82,7 +82,7 @@
             <column name="PHASE" value="SALPROJPHASENEGO"/>
             <column name="CHECKLIST_ID" value="cb0357c9-a222-4d78-b2c5-035fffe3bb51"/>
             <column name="DATE_EDIT"/>
-            <column name="DESCRIPTION" value="Voraussetzungen für die Phase: 'Negotiation'."/>
+            <column name="DESCRIPTION" value="Aufgaben für die Phase: 'Negotiation'."/>
             <column name="USER_EDIT"/>
             <column name="USER_NEW" value="Admin"/>
             <column name="SALESPROJECTPHASEDEFINITIONID" value="21011181-fe9f-4c6c-910e-344ce10e3fc1"/>
diff --git a/.liquibase/Data_alias/basic/2021.0.3/CommunicationBlacklist/create_communicationBlacklist.xml b/.liquibase/Data_alias/basic/2021.0.3/CommunicationBlacklist/create_communicationBlacklist.xml
deleted file mode 100644
index faf00d8192c66f4d93f76288fd73a64243d37807..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2021.0.3/CommunicationBlacklist/create_communicationBlacklist.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="s.listl" id="9415eb4f-ea93-433c-8a69-1bdb77c6ec87">
-    <createTable tableName="COMMUNICATIONBLACKLIST">
-          <column name="COMMUNICATIONBLACKLISTID" type="CHAR(36)">
-              <constraints nullable="false" primaryKey="true" primaryKeyName="PK_COMMUNICATIONBLACKLISTID"/>
-          </column>
-          <column name="BLACKLIST_TYPE" type="VARCHAR(36)">
-              <constraints nullable="false"/>
-          </column>
-          <column name="BLACKLIST_FILTER" type="NCLOB"/>
-          <column name="REASON" type="NVARCHAR(500)"/>
-          <column name="START_DATE" type="DATETIME"/>
-          <column name="END_DATE" type="DATETIME"/>
-          <column name="DATE_NEW" type="DATETIME">
-              <constraints nullable="false"/>
-          </column>
-          <column name="USER_NEW" type="VARCHAR(50)">
-              <constraints nullable="false"/>
-          </column>
-          <column name="DATE_EDIT" type="DATETIME"/>
-          <column name="USER_EDIT" type="VARCHAR(50)"/>
-      </createTable>
-  </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/CommunicationBlacklist/insert_blacklistTypeKeyword.xml b/.liquibase/Data_alias/basic/2021.0.3/CommunicationBlacklist/insert_blacklistTypeKeyword.xml
deleted file mode 100644
index c2a6c8057c98bad7b41e2298ed807dbb4032dfc7..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2021.0.3/CommunicationBlacklist/insert_blacklistTypeKeyword.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="s.listl" id="89ba3828-288c-4af7-bf98-feccc01ce312">
-    <insert tableName="AB_KEYWORD_CATEGORY">
-      <column name="AB_KEYWORD_CATEGORYID" value="e980999c-0f8e-484b-852b-92d60c38c14f"/>
-      <column name="NAME" value="CommunicationBlacklistType"/>
-      <column name="SORTINGBY" valueNumeric="0"/>
-      <column name="SORTINGDIRECTION" value="ASC"/>
-    </insert>
-    <insert tableName="AB_KEYWORD_ENTRY">
-        <column name="AB_KEYWORD_ENTRYID" value="a1c8d2c6-54c7-4e9d-9792-dd576ac6f43e"/>
-        <column name="AB_KEYWORD_CATEGORY_ID" value="e980999c-0f8e-484b-852b-92d60c38c14f"/>
-        <column name="KEYID" value="BLACKLIST_TYPE_EMAILRECIPIENT_FILTER"/>
-        <column name="TITLE" value="Recipient filter"/>
-        <column name="CONTAINER" value="CommunicationBlacklistType"/>
-        <column name="SORTING" valueNumeric="1"/>
-        <column name="ISACTIVE" valueNumeric="1"/>
-        <column name="ISESSENTIAL" valueNumeric="0"/>
-    </insert>
-  </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/CommunicationSettings/changelog.xml b/.liquibase/Data_alias/basic/2021.0.3/CommunicationSettings/changelog.xml
index 985bb74bdd6da48d4b5b6f467fbfb81027763e42..7f9a276d0e9d6022eea4337cd99919ed07dfdffb 100644
--- a/.liquibase/Data_alias/basic/2021.0.3/CommunicationSettings/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.0.3/CommunicationSettings/changelog.xml
@@ -7,4 +7,5 @@
     <include relativeToChangelogFile="true" file="insert_communicationSettingsStatus.xml"/>
     <include relativeToChangelogFile="true" file="insert_commMediumCampaignCategory.xml"/>
     <include relativeToChangelogFile="true" file="create_communicationLegalBase.xml"/>
+    <include relativeToChangelogFile="true" file="insert_commRestrictions.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/CommunicationSettings/insert_commRestrictions.xml b/.liquibase/Data_alias/basic/2021.0.3/CommunicationSettings/insert_commRestrictions.xml
new file mode 100644
index 0000000000000000000000000000000000000000..60be8d3018fc6f55008dbb070839a61414fd8f0f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.3/CommunicationSettings/insert_commRestrictions.xml
@@ -0,0 +1,36 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="s.listl" id="67710143-ad12-4537-9995-e7c2beb3c4e7">
+      <sql dbms="mysql,mariadb,mssql,postgresql,oracle">
+            insert into COMMUNICATIONSETTINGS (COMMUNICATIONSETTINGSID, CONTACT_ID, CHANNEL_TYPE, MEDIUM, STATUS, DATE_NEW, USER_NEW)
+            select COMMRESTRICTIONID, CONTACT_ID, 'COMMUNICATIONCHANNEL_COMMUNICATION', MEDIUM, 'COMMUNICATION_REJECTED', CURRENT_TIMESTAMP, 'Admin'
+            from COMMRESTRICTION;
+      </sql>
+      <sql dbms="mysql,mariadb">
+            insert into COMMUNICATIONLEGALBASE (COMMUNICATIONLEGALBASEID, COMMUNICATIONSETTINGS_ID, DATE_NEW, USER_NEW, VERSION, INFO)
+            select UUID(), COMMUNICATIONSETTINGSID, CURRENT_TIMESTAMP, 'Admin', 1, REASON
+            from COMMUNICATIONSETTINGS
+            join COMMRESTRICTION on COMMUNICATIONSETTINGS.COMMUNICATIONSETTINGSID = COMMRESTRICTION.COMMRESTRICTIONID;
+      </sql>
+      <sql dbms="mssql">
+            insert into COMMUNICATIONLEGALBASE (COMMUNICATIONLEGALBASEID, COMMUNICATIONSETTINGS_ID, DATE_NEW, USER_NEW, VERSION, INFO)
+            select NEWID(), COMMUNICATIONSETTINGSID, CURRENT_TIMESTAMP, 'Admin', 1, REASON
+            from COMMUNICATIONSETTINGS
+            join COMMRESTRICTION on COMMUNICATIONSETTINGS.COMMUNICATIONSETTINGSID = COMMRESTRICTION.COMMRESTRICTIONID;
+      </sql>
+      <sql dbms="postgresql">
+            insert into COMMUNICATIONLEGALBASE (COMMUNICATIONLEGALBASEID, COMMUNICATIONSETTINGS_ID, DATE_NEW, USER_NEW, VERSION, INFO)
+            select uuid_in(md5(random()::text || clock_timestamp()::text)::cstring), COMMUNICATIONSETTINGSID, CURRENT_TIMESTAMP, 'Admin', 1, REASON
+            from COMMUNICATIONSETTINGS
+            join COMMRESTRICTION on COMMUNICATIONSETTINGS.COMMUNICATIONSETTINGSID = COMMRESTRICTION.COMMRESTRICTIONID;
+      </sql>
+      <sql dbms="oracle">
+            insert into COMMUNICATIONLEGALBASE (COMMUNICATIONLEGALBASEID, COMMUNICATIONSETTINGS_ID, DATE_NEW, USER_NEW, VERSION, INFO)
+            select SYS_GUID(), COMMUNICATIONSETTINGSID, CURRENT_TIMESTAMP, 'Admin', 1, REASON
+            from COMMUNICATIONSETTINGS
+            join COMMRESTRICTION on COMMUNICATIONSETTINGS.COMMUNICATIONSETTINGSID = COMMRESTRICTION.COMMRESTRICTIONID;
+      </sql>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/CommunicationSettings/insert_iconsCommChannelType.xml b/.liquibase/Data_alias/basic/2021.0.3/CommunicationSettings/insert_iconsCommChannelType.xml
deleted file mode 100644
index 7e4a3495dfda00d915cb2ac679dd024e8eba0c94..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2021.0.3/CommunicationSettings/insert_iconsCommChannelType.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <changeSet author="s.listl" id="6f8ade49-21aa-4ac6-8a7f-3ddd1c619d95">
-      <insert tableName="AB_KEYWORD_ATTRIBUTE">
-          <column name="AB_KEYWORD_ATTRIBUTEID" value="f1841bca-e937-44f6-ba94-0e321e81e960"/>
-          <column name="AB_KEYWORD_CATEGORY_ID" value=""/>
-          <column name="CONTAINER" value=""/>
-          <column name="KIND" value="CHAR_VALUE"/>
-          <column name="NAME" value="iconApproved"/>
-      </insert>
-      <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
-          <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="c497054c-93ff-4436-9cb5-94661fe99a7c"/>
-          <column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1841bca-e937-44f6-ba94-0e321e81e960"/>
-          <column name="AB_KEYWORD_ENTRY_ID" value="a395d73b-6780-41d2-9934-70d4f4a021ff"/>
-          <column name="CHAR_VALUE" value="VAADIN:USER"/>
-      </insert>
-      <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
-          <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="c640739d-c38f-456b-9083-f3fedb0ddaaa"/>
-          <column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1841bca-e937-44f6-ba94-0e321e81e960"/>
-          <column name="AB_KEYWORD_ENTRY_ID" value="10451ef3-9fee-41f9-88f2-8e3c0b326dab"/>
-          <column name="CHAR_VALUE" value=""/>
-      </insert>
-      <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
-          <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="a8c8208c-b1e7-41ed-9b9d-829912930a1b"/>
-          <column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1841bca-e937-44f6-ba94-0e321e81e960"/>
-          <column name="AB_KEYWORD_ENTRY_ID" value="49786329-801b-4adf-b5f9-34234d65111b"/>
-          <column name="CHAR_VALUE" value=""/>
-      </insert>
-      <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
-          <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="c9a818a2-12c1-424b-9f9b-d731eb91d1f6"/>
-          <column name="AB_KEYWORD_ATTRIBUTE_ID" value="f1841bca-e937-44f6-ba94-0e321e81e960"/>
-          <column name="AB_KEYWORD_ENTRY_ID" value="b1234ea8-f560-401d-b63a-06497c873fec"/>
-          <column name="CHAR_VALUE" value=""/>
-      </insert>
-  </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/Duplicate/changelog.xml b/.liquibase/Data_alias/basic/2021.0.3/Duplicate/changelog.xml
index 10ee1b9cc2cb6cd02db3b863cb695a114c9625d1..15d32034eeb6946e544f20d58b7dc3777a56c525 100644
--- a/.liquibase/Data_alias/basic/2021.0.3/Duplicate/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.0.3/Duplicate/changelog.xml
@@ -7,4 +7,5 @@
     <include relativeToChangelogFile="true" file="drop_duplicatescannerresultfieldconfig.xml"/>
     <include relativeToChangelogFile="true" file="alter_unrelatedduplicates.xml"/>
     <include relativeToChangelogFile="true" file="migrate_unrelatedduplicates.xml"/>
+    <include relativeToChangelogFile="true" file="insert_duplicatescanner.xml" />
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/duplicatescanner.xml b/.liquibase/Data_alias/basic/2021.0.3/Duplicate/insert_duplicatescanner.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/_demoData/generatedData/duplicatescanner.xml
rename to .liquibase/Data_alias/basic/2021.0.3/Duplicate/insert_duplicatescanner.xml
diff --git a/.liquibase/Data_alias/basic/2021.0.3/LinkWorkflows/add_weblinkWorkflowColumns.xml b/.liquibase/Data_alias/basic/2021.0.3/LinkWorkflows/add_weblinkWorkflowColumns.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f88670c4f4db6c4a554345103a1f682c9adfb61c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.3/LinkWorkflows/add_weblinkWorkflowColumns.xml
@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="s.listl" id="90e1ef8c-62ac-4c98-839b-429b8ae83251">
+      <addColumn tableName="WEBLINK">
+          <column name="ACTION_TYPE" type="VARCHAR(36)"/>
+          <column name="WORKFLOWSIGNAL_NAME" type="VARCHAR(255)"/>
+      </addColumn>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/CommunicationBlacklist/changelog.xml b/.liquibase/Data_alias/basic/2021.0.3/LinkWorkflows/changelog.xml
similarity index 66%
rename from .liquibase/Data_alias/basic/2021.0.3/CommunicationBlacklist/changelog.xml
rename to .liquibase/Data_alias/basic/2021.0.3/LinkWorkflows/changelog.xml
index de169ea5bfc61c615c96663b65dea30519245fff..447f29d8a252c402b3fb06633e5171de1ef42e8a 100644
--- a/.liquibase/Data_alias/basic/2021.0.3/CommunicationBlacklist/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.0.3/LinkWorkflows/changelog.xml
@@ -2,6 +2,6 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <include relativeToChangelogFile="true" file="create_communicationBlacklist.xml"/>
-    <include relativeToChangelogFile="true" file="insert_blacklistTypeKeyword.xml"/>
+    <include relativeToChangelogFile="true" file="add_weblinkWorkflowColumns.xml"/>
+    <include relativeToChangelogFile="true" file="insert_linkActionTypeKeyword.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/LinkWorkflows/insert_linkActionTypeKeyword.xml b/.liquibase/Data_alias/basic/2021.0.3/LinkWorkflows/insert_linkActionTypeKeyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..59172ddb4582214f902f3a8450614df26147cf06
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.3/LinkWorkflows/insert_linkActionTypeKeyword.xml
@@ -0,0 +1,33 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="s.listl" id="3b41b283-4e04-451f-96c9-ab829b2ab06c">
+    <insert tableName="AB_KEYWORD_CATEGORY">
+      <column name="AB_KEYWORD_CATEGORYID" value="90afa287-20b7-4d52-9227-63950f2c96be"/>
+      <column name="NAME" value="WeblinkActionType"/>
+      <column name="SORTINGBY" valueNumeric="0"/>
+      <column name="SORTINGDIRECTION" value="ASC"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="afd1b624-c7c3-47c9-9ec3-c4638652ca1f"/>
+        <column name="AB_KEYWORD_CATEGORY_ID" value="90afa287-20b7-4d52-9227-63950f2c96be"/>
+        <column name="KEYID" value="LINKACTION_STARTWORKFLOW"/>
+        <column name="TITLE" value="Start workflow"/>
+        <column name="CONTAINER" value="WeblinkActionType"/>
+        <column name="SORTING" valueNumeric="1"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="2cd0b9e4-7a37-4d44-96e8-13d77e08213c"/>
+        <column name="AB_KEYWORD_CATEGORY_ID" value="90afa287-20b7-4d52-9227-63950f2c96be"/>
+        <column name="KEYID" value="LINKACTION_SENDSIGNAL"/>
+        <column name="TITLE" value="Send workflow signal"/>
+        <column name="CONTAINER" value="WeblinkActionType"/>
+        <column name="SORTING" valueNumeric="2"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/changelog.xml b/.liquibase/Data_alias/basic/2021.0.3/changelog.xml
index 33011d5d959969ac0617d0f0e0fa6b84635b75fe..1c8d89015e94fc36f4aa8a62af1bd43c5d8938e8 100644
--- a/.liquibase/Data_alias/basic/2021.0.3/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.0.3/changelog.xml
@@ -5,10 +5,13 @@
     <include relativeToChangelogFile="true" file="LinkManagement/changelog.xml"/>
     <include relativeToChangelogFile="true" file="CommunicationSettings/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Interest/changelog.xml"/>
-    <include relativeToChangelogFile="true" file="CommunicationBlacklist/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Checklists/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Planning/changelog.xml"/>
     <include relativeToChangelogFile="true" file="alter_origin_attribute.xml"/>
     <include relativeToChangelogFile="true" file="Duplicate/changelog.xml"/>
     <include relativeToChangelogFile="true" file="DSGVO/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="update_ab_countryinfo_name_native.xml"/>
+    <include relativeToChangelogFile="true" file="create_probability_keywords.xml"/>
+    <include relativeToChangelogFile="true" file="LinkWorkflows/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="renameLeadTable.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/create_probability_keywords.xml b/.liquibase/Data_alias/basic/2021.0.3/create_probability_keywords.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8243d75edb38dace41edae1b72cd3620ceec5b91
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.3/create_probability_keywords.xml
@@ -0,0 +1,120 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="p.neub" id="d9d6e2dd-5d9f-4c92-bd78-f33e6320b273">
+        <insert tableName="AB_KEYWORD_CATEGORY">
+            <column name="AB_KEYWORD_CATEGORYID" value="2d4a7918-6105-4746-b196-504ebe352250"/>
+            <column name="NAME" value="ProbabilitySalesproject"/>
+            <column name="SORTINGBY" valueNumeric="0"/>
+            <column name="SORTINGDIRECTION" value="ASC"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="d8c35e5a-6935-4262-b919-84196bce8e6d"/>
+            <column name="CONTAINER" value="ProbabilitySalesproject"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="2d4a7918-6105-4746-b196-504ebe352250"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="KEYID" value="0"/>
+            <column name="TITLE" value="0%"/>
+            <column name="SORTING" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="59fbb811-d183-4746-9b88-ed3c275f6f82"/>
+            <column name="CONTAINER" value="ProbabilitySalesproject"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="2d4a7918-6105-4746-b196-504ebe352250"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="KEYID" value="25"/>
+            <column name="TITLE" value="25%"/>
+            <column name="SORTING" valueNumeric="1"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="9fcc2591-9e96-466e-8fd0-223337a50a8f"/>
+            <column name="CONTAINER" value="ProbabilitySalesproject"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="2d4a7918-6105-4746-b196-504ebe352250"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="KEYID" value="50"/>
+            <column name="TITLE" value="50%"/>
+            <column name="SORTING" valueNumeric="2"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="70cef9ee-b221-4097-be5e-08a8f3e5a8b4"/>
+            <column name="CONTAINER" value="ProbabilitySalesproject"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="2d4a7918-6105-4746-b196-504ebe352250"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="KEYID" value="75"/>
+            <column name="TITLE" value="75%"/>
+            <column name="SORTING" valueNumeric="3"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="5de50a13-7871-4cee-9fab-9c419b2ce620"/>
+            <column name="CONTAINER" value="ProbabilitySalesproject"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="2d4a7918-6105-4746-b196-504ebe352250"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="KEYID" value="100"/>
+            <column name="TITLE" value="100%"/>
+            <column name="SORTING" valueNumeric="4"/>
+        </insert>
+
+        <insert tableName="AB_KEYWORD_CATEGORY">
+            <column name="AB_KEYWORD_CATEGORYID" value="aba6b313-7e35-4eeb-95e2-0e262c66fa9c"/>
+            <column name="NAME" value="ProbabilityOffer"/>
+            <column name="SORTINGBY" valueNumeric="0"/>
+            <column name="SORTINGDIRECTION" value="ASC"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="38f30441-2d94-4558-9c53-a29d066731b9"/>
+            <column name="CONTAINER" value="ProbabilityOffer"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="aba6b313-7e35-4eeb-95e2-0e262c66fa9c"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="KEYID" value="0"/>
+            <column name="TITLE" value="0%"/>
+            <column name="SORTING" valueNumeric="0"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="1f411441-7677-4c64-88c0-d0f5b24f8a4c"/>
+            <column name="CONTAINER" value="ProbabilityOffer"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="aba6b313-7e35-4eeb-95e2-0e262c66fa9c"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="KEYID" value="25"/>
+            <column name="TITLE" value="25%"/>
+            <column name="SORTING" valueNumeric="1"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="26225ece-fdf9-4e72-a2b3-8ea295429157"/>
+            <column name="CONTAINER" value="ProbabilityOffer"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="aba6b313-7e35-4eeb-95e2-0e262c66fa9c"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="KEYID" value="50"/>
+            <column name="TITLE" value="50%"/>
+            <column name="SORTING" valueNumeric="2"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="01865353-6137-44fe-8817-6d67e33f895e"/>
+            <column name="CONTAINER" value="ProbabilityOffer"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="aba6b313-7e35-4eeb-95e2-0e262c66fa9c"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="KEYID" value="75"/>
+            <column name="TITLE" value="75%"/>
+            <column name="SORTING" valueNumeric="3"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="755eefec-ecb6-485d-91c9-8763b2a24ebf"/>
+            <column name="CONTAINER" value="ProbabilityOffer"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="aba6b313-7e35-4eeb-95e2-0e262c66fa9c"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="KEYID" value="100"/>
+            <column name="TITLE" value="100%"/>
+            <column name="SORTING" valueNumeric="4"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/renameLeadTable.xml b/.liquibase/Data_alias/basic/2021.0.3/renameLeadTable.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3ff67e81e9cb86060978f085eee96d9d5f3fc8f2
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.3/renameLeadTable.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="d.tran" id="22056191-8d5a-4690-8872-d0aa6cca43b4">
+      <renameTable oldTableName="LEAD" newTableName="LEADS"/>
+      <renameColumn tableName="LEADS" columnDataType="CHAR(36)" oldColumnName="LEADID" newColumnName="LEADSID"/>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.0.3/update_ab_countryinfo_name_native.xml b/.liquibase/Data_alias/basic/2021.0.3/update_ab_countryinfo_name_native.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1b1d4071a37e1a78db8ca1ff340e0cfb950c2b6f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.0.3/update_ab_countryinfo_name_native.xml
@@ -0,0 +1,527 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="p.dietl" id="6788dcc4-2d9a-4863-9660-5069a69e1932">
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="دولة الإمارات العربية المتحدة"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="AE"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="افغانستان"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="AF"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Õ€Õ¡ÕµÕ¡Õ½Õ¿Õ¡Õ¶"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="AM"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Azərbaycan"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="AZ"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="България"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="BG"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="‏البحرين"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="BH"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="ʼbrug-yul"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="BT"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Белару́сь"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="BY"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="中国"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="CN"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Κύπρος"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="CY"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Česká republika"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="CZ"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="الجزائر"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="DZ"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="مصر‎"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="EG"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="الصحراء الغربية"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="EH"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="ኤርትራ"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="ER"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="ኢትዮጵያ"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="ET"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="საქართველო"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="GE"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Ελλάδα"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="GR"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="香港"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="HK"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="יִשְׂרָאֵל"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="IL"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="भारत"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="IN"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="العراق"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="IQ"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="ایران"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="IR"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="الأردن"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="JO"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="日本"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="JP"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Кыргызстан"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="KG"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Kâmpŭchéa"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="KH"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="북한"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="KP"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="대한민국"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="KR"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="الكويت"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="KW"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Қазақстан"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="KZ"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="ສປປລາວ"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="LA"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="لبنان"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="LB"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="śrī laṃkāva"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="LK"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="‏ليبيا"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="LY"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="المغرب"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="MA"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Црна Гора"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="ME"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="M̧ajeļ"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="MH"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Македонија"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="MK"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Монгол улс"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="MN"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="澳門"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="MO"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="موريتانيا"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="MR"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="नेपाल"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="NP"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Niuē"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="NU"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="عمان"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="OM"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="فلسطين"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="PS"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="قطر"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="QA"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Србија"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="RS"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Россия"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="RU"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="العربية السعودية"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="SA"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="السودان"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="SD"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="سوريا"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="SY"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="ประเทศไทย"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="TH"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Тоҷикистон"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="TJ"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="تونس"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="TN"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="臺灣"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="TW"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Україна"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="UA"/>
+            </whereParams>
+        </update>
+
+
+        <update tableName="AB_COUNTRYINFO">
+            <column name="NAME_NATIVE" value="Việt Nam"/>
+            <where>ISO2 = ?</where>
+            <whereParams>
+                <param value="VN"/>
+            </whereParams>
+        </update>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/changelog.xml b/.liquibase/Data_alias/basic/_demoData/changelog.xml
index d27f20c3d1e4c8f98ff2042dd3a2f2202d1c4ffb..034f757e84d30554d0c9f4e19599d97831d99f31 100644
--- a/.liquibase/Data_alias/basic/_demoData/changelog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/changelog.xml
@@ -33,17 +33,18 @@
   <include file="generatedData/documenttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/dsgvo.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/dsgvoinfo.xml" relativeToChangelogFile="true"/>
-  <include file="generatedData/duplicatescanner.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/exporttemplate.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/exporttemplatefield.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/exporttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/forecast.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/interest.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/letterrecipient.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/objectmember.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/offer.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/offeritem.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/organisation.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/person.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/prod2prod.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/product.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/productprice.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/salesorder.xml" relativeToChangelogFile="true"/>
@@ -57,4 +58,5 @@
   <include file="generatedData/tasklink.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/ticket.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/visitrecommendation.xml" relativeToChangelogFile="true"/>
+  <include file="generatedData/weblink.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
index 2231334c01502ed21cf8303321b6825dc57b0af3..54c82b6ecbb371bfbfc8b24503aee7a122869330 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
@@ -41,7 +41,7 @@
     <insert tableName="ab_objectrelationtype">
       <column name="SIDE" valueNumeric="1"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="39e73949-c8d9-46a2-a0b5-18be95e7ba11"/>
-      <column name="OBJECT_TYPE" value="PrivatePerson"/>
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:FAMILY"/>
       <column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
@@ -86,7 +86,7 @@
     <insert tableName="ab_objectrelationtype">
       <column name="SIDE" valueNumeric="2"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="a2296f93-2371-4ab8-9f29-ef0795d1e9b2"/>
-      <column name="OBJECT_TYPE" value="PrivatePerson"/>
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:FAMILY"/>
       <column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
@@ -104,7 +104,7 @@
     <insert tableName="ab_objectrelationtype">
       <column name="SIDE" valueNumeric="2"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
-      <column name="OBJECT_TYPE" value="PrivatePerson"/>
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:FAMILY"/>
       <column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
@@ -122,7 +122,7 @@
     <insert tableName="ab_objectrelationtype">
       <column name="SIDE" valueNumeric="1"/>
       <column name="AB_OBJECTRELATIONTYPEID" value="c74ad02c-1db9-4f47-8691-aba349dbe316"/>
-      <column name="OBJECT_TYPE" value="PrivatePerson"/>
+      <column name="OBJECT_TYPE" value="Person"/>
       <column name="HIERARCHY" valueNumeric="0"/>
       <column name="ICON" value="VAADIN:FAMILY"/>
       <column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/commrestriction.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/commrestriction.xml
deleted file mode 100644
index 4bfd0d305d99ad749ed5dd75d8295144480a580e..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/commrestriction.xml
+++ /dev/null
@@ -1,13 +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="c663330c-e55f-4804-a18b-64c6693e5e12">
-    <delete tableName="commrestriction"/>
-    <insert tableName="commrestriction">
-      <column name="COMMRESTRICTIONID" value="a07a7061-245f-4674-8482-282f5e5d2a5b"/>
-      <column name="MEDIUM" value="CAMPAIGNPHONE"/>
-      <column name="EMPLOYEE_INVOLVED" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="STARTDATE" valueDate="2019-11-25T02:47:33"/>
-    </insert>
-  </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/interest.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/interest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3294e38ae5f1858f19284780b55ee8046d6f5d98
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/interest.xml
@@ -0,0 +1,26 @@
+<?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-4.1.xsd">
+    <changeSet author="m.groppe" id="0764fb10-a239-4698-9aeb-6cf82cf2c4cc">
+        <insert tableName="interest">
+            <column name="INTERESTID" value="2ad0e569-b9eb-4261-9cc7-4ed59e43a7ac"/>
+            <column name="TITLE" value="Events &amp; Webinare"/>
+            <column name="DESCRIPTION"/>
+            <column name="STATUS" value="INTEREST_ACTIVE"/>
+            <column name="IS_DEFAULT" valueNumeric="0"/>
+        </insert>
+        <insert tableName="interest">
+            <column name="INTERESTID" value="38c97136-9ea0-48f2-99e5-2bff9c2473c3"/>
+            <column name="TITLE" value="Produktinformationen"/>
+            <column name="DESCRIPTION"/>
+            <column name="STATUS" value="INTEREST_ACTIVE"/>
+            <column name="IS_DEFAULT" valueNumeric="0"/>
+        </insert>
+        <insert tableName="interest">
+            <column name="INTERESTID" value="6dd7cee1-5103-4086-8291-c29176c7b082"/>
+            <column name="TITLE" value="Newsletter"/>
+            <column name="DESCRIPTION"/>
+            <column name="STATUS" value="INTEREST_ACTIVE"/>
+            <column name="IS_DEFAULT" valueNumeric="1"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/prod2prod.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/prod2prod.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f8374b87cfa024260e81b37c5cedd1a2b0df4f74
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/prod2prod.xml
@@ -0,0 +1,70 @@
+<?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="ef18ec60-88c1-4ff5-9553-2e17da33b6aa">
+    <delete tableName="PROD2PROD"/>
+    <insert tableName="PROD2PROD">
+      <column name="PROD2PRODID" value="1fb7dfed-a491-467c-bc1e-2a78fb4902e6"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="TAKEPRICE" valueNumeric="1"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="SOURCE_ID" value="4775aed7-e165-495b-a147-7e3312b27d0b"/>
+      <column name="DEST_ID" value="acd4cbde-f55d-444b-b294-1c6fe8588000"/>
+    </insert>
+    <insert tableName="PROD2PROD">
+      <column name="PROD2PRODID" value="2132635f-a409-489d-a805-348f4f350de2"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="TAKEPRICE" valueNumeric="1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="SOURCE_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
+      <column name="DEST_ID" value="59851fb8-e743-46bb-8df9-bc2789fd5b37"/>
+    </insert>
+    <insert tableName="PROD2PROD">
+      <column name="PROD2PRODID" value="72b5cc22-7e17-44bc-aabd-0db73f6f4056"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="TAKEPRICE" valueNumeric="1"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="SOURCE_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
+      <column name="DEST_ID" value="4203b3f3-e8d9-483e-a9f8-274a40f92074"/>
+    </insert>
+    <insert tableName="PROD2PROD">
+      <column name="PROD2PRODID" value="732577f8-8119-40a3-8b1e-77290dc9d8f7"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="TAKEPRICE" valueNumeric="1"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="SOURCE_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
+      <column name="DEST_ID" value="59851fb8-e743-46bb-8df9-bc2789fd5b37"/>
+    </insert>
+    <insert tableName="PROD2PROD">
+      <column name="PROD2PRODID" value="a2c66ce9-526d-4352-869b-2e72549961f3"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="TAKEPRICE" valueNumeric="1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="SOURCE_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
+      <column name="DEST_ID" value="4203b3f3-e8d9-483e-a9f8-274a40f92074"/>
+    </insert>
+    <insert tableName="PROD2PROD">
+      <column name="PROD2PRODID" value="ad73422c-9948-40af-9e2b-fd1d94d0abc1"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="TAKEPRICE" valueNumeric="1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="SOURCE_ID" value="4004db3e-a63e-4b32-b7da-8c899996ddcd"/>
+      <column name="DEST_ID" value="acd4cbde-f55d-444b-b294-1c6fe8588000"/>
+    </insert>
+    <insert tableName="PROD2PROD">
+      <column name="PROD2PRODID" value="c5ee9f21-d780-4207-8417-0b0ba944c795"/>
+      <column name="OPTIONAL" valueNumeric="1"/>
+      <column name="TAKEPRICE" valueNumeric="0"/>
+      <column name="QUANTITY" valueNumeric="2.00"/>
+      <column name="SOURCE_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
+      <column name="DEST_ID" value="59851fb8-e743-46bb-8df9-bc2789fd5b37"/>
+    </insert>
+    <insert tableName="PROD2PROD">
+      <column name="PROD2PRODID" value="e230bac0-ecb4-4664-978e-97d50a44edc5"/>
+      <column name="OPTIONAL" valueNumeric="0"/>
+      <column name="TAKEPRICE" valueNumeric="1"/>
+      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="SOURCE_ID" value="4a234269-faab-474e-82e8-662e7600e1ea"/>
+      <column name="DEST_ID" value="4203b3f3-e8d9-483e-a9f8-274a40f92074"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/product.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/product.xml
index 2de3cd44d1b4f7b35a6543f1f4dfc7c4667019d0..23aaf952c6f339a7ac83a4fc6d1b507a8bcbf0d8 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/product.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/product.xml
@@ -1,230 +1,330 @@
 <?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="ecc3f53c-f7a8-464e-a85a-327745dd8ec4">
-    <delete tableName="product"/>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="ET1009"/>
-      <column name="PRODUCTID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
-      <column name="MINSTOCK" valueNumeric="50"/>
-      <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-05-22T11:14:32"/>
-      <column name="PRODUCTNAME" value="Ersatzteil 4"/>
-      <column name="STATUS" valueNumeric="1"/>
-    </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="WG1005"/>
+  <changeSet author="autogenerated" id="7e92d0d8-0259-4709-936c-ce49e68b154a">
+    <delete tableName="PRODUCT"/>
+    <insert tableName="PRODUCT">
       <column name="PRODUCTID" value="155ac430-ccfc-4814-95fc-189631779064"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:32:19"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="PRODUCTCODE" value="WG1005"/>
       <column name="PRODUCTNAME" value="WG1 Standardprodukt 3"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:32:19"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T11:00:55"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="DL1001"/>
+    <insert tableName="PRODUCT">
       <column name="PRODUCTID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
-      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:30:01"/>
-      <column name="UNIT" value="QUANTITYHOUR"/>
+      <column name="PRODUCTCODE" value="DL1001"/>
       <column name="PRODUCTNAME" value="Service Einsatz"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:30:01"/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="WG2004"/>
+    <insert tableName="PRODUCT">
       <column name="PRODUCTID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ADVERTISING" value="N"/>
+      <column name="PRODUCTCODE" value="WG2004"/>
+      <column name="PRODUCTNAME" value="WG2 Produkt 3"/>
+      <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
       <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-16T03:53:18"/>
+      <column name="DATE_EDIT" valueDate="2021-04-09T11:20:03"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+    </insert>
+    <insert tableName="PRODUCT">
+      <column name="PRODUCTID" value="4004db3e-a63e-4b32-b7da-8c899996ddcd"/>
+      <column name="ADVERTISING" value="N"/>
+      <column name="PRODUCTCODE" value="WG3001-C"/>
+      <column name="PRODUCTNAME" value="WG3 Produkt A - Comfort"/>
+      <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-16T01:53:18"/>
+      <column name="DATE_NEW" valueDate="2021-04-09T11:41:02"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
+    </insert>
+    <insert tableName="PRODUCT">
+      <column name="PRODUCTID" value="4203b3f3-e8d9-483e-a9f8-274a40f92074"/>
+      <column name="ADVERTISING" value="N"/>
+      <column name="PRODUCTCODE" value="WG3006-SL"/>
+      <column name="PRODUCTNAME" value="WG3 Produkt SL3"/>
+      <column name="STATUS" valueNumeric="1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
-      <column name="PRODUCTNAME" value="WG2 Proudkt 3"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2021-04-09T11:50:34"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
+    </insert>
+    <insert tableName="PRODUCT">
+      <column name="PRODUCTID" value="4775aed7-e165-495b-a147-7e3312b27d0b"/>
+      <column name="ADVERTISING" value="N"/>
+      <column name="PRODUCTCODE" value="WG3002-C"/>
+      <column name="PRODUCTNAME" value="WG3 Produkt B - Comfort"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2021-04-09T11:43:06"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="WG2002"/>
-      <column name="PRODUCTID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+    <insert tableName="PRODUCT">
+      <column name="PRODUCTID" value="488e25b2-0210-41bd-bfe6-4312a9e68a20"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
+      <column name="PRODUCTCODE" value="WG1007"/>
+      <column name="PRODUCTNAME" value="WG1 Standardprodukt 4"/>
+      <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-16T01:48:31"/>
+      <column name="DATE_NEW" valueDate="2021-04-09T11:11:18"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+    </insert>
+    <insert tableName="PRODUCT">
+      <column name="PRODUCTID" value="4a234269-faab-474e-82e8-662e7600e1ea"/>
+      <column name="ADVERTISING" value="N"/>
+      <column name="PRODUCTCODE" value="WG3003-C"/>
+      <column name="PRODUCTNAME" value="WG3 Produkt C - Comfort"/>
+      <column name="STATUS" valueNumeric="1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2021-04-09T11:44:15"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
+    </insert>
+    <insert tableName="PRODUCT">
+      <column name="PRODUCTID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
+      <column name="ADVERTISING" value="N"/>
+      <column name="PRODUCTCODE" value="WG2002"/>
       <column name="PRODUCTNAME" value="WG2 Produkt 1"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-16T03:48:31"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T11:00:55"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="ET1004"/>
-      <column name="PRODUCTID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
-      <column name="MINSTOCK" valueNumeric="15"/>
+    <insert tableName="PRODUCT">
+      <column name="PRODUCTID" value="59851fb8-e743-46bb-8df9-bc2789fd5b37"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
+      <column name="PRODUCTCODE" value="WG3004-SL"/>
+      <column name="PRODUCTNAME" value="WG3 Produkt SL1"/>
+      <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
+      <column name="DATE_NEW" valueDate="2021-04-09T11:44:53"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
+    </insert>
+    <insert tableName="PRODUCT">
+      <column name="PRODUCTID" value="6d1321d0-7777-4b6e-8a01-08b77ea3c5bf"/>
+      <column name="ADVERTISING" value="N"/>
+      <column name="PRODUCTCODE" value="WG2009"/>
+      <column name="PRODUCTNAME" value="WG2 Produkt 8"/>
+      <column name="STATUS" valueNumeric="1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-05-22T11:14:05"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2021-04-09T11:37:43"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+    </insert>
+    <insert tableName="PRODUCT">
+      <column name="PRODUCTID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
+      <column name="ADVERTISING" value="N"/>
+      <column name="MINSTOCK" valueNumeric="15"/>
+      <column name="MINSTOCK" valueNumeric="15"/>
+      <column name="PRODUCTCODE" value="ET1004"/>
       <column name="PRODUCTNAME" value="Ersatzteil 3"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T03:16:36"/>
+      <column name="DATE_EDIT" valueDate="2019-05-22T01:14:05"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="WG2005"/>
+    <insert tableName="PRODUCT">
       <column name="PRODUCTID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:23:33"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="PRODUCTCODE" value="WG2005"/>
       <column name="PRODUCTNAME" value="WG2 Produkt 4"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:23:33"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T11:00:55"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="WG2003"/>
+    <insert tableName="PRODUCT">
       <column name="PRODUCTID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-16T01:49:51"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="PRODUCTCODE" value="WG2003"/>
       <column name="PRODUCTNAME" value="WG2 Produkt 2"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-16T03:49:51"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T11:00:55"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="WG2006"/>
+    <insert tableName="PRODUCT">
       <column name="PRODUCTID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:25:18"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="PRODUCTCODE" value="WG2006"/>
       <column name="PRODUCTNAME" value="WG2 Produkt 5"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:25:18"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T11:00:55"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="WG0001"/>
+    <insert tableName="PRODUCT">
       <column name="PRODUCTID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
-      <column name="MINSTOCK" valueNumeric="10"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-16T01:43:25"/>
-      <column name="UNIT" value="QUANTITYKGS"/>
-      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="MINSTOCK" valueNumeric="10"/>
+      <column name="MINSTOCK" valueNumeric="10"/>
+      <column name="PRODUCTCODE" value="WG0001"/>
       <column name="PRODUCTNAME" value="WG1 Standardprodukt 1"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYKGS"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-16T03:43:25"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T11:00:55"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="WG3003"/>
+    <insert tableName="PRODUCT">
       <column name="PRODUCTID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
+      <column name="PRODUCTCODE" value="WG3003-S"/>
+      <column name="PRODUCTNAME" value="WG3 Produkt C - Standard"/>
+      <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:45:10"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:45:10"/>
+      <column name="DATE_EDIT" valueDate="2021-04-09T11:40:48"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
+    </insert>
+    <insert tableName="PRODUCT">
+      <column name="PRODUCTID" value="9eb8b4de-5eda-4b5c-a934-acd30a840cba"/>
+      <column name="ADVERTISING" value="N"/>
+      <column name="PRODUCTCODE" value="WG2007"/>
+      <column name="PRODUCTNAME" value="WG2 Produkt 6"/>
+      <column name="STATUS" valueNumeric="1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-06-11T11:14:35"/>
-      <column name="PRODUCTNAME" value="WG3 Produkt C"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2021-04-09T11:28:11"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+    </insert>
+    <insert tableName="PRODUCT">
+      <column name="PRODUCTID" value="acd4cbde-f55d-444b-b294-1c6fe8588000"/>
+      <column name="ADVERTISING" value="N"/>
+      <column name="PRODUCTCODE" value="WG3005-SL"/>
+      <column name="PRODUCTNAME" value="WG3 Produkt SL2"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2021-04-09T11:48:09"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="ET1005"/>
+    <insert tableName="PRODUCT">
       <column name="PRODUCTID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
-      <column name="MINSTOCK" valueNumeric="10"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-05-22T11:13:42"/>
+      <column name="MINSTOCK" valueNumeric="10"/>
+      <column name="MINSTOCK" valueNumeric="10"/>
+      <column name="PRODUCTCODE" value="ET1005"/>
       <column name="PRODUCTNAME" value="Ersatzteil 2"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T03:16:36"/>
+      <column name="DATE_EDIT" valueDate="2019-05-22T01:13:42"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="DL1005"/>
+    <insert tableName="PRODUCT">
       <column name="PRODUCTID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
-      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-22T11:20:28"/>
-      <column name="UNIT" value="QUANTITYHOUR"/>
-      <column name="DATE_EDIT" valueDate="2019-05-22T11:22:20"/>
+      <column name="PRODUCTCODE" value="DL1005"/>
       <column name="PRODUCTNAME" value="Beratungsdienstleistung"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-22T01:20:28"/>
+      <column name="DATE_EDIT" valueDate="2019-05-22T01:22:20"/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="WG1003"/>
-      <column name="PRODUCTID" value="c8244502-73be-4ef7-9ef7-2b5ae95d3718"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
+    <insert tableName="PRODUCT">
+      <column name="PRODUCTID" value="c08e32db-73ce-49a2-8306-860ac7081e77"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:34:44"/>
+      <column name="PRODUCTCODE" value="WG2008"/>
+      <column name="PRODUCTNAME" value="WG2 Produkt 7"/>
+      <column name="STATUS" valueNumeric="1"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2021-04-09T11:34:21"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
+    </insert>
+    <insert tableName="PRODUCT">
+      <column name="PRODUCTID" value="c8244502-73be-4ef7-9ef7-2b5ae95d3718"/>
+      <column name="ADVERTISING" value="N"/>
+      <column name="PRODUCTCODE" value="WG1003"/>
       <column name="PRODUCTNAME" value="WG1 Standardprodukt 2"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:34:44"/>
+      <column name="DATE_EDIT" valueDate="2019-05-21T11:00:55"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="WG3001"/>
+    <insert tableName="PRODUCT">
       <column name="PRODUCTID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:37:31"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-06-11T11:14:18"/>
-      <column name="PRODUCTNAME" value="WG3 Produkt A"/>
+      <column name="PRODUCTCODE" value="WG3001-S"/>
+      <column name="PRODUCTNAME" value="WG3 Produkt A - Standard"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:37:31"/>
+      <column name="DATE_EDIT" valueDate="2021-04-09T11:40:04"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="WG3002"/>
+    <insert tableName="PRODUCT">
       <column name="PRODUCTID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:39:37"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-06-11T11:14:27"/>
-      <column name="PRODUCTNAME" value="WG3 Produkt B"/>
+      <column name="PRODUCTCODE" value="WG3002-S"/>
+      <column name="PRODUCTNAME" value="WG3 Produkt B - Standard"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-17T09:39:37"/>
+      <column name="DATE_EDIT" valueDate="2021-04-09T11:40:25"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
     </insert>
-    <insert tableName="product">
-      <column name="PRODUCTCODE" value="ET1006"/>
+    <insert tableName="PRODUCT">
       <column name="PRODUCTID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
-      <column name="MINSTOCK" valueNumeric="12"/>
       <column name="ADVERTISING" value="N"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="DATE_EDIT" valueDate="2019-05-22T11:13:33"/>
+      <column name="MINSTOCK" valueNumeric="12"/>
+      <column name="MINSTOCK" valueNumeric="12"/>
+      <column name="PRODUCTCODE" value="ET1006"/>
       <column name="PRODUCTNAME" value="Ersatzteil 1"/>
       <column name="STATUS" valueNumeric="1"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
+      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_EDIT" value="Admin"/>
+      <column name="DATE_NEW" valueDate="2019-05-13T03:16:36"/>
+      <column name="DATE_EDIT" valueDate="2019-05-22T01:13:33"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/productprice.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/productprice.xml
index 2bf76a4ff9984e6ba625e20e18ea7c8f66850a53..e85dd3e1aa7be57e9ff2ac25d0f8c47fbf5df685 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/productprice.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/productprice.xml
@@ -1,240 +1,433 @@
 <?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="8eb1ec28-0236-45c7-af4c-8125a3aa855e">
-    <delete tableName="productprice"/>
-    <insert tableName="productprice">
+  <changeSet author="autogenerated" id="00b2ef8d-0469-4c5b-a0a8-e4b22a30993b">
+    <delete tableName="PRODUCTPRICE"/>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="174b4614-93ae-47d0-aded-171f502da885"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="PRICE" valueNumeric="7300.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="c08e32db-73ce-49a2-8306-860ac7081e77"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="BUYSELL" value="SP"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="18df2550-d1f3-4908-af4d-cbbb6f75fe62"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="PRICE" valueNumeric="11000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="6d1321d0-7777-4b6e-8a01-08b77ea3c5bf"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="PRICELIST" value="PRICELISTKEY"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="1c5b6a5a-4aa0-499e-994f-278c7bdf87bf"/>
+      <column name="VALID_TO" valueDate="2020-07-15T02:00:00"/>
+      <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
       <column name="PRICE" valueNumeric="25000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="VALID_TO" valueDate="2020-07-15T00:00:00"/>
-      <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-17T00:00:00"/>
+      <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-    </insert>
-    <insert tableName="productprice">
-      <column name="BUYSELL" value="SP"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="24d65d20-bf5c-474d-8351-2788431e0e1a"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="PRICE" valueNumeric="35000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T00:00:00"/>
+      <column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-    </insert>
-    <insert tableName="productprice">
-      <column name="BUYSELL" value="SP"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="2749f80a-f09b-4153-97dd-2284253e8228"/>
+      <column name="VALID_TO" valueDate="2021-04-11T02:00:00"/>
+      <column name="VALID_FROM" valueDate="2019-05-23T02:00:00"/>
       <column name="PRICE" valueNumeric="150000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="VALID_TO" valueDate="2021-06-17T00:00:00"/>
-      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-23T00:00:00"/>
+      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="2873323a-1e31-4758-b58d-84ee7326b2da"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="PRICE" valueNumeric="10000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="6d1321d0-7777-4b6e-8a01-08b77ea3c5bf"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="BUYSELL" value="SP"/>
     </insert>
-    <insert tableName="productprice">
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="29c161e2-4d4d-4c84-86ae-99a778beb78c"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="PRICE" valueNumeric="9800.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="6d1321d0-7777-4b6e-8a01-08b77ea3c5bf"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="BUYSELL" value="SP"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="30fed437-ce2d-4326-8c21-20017a7bd24d"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="PRICE" valueNumeric="5000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="PRICELIST" value="PRICELISTKEY"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="4028dfb7-d0e4-493e-9676-6f14a24a9507"/>
+      <column name="VALID_FROM" valueDate="2020-07-15T02:00:00"/>
       <column name="PRICE" valueNumeric="10000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
       <column name="VAT" valueNumeric="0.00"/>
-      <column name="VALID_FROM" valueDate="2020-07-15T00:00:00"/>
+      <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
     </insert>
-    <insert tableName="productprice">
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="42c3919f-cd77-43ef-9075-acfd627bfc5b"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="PRICE" valueNumeric="40000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="PRICELIST" value="PRICELISTKEY"/>
       <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="43467798-a1a7-4118-8719-a86a9b34a637"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="PRICE" valueNumeric="13000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="4004db3e-a63e-4b32-b7da-8c899996ddcd"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="43fa161c-0f85-4915-89be-6bb442143506"/>
+      <column name="VALID_TO" valueDate="2021-04-08T02:00:00"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="PRICE" valueNumeric="30000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T00:00:00"/>
+      <column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-    </insert>
-    <insert tableName="productprice">
-      <column name="BUYSELL" value="SP"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="443b9532-7a41-481a-8f95-ffaf5e7949af"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="PRICE" valueNumeric="1000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T00:00:00"/>
+      <column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-    </insert>
-    <insert tableName="productprice">
-      <column name="BUYSELL" value="SP"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
-      <column name="PRODUCTPRICEID" value="71d5a323-12d8-4d1b-8de6-6a7bf81d0b61"/>
-      <column name="PRICE" valueNumeric="25000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="6ddbbcac-00fd-4ba5-ad92-dc27cc365c9a"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="PRICE" valueNumeric="7000.00"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T00:00:00"/>
+      <column name="PRODUCT_ID" value="c08e32db-73ce-49a2-8306-860ac7081e77"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-    </insert>
-    <insert tableName="productprice">
       <column name="BUYSELL" value="SP"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="75365b30-fd09-4255-b1d7-f4c91e9d255e"/>
+      <column name="VALID_TO" valueDate="2022-05-17T02:00:00"/>
+      <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
       <column name="PRICE" valueNumeric="2500.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="VALID_TO" valueDate="2022-05-17T00:00:00"/>
-      <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-17T00:00:00"/>
+      <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
     </insert>
-    <insert tableName="productprice">
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="762691fd-62d1-417b-866e-fc2ddd4f751b"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+      <column name="PRICE" valueNumeric="4000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="BUYSELL" value="SP"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
-      <column name="PRODUCTPRICEID" value="a2c9954b-bda0-4f02-8269-96cb86cb2516"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="7d66db96-9ece-4e41-acd3-6305035dc795"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
       <column name="PRICE" valueNumeric="20000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRODUCT_ID" value="c8244502-73be-4ef7-9ef7-2b5ae95d3718"/>
+      <column name="CURRENCY" value="USD"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="84a7e7d0-4b18-44aa-8dbb-507674d97df3"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="PRICE" valueNumeric="4500.00"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T00:00:00"/>
+      <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
+      <column name="PRICELIST" value="PRICELISTKEY"/>
+      <column name="BUYSELL" value="SP"/>
     </insert>
-    <insert tableName="productprice">
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="8ec3f7bf-97ec-49fc-a0fd-af6211d9ed19"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="PRICE" valueNumeric="10000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="a2c9954b-bda0-4f02-8269-96cb86cb2516"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
+      <column name="PRICE" valueNumeric="20000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="c8244502-73be-4ef7-9ef7-2b5ae95d3718"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="a75cc2e2-bb81-4e9f-9fa4-95c8531e966d"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="PRICE" valueNumeric="2500.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T00:00:00"/>
+      <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-    </insert>
-    <insert tableName="productprice">
-      <column name="BUYSELL" value="SP"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="a9b9097a-f664-4114-aa0a-ff2a01dddd04"/>
+      <column name="VALID_FROM" valueDate="2021-06-17T02:00:00"/>
       <column name="PRICE" valueNumeric="10000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2021-06-17T00:00:00"/>
+      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-    </insert>
-    <insert tableName="productprice">
-      <column name="BUYSELL" value="SP"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="abfa7e4d-bd88-4186-a7ae-26385ea1d91c"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="PRICE" valueNumeric="30000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T00:00:00"/>
+      <column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-    </insert>
-    <insert tableName="productprice">
-      <column name="BUYSELL" value="SP"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="ad57ee30-4afe-4426-912b-c0b9d03107f7"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="PRICE" valueNumeric="7500.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T00:00:00"/>
+      <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-    </insert>
-    <insert tableName="productprice">
-      <column name="BUYSELL" value="SP"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="bb425e07-4238-4cb7-b20b-a0ba4ed8b1ae"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="PRICE" valueNumeric="5000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T00:00:00"/>
+      <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-    </insert>
-    <insert tableName="productprice">
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="bd5e1561-9193-44c0-a40f-ca3ae81b6acd"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="PRICE" valueNumeric="18000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="4775aed7-e165-495b-a147-7e3312b27d0b"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="bf8ef6ac-9f34-40fd-aa2e-9792fee9a970"/>
+      <column name="VALID_TO" valueDate="2022-05-21T02:00:00"/>
+      <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
       <column name="PRICE" valueNumeric="15000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="VALID_TO" valueDate="2022-05-21T00:00:00"/>
-      <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-17T00:00:00"/>
+      <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-      <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-    </insert>
-    <insert tableName="productprice">
-      <column name="BUYSELL" value="SP"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="c0769e98-bf18-444c-92b0-fc5d17613ea8"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="PRICE" valueNumeric="1500.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T00:00:00"/>
+      <column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-    </insert>
-    <insert tableName="productprice">
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="c483e254-3ccb-4394-af3b-6cfbb60f498d"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="PRICE" valueNumeric="1000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="488e25b2-0210-41bd-bfe6-4312a9e68a20"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="CHF"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="c5b5bfce-2bec-4601-ba43-2567209bea04"/>
+      <column name="VALID_TO" valueDate="2058-10-31T01:00:00"/>
+      <column name="VALID_FROM" valueDate="2018-11-01T01:00:00"/>
       <column name="PRICE" valueNumeric="1060.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="VALID_TO" valueDate="2058-10-31T00:00:00"/>
-      <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2018-11-01T00:00:00"/>
+      <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
     </insert>
-    <insert tableName="productprice">
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="cfba9086-9e38-4fb7-b3eb-6dfe30216149"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="PRICE" valueNumeric="10000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="d1d86ca7-2408-4c71-b10a-1d13c889e038"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="PRICE" valueNumeric="33000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="4a234269-faab-474e-82e8-662e7600e1ea"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="da24d30e-c2d7-428f-84a4-060d2533ea51"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="PRICE" valueNumeric="7500.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="c08e32db-73ce-49a2-8306-860ac7081e77"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="df9fe0b0-4f16-4592-8066-fe9b3f41fdc1"/>
+      <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
       <column name="PRICE" valueNumeric="50000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-22T00:00:00"/>
+      <column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-    </insert>
-    <insert tableName="productprice">
-      <column name="BUYSELL" value="SP"/>
       <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="ead04c9b-955e-4595-bb31-31685b3ceaec"/>
+      <column name="VALID_TO" valueDate="2022-05-20T02:00:00"/>
+      <column name="VALID_FROM" valueDate="2019-05-23T02:00:00"/>
       <column name="PRICE" valueNumeric="10000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="VALID_TO" valueDate="2022-05-20T00:00:00"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="ec8bf01a-9796-4bc6-803a-11822bd6dac8"/>
+      <column name="VALID_FROM" valueDate="2021-04-12T02:00:00"/>
+      <column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+      <column name="PRICE" valueNumeric="0.00"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-23T00:00:00"/>
+      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+      <column name="BUYSELL" value="SP"/>
     </insert>
-    <insert tableName="productprice">
+    <insert tableName="PRODUCTPRICE">
+      <column name="PRODUCTPRICEID" value="f6cef764-d08d-42dd-a681-70fbb6aeb7ff"/>
+      <column name="VALID_TO" valueDate="2021-06-25T02:00:00"/>
+      <column name="VALID_FROM" valueDate="2021-04-09T02:00:00"/>
+      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="PRICE" valueNumeric="2000.00"/>
+      <column name="VAT" valueNumeric="19.00"/>
+      <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
+      <column name="CURRENCY" value="EUR"/>
       <column name="BUYSELL" value="SP"/>
-      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+    </insert>
+    <insert tableName="PRODUCTPRICE">
       <column name="PRODUCTPRICEID" value="f90ff3d2-3e62-4b6f-bcfb-db4d4ecd8de8"/>
+      <column name="VALID_TO" valueDate="2019-05-22T02:00:00"/>
+      <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
       <column name="PRICE" valueNumeric="5000.00"/>
-      <column name="FROMQUANTITY" valueNumeric="1.00"/>
-      <column name="VALID_TO" valueDate="2019-05-22T00:00:00"/>
-      <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
       <column name="VAT" valueNumeric="19.00"/>
-      <column name="VALID_FROM" valueDate="2019-05-17T00:00:00"/>
+      <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
+      <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="CURRENCY" value="EUR"/>
-      <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
+      <column name="BUYSELL" value="SP"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/weblink.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/weblink.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a5f7556599f15b7058a3848a168f7445ccda97d0
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/weblink.xml
@@ -0,0 +1,70 @@
+<?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-4.1.xsd">
+    <changeSet author="m.groppe" id="6b010229-fa19-469c-b58d-2dcb6fea318e">
+        <insert tableName="weblink">
+            <column name="WEBLINKID" value="1b192d03-a489-4b7d-ae5d-8e2e7a28d08e"/>
+            <column name="URL" value="https://www.adito.de/software/xrm.html"/>
+            <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+            <column name="PLACEHOLDER" value="adito_xrm"/>
+            <column name="SCORE" valueNumeric="0"/>
+            <column name="USER_NEW" value="Admin"/>
+            <column name="DATE_NEW" valueDate="2021-04-28T11:17:34"/>
+            <column name="USER_EDIT"/>
+            <column name="DATE_EDIT"/>
+            <column name="ISREDIRECT" valueNumeric="1"/>
+            <column name="WORKFLOWPROCESSDEFINITION_KEY"/>
+        </insert>
+        <insert tableName="weblink">
+            <column name="WEBLINKID" value="2f6f05ed-9e6a-4877-a47a-f69def7b5a70"/>
+            <column name="URL" value="https://www.adito.de/fileadmin/user_upload/pixel.png"/>
+            <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+            <column name="PLACEHOLDER" value="pixel"/>
+            <column name="SCORE" valueNumeric="0"/>
+            <column name="USER_NEW" value="Admin"/>
+            <column name="DATE_NEW" valueDate="2021-04-27T10:40:46"/>
+            <column name="USER_EDIT"/>
+            <column name="DATE_EDIT"/>
+            <column name="ISREDIRECT" valueNumeric="1"/>
+            <column name="WORKFLOWPROCESSDEFINITION_KEY"/>
+        </insert>
+        <insert tableName="weblink">
+            <column name="WEBLINKID" value="9517e509-0a2c-4afc-981a-0252b9e0d8db"/>
+            <column name="URL" value="https://www.adito.de/knowhow/blog/"/>
+            <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+            <column name="PLACEHOLDER" value="adito_blog"/>
+            <column name="SCORE" valueNumeric="0"/>
+            <column name="USER_NEW" value="Admin"/>
+            <column name="DATE_NEW" valueDate="2021-04-27T07:47:07"/>
+            <column name="USER_EDIT"/>
+            <column name="DATE_EDIT"/>
+            <column name="ISREDIRECT" valueNumeric="1"/>
+            <column name="WORKFLOWPROCESSDEFINITION_KEY"/>
+        </insert>
+        <insert tableName="weblink">
+            <column name="WEBLINKID" value="c2c971b9-9836-44a9-8d9f-bf83366399c4"/>
+            <column name="URL" value="https://www.adito.de/knowhow/webinare.html"/>
+            <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+            <column name="PLACEHOLDER" value="adito_webinare"/>
+            <column name="SCORE" valueNumeric="0"/>
+            <column name="USER_NEW" value="Admin"/>
+            <column name="DATE_NEW" valueDate="2021-04-27T07:55:57"/>
+            <column name="USER_EDIT"/>
+            <column name="DATE_EDIT"/>
+            <column name="ISREDIRECT" valueNumeric="1"/>
+            <column name="WORKFLOWPROCESSDEFINITION_KEY"/>
+        </insert>
+        <insert tableName="weblink">
+            <column name="WEBLINKID" value="f3997238-50f8-446e-acb3-2a58a5fb5002"/>
+            <column name="URL" value="http://www.adito.de"/>
+            <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+            <column name="PLACEHOLDER" value="adito_homepage"/>
+            <column name="SCORE" valueNumeric="0"/>
+            <column name="USER_NEW" value="Admin"/>
+            <column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
+            <column name="USER_EDIT"/>
+            <column name="DATE_EDIT"/>
+            <column name="ISREDIRECT" valueNumeric="1"/>
+            <column name="WORKFLOWPROCESSDEFINITION_KEY"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index aec7ecad42bf0be47e143e6c9c5d17d9a04b447c..52100154420acf219fbd3560f6d0f33789c9e7fa 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -10120,7 +10120,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -10183,7 +10183,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -10606,8 +10606,8 @@
                 <name>CREATEACTIVITIES</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-6" />
-                <size v="3" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10648,8 +10648,8 @@
                 <name>USE_TEMPLATE_ATTACHMENTS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-6" />
-                <size v="3" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10663,8 +10663,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="19" />
-                <scale v="0" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10795,8 +10795,8 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="19" />
-                <scale v="0" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10836,8 +10836,8 @@
                 <name>IS_TEST_RECIPIENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-6" />
-                <size v="3" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -12203,7 +12203,7 @@
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -12245,7 +12245,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -13299,12 +13299,12 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>LEAD</name>
+            <name>WORKFLOWSTARTCONFIG</name>
             <dbName></dbName>
-            <idColumn>LEADID</idColumn>
+            <idColumn>WORKFLOWSTARTCONFIGID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
-            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/lead/documentation.adoc</documentation>
+            <documentation></documentation>
             <title></title>
             <description></description>
             <auditSyncConfig>
@@ -13317,11 +13317,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>ZIP</name>
+                <name>TRIGGER_EVENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13331,26 +13331,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CUSTOMERCODE</name>
+                <name>WORKFLOWSTARTCONFIGID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>PROCESSDEFINITION_KEY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13359,11 +13359,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FIRSTNAME</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13372,12 +13372,32 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>WORKFLOWSIGNAL</name>
+            <dbName></dbName>
+            <idColumn>WORKFLOWSIGNALID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>ATTRIBUTE_LOYALTY</name>
+                <name>SIGNAL_NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="100" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13387,24 +13407,24 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DUPLICAT</name>
+                <name>WORKFLOWSIGNALID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>TRIGGER_EVENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -13415,11 +13435,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MIDDLENAME</name>
+                <name>OBJECT_CONDITION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="512" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13429,11 +13449,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COUNTRY</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="2" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13443,11 +13463,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LASTNAME</name>
+                <name>PROCESSDEFINITION_KEY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13457,11 +13477,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALUTATION</name>
+                <name>VARIABLES</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="30" />
+                <size v="512" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13470,26 +13490,46 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>EXPORTTEMPLATEPLACEOFUSE</name>
+            <dbName></dbName>
+            <idColumn>EXPORTTEMPLATEPLACEOFUSEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/exporttemplateplaceofuse/documentation.adoc</documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>TAXCODE</name>
+                <name>EXPORTTEMPLATEPLACEOFUSEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="30" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ORGCOUNTRYCODE</name>
+                <name>PLACEOFUSE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="10" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13499,7 +13539,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LEADIMPORT_ID</name>
+                <name>EXPORTTEMPLATE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -13513,32 +13553,59 @@
                 <description></description>
                 <dependencies>
                   <entityDependency>
-                    <name>14ab15d3-99fc-4c58-9c4a-c2ec404e5c67</name>
-                    <entityName>LEADIMPORT</entityName>
-                    <fieldName>LEADIMPORTID</fieldName>
+                    <name>a9054d80-d866-4312-9a53-03c7fbb06165</name>
+                    <entityName>EXPORTTEMPLATE</entityName>
+                    <fieldName>EXPORTTEMPLATEID</fieldName>
                   </entityDependency>
                 </dependencies>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>DOCUMENTTEMPLATEPLACEOFUSE</name>
+            <dbName></dbName>
+            <idColumn>DOCUMENTTEMPLATEPLACEOFUSEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/documenttemplateplaceofuse/documentation.adoc</documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>BUILDINGNO</name>
+                <name>DOCUMENTTEMPLATE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
+                <dependencies>
+                  <entityDependency>
+                    <name>14bbdba4-88c2-4cf3-aaa6-71328e590968</name>
+                    <entityName>DOCUMENTTEMPLATE</entityName>
+                    <fieldName>DOCUMENTTEMPLATEID</fieldName>
+                  </entityDependency>
+                </dependencies>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACTPOSITION</name>
+                <name>PLACEOFUSE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13548,25 +13615,45 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE03</name>
+                <name>DOCUMENTTEMPLATEPLACEOFUSEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>EXPORTTEMPLATE</name>
+            <dbName></dbName>
+            <idColumn>EXPORTTEMPLATEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/exporttemplate/documentation.adoc</documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>ATTRIBUTE02</name>
+                <name>ISOLANGUAGE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <columnType v="1" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13576,12 +13663,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACTROLE</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="60" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13590,11 +13677,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PERSINFO</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="1337" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13604,25 +13691,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DEPARTMENT</name>
+                <name>EXPORTTEMPLATEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NAME</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="250" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13632,12 +13719,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>REGION</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13646,28 +13733,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PERSON_ID</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-                <dependencies>
-                  <entityDependency>
-                    <name>b3823998-cf9c-4fa1-914c-6158945e9863</name>
-                    <entityName>PERSON</entityName>
-                    <fieldName>PERSONID</fieldName>
-                  </entityDependency>
-                </dependencies>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADDRESS</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -13681,11 +13761,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SOURCE</name>
+                <name>FIELDSEPARATOR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13695,11 +13775,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LEGALFORM</name>
+                <name>SENTENCESEPARATOR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13709,11 +13789,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISTRICT</name>
+                <name>FIELDDELIMITER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13722,12 +13802,32 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>EXPORTTEMPLATEFIELD</name>
+            <dbName></dbName>
+            <idColumn>EXPORTTEMPLATEFIELDID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/exporttemplatefield/documentation.adoc</documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>DUPSTATUS</name>
+                <name>FIELD</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="20" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13737,25 +13837,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GENDER</name>
+                <name>EXPORTTEMPLATEFIELDID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE04</name>
+                <name>SORTING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13765,35 +13865,62 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LETTERSALUTATION</name>
+                <name>EXPORTTEMPLATE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
+                <dependencies>
+                  <entityDependency>
+                    <name>b5bdf0af-cfed-4718-bcb6-9f8ff24842dd</name>
+                    <entityName>EXPORTTEMPLATE</entityName>
+                    <fieldName>EXPORTTEMPLATEID</fieldName>
+                  </entityDependency>
+                </dependencies>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>EXPORTTEMPLATESELECTION</name>
+            <dbName></dbName>
+            <idColumn>EXPORTTEMPLATESELECTIONID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/exporttemplateselection/documentation.adoc</documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>EXPORTTEMPLATESELECTIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ORGANISATION_ID</name>
+                <name>EXPORTTEMPLATE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -13807,32 +13934,52 @@
                 <description></description>
                 <dependencies>
                   <entityDependency>
-                    <name>abfbfb1e-678a-409b-a5cb-a87c8332478f</name>
-                    <entityName>ORGANISATION</entityName>
-                    <fieldName>ORGANISATIONID</fieldName>
+                    <name>e391399b-0f92-436d-96fa-1aaed5f712a8</name>
+                    <entityName>EXPORTTEMPLATE</entityName>
+                    <fieldName>EXPORTTEMPLATEID</fieldName>
                   </entityDependency>
                 </dependencies>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LEADID</name>
+                <name>FILENAME</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="33" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>AB_PERMISSIONCALENDAR</name>
+            <dbName></dbName>
+            <idColumn>AB_PERMISSIONCALENDARID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>PERMISSION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13842,11 +13989,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CITY</name>
+                <name>PERMISSIONPROCURER_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13856,7 +14003,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATEOFBIRTH</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -13870,27 +14017,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VATCODE</name>
+                <name>AB_PERMISSIONCALENDARID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="30" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ORGINFO</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
-                <scale v="0" />
-                <notNull v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -13898,13 +14045,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROVINCE</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -13912,39 +14059,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TITLE</name>
+                <name>PERMISSIONPROCURER_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>PERMISSIONDEALER_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE_INDUSTRY</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="100" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13954,11 +14101,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMXING</name>
+                <name>PERMISSIONDEALER_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13967,13 +14114,33 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>O_COMMPHONE</name>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>VISITRECOMMENDATION</name>
+            <dbName></dbName>
+            <idColumn>VISITRECOMMENDATIONID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>DUE_DATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13982,11 +14149,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMMOBIL</name>
+                <name>SOURCE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13996,39 +14163,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMEMAIL</name>
+                <name>VISITRECOMMENDATIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMLINKEDIN</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMBLOG</name>
+                <name>PRIORITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14038,11 +14205,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMXING</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14052,11 +14219,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMLINKEDIN</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14066,25 +14233,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ISOLANGUAGE</name>
+                <name>CONTACT_PERSON_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMBLOG</name>
+                <name>RESPONSIBLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14094,11 +14261,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMPHONE</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14107,26 +14274,60 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>VISITPLANEMPLOYEEWEEK</name>
+            <dbName></dbName>
+            <idColumn>VISITPLANEMPLOYEEWEEKID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>VISITPLANEMPLOYEEWEEKID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMMOBIL</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMEMAIL</name>
+                <name>VISITPLAN_WEEK</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14136,11 +14337,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMINTERNET</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14150,11 +14351,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMINTERNET</name>
+                <name>VISITPLAN_YEAR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14166,9 +14367,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>WORKFLOWSTARTCONFIG</name>
+            <name>VISITPLANENTRY</name>
             <dbName></dbName>
-            <idColumn>WORKFLOWSTARTCONFIGID</idColumn>
+            <idColumn>VISITPLANENTRYID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -14184,10 +14385,10 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>TRIGGER_EVENT</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -14198,25 +14399,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WORKFLOWSTARTCONFIGID</name>
+                <name>END_TIME</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="92" />
+                <size v="8" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROCESSDEFINITION_KEY</name>
+                <name>BEGIN_TIME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <columnType v="92" />
+                <size v="8" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14226,55 +14427,35 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>VISITPLANEMPLOYEEWEEK_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>WORKFLOWSIGNAL</name>
-            <dbName></dbName>
-            <idColumn>WORKFLOWSIGNALID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>SIGNAL_NAME</name>
+                <name>VISITRECOMMENDATION_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WORKFLOWSIGNALID</name>
+                <name>VISITPLANENTRYID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -14288,7 +14469,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TRIGGER_EVENT</name>
+                <name>APPOINTMENT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -14302,11 +14483,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_CONDITION</name>
+                <name>ENTRYDATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="512" />
+                <columnType v="91" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14316,39 +14497,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROCESSDEFINITION_KEY</name>
+                <name>ORGANISATION_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VARIABLES</name>
+                <name>STATUS_APPOINTMENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="512" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14360,12 +14541,12 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>EXPORTTEMPLATEPLACEOFUSE</name>
+            <name>CLASSIFICATIONGRADING</name>
             <dbName></dbName>
-            <idColumn>EXPORTTEMPLATEPLACEOFUSEID</idColumn>
+            <idColumn>CLASSIFICATIONGRADINGID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
-            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/exporttemplateplaceofuse/documentation.adoc</documentation>
+            <documentation></documentation>
             <title></title>
             <description></description>
             <auditSyncConfig>
@@ -14378,7 +14559,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>EXPORTTEMPLATEPLACEOFUSEID</name>
+                <name>CLASSIFICATIONGRADINGID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -14392,11 +14573,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PLACEOFUSE</name>
+                <name>GRADING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="1" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14406,7 +14587,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EXPORTTEMPLATE_ID</name>
+                <name>CLASSIFICATIONGROUP_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -14418,23 +14599,30 @@
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-                <dependencies>
-                  <entityDependency>
-                    <name>a9054d80-d866-4312-9a53-03c7fbb06165</name>
-                    <entityName>EXPORTTEMPLATE</entityName>
-                    <fieldName>EXPORTTEMPLATEID</fieldName>
-                  </entityDependency>
-                </dependencies>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MINPERCENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
               </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>DOCUMENTTEMPLATEPLACEOFUSE</name>
+            <name>CLASSIFICATIONSTORAGE</name>
             <dbName></dbName>
-            <idColumn>DOCUMENTTEMPLATEPLACEOFUSEID</idColumn>
+            <idColumn>CLASSIFICATIONSTORAGEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
-            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/documenttemplateplaceofuse/documentation.adoc</documentation>
+            <documentation></documentation>
             <title></title>
             <description></description>
             <auditSyncConfig>
@@ -14447,10 +14635,10 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DOCUMENTTEMPLATE_ID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -14459,20 +14647,13 @@
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-                <dependencies>
-                  <entityDependency>
-                    <name>14bbdba4-88c2-4cf3-aaa6-71328e590968</name>
-                    <entityName>DOCUMENTTEMPLATE</entityName>
-                    <fieldName>DOCUMENTTEMPLATEID</fieldName>
-                  </entityDependency>
-                </dependencies>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PLACEOFUSE</name>
+                <name>CLASSIFICATIONVALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="20" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14482,7 +14663,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DOCUMENTTEMPLATEPLACEOFUSEID</name>
+                <name>CLASSIFICATIONSTORAGEID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -14495,15 +14676,43 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>OBJECT_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OUTDATED</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>EXPORTTEMPLATE</name>
+            <name>CLASSIFICATIONGROUP</name>
             <dbName></dbName>
-            <idColumn>EXPORTTEMPLATEID</idColumn>
+            <idColumn>CLASSIFICATIONGROUPID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
-            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/exporttemplate/documentation.adoc</documentation>
+            <documentation></documentation>
             <title></title>
             <description></description>
             <auditSyncConfig>
@@ -14516,26 +14725,26 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>ISOLANGUAGE</name>
+                <name>CLASSIFICATIONGROUPID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
-                <size v="3" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>SORTING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -14544,11 +14753,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="1337" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14557,8 +14766,28 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>LEADIMPORTMAPPINGASSISTANT</name>
+            <dbName></dbName>
+            <idColumn>LEADIMPORTMAPPINGASSISTANTID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>EXPORTTEMPLATEID</name>
+                <name>LEADIMPORTMAPPINGASSISTANTID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -14572,7 +14801,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TITLE</name>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>FIELDNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -14592,7 +14835,7 @@
                 <columnType v="93" />
                 <size v="29" />
                 <scale v="9" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -14600,11 +14843,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>INPUTVALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14614,11 +14857,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>OUTPUTVALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14628,13 +14871,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FIELDSEPARATOR</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -14642,25 +14885,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SENTENCESEPARATOR</name>
+                <name>LEADIMPORT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FIELDDELIMITER</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14672,12 +14915,12 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>EXPORTTEMPLATEFIELD</name>
+            <name>DISTRICT</name>
             <dbName></dbName>
-            <idColumn>EXPORTTEMPLATEFIELDID</idColumn>
+            <idColumn>DISTRICTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
-            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/exporttemplatefield/documentation.adoc</documentation>
+            <documentation></documentation>
             <title></title>
             <description></description>
             <auditSyncConfig>
@@ -14690,11 +14933,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>FIELD</name>
+                <name>DISTRICT_NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14704,26 +14947,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EXPORTTEMPLATEFIELDID</name>
+                <name>DISTRICT_INFO</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTING</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -14732,87 +14975,53 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EXPORTTEMPLATE_ID</name>
+                <name>DISTRICT_STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-                <dependencies>
-                  <entityDependency>
-                    <name>b5bdf0af-cfed-4718-bcb6-9f8ff24842dd</name>
-                    <entityName>EXPORTTEMPLATE</entityName>
-                    <fieldName>EXPORTTEMPLATEID</fieldName>
-                  </entityDependency>
-                </dependencies>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>EXPORTTEMPLATESELECTION</name>
-            <dbName></dbName>
-            <idColumn>EXPORTTEMPLATESELECTIONID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/exporttemplateselection/documentation.adoc</documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>EXPORTTEMPLATESELECTIONID</name>
+                <name>PARENTDISTRICT_DISTRICTID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EXPORTTEMPLATE_ID</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
-                <dependencies>
-                  <entityDependency>
-                    <name>e391399b-0f92-436d-96fa-1aaed5f712a8</name>
-                    <entityName>EXPORTTEMPLATE</entityName>
-                    <fieldName>EXPORTTEMPLATEID</fieldName>
-                  </entityDependency>
-                </dependencies>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FILENAME</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="33" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14821,32 +15030,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>AB_PERMISSIONCALENDAR</name>
-            <dbName></dbName>
-            <idColumn>AB_PERMISSIONCALENDARID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>PERMISSION</name>
+                <name>DISTRICT_NUMBER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14856,11 +15045,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PERMISSIONPROCURER_TYPE</name>
+                <name>ISO3</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14870,21 +15059,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>AB_PERMISSIONCALENDARID</name>
+                <name>DISTRICTID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -14898,67 +15073,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>PERMISSIONPROCURER_ROWID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>PERMISSIONDEALER_ROWID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>DISTRICT_FILTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14968,11 +15101,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PERMISSIONDEALER_TYPE</name>
+                <name>DISTRICT_AUTOADD</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14984,9 +15117,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>VISITRECOMMENDATION</name>
+            <name>DISTRICTRESPONSIBLE</name>
             <dbName></dbName>
-            <idColumn>VISITRECOMMENDATIONID</idColumn>
+            <idColumn>DISTRICTRESPONSIBLEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -15002,7 +15135,21 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DUE_DATE</name>
+                <name>DISTRICTRESPONSIBLEID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -15016,35 +15163,35 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SOURCE</name>
+                <name>DEPARTMENT_ATTRIBUTE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VISITRECOMMENDATIONID</name>
+                <name>DISTRICT_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>EMPLOYEE_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -15058,12 +15205,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PRIORITY</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15072,11 +15219,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15086,7 +15233,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -15100,24 +15247,24 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_PERSON_ID</name>
+                <name>ADVISER_STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>RESPONSIBLE</name>
+                <name>ADVISER_ROLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15128,12 +15275,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>VALID_FROM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>VALID_UNTIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15144,9 +15305,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>VISITPLANEMPLOYEEWEEK</name>
+            <name>DISTRICTCONTACT</name>
             <dbName></dbName>
-            <idColumn>VISITPLANEMPLOYEEWEEKID</idColumn>
+            <idColumn>DISTRICTCONTACTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -15154,7 +15315,7 @@
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
-              <auditMode v="0" />
+              <auditMode v="1" />
               <syncActive v="false" />
               <syncComplete v="true" />
               <syncDirection v="1" />
@@ -15162,21 +15323,21 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>VISITPLANEMPLOYEEWEEKID</name>
+                <name>ORIGIN</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
+                <primaryKey v="false" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -15184,17 +15345,29 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
-                <title></title>
+                <title>District assignment status</title>
                 <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                  <customJDitoProperty>
+                    <name>translate4Log</name>
+                    <global v="false" />
+                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/districtcontact/entityfields/status/customproperties/translate4log/property.js</property>
+                  </customJDitoProperty>
+                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VISITPLAN_WEEK</name>
+                <name>ADVISER_ROLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15204,55 +15377,35 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>ADVISER_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VISITPLAN_YEAR</name>
+                <name>DISTRICTCONTACTID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>VISITPLANENTRY</name>
-            <dbName></dbName>
-            <idColumn>VISITPLANENTRYID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>DISTRICT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -15260,44 +15413,28 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>END_TIME</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="92" />
-                <size v="8" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>BEGIN_TIME</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="92" />
-                <size v="8" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
-                <title></title>
+                <title>District</title>
                 <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                  <customJDitoProperty>
+                    <name>translate4Log</name>
+                    <global v="false" />
+                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/districtcontact/entityfields/district_id/customproperties/translate4log/property.js</property>
+                  </customJDitoProperty>
+                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VISITPLANEMPLOYEEWEEK_ID</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -15306,42 +15443,40 @@
                 <documentation></documentation>
                 <title></title>
                 <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="false" />
+                  </customBooleanProperty>
+                  <customStringProperty>
+                    <name>tableRef</name>
+                    <global v="false" />
+                    <property>CONTACT</property>
+                  </customStringProperty>
+                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VISITRECOMMENDATION_ID</name>
+                <name>VALID_FROM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>VISITPLANENTRYID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>APPOINTMENT_ID</name>
+                <name>VALID_UNTIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15350,12 +15485,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ENTRYDATE</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15364,39 +15499,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ORGANISATION_CONTACT_ID</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS_APPOINTMENT</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15408,9 +15543,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CLASSIFICATIONGRADING</name>
+            <name>KNOWLEDGEDISCUSSION</name>
             <dbName></dbName>
-            <idColumn>CLASSIFICATIONGRADINGID</idColumn>
+            <idColumn>KNOWLEDGEDISCUSSIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -15426,25 +15561,25 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>CLASSIFICATIONGRADINGID</name>
+                <name>PARENTENTRY</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GRADING</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15454,26 +15589,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONGROUP_ID</name>
+                <name>DISCUSSIONTEXT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MINPERCENT</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15481,28 +15616,22 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>CLASSIFICATIONSTORAGE</name>
-            <dbName></dbName>
-            <idColumn>CLASSIFICATIONSTORAGEID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>KNOWLEDGEDISCUSSIONID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>KNOWLEDGEMANAGEMENT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -15516,11 +15645,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONVALUE</name>
+                <name>AUTHOR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="20" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15530,25 +15659,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONSTORAGEID</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15558,11 +15687,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OUTDATED</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15574,9 +15703,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CLASSIFICATIONGROUP</name>
+            <name>KNOWLEDGELINK</name>
             <dbName></dbName>
-            <idColumn>CLASSIFICATIONGROUPID</idColumn>
+            <idColumn>KNOWLEDGELINKID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -15592,69 +15721,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>CLASSIFICATIONGROUPID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SORTING</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>TITLE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>LEADIMPORTMAPPINGASSISTANT</name>
-            <dbName></dbName>
-            <idColumn>LEADIMPORTMAPPINGASSISTANTID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>LEADIMPORTMAPPINGASSISTANTID</name>
+                <name>KNOWLEDGELINKID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -15682,15 +15749,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FIELDNAME</name>
+                <name>KNOWLEDGEMANAGEMENT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -15702,7 +15769,7 @@
                 <columnType v="93" />
                 <size v="29" />
                 <scale v="9" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -15710,11 +15777,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INPUTVALUE</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15724,11 +15791,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OUTPUTVALUE</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15738,13 +15805,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -15752,7 +15819,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LEADIMPORT_ID</name>
+                <name>ROW_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -15765,26 +15832,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>DISTRICT</name>
+            <name>KNOWLEDGEMANAGEMENT</name>
             <dbName></dbName>
-            <idColumn>DISTRICTID</idColumn>
+            <idColumn>KNOWLEDGEMANAGEMENTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -15800,12 +15853,12 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DISTRICT_NAME</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15814,39 +15867,46 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISTRICT_INFO</name>
+                <name>KNOWLEDGEMANAGEMENTID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>AUTHOR_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISTRICT_STATUS</name>
+                <name>PUBLISH</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15856,11 +15916,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PARENTDISTRICT_DISTRICTID</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15870,12 +15930,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>CONTENTDECODED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15884,25 +15944,32 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISTRICT_NUMBER</name>
+                <name>CONTENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15910,14 +15977,21 @@
                 <documentation></documentation>
                 <title></title>
                 <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ISO3</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="5" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15926,25 +16000,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISTRICTID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15954,29 +16014,36 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISTRICT_FILTER</name>
+                <name>RESPONSIBLE_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISTRICT_AUTOADD</name>
+                <name>TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -15984,9 +16051,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>DISTRICTRESPONSIBLE</name>
+            <name>KNOWLEDGEROLES</name>
             <dbName></dbName>
-            <idColumn>DISTRICTRESPONSIBLEID</idColumn>
+            <idColumn>KNOWLEDGEROLESID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -16002,7 +16069,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DISTRICTRESPONSIBLEID</name>
+                <name>KNOWLEDGEROLESID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -16016,68 +16083,88 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>KNOWLEDGEMANAGEMENT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DEPARTMENT_ATTRIBUTE_ID</name>
+                <name>ROLENAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>KNOWLEDGEGITINTERFACE</name>
+            <dbName></dbName>
+            <idColumn>KNOWLEDGEGITINTERFACEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>DISTRICT_ID</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EMPLOYEE_CONTACT_ID</name>
+                <name>KNOWLEDGEGITINTERFACEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>GITCOMMIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="200" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16086,12 +16173,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16100,7 +16187,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -16114,11 +16201,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADVISER_STATUS</name>
+                <name>SYSTEMNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -16128,11 +16215,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADVISER_ROLE</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -16141,40 +16228,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>VALID_FROM</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>VALID_UNTIL</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>DISTRICTCONTACT</name>
+            <name>KNOWLEDGEMANAGEMENTTAGMODERATION</name>
             <dbName></dbName>
-            <idColumn>DISTRICTCONTACTID</idColumn>
+            <idColumn>KNOWLEDGEMANAGEMENTTAGMODERATIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -16182,27 +16241,13 @@
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
-              <auditMode v="1" />
+              <auditMode v="0" />
               <syncActive v="false" />
               <syncComplete v="true" />
               <syncDirection v="1" />
               <syncIds></syncIds>
             </auditSyncConfig>
             <entityFields>
-              <entityFieldDb>
-                <name>ORIGIN</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>STATUS</name>
                 <dbName></dbName>
@@ -16214,40 +16259,14 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>District assignment status</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                  <customJDitoProperty>
-                    <name>translate4Log</name>
-                    <global v="false" />
-                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/districtcontact/entityfields/status/customproperties/translate4log/property.js</property>
-                  </customJDitoProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ADVISER_ROLE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADVISER_CONTACT_ID</name>
+                <name>AB_ATTRIBUTE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -16258,7 +16277,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISTRICTCONTACTID</name>
+                <name>KNOWLEDGEMANAGEMENTTAGMODERATIONID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -16271,74 +16290,56 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>KNOWLEDGETAG</name>
+            <dbName></dbName>
+            <idColumn>KNOWLEDGETAGID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>DISTRICT_ID</name>
+                <name>KNOWLEDGETAGID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
+                <primaryKey v="true" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
-                <title>District</title>
+                <title></title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                  <customJDitoProperty>
-                    <name>translate4Log</name>
-                    <global v="false" />
-                    <property>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/districtcontact/entityfields/district_id/customproperties/translate4log/property.js</property>
-                  </customJDitoProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="false" />
-                  </customBooleanProperty>
-                  <customStringProperty>
-                    <name>tableRef</name>
-                    <global v="false" />
-                    <property>CONTACT</property>
-                  </customStringProperty>
-                </customProperties>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>VALID_FROM</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VALID_UNTIL</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -16352,7 +16353,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -16366,7 +16367,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>TAG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -16380,12 +16381,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16394,7 +16395,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -16410,9 +16411,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>KNOWLEDGEDISCUSSION</name>
+            <name>KNOWLEDGETAGLINK</name>
             <dbName></dbName>
-            <idColumn>KNOWLEDGEDISCUSSIONID</idColumn>
+            <idColumn>KNOWLEDGETAGLINKID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -16428,12 +16429,12 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>PARENTENTRY</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16442,35 +16443,35 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>KNOWLEDGEMANAGEMENT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISCUSSIONTEXT</name>
+                <name>KNOWLEDGETAGLINKID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -16484,35 +16485,35 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KNOWLEDGEDISCUSSIONID</name>
+                <name>KNOWLEDGETAG_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KNOWLEDGEMANAGEMENT_ID</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AUTHOR</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -16525,14 +16526,34 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>AB_KEYWORD_CATEGORY</name>
+            <dbName></dbName>
+            <idColumn>AB_KEYWORD_CATEGORYID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>SORTINGBY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -16540,13 +16561,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>AB_KEYWORD_CATEGORYID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SORTINGDIRECTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="4" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -16554,13 +16589,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="80" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -16570,9 +16605,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>KNOWLEDGELINK</name>
+            <name>MST_TEAMLINK</name>
             <dbName></dbName>
-            <idColumn>KNOWLEDGELINKID</idColumn>
+            <idColumn>MST_TEAMLINKID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -16588,7 +16623,35 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>KNOWLEDGELINKID</name>
+                <name>OBJECT_ROWID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MST_TEAM_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MST_TEAMLINKID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -16602,40 +16665,60 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>MST_TEAM</name>
+            <dbName></dbName>
+            <idColumn>MST_TEAMID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>KNOWLEDGEMANAGEMENT_ID</name>
+                <name>MST_TEAMID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>IS_ARCHIVED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16644,11 +16727,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>SERVICE_URL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -16658,11 +16741,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>TEAMNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="100" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -16672,11 +16755,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>GENERAL_CHANNELID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="48" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -16686,15 +16769,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ROW_ID</name>
+                <name>WEB_URL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="500" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -16702,13 +16785,12 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>KNOWLEDGEMANAGEMENT</name>
+            <name>OBSERVATION</name>
             <dbName></dbName>
-            <idColumn>KNOWLEDGEMANAGEMENTID</idColumn>
+            <idColumn>OBSERVATIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
-            <title></title>
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
@@ -16719,6 +16801,19 @@
               <syncIds></syncIds>
             </auditSyncConfig>
             <entityFields>
+              <entityFieldDb>
+                <name>OBJECT_FILTER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <description></description>
+              </entityFieldDb>
               <entityFieldDb>
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
@@ -16730,25 +16825,23 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KNOWLEDGEMANAGEMENTID</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="80" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AUTHOR_CONTACT_ID</name>
+                <name>OBSERVATION_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -16758,18 +16851,23 @@
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PUBLISH</name>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>NOTIFICATION_PRIO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -16779,11 +16877,10 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>OBJECT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -16791,66 +16888,61 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTENTDECODED</name>
+                <name>OBSERVATIONID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TRIGGEREVENTDELETE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TITLE</name>
+                <name>TRIGGEREVENTINSERT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTENT</name>
+                <name>TRIGGEREVENTUPDATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
                 <name>DATE_NEW</name>
@@ -16863,68 +16955,56 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>OBSERVER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>RESPONSIBLE_CONTACT_ID</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TYPE</name>
+                <name>OBJECT_FIELD</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>KNOWLEDGEROLES</name>
+            <name>SALESPROJECTPHASEDEFINITION</name>
             <dbName></dbName>
-            <idColumn>KNOWLEDGEROLESID</idColumn>
+            <idColumn>SALESPROJECTPHASEDEFINITIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
-            <title></title>
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
@@ -16936,40 +17016,116 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>KNOWLEDGEROLESID</name>
+                <name>PHASE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CHECKLIST_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KNOWLEDGEMANAGEMENT_ID</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="500" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SALESPROJECTPHASEDEFINITIONID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ROLENAME</name>
+                <name>AUTOPROBABILITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
-                <scale v="0" />
+                <columnType v="3" />
+                <size v="6" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -16980,13 +17136,12 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>KNOWLEDGEGITINTERFACE</name>
+            <name>CHECKLISTENTRY</name>
             <dbName></dbName>
-            <idColumn>KNOWLEDGEGITINTERFACEID</idColumn>
+            <idColumn>CHECKLISTENTRYID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
-            <title></title>
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
@@ -16998,45 +17153,55 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>CHECKLISTENTRYID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KNOWLEDGEGITINTERFACEID</name>
+                <name>CHECKLIST_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GITCOMMIT</name>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="200" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -17050,7 +17215,6 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -17064,11 +17228,10 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SYSTEMNAME</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -17078,17 +17241,16 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>AUTO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -17098,13 +17260,12 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>KNOWLEDGEMANAGEMENTTAGMODERATION</name>
+            <name>CHECKLIST</name>
             <dbName></dbName>
-            <idColumn>KNOWLEDGEMANAGEMENTTAGMODERATIONID</idColumn>
+            <idColumn>CHECKLISTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
-            <title></title>
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
@@ -17116,57 +17277,79 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>CHECKLISTID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_ATTRIBUTE_ID</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KNOWLEDGEMANAGEMENTTAGMODERATIONID</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>KNOWLEDGETAG</name>
+            <name>CHECKLISTENTRYVALUE</name>
             <dbName></dbName>
-            <idColumn>KNOWLEDGETAGID</idColumn>
+            <idColumn>CHECKLISTENTRYVALUEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
-            <title></title>
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
@@ -17178,31 +17361,29 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>KNOWLEDGETAGID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>IS_FULFILLED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -17216,7 +17397,19 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CHECKLISTENTRYVALUEID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -17230,11 +17423,10 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TAG</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -17244,11 +17436,10 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -17258,7 +17449,6 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -17272,15 +17462,27 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CHECKLISTENTRY_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
                 <description></description>
               </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>KNOWLEDGETAGLINK</name>
+            <name>HASDUPLICATE</name>
             <dbName></dbName>
-            <idColumn>KNOWLEDGETAGLINKID</idColumn>
+            <idColumn>HASDUPLICATEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -17296,21 +17498,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>KNOWLEDGEMANAGEMENT_ID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -17324,53 +17512,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KNOWLEDGETAGLINKID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>KNOWLEDGETAG_ID</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>DUPLICATECOUNT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -17380,15 +17540,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>HASDUPLICATEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -17396,9 +17556,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>AB_KEYWORD_CATEGORY</name>
+            <name>AB_SYNCCONTACT</name>
             <dbName></dbName>
-            <idColumn>AB_KEYWORD_CATEGORYID</idColumn>
+            <idColumn>SYNCCONTACTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -17414,13 +17574,13 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>SORTINGBY</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -17428,75 +17588,55 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_KEYWORD_CATEGORYID</name>
+                <name>EXCHANGEID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTINGDIRECTION</name>
+                <name>ASYS_FAVORITEID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="4" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NAME</name>
+                <name>USER_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="80" />
+                <columnType v="1" />
+                <size v="46" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>MST_TEAMLINK</name>
-            <dbName></dbName>
-            <idColumn>MST_TEAMLINKID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -17504,21 +17644,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MST_TEAM_ID</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MST_TEAMLINKID</name>
+                <name>SYNCCONTACTID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -17532,13 +17672,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>DATE_DEL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -17548,9 +17688,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>MST_TEAM</name>
+            <name>WEBLINK</name>
             <dbName></dbName>
-            <idColumn>MST_TEAMID</idColumn>
+            <idColumn>WEBLINKID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -17566,25 +17706,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>MST_TEAMID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>IS_ARCHIVED</name>
+                <name>SCORE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -17594,11 +17720,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SERVICE_URL</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <columnType v="93" />
+                <size v="19" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -17608,11 +17734,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TEAMNAME</name>
+                <name>LINKTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -17622,11 +17748,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GENERAL_CHANNELID</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="48" />
+                <columnType v="93" />
+                <size v="19" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -17636,11 +17762,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WEB_URL</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="500" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -17649,166 +17775,164 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>OBSERVATION</name>
-            <dbName></dbName>
-            <idColumn>OBSERVATIONID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>OBJECT_FILTER</name>
+                <name>WEBLINKID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>URL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="512" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="80" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBSERVATION_ID</name>
+                <name>PLACEHOLDER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>WORKFLOWPROCESSDEFINITION_KEY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NOTIFICATION_PRIO</name>
+                <name>ISREDIRECT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="-6" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_ID</name>
+                <name>WORKFLOWSIGNAL_NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>OBSERVATIONID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TRIGGEREVENTDELETE</name>
+                <name>ACTION_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>WEBLINKTAG</name>
+            <dbName></dbName>
+            <idColumn>WEBLINKTAGID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>TRIGGEREVENTINSERT</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TRIGGEREVENTUPDATE</name>
+                <name>WEBLINK_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -17822,19 +17946,21 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBSERVER</name>
+                <name>TAG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="100" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -17848,30 +17974,47 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>WEBLINKTAGID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_FIELD</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>SALESPROJECTPHASEDEFINITION</name>
+            <name>MAIL_LOG</name>
             <dbName></dbName>
-            <idColumn>SALESPROJECTPHASEDEFINITIONID</idColumn>
+            <idColumn>MAIL_LOGID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
+            <title></title>
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
@@ -17883,118 +18026,155 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>PHASE</name>
+                <name>ERRORMESSAGE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CHECKLIST_ID</name>
+                <name>MAIL_LOGID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>SENDER_EMAIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="500" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>RECIPIENT_EMAIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>MAILING_SUBJECT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESPROJECTPHASEDEFINITIONID</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>MAIL_RUN_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_SEND</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OPENER_LINK_CLICK_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CHECKLISTENTRY</name>
+            <name>MAIL_RUN</name>
             <dbName></dbName>
-            <idColumn>CHECKLISTENTRYID</idColumn>
+            <idColumn>MAIL_RUNID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
+            <title></title>
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
@@ -18006,7 +18186,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>CHECKLISTENTRYID</name>
+                <name>MAIL_RUNID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -18016,49 +18196,53 @@
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CHECKLIST_ID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="100" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TITLE</name>
+                <name>INTEREST_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>DATE_RUN_START</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -18068,42 +18252,45 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>DATE_RUN_FINISHED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AUTO</name>
+                <name>TESTRUN</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="5" />
                 <size v="5" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -18113,12 +18300,13 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CHECKLIST</name>
+            <name>COMMUNICATIONSETTINGS</name>
             <dbName></dbName>
-            <idColumn>CHECKLISTID</idColumn>
+            <idColumn>COMMUNICATIONSETTINGSID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
+            <title></title>
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
@@ -18130,7 +18318,63 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>CHECKLISTID</name>
+                <name>STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CHANNEL_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CHANNEL_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>COMMUNICATIONSETTINGSID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -18140,6 +18384,21 @@
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MEDIUM</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -18153,6 +18412,7 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -18162,10 +18422,11 @@
                 <columnType v="93" />
                 <size v="29" />
                 <scale v="9" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -18175,10 +18436,11 @@
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -18192,17 +18454,19 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CHECKLISTENTRYVALUE</name>
+            <name>COMMUNICATIONLEGALBASE</name>
             <dbName></dbName>
-            <idColumn>CHECKLISTENTRYVALUEID</idColumn>
+            <idColumn>COMMUNICATIONLEGALBASEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
+            <title></title>
             <description></description>
             <auditSyncConfig>
               <name>auditSyncConfig</name>
@@ -18214,29 +18478,17 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>COMMUNICATIONSETTINGS_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>IS_FULFILLED</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -18250,10 +18502,11 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CHECKLISTENTRYVALUEID</name>
+                <name>COMMUNICATIONLEGALBASEID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -18263,6 +18516,21 @@
                 <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>VERSION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -18272,10 +18540,11 @@
                 <columnType v="93" />
                 <size v="29" />
                 <scale v="9" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -18285,23 +18554,25 @@
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="250" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
@@ -18315,27 +18586,15 @@
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>CHECKLISTENTRY_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
+                <title></title>
                 <description></description>
               </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>HASDUPLICATE</name>
+            <name>BULKMAILTESTRECIPIENT</name>
             <dbName></dbName>
-            <idColumn>HASDUPLICATEID</idColumn>
+            <idColumn>BULKMAILTESTRECIPIENTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -18351,7 +18610,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>BULKMAIL_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -18365,11 +18624,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>EMAIL_ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -18379,11 +18638,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DUPLICATECOUNT</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -18393,7 +18652,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>HASDUPLICATEID</name>
+                <name>BULKMAILTESTRECIPIENTID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -18409,9 +18668,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>AB_SYNCCONTACT</name>
+            <name>INTERESTLINK</name>
             <dbName></dbName>
-            <idColumn>SYNCCONTACTID</idColumn>
+            <idColumn>INTERESTLINKID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -18427,12 +18686,12 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18441,11 +18700,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EXCHANGEID</name>
+                <name>INTEREST_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -18455,25 +18714,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ASYS_FAVORITEID</name>
+                <name>INTERESTLINKID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_ID</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
-                <size v="46" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -18482,27 +18741,47 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>INTEREST</name>
+            <dbName></dbName>
+            <idColumn>INTERESTID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="500" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18511,7 +18790,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SYNCCONTACTID</name>
+                <name>INTERESTID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -18525,12 +18804,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_DEL</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>IS_DEFAULT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18541,9 +18834,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>WEBLINK</name>
+            <name>WEBLINK_CLICK</name>
             <dbName></dbName>
-            <idColumn>WEBLINKID</idColumn>
+            <idColumn>WEBLINK_CLICKID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -18559,54 +18852,12 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>SCORE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LINKTYPE</name>
+                <name>BROWSER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <size v="255" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18615,11 +18866,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>DEVICE_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -18629,7 +18880,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WEBLINKID</name>
+                <name>WEBLINK_CLICKID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -18643,21 +18894,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>URL</name>
+                <name>MAIL_LOG_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="512" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>IP_ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -18671,11 +18922,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PLACEHOLDER</name>
+                <name>WEBLINK_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -18685,7 +18936,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WORKFLOWPROCESSDEFINITION_KEY</name>
+                <name>OPERATING_SYSTEM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -18699,12 +18950,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ISREDIRECT</name>
+                <name>DATE_OPENED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18715,9 +18966,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>WEBLINKTAG</name>
+            <name>COMMUNICATIONBLACKLIST</name>
             <dbName></dbName>
-            <idColumn>WEBLINKTAGID</idColumn>
+            <idColumn>COMMUNICATIONBLACKLISTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -18732,6 +18983,20 @@
               <syncIds></syncIds>
             </auditSyncConfig>
             <entityFields>
+              <entityFieldDb>
+                <name>BLACKLIST_FILTER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
               <entityFieldDb>
                 <name>DATE_EDIT</name>
                 <dbName></dbName>
@@ -18747,12 +19012,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WEBLINK_ID</name>
+                <name>END_DATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18761,7 +19026,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>START_DATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -18775,13 +19040,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TAG</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
-                <scale v="0" />
-                <notNull v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -18795,7 +19060,7 @@
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -18803,7 +19068,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WEBLINKTAGID</name>
+                <name>COMMUNICATIONBLACKLISTID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -18816,6 +19081,20 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>REASON</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="500" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
               <entityFieldDb>
                 <name>USER_EDIT</name>
                 <dbName></dbName>
@@ -18830,12 +19109,26 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>BLACKLIST_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>MAIL_LOG</name>
+            <name>PLANNING_MONTH</name>
             <dbName></dbName>
-            <idColumn>MAIL_LOGID</idColumn>
+            <idColumn>PLANNING_MONTHID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -18851,21 +19144,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>ERRORMESSAGE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="-1" />
-                <size v="2147483647" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>MAIL_LOGID</name>
+                <name>PLANNING_MONTHID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -18879,40 +19158,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SENDER_EMAIL</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>RECIPIENT_EMAIL</name>
+                <name>MONTH_FACTOR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
+                <columnType v="2" />
+                <size v="5" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18921,11 +19172,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MAILING_SUBJECT</name>
+                <name>MONTH_NUMBER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -18934,12 +19185,32 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>DSGVOCONFIGURATION</name>
+            <dbName></dbName>
+            <idColumn>DSGVOCONFIGURATIONID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>FILTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -18949,12 +19220,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FILEPATH</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18963,26 +19234,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MAIL_RUN_ID</name>
+                <name>DSGVOCONFIGURATIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_SEND</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
-                <size v="23" />
-                <scale v="0" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -18991,55 +19262,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OPENER_LINK_CLICK_ID</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>MAIL_RUN</name>
-            <dbName></dbName>
-            <idColumn>MAIL_RUNID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>MAIL_RUNID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>REASON</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -19053,11 +19290,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="100" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19066,41 +19303,80 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>DSGVODELETEFLAG</name>
+            <dbName></dbName>
+            <idColumn>DSGVODELETEFLAGID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="1" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>INTEREST_ID</name>
+                <name>DSGVODELETEFLAGID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_RUN_START</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
-                <title></title>
+                <title>Contact Id</title>
                 <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="false" />
+                  </customBooleanProperty>
+                  <customStringProperty>
+                    <name>tableRef</name>
+                    <global v="false" />
+                    <property>CONTACT</property>
+                  </customStringProperty>
+                </customProperties>
+                <dependencies>
+                  <entityDependency>
+                    <name>2278befb-de66-4f45-98c2-619eb686d999</name>
+                    <entityName>CONTACT</entityName>
+                    <fieldName>CONTACTID</fieldName>
+                  </entityDependency>
+                </dependencies>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -19109,11 +19385,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_RUN_FINISHED</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19123,25 +19399,37 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TESTRUN</name>
+                <name>REASON</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title></title>
+                <title>Reason</title>
                 <description></description>
+                <customProperties>
+                  <customBooleanProperty>
+                    <name>log</name>
+                    <global v="false" />
+                    <property v="true" />
+                  </customBooleanProperty>
+                  <customStringProperty>
+                    <name>keyword</name>
+                    <global v="false" />
+                    <property>DSGVOReason</property>
+                  </customStringProperty>
+                </customProperties>
               </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>COMMUNICATIONSETTINGS</name>
+            <name>LEADS</name>
             <dbName></dbName>
-            <idColumn>COMMUNICATIONSETTINGSID</idColumn>
+            <idColumn>LEADID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -19157,13 +19445,13 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>ZIP</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19171,11 +19459,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CHANNEL_ID</name>
+                <name>CUSTOMERCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19185,13 +19473,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CHANNEL_TYPE</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19199,39 +19487,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>FIRSTNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>COMMUNICATIONSETTINGSID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MEDIUM</name>
+                <name>ATTRIBUTE_LOYALTY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19241,11 +19515,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>DUPLICAT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19255,13 +19529,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>P_COMMINTERNET</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19269,13 +19543,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19283,7 +19557,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>MIDDLENAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -19296,46 +19570,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>COMMUNICATIONLEGALBASE</name>
-            <dbName></dbName>
-            <idColumn>COMMUNICATIONLEGALBASEID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>COMMUNICATIONSETTINGS_ID</name>
+                <name>COUNTRY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <size v="2" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19345,27 +19585,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COMMUNICATIONLEGALBASEID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>VERSION</name>
+                <name>LASTNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19373,13 +19599,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>SALUTATION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="30" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19387,13 +19613,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>TAXCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="30" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19401,11 +19627,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>ORGCOUNTRYCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="250" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19415,11 +19641,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>P_COMMXING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19428,28 +19654,8 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>BULKMAILTESTRECIPIENT</name>
-            <dbName></dbName>
-            <idColumn>BULKMAILTESTRECIPIENTID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>BULKMAIL_ID</name>
+                <name>LEADIMPORT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -19457,17 +19663,17 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EMAIL_ADDRESS</name>
+                <name>P_COMMLINKEDIN</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19477,11 +19683,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>BUILDINGNO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19491,45 +19697,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>BULKMAILTESTRECIPIENTID</name>
+                <name>ISOLANGUAGE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>INTERESTLINK</name>
-            <dbName></dbName>
-            <idColumn>INTERESTLINKID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>ATTRIBUTE_INDUSTRY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19539,73 +19725,53 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INTEREST_ID</name>
+                <name>CONTACTPOSITION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INTERESTLINKID</name>
+                <name>ATTRIBUTE03</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>ATTRIBUTE02</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>INTEREST</name>
-            <dbName></dbName>
-            <idColumn>INTERESTID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>CONTACTROLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="60" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19615,11 +19781,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>P_COMMBLOG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="500" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19629,21 +19795,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INTERESTID</name>
+                <name>PERSINFO</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TITLE</name>
+                <name>DEPARTMENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -19657,45 +19823,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>IS_DEFAULT</name>
+                <name>NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-6" />
-                <size v="3" />
+                <columnType v="12" />
+                <size v="250" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>WEBLINK_CLICK</name>
-            <dbName></dbName>
-            <idColumn>WEBLINK_CLICKID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>BROWSER</name>
+                <name>REGION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19705,11 +19851,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DEVICE_TYPE</name>
+                <name>O_COMMXING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19719,25 +19865,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WEBLINK_CLICKID</name>
+                <name>PERSON_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MAIL_LOG_ID</name>
+                <name>ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19747,7 +19893,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>IP_ADDRESS</name>
+                <name>SOURCE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -19761,11 +19907,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WEBLINK_ID</name>
+                <name>O_COMMPHONE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19775,11 +19921,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OPERATING_SYSTEM</name>
+                <name>O_COMMMOBIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19789,12 +19935,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_OPENED</name>
+                <name>O_COMMINTERNET</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -19802,32 +19948,26 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>COMMUNICATIONBLACKLIST</name>
-            <dbName></dbName>
-            <idColumn>COMMUNICATIONBLACKLISTID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>BLACKLIST_FILTER</name>
+                <name>LEGALFORM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="-1" />
-                <size v="2147483647" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>O_COMMEMAIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19837,11 +19977,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>DISTRICT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19851,11 +19991,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>END_DATE</name>
+                <name>O_COMMLINKEDIN</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19865,11 +20005,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>START_DATE</name>
+                <name>DUPSTATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="20" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19879,13 +20019,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>O_COMMBLOG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="19" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19893,13 +20033,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>GENDER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -19907,25 +20047,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COMMUNICATIONBLACKLISTID</name>
+                <name>ATTRIBUTE04</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>REASON</name>
+                <name>LETTERSALUTATION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="500" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -19935,7 +20075,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -19949,59 +20089,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>BLACKLIST_TYPE</name>
+                <name>P_COMMPHONE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>PLANNING_MONTH</name>
-            <dbName></dbName>
-            <idColumn>PLANNING_MONTHID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>PLANNING_MONTHID</name>
+                <name>ORGANISATION_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MONTH_FACTOR</name>
+                <name>P_COMMMOBIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20011,11 +20131,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MONTH_NUMBER</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20024,32 +20144,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>DSGVOCONFIGURATION</name>
-            <dbName></dbName>
-            <idColumn>DSGVOCONFIGURATIONID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>FILTER</name>
+                <name>CITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20059,7 +20159,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>DATEOFBIRTH</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -20073,26 +20173,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DSGVOCONFIGURATIONID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>VATCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="30" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -20101,11 +20187,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>P_COMMEMAIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20115,11 +20201,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>REASON</name>
+                <name>ORGINFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -20129,7 +20215,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>PROVINCE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -20142,72 +20228,19 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>DSGVODELETEFLAG</name>
-            <dbName></dbName>
-            <idColumn>DSGVODELETEFLAGID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="1" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>DSGVODELETEFLAGID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
-                <title>Contact Id</title>
+                <title></title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="false" />
-                  </customBooleanProperty>
-                  <customStringProperty>
-                    <name>tableRef</name>
-                    <global v="false" />
-                    <property>CONTACT</property>
-                  </customStringProperty>
-                </customProperties>
-                <dependencies>
-                  <entityDependency>
-                    <name>2278befb-de66-4f45-98c2-619eb686d999</name>
-                    <entityName>CONTACT</entityName>
-                    <fieldName>CONTACTID</fieldName>
-                  </entityDependency>
-                </dependencies>
               </entityFieldDb>
               <entityFieldDb>
                 <name>DATE_NEW</name>
@@ -20224,44 +20257,18 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>REASON</name>
+                <name>LEADSID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
-                <title>Reason</title>
+                <title></title>
                 <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                  <customStringProperty>
-                    <name>keyword</name>
-                    <global v="false" />
-                    <property>DSGVOReason</property>
-                  </customStringProperty>
-                </customProperties>
               </entityFieldDb>
             </entityFields>
           </entityDb>
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/lead/documentation.adoc b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/lead/documentation.adoc
deleted file mode 100644
index e8620e87403b2200fd7d970063f1412faa7980dc..0000000000000000000000000000000000000000
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/lead/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-== LEAD
-
-Used to store leads (potential interested contacts)
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
index 1c4215342d4256568e37babf86ad9e3b8292c788..5b08bfa758bd3d89880949aedb36d889fdd00d1b 100644
--- a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
+++ b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
@@ -9,124 +9,6 @@
       <entityGroup>
         <name>entityGroup</name>
         <entities>
-          <entityDb>
-            <name>DUPLICATESCANNERRESULTFIELDCONFIG</name>
-            <dbName></dbName>
-            <idColumn>ID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>DATE_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DUPLICATESCANNER_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ENTITY_FIELD_NAME</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-            </entityFields>
-          </entityDb>
           <entityDb>
             <name>KNOWLEDGEDISCUSSION</name>
             <dbName></dbName>
@@ -3684,7 +3566,7 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -6000,9 +5882,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>LEAD</name>
+            <name>CONTACT</name>
             <dbName></dbName>
-            <idColumn>LEADID</idColumn>
+            <idColumn>CONTACTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -6018,11 +5900,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>ZIP</name>
+                <name>ISOLANGUAGE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6032,7 +5914,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CUSTOMERCODE</name>
+                <name>CONTACTPOSITION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -6060,7 +5942,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FIRSTNAME</name>
+                <name>CONTACTROLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -6074,25 +5956,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE_LOYALTY</name>
+                <name>ORGANISATION_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DUPLICAT</name>
+                <name>DEPARTMENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6102,11 +5984,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMINTERNET</name>
+                <name>CONTACTID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6130,27 +6026,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MIDDLENAME</name>
+                <name>PERSON_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COUNTRY</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="2" />
-                <scale v="0" />
-                <notNull v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -6158,11 +6054,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LASTNAME</name>
+                <name>LETTERSALUTATION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="200" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6172,13 +6068,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALUTATION</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="30" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -6186,24 +6082,44 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TAXCODE</name>
+                <name>ADDRESS_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="30" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>LEADLOG</name>
+            <dbName></dbName>
+            <idColumn>LEADLOGID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>ORGCOUNTRYCODE</name>
+                <name>ROWSINSERTED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="4" />
                 <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -6214,11 +6130,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMXING</name>
+                <name>IMPORTSOURCE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="500" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6228,25 +6144,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LEADIMPORT_ID</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMLINKEDIN</name>
+                <name>IMPORTERRORS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6256,25 +6172,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>BUILDINGNO</name>
+                <name>LEADLOGID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ISOLANGUAGE</name>
+                <name>IMPORTCANCELED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="1" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6284,12 +6200,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE_INDUSTRY</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -6298,7 +6214,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACTPOSITION</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -6312,25 +6228,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE03</name>
+                <name>LEADIMPORT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE02</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="100" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6339,12 +6255,32 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>LEADTEMP</name>
+            <dbName></dbName>
+            <idColumn>LEADTEMPID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>CONTACTROLE</name>
+                <name>COLUMN18</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="60" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6354,11 +6290,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMBLOG</name>
+                <name>COLUMN17</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6368,11 +6304,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PERSINFO</name>
+                <name>COLUMN19</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6382,11 +6318,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DEPARTMENT</name>
+                <name>COLUMN14</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6396,11 +6332,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NAME</name>
+                <name>COLUMN13</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="250" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6410,11 +6346,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>REGION</name>
+                <name>COLUMN16</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6424,11 +6360,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMXING</name>
+                <name>COLUMN15</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6438,25 +6374,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PERSON_ID</name>
+                <name>COLUMN10</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADDRESS</name>
+                <name>COLUMN12</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6466,11 +6402,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SOURCE</name>
+                <name>COLUMN11</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6480,11 +6416,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMPHONE</name>
+                <name>COLUMN30</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6494,25 +6430,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMMOBIL</name>
+                <name>LEADTEMPID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMINTERNET</name>
+                <name>POSITION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6522,12 +6458,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LEGALFORM</name>
+                <name>IMPORT_DATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -6536,11 +6472,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMEMAIL</name>
+                <name>COLUMN07</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6550,11 +6486,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISTRICT</name>
+                <name>COLUMN29</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6564,11 +6500,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMLINKEDIN</name>
+                <name>COLUMN06</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6578,11 +6514,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DUPSTATUS</name>
+                <name>COLUMN28</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="20" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6592,11 +6528,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>O_COMMBLOG</name>
+                <name>COLUMN09</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6606,11 +6542,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GENDER</name>
+                <name>COLUMN08</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6620,11 +6556,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE04</name>
+                <name>COLUMN03</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="100" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6634,11 +6570,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LETTERSALUTATION</name>
+                <name>COLUMN25</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="100" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6648,11 +6584,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>COLUMN02</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6662,11 +6598,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMPHONE</name>
+                <name>COLUMN24</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6676,39 +6612,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ORGANISATION_ID</name>
+                <name>COLUMN05</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LEADID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMMOBIL</name>
+                <name>COLUMN27</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6718,11 +6640,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>COLUMN04</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6732,11 +6654,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CITY</name>
+                <name>COLUMN26</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6746,12 +6668,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATEOFBIRTH</name>
+                <name>COLUMN21</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="300" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -6760,11 +6682,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VATCODE</name>
+                <name>COLUMN20</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="30" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6774,11 +6696,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>P_COMMEMAIL</name>
+                <name>COLUMN01</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6788,11 +6710,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ORGINFO</name>
+                <name>COLUMN23</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6802,11 +6724,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROVINCE</name>
+                <name>COLUMN22</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="300" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6816,7 +6738,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TITLE</name>
+                <name>NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -6830,15 +6752,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>ROW_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -6846,9 +6768,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CONTACT</name>
+            <name>BULKMAILRECIPIENT</name>
             <dbName></dbName>
-            <idColumn>CONTACTID</idColumn>
+            <idColumn>BULKMAILRECIPIENTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -6864,11 +6786,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>ISOLANGUAGE</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="3" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6878,26 +6800,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACTPOSITION</name>
+                <name>BULKMAIL_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>EMAIL_ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -6906,11 +6828,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACTROLE</name>
+                <name>PROBLEM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6920,53 +6842,53 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ORGANISATION_ID</name>
+                <name>BULKMAILRECIPIENTID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DEPARTMENT</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACTID</name>
+                <name>SENTDATE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>IS_TEST_RECIPIENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -6975,13 +6897,33 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>LEADIMPORT</name>
+            <dbName></dbName>
+            <idColumn>LEADIMPORTID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -6990,27 +6932,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PERSON_ID</name>
+                <name>RECORD_SEPARATOR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>FIELD_SEPARATOR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -7018,11 +6960,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LETTERSALUTATION</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="200" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7032,13 +6974,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -7046,45 +6988,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADDRESS_ID</name>
+                <name>LEADIMPORTID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>LEADLOG</name>
-            <dbName></dbName>
-            <idColumn>LEADLOGID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>ROWSINSERTED</name>
+                <name>IMPORTEMPLOYEE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7108,12 +7030,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7122,12 +7044,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>IMPORTERRORS</name>
+                <name>IMPORT_DATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7136,25 +7058,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LEADLOGID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>IMPORTCANCELED</name>
+                <name>FIELD_DELIMITER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="1" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7178,35 +7086,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LEADIMPORT_ID</name>
+                <name>HEADLINE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
-                <size v="36" />
+                <size v="1" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -7222,9 +7116,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>LEADTEMP</name>
+            <name>FORECAST</name>
             <dbName></dbName>
-            <idColumn>LEADTEMPID</idColumn>
+            <idColumn>FORECASTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -7240,25 +7134,25 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>COLUMN18</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN17</name>
+                <name>GROUPCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7268,25 +7162,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN19</name>
+                <name>FORECASTID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN14</name>
+                <name>VOLUME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7296,12 +7190,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN13</name>
+                <name>DATE_START</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7310,11 +7204,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN16</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7324,11 +7218,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN15</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7338,11 +7232,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN10</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7352,11 +7246,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN12</name>
+                <name>KIND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7366,11 +7260,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN11</name>
+                <name>FORECAST_YEAR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7380,39 +7274,59 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN30</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LEADTEMPID</name>
+                <name>RESPONSIBLE_CONTACT_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>VISITRECOMMENDATION</name>
+            <dbName></dbName>
+            <idColumn>VISITRECOMMENDATIONID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>POSITION</name>
+                <name>RESPONSIBLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7422,12 +7336,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>IMPORT_DATE</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7436,12 +7350,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN07</name>
+                <name>DUE_DATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7450,11 +7364,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN29</name>
+                <name>SOURCE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7464,25 +7378,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN06</name>
+                <name>VISITRECOMMENDATIONID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN28</name>
+                <name>PRIORITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7492,11 +7420,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN09</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7506,25 +7434,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN08</name>
+                <name>CONTACT_PERSON_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN03</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7533,12 +7461,32 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>OBSERVATION</name>
+            <dbName></dbName>
+            <idColumn>OBSERVATIONID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>COLUMN25</name>
+                <name>OBJECT_FILTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7548,12 +7496,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN02</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7562,13 +7510,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN24</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="80" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -7576,25 +7524,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN05</name>
+                <name>OBSERVATION_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN27</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7604,11 +7552,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN04</name>
+                <name>NOTIFICATION_PRIO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7618,25 +7566,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN26</name>
+                <name>OBJECT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN21</name>
+                <name>OBSERVATIONID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TRIGGEREVENTDELETE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7646,11 +7608,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN20</name>
+                <name>TRIGGEREVENTINSERT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7660,11 +7622,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN01</name>
+                <name>TRIGGEREVENTUPDATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7674,12 +7636,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN23</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="300" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7688,13 +7650,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COLUMN22</name>
+                <name>OBSERVER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="300" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -7702,7 +7664,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NAME</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -7716,15 +7678,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ROW_ID</name>
+                <name>OBJECT_FIELD</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -7732,9 +7694,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>BULKMAILRECIPIENT</name>
+            <name>SALUTATION</name>
             <dbName></dbName>
-            <idColumn>BULKMAILRECIPIENTID</idColumn>
+            <idColumn>SALUTATIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -7750,11 +7712,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>ISOLANGUAGE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="1" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7764,25 +7726,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>BULKMAIL_ID</name>
+                <name>SALUTATION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="200" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EMAIL_ADDRESS</name>
+                <name>SEX</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7792,11 +7754,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROBLEM</name>
+                <name>SORT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7806,7 +7768,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>BULKMAILRECIPIENTID</name>
+                <name>SALUTATIONID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -7820,26 +7782,40 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="30" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SENTDATE</name>
+                <name>HEADLINE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LETTERSALUTATION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="200" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7850,9 +7826,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>LEADIMPORT</name>
+            <name>CLASSIFICATIONSTORAGE</name>
             <dbName></dbName>
-            <idColumn>LEADIMPORTID</idColumn>
+            <idColumn>CLASSIFICATIONSTORAGEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -7868,25 +7844,25 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>RECORD_SEPARATOR</name>
+                <name>CLASSIFICATIONVALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="20" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7896,25 +7872,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FIELD_SEPARATOR</name>
+                <name>CLASSIFICATIONSTORAGEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
+                <primaryKey v="true" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>OUTDATED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7924,11 +7900,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NAME</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7937,25 +7913,45 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>COMPETITION</name>
+            <dbName></dbName>
+            <idColumn>COMPETITIONID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>LEADIMPORTID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>IMPORTEMPLOYEE</name>
+                <name>PHASE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -7966,11 +7962,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>IMPORTSOURCE</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="500" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7980,39 +7976,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>IMPORT_DATE</name>
+                <name>COMPETITIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FIELD_DELIMITER</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8022,13 +8018,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8036,11 +8032,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>HEADLINE</name>
+                <name>REASON</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="1" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8050,12 +8046,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>DATE_CANCELLED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8066,9 +8062,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>FORECAST</name>
+            <name>MST_TEAM</name>
             <dbName></dbName>
-            <idColumn>FORECASTID</idColumn>
+            <idColumn>MST_TEAMID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -8084,25 +8080,25 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>MST_TEAMID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="false" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GROUPCODE</name>
+                <name>IS_ARCHIVED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8112,25 +8108,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FORECASTID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>VOLUME</name>
+                <name>SERVICE_URL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8140,12 +8122,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_START</name>
+                <name>TEAMNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8154,11 +8136,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>GENERAL_CHANNELID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="1" />
+                <size v="48" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8168,13 +8150,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>WEB_URL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="500" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8184,9 +8166,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>VISITRECOMMENDATION</name>
+            <name>PRODUCT</name>
             <dbName></dbName>
-            <idColumn>VISITRECOMMENDATIONID</idColumn>
+            <idColumn>PRODUCTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -8202,10 +8184,10 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>RESPONSIBLE</name>
+                <name>UNIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -8216,12 +8198,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8230,12 +8212,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DUE_DATE</name>
+                <name>PICTURE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="2004" />
+                <size v="2147483647" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8244,11 +8226,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SOURCE</name>
+                <name>ADVERTISING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="1" />
+                <size v="1" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8258,7 +8240,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VISITRECOMMENDATIONID</name>
+                <name>PRODUCTID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -8272,25 +8254,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>PRODUCTNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PRIORITY</name>
+                <name>PRODUCTCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="100" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8300,11 +8296,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>MINSTOCK</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8314,25 +8310,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_PERSON_ID</name>
+                <name>GROUPCODEID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8341,48 +8337,28 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>OBSERVATION</name>
-            <dbName></dbName>
-            <idColumn>OBSERVATIONID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>OBJECT_FILTER</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
                 <scale v="9" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8390,11 +8366,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="80" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -8403,8 +8379,28 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>TASK</name>
+            <dbName></dbName>
+            <idColumn>TASKID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>OBSERVATION_ID</name>
+                <name>REQUESTOR_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -8418,11 +8414,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>PRIORITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8432,12 +8428,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NOTIFICATION_PRIO</name>
+                <name>START_DATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8446,11 +8442,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_ID</name>
+                <name>MATURITY_DATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PARENT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8460,7 +8470,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBSERVATIONID</name>
+                <name>TASKID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -8474,11 +8484,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TRIGGEREVENTDELETE</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8488,11 +8498,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TRIGGEREVENTINSERT</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8502,11 +8512,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TRIGGEREVENTUPDATE</name>
+                <name>KIND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8516,12 +8526,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>PROGRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8530,13 +8540,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBSERVER</name>
+                <name>EDITOR_CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SUBJECT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8544,11 +8568,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>PROTECTIONLEVEL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8558,11 +8582,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_FIELD</name>
+                <name>PARENT_CONTEXT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="64" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8574,9 +8598,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>SALUTATION</name>
+            <name>AB_KEYWORD_ENTRY</name>
             <dbName></dbName>
-            <idColumn>SALUTATIONID</idColumn>
+            <idColumn>AB_KEYWORD_ENTRYID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -8592,11 +8616,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>ISOLANGUAGE</name>
+                <name>ISESSENTIAL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="3" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8606,27 +8630,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALUTATION</name>
+                <name>CONTAINER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="200" />
+                <size v="80" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SEX</name>
+                <name>SORTING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8634,13 +8658,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORT</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="100" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8648,27 +8672,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALUTATIONID</name>
+                <name>KEYID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
+                <primaryKey v="false" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TITLE</name>
+                <name>ISACTIVE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="30" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8676,29 +8700,29 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>HEADLINE</name>
+                <name>AB_KEYWORD_CATEGORY_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LETTERSALUTATION</name>
+                <name>AB_KEYWORD_ENTRYID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="200" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -8706,9 +8730,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CLASSIFICATIONSTORAGE</name>
+            <name>AB_OBJECTRELATIONTYPE</name>
             <dbName></dbName>
-            <idColumn>CLASSIFICATIONSTORAGEID</idColumn>
+            <idColumn>AB_OBJECTRELATIONTYPEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -8724,27 +8748,27 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>AB_OBJECTRELATIONTYPEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONVALUE</name>
+                <name>SIDE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="20" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8752,25 +8776,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLASSIFICATIONSTORAGEID</name>
+                <name>RELATION_TYPE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
+                <primaryKey v="false" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OUTDATED</name>
+                <name>ICON</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8784,9 +8808,37 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>RELATION_TITLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="80" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>HIERARCHY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -8796,9 +8848,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>COMPETITION</name>
+            <name>CLASSIFICATIONGROUP</name>
             <dbName></dbName>
-            <idColumn>COMPETITIONID</idColumn>
+            <idColumn>CLASSIFICATIONGROUPID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -8814,25 +8866,25 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>CLASSIFICATIONGROUPID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="false" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PHASE</name>
+                <name>SORTING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8842,7 +8894,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -8855,12 +8907,32 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>AB_APPOINTMENTLINK</name>
+            <dbName></dbName>
+            <idColumn>AB_APPOINTMENTLINK_ID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="512" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -8870,7 +8942,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COMPETITIONID</name>
+                <name>AB_APPOINTMENTLINK_ID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -8884,15 +8956,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>APPOINTMENT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="512" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -8911,40 +8983,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>REASON</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_CANCELLED</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>MST_TEAM</name>
+            <name>CAMPAIGNSTEP</name>
             <dbName></dbName>
-            <idColumn>MST_TEAMID</idColumn>
+            <idColumn>CAMPAIGNSTEPID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -8960,26 +9004,26 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>MST_TEAMID</name>
+                <name>CAMPAIGN_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>IS_ARCHIVED</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8988,39 +9032,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SERVICE_URL</name>
+                <name>PREDECESSORSTEP_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TEAMNAME</name>
+                <name>CAMPAIGNSTEPID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GENERAL_CHANNELID</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="48" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -9030,47 +9074,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WEB_URL</name>
+                <name>NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="500" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>PRODUCT</name>
-            <dbName></dbName>
-            <idColumn>PRODUCTID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>UNIT</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9078,12 +9102,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="500" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9092,11 +9116,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PICTURE</name>
+                <name>STEPMEDIUM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2004" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -9106,13 +9130,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADVERTISING</name>
+                <name>DATE_START</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="1" />
+                <columnType v="91" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9120,55 +9144,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PRODUCTID</name>
+                <name>EMPLOYEE_CONTACT_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PRODUCTNAME</name>
+                <name>SORTING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>PRODUCTCODE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9176,13 +9172,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MINSTOCK</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
-                <notNull v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9190,13 +9186,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GROUPCODEID</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9204,40 +9200,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>MAXPARTICIPANTS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="4" />
                 <size v="10" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>CONTACT_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9246,11 +9214,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>DATE_END</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="91" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -9262,9 +9230,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>TASK</name>
+            <name>ORGANISATION</name>
             <dbName></dbName>
-            <idColumn>TASKID</idColumn>
+            <idColumn>ORGANISATIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -9280,25 +9248,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>REQUESTOR_CONTACT_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>PRIORITY</name>
+                <name>CUSTOMERCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="30" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -9308,7 +9262,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>START_DATE</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -9322,12 +9276,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MATURITY_DATE</name>
+                <name>PICTURE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="2004" />
+                <size v="2147483647" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9336,41 +9290,41 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PARENT_ID</name>
+                <name>KIND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TASKID</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9378,7 +9332,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
@@ -9392,25 +9346,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KIND</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>PROGRESS</name>
+                <name>SALESAREA</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -9420,39 +9360,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EDITOR_CONTACT_ID</name>
+                <name>ORGANISATIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SUBJECT</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="254" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>PROTECTIONLEVEL</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -9462,13 +9388,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PARENT_CONTEXT</name>
+                <name>NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="64" />
+                <size v="255" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9478,9 +9404,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>AB_KEYWORD_ENTRY</name>
+            <name>CAMPAIGNCOST</name>
             <dbName></dbName>
-            <idColumn>AB_KEYWORD_ENTRYID</idColumn>
+            <idColumn>CAMPAIGNCOSTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -9496,53 +9422,53 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>ISESSENTIAL</name>
+                <name>CAMPAIGN_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTAINER</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="80" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTING</name>
+                <name>CAMPAIGNCOSTID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TITLE</name>
+                <name>CATEGORY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="100" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -9552,25 +9478,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KEYID</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ISACTIVE</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -9580,28 +9506,42 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_KEYWORD_CATEGORY_ID</name>
+                <name>NET</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_KEYWORD_ENTRYID</name>
+                <name>CAMPAIGNSTEP_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
@@ -9610,9 +9550,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>AB_OBJECTRELATIONTYPE</name>
+            <name>DSGVO</name>
             <dbName></dbName>
-            <idColumn>AB_OBJECTRELATIONTYPEID</idColumn>
+            <idColumn>DSGVOID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -9628,27 +9568,27 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>AB_OBJECTRELATIONTYPEID</name>
+                <name>DSGVOTYPE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
+                <primaryKey v="false" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SIDE</name>
+                <name>VALID_TO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9656,13 +9596,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>RELATION_TYPE</name>
+                <name>STATUORITYSOURCE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9670,12 +9610,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ICON</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9684,13 +9624,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>DSGVOID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PURPOSE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9698,26 +9652,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>RELATION_TITLE</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="80" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>HIERARCHY</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9725,46 +9679,26 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>CLASSIFICATIONGROUP</name>
-            <dbName></dbName>
-            <idColumn>CLASSIFICATIONGROUPID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>CLASSIFICATIONGROUPID</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTING</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -9774,15 +9708,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TITLE</name>
+                <name>ROW_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -9790,9 +9724,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>AB_APPOINTMENTLINK</name>
+            <name>AB_ATTRIBUTERELATION</name>
             <dbName></dbName>
-            <idColumn>AB_APPOINTMENTLINK_ID</idColumn>
+            <idColumn>AB_ATTRIBUTERELATIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -9808,13 +9742,13 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>INT_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="512" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -9822,27 +9756,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_APPOINTMENTLINK_ID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>APPOINTMENT_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="512" />
-                <scale v="0" />
-                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -9850,55 +9770,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>CAMPAIGNSTEP</name>
-            <dbName></dbName>
-            <idColumn>CAMPAIGNSTEPID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
-              <entityFieldDb>
-                <name>CAMPAIGN_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>DATE_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -9906,18 +9792,18 @@
                 <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PREDECESSORSTEP_ID</name>
+                <name>NUMBER_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
@@ -9926,7 +9812,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CAMPAIGNSTEPID</name>
+                <name>AB_ATTRIBUTERELATIONID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -9940,13 +9826,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9954,13 +9840,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NAME</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9968,13 +9854,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>CHAR_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="512" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -9982,21 +9868,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>AB_ATTRIBUTE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="500" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STEPMEDIUM</name>
+                <name>ID_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -10004,17 +9890,31 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_START</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -10023,8 +9923,28 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ACTIVITYLINK</name>
+            <dbName></dbName>
+            <idColumn>ACTIVITYLINKID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>EMPLOYEE_CONTACT_ID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -10038,19 +9958,33 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTING</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>ACTIVITYLINKID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
               <entityFieldDb>
                 <name>DATE_NEW</name>
                 <dbName></dbName>
@@ -10080,28 +10014,42 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MAXPARTICIPANTS</name>
+                <name>ACTIVITY_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_END</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="91" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
@@ -10110,9 +10058,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>ORGANISATION</name>
+            <name>ADDRESS</name>
             <dbName></dbName>
-            <idColumn>ORGANISATIONID</idColumn>
+            <idColumn>ADDRESSID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -10128,11 +10076,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>CUSTOMERCODE</name>
+                <name>ZIP</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="30" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10156,25 +10104,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PICTURE</name>
+                <name>LON</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2004" />
-                <size v="2147483647" />
-                <scale v="0" />
+                <columnType v="3" />
+                <size v="11" />
+                <scale v="8" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KIND</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10184,13 +10132,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>ADDR_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -10198,13 +10146,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>REGION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -10212,11 +10160,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>ADDRESSADDITION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="60" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10226,11 +10174,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESAREA</name>
+                <name>DISTRICT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10240,25 +10188,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ORGANISATIONID</name>
+                <name>CITY</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>COUNTRY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="2" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10268,89 +10216,69 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NAME</name>
+                <name>ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>CAMPAIGNCOST</name>
-            <dbName></dbName>
-            <idColumn>CAMPAIGNCOSTID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>CAMPAIGN_ID</name>
+                <name>ADDRESSID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="false" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CAMPAIGNCOSTID</name>
+                <name>PROVINCE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CATEGORY</name>
+                <name>ADDRIDENTIFIER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="60" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -10386,21 +10314,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NET</name>
+                <name>LAT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="3" />
+                <size v="10" />
+                <scale v="8" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>BUILDINGNO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -10413,26 +10341,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>CAMPAIGNSTEP_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>DSGVO</name>
+            <name>DOCUMENTTEMPLATELINK</name>
             <dbName></dbName>
-            <idColumn>DSGVOID</idColumn>
+            <idColumn>DOCUMENTTEMPLATELINKID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -10448,7 +10362,21 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DSGVOTYPE</name>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DOCUMENTTEMPLATE_ID_PARENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -10462,13 +10390,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VALID_TO</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
                 <scale v="9" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -10476,13 +10404,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUORITYSOURCE</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -10490,12 +10418,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>DOCUMENTTEMPLATELINKID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10504,25 +10446,45 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DSGVOID</name>
+                <name>DOCUMENTTEMPLATE_ID_CHILD</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
+                <primaryKey v="false" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>WORKFLOWSIGNAL</name>
+            <dbName></dbName>
+            <idColumn>WORKFLOWSIGNALID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>PURPOSE</name>
+                <name>SIGNAL_NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10532,27 +10494,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>WORKFLOWSIGNALID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="false" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>TRIGGER_EVENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -10560,13 +10522,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>OBJECT_CONDITION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="512" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -10574,11 +10536,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>PROCESSDEFINITION_KEY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10588,15 +10550,29 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ROW_ID</name>
+                <name>VARIABLES</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="512" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OBJECT_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -10604,9 +10580,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>AB_ATTRIBUTERELATION</name>
+            <name>KNOWLEDGEMANAGEMENT</name>
             <dbName></dbName>
-            <idColumn>AB_ATTRIBUTERELATIONID</idColumn>
+            <idColumn>KNOWLEDGEMANAGEMENTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -10622,29 +10598,15 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>INT_VALUE</name>
+                <name>CONTENTDECODED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>OBJECT_ROWID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -10664,26 +10626,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_VALUE</name>
+                <name>KNOWLEDGEMANAGEMENTID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NUMBER_VALUE</name>
+                <name>AUTHOR_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
@@ -10692,27 +10654,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_ATTRIBUTERELATIONID</name>
+                <name>TITLE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>CONTENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -10720,12 +10682,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10734,11 +10696,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CHAR_VALUE</name>
+                <name>PUBLISH</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="512" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10748,24 +10710,24 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_ATTRIBUTE_ID</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ID_VALUE</name>
+                <name>RESPONSIBLE_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10776,27 +10738,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -10806,9 +10768,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>ACTIVITYLINK</name>
+            <name>BULKMAIL</name>
             <dbName></dbName>
-            <idColumn>ACTIVITYLINKID</idColumn>
+            <idColumn>BULKMAILID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -10824,55 +10786,27 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>DOCUMENTTEMPLATE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ACTIVITYLINKID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>USE_TEMPLATE_ATTACHMENTS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -10880,13 +10814,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -10894,39 +10828,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ACTIVITY_ID</name>
+                <name>BULKMAILID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>OBJECT_TYPE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
-                <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="false" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="500" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10935,32 +10855,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ADDRESS</name>
-            <dbName></dbName>
-            <idColumn>ADDRESSID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>ZIP</name>
+                <name>TESTING_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -10970,12 +10870,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>SUBJECT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="100" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10984,21 +10884,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LON</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="3" />
-                <size v="11" />
-                <scale v="8" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>TESTING_EMAIL_ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -11012,11 +10898,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADDR_TYPE</name>
+                <name>CREATEACTIVITIES</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11026,7 +10912,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>REGION</name>
+                <name>NAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -11040,11 +10926,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADDRESSADDITION</name>
+                <name>INTEREST_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="60" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11054,7 +10940,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISTRICT</name>
+                <name>SENDER_EMAIL_ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -11068,12 +10954,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CITY</name>
+                <name>DATE_TO_SEND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11081,14 +10967,34 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>COMMUNICATION</name>
+            <dbName></dbName>
+            <idColumn>COMMUNICATIONID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>COUNTRY</name>
+                <name>ISSTANDARD</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="2" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11096,12 +11002,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADDRESS</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11110,14 +11016,14 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADDRESSID</name>
+                <name>MEDIUM_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
+                <primaryKey v="false" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
@@ -11130,7 +11036,7 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -11138,13 +11044,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROVINCE</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11152,13 +11058,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADDRIDENTIFIER</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="60" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11166,57 +11072,43 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>COMMUNICATIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>LAT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="3" />
-                <size v="10" />
-                <scale v="8" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>BUILDINGNO</name>
+                <name>ADDR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -11224,9 +11116,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>DOCUMENTTEMPLATELINK</name>
+            <name>AB_OBJECTRELATION</name>
             <dbName></dbName>
-            <idColumn>DOCUMENTTEMPLATELINKID</idColumn>
+            <idColumn>AB_OBJECTRELATIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -11242,12 +11134,12 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>AB_OBJECTRELATIONTYPE1</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11256,7 +11148,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DOCUMENTTEMPLATE_ID_PARENT</name>
+                <name>AB_OBJECTRELATIONTYPE2</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -11270,35 +11162,49 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>OBJECT2_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INFO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>OBJECT1_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DOCUMENTTEMPLATELINKID</name>
+                <name>AB_OBJECTRELATIONID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -11311,14 +11217,62 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>UNRELATEDDUPLICATES</name>
+            <dbName></dbName>
+            <idColumn>ID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>SOURCEDUPLICATEID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>UNRELATEDDUPLICATEID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11326,15 +11280,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DOCUMENTTEMPLATE_ID_CHILD</name>
+                <name>DUPLICATETYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -11342,9 +11296,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>WORKFLOWSIGNAL</name>
+            <name>KNOWLEDGEGITINTERFACE</name>
             <dbName></dbName>
-            <idColumn>WORKFLOWSIGNALID</idColumn>
+            <idColumn>KNOWLEDGEGITINTERFACEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -11360,12 +11314,12 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>SIGNAL_NAME</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11374,7 +11328,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>WORKFLOWSIGNALID</name>
+                <name>KNOWLEDGEGITINTERFACEID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -11388,11 +11342,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TRIGGER_EVENT</name>
+                <name>GITCOMMIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="200" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11402,12 +11356,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_CONDITION</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="512" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11416,11 +11370,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROCESSDEFINITION_KEY</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="255" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11430,11 +11384,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VARIABLES</name>
+                <name>SYSTEMNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="512" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11444,11 +11398,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11460,9 +11414,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>KNOWLEDGEMANAGEMENT</name>
+            <name>TASKLINK</name>
             <dbName></dbName>
-            <idColumn>KNOWLEDGEMANAGEMENTID</idColumn>
+            <idColumn>TASKLINKID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -11478,27 +11432,27 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>CONTENTDECODED</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11506,7 +11460,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KNOWLEDGEMANAGEMENTID</name>
+                <name>TASKLINKID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -11520,39 +11474,59 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AUTHOR_CONTACT_ID</name>
+                <name>TASK_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>KNOWLEDGETAG</name>
+            <dbName></dbName>
+            <idColumn>KNOWLEDGETAGID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>TITLE</name>
+                <name>KNOWLEDGETAGID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTENT</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11562,7 +11536,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -11576,12 +11550,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PUBLISH</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11590,11 +11564,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>TAG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11604,29 +11578,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>RESPONSIBLE_CONTACT_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>TYPE</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -11636,7 +11596,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11648,9 +11608,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>BULKMAIL</name>
+            <name>DOCUMENTTEMPLATEPLACEOFUSE</name>
             <dbName></dbName>
-            <idColumn>BULKMAILID</idColumn>
+            <idColumn>DOCUMENTTEMPLATEPLACEOFUSEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -11669,7 +11629,7 @@
                 <name>DOCUMENTTEMPLATE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -11680,11 +11640,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USE_TEMPLATE_ATTACHMENTS</name>
+                <name>PLACEOFUSE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11694,24 +11654,10 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>DOCUMENTTEMPLATEPLACEOFUSEID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>BULKMAILID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
+                <primaryKey v="true" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
@@ -11721,36 +11667,56 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>LETTERRECIPIENT</name>
+            <dbName></dbName>
+            <idColumn>LETTERRECIPIENTID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>SERIALLETTER_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="500" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SENDER</name>
+                <name>LETTERRECIPIENTID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TESTING_CONTACT_ID</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -11758,61 +11724,81 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>MST_TEAMLINK</name>
+            <dbName></dbName>
+            <idColumn>MST_TEAMLINKID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>SUBJECT</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="100" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TESTING_EMAIL_ADDRESS</name>
+                <name>MST_TEAM_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CREATEACTIVITIES</name>
+                <name>MST_TEAMLINKID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NAME</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="63" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11822,9 +11808,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>COMMUNICATION</name>
+            <name>CONTRACT</name>
             <dbName></dbName>
-            <idColumn>COMMUNICATIONID</idColumn>
+            <idColumn>CONTRACTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -11840,11 +11826,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>ISSTANDARD</name>
+                <name>CONTRACTCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="30" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -11854,7 +11840,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>CONTRACTDUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -11868,7 +11854,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MEDIUM_ID</name>
+                <name>PAYMENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -11876,11 +11862,39 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTRACTID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTRACTSTATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
               <entityFieldDb>
                 <name>CONTACT_ID</name>
                 <dbName></dbName>
@@ -11896,13 +11910,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>CONTRACTEND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
                 <scale v="9" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11910,13 +11924,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>CONTRACTTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -11924,26 +11938,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>COMMUNICATIONID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>CONTRACTSTART</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11952,15 +11952,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADDR</name>
+                <name>REMARK</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -11968,9 +11968,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>AB_OBJECTRELATION</name>
+            <name>SALESPROJECT</name>
             <dbName></dbName>
-            <idColumn>AB_OBJECTRELATIONID</idColumn>
+            <idColumn>SALESPROJECTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -11986,12 +11986,12 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>AB_OBJECTRELATIONTYPE1</name>
+                <name>STARTDATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12000,12 +12000,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_OBJECTRELATIONTYPE2</name>
+                <name>VOLUME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12014,26 +12014,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT2_ROWID</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>ENDDATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12042,58 +12042,38 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT1_ROWID</name>
+                <name>PHASE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_OBJECTRELATIONID</name>
+                <name>PROBABILITY</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
+                <primaryKey v="false" />
+                <columnType v="3" />
+                <size v="6" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>UNRELATEDDUPLICATES</name>
-            <dbName></dbName>
-            <idColumn>ID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>CLUSTERID</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -12104,13 +12084,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SOURCEDUPLICATEID</name>
+                <name>PROJECTCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>REASONS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="498" />
+                <scale v="0" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -12118,7 +12112,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ID</name>
+                <name>SALESPROJECTID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -12132,7 +12126,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>UNRELATEDDUPLICATEID</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -12140,6 +12134,34 @@
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PROJECTTITLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="150" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
@@ -12148,9 +12170,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>KNOWLEDGEGITINTERFACE</name>
+            <name>CAMPAIGNPARTICIPANT</name>
             <dbName></dbName>
-            <idColumn>KNOWLEDGEGITINTERFACEID</idColumn>
+            <idColumn>CAMPAIGNPARTICIPANTID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -12166,21 +12188,21 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>CAMPAIGN_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KNOWLEDGEGITINTERFACEID</name>
+                <name>CAMPAIGNPARTICIPANTID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -12194,12 +12216,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GITCOMMIT</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="200" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12207,6 +12229,20 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
               <entityFieldDb>
                 <name>DATE_NEW</name>
                 <dbName></dbName>
@@ -12214,7 +12250,7 @@
                 <columnType v="93" />
                 <size v="29" />
                 <scale v="9" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -12228,7 +12264,7 @@
                 <columnType v="12" />
                 <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -12236,15 +12272,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SYSTEMNAME</name>
+                <name>RESPONSIBLE_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -12263,12 +12299,26 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>CAMPAIGNSTEP_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>TASKLINK</name>
+            <name>DESCRIPTIONTRANSLATION</name>
             <dbName></dbName>
-            <idColumn>TASKLINKID</idColumn>
+            <idColumn>DESCRIPTIONTRANSLATIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -12298,13 +12348,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>DESCRIPTIONTRANSLATIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -12312,29 +12376,29 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TASKLINKID</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TASK_ID</name>
+                <name>LANG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -12342,9 +12406,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>KNOWLEDGETAG</name>
+            <name>DISTRICTRESPONSIBLE</name>
             <dbName></dbName>
-            <idColumn>KNOWLEDGETAGID</idColumn>
+            <idColumn>DISTRICTRESPONSIBLEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -12360,7 +12424,21 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>KNOWLEDGETAGID</name>
+                <name>ADVISER_STATUS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISTRICTRESPONSIBLEID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -12374,10 +12452,10 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>ADVISER_ROLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -12402,54 +12480,54 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>DEPARTMENT_ATTRIBUTE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TAG</name>
+                <name>DISTRICT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>EMPLOYEE_CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12457,12 +12535,68 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>DOCUMENTTEMPLATEPLACEOFUSE</name>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>VALID_FROM</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>VALID_UNTIL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>SALESPROJECT_MILESTONE</name>
             <dbName></dbName>
-            <idColumn>DOCUMENTTEMPLATEPLACEOFUSEID</idColumn>
+            <idColumn>SALESPROJECT_MILESTONEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -12478,7 +12612,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DOCUMENTTEMPLATE_ID</name>
+                <name>MILESTONEVALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -12486,17 +12620,17 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PLACEOFUSE</name>
+                <name>KIND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="80" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -12506,7 +12640,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DOCUMENTTEMPLATEPLACEOFUSEID</name>
+                <name>SALESPROJECT_MILESTONEID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -12519,12 +12653,68 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_START</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SALESPROJECT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_END</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PARENT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>LETTERRECIPIENT</name>
+            <name>COMMRESTRICTION</name>
             <dbName></dbName>
-            <idColumn>LETTERRECIPIENTID</idColumn>
+            <idColumn>COMMRESTRICTIONID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -12540,29 +12730,57 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>SERIALLETTER_ID</name>
+                <name>COMMRESTRICTIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MEDIUM</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LETTERRECIPIENTID</name>
+                <name>STARTDATE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>EMPLOYEE_INVOLVED</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -12581,12 +12799,26 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>REASON</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="250" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>MST_TEAMLINK</name>
+            <name>OBJECTMEMBER</name>
             <dbName></dbName>
-            <idColumn>MST_TEAMLINKID</idColumn>
+            <idColumn>OBJECTMEMBERID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -12602,21 +12834,21 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>OBJECTMEMBERID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="false" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MST_TEAM_ID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -12630,14 +12862,42 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MST_TEAMLINKID</name>
+                <name>ONSITE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>MEMBERROLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
@@ -12660,9 +12920,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CONTRACT</name>
+            <name>EXPORTTEMPLATE</name>
             <dbName></dbName>
-            <idColumn>CONTRACTID</idColumn>
+            <idColumn>EXPORTTEMPLATEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -12678,13 +12938,13 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>CONTRACTCODE</name>
+                <name>FIELDSEPARATOR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="30" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -12692,12 +12952,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTRACTDUE</name>
+                <name>ISOLANGUAGE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="3" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12706,7 +12966,1369 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PAYMENT</name>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="1337" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>EXPORTTEMPLATEID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>FIELDDELIMITER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TITLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SENTENCESEPARATOR</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>PROD2PROD</name>
+            <dbName></dbName>
+            <idColumn>PROD2PRODID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>OPTIONAL</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TAKEPRICE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SOURCE_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>QUANTITY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DEST_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PROD2PRODID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>TIMETRACKING</name>
+            <dbName></dbName>
+            <idColumn>TIMETRACKINGID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>TIMETRACKINGID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OBJECT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TRACKINGMINUTES</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INFO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TRACKINGDATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ROW_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>AB_ATTRIBUTE</name>
+            <dbName></dbName>
+            <idColumn>AB_ATTRIBUTEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>ATTRIBUTE_NAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATTRIBUTE_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DROPDOWNDEFINITION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="80" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>AB_ATTRIBUTEID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATTRIBUTE_ACTIVE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>VALIDATIONPARAMETERS</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="512" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DROPDOWNFILTER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="512" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SORTING</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATTRIBUTE_INFO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ATTRIBUTE_PARENT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>AB_KEYWORD_ATTRIBUTE</name>
+            <dbName></dbName>
+            <idColumn>AB_KEYWORD_ATTRIBUTEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>AB_KEYWORD_ATTRIBUTEID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>KIND</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTAINER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="80" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>AB_KEYWORD_CATEGORY_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>NAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>CHECKLISTENTRYVALUE</name>
+            <dbName></dbName>
+            <idColumn>CHECKLISTENTRYVALUEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>OBJECT_ROWID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>IS_FULFILLED</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CHECKLISTENTRYVALUEID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OBJECT_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CHECKLISTENTRY_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>AB_LOGHISTORY</name>
+            <dbName></dbName>
+            <idColumn>AB_LOGHISTORYID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>TABLENAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="30" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DESCRIPTION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SOURCE_TABLENAMEID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LOGTYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="1" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SOURCE_TABLENAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="30" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>AB_LOGHISTORYID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>TABLENAMEID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>EXPORTTEMPLATEFIELD</name>
+            <dbName></dbName>
+            <idColumn>EXPORTTEMPLATEFIELDID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>FIELD</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>EXPORTTEMPLATEFIELDID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SORTING</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>EXPORTTEMPLATE_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>KNOWLEDGETAGLINK</name>
+            <dbName></dbName>
+            <idColumn>KNOWLEDGETAGLINKID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>KNOWLEDGEMANAGEMENT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>KNOWLEDGETAGLINKID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>KNOWLEDGETAG_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>DATABASECHANGELOGLOCK</name>
+            <dbName></dbName>
+            <idColumn>ID</idColumn>
+            <idGeneratorType v="1" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>LOCKGRANTED</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LOCKED</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="16" />
+                <size v="1" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>LOCKEDBY</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>ID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>SALESORDER</name>
+            <dbName></dbName>
+            <idColumn>SALESORDERID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>NOTICE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISCOUNTED_VAT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PAYDUEDATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>VAT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>HEADER</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SALESORDERCODE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CANCELLATION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>INFO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>OBJECT_TYPE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="63" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PAYDATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DUNNINGTEXT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SALESORDERDATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>SALESORDER_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DUNNINGLEVEL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -12720,25 +14342,53 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTRACTID</name>
+                <name>SALESORDERID</name>
+                <dbName></dbName>
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DUNNINGDATE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>CURRENCY</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
+                <primaryKey v="false" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTRACTSTATUS</name>
+                <name>ISOLANGUAGE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="1" />
+                <size v="3" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -12748,26 +14398,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>PAYMENTTERMS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTRACTEND</name>
+                <name>DELIVERYTERMS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12776,26 +14426,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTRACTTYPE</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTRACTSTART</name>
+                <name>PAYMENTADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12804,11 +14454,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>REMARK</name>
+                <name>ORDERTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -12817,45 +14467,25 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>SALESPROJECT</name>
-            <dbName></dbName>
-            <idColumn>SALESPROJECTID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>STARTDATE</name>
+                <name>OFFER_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VOLUME</name>
+                <name>PAID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
+                <columnType v="3" />
                 <size v="14" />
                 <scale v="2" />
                 <notNull v="false" />
@@ -12866,7 +14496,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>FOOTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
@@ -12880,12 +14510,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ENDDATE</name>
+                <name>DISCOUNT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12894,12 +14524,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PHASE</name>
+                <name>DISCOUNTED_NET</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12908,12 +14538,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROBABILITY</name>
+                <name>DELIVERYADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="3" />
-                <size v="6" />
-                <scale v="2" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12922,11 +14552,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>ORDERSTATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -12936,26 +14566,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROJECTCODE</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="true" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>REASONS</name>
+                <name>NET</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="498" />
-                <scale v="0" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -12963,58 +14593,64 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>KNOWLEDGEMANAGEMENTTAGMODERATION</name>
+            <dbName></dbName>
+            <idColumn>KNOWLEDGEMANAGEMENTTAGMODERATIONID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>SALESPROJECTID</name>
+                <name>STATUS</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>AB_ATTRIBUTE_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROJECTTITLE</name>
+                <name>KNOWLEDGEMANAGEMENTTAGMODERATIONID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="150" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -13022,9 +14658,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>CAMPAIGNPARTICIPANT</name>
+            <name>SALESORDERITEM</name>
             <dbName></dbName>
-            <idColumn>CAMPAIGNPARTICIPANTID</idColumn>
+            <idColumn>SALESORDERITEMID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -13040,40 +14676,40 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>CAMPAIGN_ID</name>
+                <name>UNIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CAMPAIGNPARTICIPANTID</name>
+                <name>PRICE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <primaryKey v="false" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>QUANTITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13082,27 +14718,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>VAT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
+                <columnType v="2005" />
+                <size v="2147483647" />
+                <scale v="0" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -13110,39 +14746,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>PRODUCT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>RESPONSIBLE_CONTACT_ID</name>
+                <name>DISCOUNT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="2" />
+                <size v="14" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>ITEMPOSITION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="30" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13152,73 +14788,53 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CAMPAIGNSTEP_ID</name>
+                <name>GROUPCODEID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>DESCRIPTIONTRANSLATION</name>
-            <dbName></dbName>
-            <idColumn>DESCRIPTIONTRANSLATIONID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>ITEMSORT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTIONTRANSLATIONID</name>
+                <name>SALESORDER_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>ASSIGNEDTO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13228,25 +14844,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>SALESORDERITEMID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LANG</name>
+                <name>ITEMNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="250" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13258,9 +14874,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>DISTRICTRESPONSIBLE</name>
+            <name>AB_CTILOG</name>
             <dbName></dbName>
-            <idColumn>DISTRICTRESPONSIBLEID</idColumn>
+            <idColumn>AB_CTILOGID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -13276,43 +14892,43 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>ADVISER_STATUS</name>
+                <name>AB_CTILOGID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
+                <primaryKey v="true" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISTRICTRESPONSIBLEID</name>
+                <name>ANSWERMODE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
+                <primaryKey v="false" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADVISER_ROLE</name>
+                <name>CALLID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="64" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -13332,35 +14948,35 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DEPARTMENT_ATTRIBUTE_ID</name>
+                <name>ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="30" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISTRICT_ID</name>
+                <name>DIRECTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EMPLOYEE_CONTACT_ID</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -13380,15 +14996,35 @@
                 <columnType v="93" />
                 <size v="29" />
                 <scale v="9" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>ACTIVITY</name>
+            <dbName></dbName>
+            <idColumn>ACTIVITYID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>RESPONSIBLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -13402,7 +15038,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VALID_FROM</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -13416,12 +15052,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VALID_UNTIL</name>
+                <name>DIRECTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13430,45 +15066,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>ENTRYDATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>SALESPROJECT_MILESTONE</name>
-            <dbName></dbName>
-            <idColumn>SALESPROJECT_MILESTONEID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>MILESTONEVALUE</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13478,11 +15094,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KIND</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="80" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13492,7 +15108,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESPROJECT_MILESTONEID</name>
+                <name>ACTIVITYID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -13506,41 +15122,69 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_START</name>
+                <name>PARENT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESPROJECT_ID</name>
+                <name>CATEGORY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_END</name>
+                <name>SUBJECT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
                 <scale v="9" />
-                <notNull v="false" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>USER_NEW</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -13548,15 +15192,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PARENT_ID</name>
+                <name>PARENT_CONTEXT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="64" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -13564,9 +15208,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>COMMRESTRICTION</name>
+            <name>PLANNING_MONTH</name>
             <dbName></dbName>
-            <idColumn>COMMRESTRICTIONID</idColumn>
+            <idColumn>PLANNING_MONTHID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -13582,7 +15226,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>COMMRESTRICTIONID</name>
+                <name>PLANNING_MONTHID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -13596,40 +15240,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MEDIUM</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>STARTDATE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>EMPLOYEE_INVOLVED</name>
+                <name>MONTH_FACTOR</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="2" />
+                <size v="5" />
+                <scale v="2" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13638,25 +15254,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>REASON</name>
+                <name>MONTH_NUMBER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="250" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13668,9 +15270,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>OBJECTMEMBER</name>
+            <name>LEADS</name>
             <dbName></dbName>
-            <idColumn>OBJECTMEMBERID</idColumn>
+            <idColumn>LEADSID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -13686,39 +15288,53 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>OBJECTMEMBERID</name>
+                <name>ZIP</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>CUSTOMERCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ONSITE</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>FIRSTNAME</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13728,11 +15344,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>MEMBERROLE</name>
+                <name>ATTRIBUTE_LOYALTY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13742,61 +15358,41 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>DUPLICAT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>P_COMMINTERNET</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>DUPLICATECLUSTERS</name>
-            <dbName></dbName>
-            <idColumn>ID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>DUPLICATEID</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -13804,13 +15400,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CLUSTERID</name>
+                <name>MIDDLENAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -13818,25 +15414,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ID</name>
+                <name>COUNTRY</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
-                <size v="36" />
+                <size v="2" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TARGET_ENTITY</name>
+                <name>LASTNAME</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="200" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13845,32 +15441,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>EXPORTTEMPLATE</name>
-            <dbName></dbName>
-            <idColumn>EXPORTTEMPLATEID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>FIELDSEPARATOR</name>
+                <name>SALUTATION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="30" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13880,11 +15456,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ISOLANGUAGE</name>
+                <name>TAXCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="3" />
+                <columnType v="12" />
+                <size v="30" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13894,12 +15470,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>ORGCOUNTRYCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="10" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13908,11 +15484,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DESCRIPTION</name>
+                <name>P_COMMXING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="1337" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13922,39 +15498,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EXPORTTEMPLATEID</name>
+                <name>LEADIMPORT_ID</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
+                <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FIELDDELIMITER</name>
+                <name>LEADSID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
+                <primaryKey v="true" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TITLE</name>
+                <name>P_COMMLINKEDIN</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="100" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -13964,12 +15540,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <name>BUILDINGNO</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -13978,7 +15554,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>ISOLANGUAGE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -13992,11 +15568,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SENTENCESEPARATOR</name>
+                <name>ATTRIBUTE_INDUSTRY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14006,7 +15582,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>CONTACTPOSITION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -14019,34 +15595,14 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>PROD2PROD</name>
-            <dbName></dbName>
-            <idColumn>PROD2PRODID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>OPTIONAL</name>
+                <name>ATTRIBUTE03</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="100" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -14054,13 +15610,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TAKEPRICE</name>
+                <name>ATTRIBUTE02</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="100" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -14068,26 +15624,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SOURCE_ID</name>
+                <name>CONTACTROLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="60" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>QUANTITY</name>
+                <name>P_COMMBLOG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -14096,89 +15652,69 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DEST_ID</name>
+                <name>PERSINFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PROD2PRODID</name>
+                <name>DEPARTMENT</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>TIMETRACKING</name>
-            <dbName></dbName>
-            <idColumn>TIMETRACKINGID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>TIMETRACKINGID</name>
+                <name>NAME</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="250" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_ID</name>
+                <name>REGION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TRACKINGMINUTES</name>
+                <name>O_COMMXING</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -14186,7 +15722,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>PERSON_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -14200,11 +15736,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14214,13 +15750,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>TRACKINGDATE</name>
+                <name>SOURCE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="true" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -14228,47 +15764,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ROW_ID</name>
+                <name>O_COMMPHONE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>AB_ATTRIBUTE</name>
-            <dbName></dbName>
-            <idColumn>AB_ATTRIBUTEID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>ATTRIBUTE_NAME</name>
+                <name>O_COMMMOBIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="63" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -14276,13 +15792,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE_TYPE</name>
+                <name>O_COMMINTERNET</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -14290,11 +15806,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DROPDOWNDEFINITION</name>
+                <name>LEGALFORM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="80" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14304,27 +15820,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_ATTRIBUTEID</name>
+                <name>O_COMMEMAIL</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE_ACTIVE</name>
+                <name>DISTRICT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -14332,11 +15848,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VALIDATIONPARAMETERS</name>
+                <name>O_COMMLINKEDIN</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="512" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14346,11 +15862,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DROPDOWNFILTER</name>
+                <name>DUPSTATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="512" />
+                <size v="20" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14360,11 +15876,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTING</name>
+                <name>O_COMMBLOG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14374,11 +15890,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE_INFO</name>
+                <name>GENDER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14388,61 +15904,41 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ATTRIBUTE_PARENT_ID</name>
+                <name>ATTRIBUTE04</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>AB_KEYWORD_ATTRIBUTE</name>
-            <dbName></dbName>
-            <idColumn>AB_KEYWORD_ATTRIBUTEID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>AB_KEYWORD_ATTRIBUTEID</name>
+                <name>LETTERSALUTATION</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="100" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KIND</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -14450,21 +15946,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTAINER</name>
+                <name>P_COMMPHONE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="80" />
+                <size v="254" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_KEYWORD_CATEGORY_ID</name>
+                <name>ORGANISATION_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -14478,59 +15974,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NAME</name>
+                <name>P_COMMMOBIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="100" />
+                <size v="254" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>CHECKLISTENTRYVALUE</name>
-            <dbName></dbName>
-            <idColumn>CHECKLISTENTRYVALUEID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>IS_FULFILLED</name>
+                <name>CITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14540,7 +16016,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>DATEOFBIRTH</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -14554,26 +16030,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CHECKLISTENTRYVALUEID</name>
+                <name>VATCODE</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="30" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>P_COMMEMAIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="254" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -14582,11 +16058,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>ORGINFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="2005" />
+                <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14596,7 +16072,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>PROVINCE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -14610,7 +16086,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -14624,15 +16100,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CHECKLISTENTRY_ID</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -14640,9 +16116,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>AB_LOGHISTORY</name>
+            <name>HASDUPLICATE</name>
             <dbName></dbName>
-            <idColumn>AB_LOGHISTORYID</idColumn>
+            <idColumn>HASDUPLICATEID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -14658,35 +16134,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>TABLENAME</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="30" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DESCRIPTION</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>SOURCE_TABLENAMEID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -14694,17 +16142,17 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LOGTYPE</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="1" />
+                <columnType v="12" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14714,11 +16162,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SOURCE_TABLENAME</name>
+                <name>DUPLICATECOUNT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="30" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14728,7 +16176,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_LOGHISTORYID</name>
+                <name>HASDUPLICATEID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -14741,8 +16189,28 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>WEBLINKTAG</name>
+            <dbName></dbName>
+            <idColumn>WEBLINKTAGID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>TABLENAMEID</name>
+                <name>WEBLINK_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -14756,59 +16224,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
                 <scale v="9" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>EXPORTTEMPLATEFIELD</name>
-            <dbName></dbName>
-            <idColumn>EXPORTTEMPLATEFIELDID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>FIELD</name>
+                <name>TAG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14818,25 +16266,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EXPORTTEMPLATEFIELDID</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SORTING</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -14846,14 +16294,14 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>EXPORTTEMPLATE_ID</name>
+                <name>WEBLINKTAGID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
@@ -14862,9 +16310,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>KNOWLEDGETAGLINK</name>
+            <name>INTERESTLINK</name>
             <dbName></dbName>
-            <idColumn>KNOWLEDGETAGLINKID</idColumn>
+            <idColumn>INTERESTLINKID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -14880,12 +16328,12 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -14894,7 +16342,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KNOWLEDGEMANAGEMENT_ID</name>
+                <name>INTEREST_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -14908,7 +16356,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KNOWLEDGETAGLINKID</name>
+                <name>INTERESTLINKID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -14922,21 +16370,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>KNOWLEDGETAG_ID</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -14949,41 +16383,13 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_NEW</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>USER_EDIT</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>DATABASECHANGELOGLOCK</name>
+            <name>BULKMAILTESTRECIPIENT</name>
             <dbName></dbName>
-            <idColumn>ID</idColumn>
-            <idGeneratorType v="1" />
+            <idColumn>BULKMAILTESTRECIPIENTID</idColumn>
+            <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
             <title></title>
@@ -14998,12 +16404,12 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>LOCKGRANTED</name>
+                <name>BULKMAIL_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15012,13 +16418,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LOCKED</name>
+                <name>EMAIL_ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="16" />
-                <size v="1" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -15026,11 +16432,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>LOCKEDBY</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15040,11 +16446,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ID</name>
+                <name>BULKMAILTESTRECIPIENTID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="true" />
@@ -15056,9 +16462,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>SALESORDER</name>
+            <name>MAIL_LOG</name>
             <dbName></dbName>
-            <idColumn>SALESORDERID</idColumn>
+            <idColumn>MAIL_LOGID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -15074,7 +16480,7 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>NOTICE</name>
+                <name>ERRORMESSAGE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
@@ -15088,40 +16494,40 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISCOUNTED_VAT</name>
+                <name>MAIL_LOGID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PAYDUEDATE</name>
+                <name>OPENER_LINK_CLICK_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>VAT</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15130,11 +16536,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>HEADER</name>
+                <name>SENDER_EMAIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15144,11 +16550,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESORDERCODE</name>
+                <name>RECIPIENT_EMAIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15158,11 +16564,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CANCELLATION</name>
+                <name>MAILING_SUBJECT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
+                <columnType v="12" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15172,11 +16578,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="255" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15186,21 +16592,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OBJECT_TYPE</name>
+                <name>MAIL_RUN_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="63" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PAYDATE</name>
+                <name>DATE_SEND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
@@ -15213,12 +16619,32 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>INTEREST</name>
+            <dbName></dbName>
+            <idColumn>INTERESTID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>DUNNINGTEXT</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15228,12 +16654,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESORDERDATE</name>
+                <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="500" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15242,26 +16668,88 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESORDER_ID</name>
+                <name>INTERESTID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DUNNINGLEVEL</name>
+                <name>TITLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>IS_DEFAULT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="5" />
+                <size v="5" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>COMMUNICATIONLEGALBASE</name>
+            <dbName></dbName>
+            <idColumn>COMMUNICATIONLEGALBASEID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
+              <entityFieldDb>
+                <name>COMMUNICATIONSETTINGS_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="false" />
+                <index v="true" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_EDIT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15270,7 +16758,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESORDERID</name>
+                <name>COMMUNICATIONLEGALBASEID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -15284,13 +16772,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DUNNINGDATE</name>
+                <name>VERSION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
+                <columnType v="4" />
+                <size v="10" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -15298,27 +16786,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CURRENCY</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ISOLANGUAGE</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="3" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -15326,11 +16814,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PAYMENTTERMS</name>
+                <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="250" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15340,11 +16828,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DELIVERYTERMS</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15353,26 +16841,46 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>WEBLINK_CLICK</name>
+            <dbName></dbName>
+            <idColumn>WEBLINK_CLICKID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>OBJECT_ROWID</name>
+                <name>BROWSER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PAYMENTADDRESS</name>
+                <name>WEBLINK_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15382,11 +16890,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ORDERTYPE</name>
+                <name>DEVICE_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15396,39 +16904,39 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>OFFER_ID</name>
+                <name>WEBLINK_CLICKID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
+                <primaryKey v="true" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PAID</name>
+                <name>MAIL_LOG_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="3" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>FOOTER</name>
+                <name>IP_ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15438,12 +16946,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISCOUNT</name>
+                <name>OPERATING_SYSTEM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="12" />
+                <size v="255" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15452,12 +16960,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISCOUNTED_NET</name>
+                <name>DATE_OPENED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15465,8 +16973,28 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>COMMUNICATIONBLACKLIST</name>
+            <dbName></dbName>
+            <idColumn>COMMUNICATIONBLACKLISTID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>DELIVERYADDRESS</name>
+                <name>BLACKLIST_FILTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="2005" />
@@ -15480,12 +17008,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ORDERSTATUS</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="5" />
-                <size v="5" />
-                <scale v="0" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15494,26 +17022,26 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CONTACT_ID</name>
+                <name>END_DATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>NET</name>
+                <name>START_DATE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15521,34 +17049,14 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>KNOWLEDGEMANAGEMENTTAGMODERATION</name>
-            <dbName></dbName>
-            <idColumn>KNOWLEDGEMANAGEMENTTAGMODERATIONID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>STATUS</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -15556,21 +17064,21 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>AB_ATTRIBUTE_ID</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>KNOWLEDGEMANAGEMENTTAGMODERATIONID</name>
+                <name>COMMUNICATIONBLACKLISTID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -15583,32 +17091,12 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>SALESORDERITEM</name>
-            <dbName></dbName>
-            <idColumn>SALESORDERITEMID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>UNIT</name>
+                <name>REASON</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="500" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15618,12 +17106,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PRICE</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15632,27 +17120,47 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>QUANTITY</name>
+                <name>BLACKLIST_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
-                <notNull v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>COMMUNICATIONSETTINGS</name>
+            <dbName></dbName>
+            <idColumn>COMMUNICATIONSETTINGSID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>VAT</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
-                <notNull v="false" />
+                <columnType v="12" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -15660,27 +17168,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>CHANNEL_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PRODUCT_ID</name>
+                <name>MEDIUM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
@@ -15688,12 +17196,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DISCOUNT</name>
+                <name>DATE_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2" />
-                <size v="14" />
-                <scale v="2" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15702,13 +17210,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ITEMPOSITION</name>
+                <name>CHANNEL_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="30" />
+                <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -15716,27 +17224,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>GROUPCODEID</name>
+                <name>CONTACT_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ITEMSORT</name>
+                <name>DATE_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
-                <notNull v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -15744,27 +17252,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESORDER_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ASSIGNEDTO</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -15772,7 +17266,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SALESORDERITEMID</name>
+                <name>COMMUNICATIONSETTINGSID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -15786,11 +17280,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ITEMNAME</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="250" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15802,9 +17296,9 @@
             </entityFields>
           </entityDb>
           <entityDb>
-            <name>AB_CTILOG</name>
+            <name>WEBLINK</name>
             <dbName></dbName>
-            <idColumn>AB_CTILOGID</idColumn>
+            <idColumn>WEBLINKID</idColumn>
             <idGeneratorType v="0" />
             <idGeneratorInterval v="1" />
             <documentation></documentation>
@@ -15820,25 +17314,11 @@
             </auditSyncConfig>
             <entityFields>
               <entityFieldDb>
-                <name>AB_CTILOGID</name>
-                <dbName></dbName>
-                <primaryKey v="true" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>ANSWERMODE</name>
+                <name>ISREDIRECT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="36" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15848,15 +17328,15 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CALLID</name>
+                <name>SCORE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="64" />
+                <columnType v="4" />
+                <size v="10" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
@@ -15876,25 +17356,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ADDRESS</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="30" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
-              <entityFieldDb>
-                <name>DIRECTION</name>
+                <name>LINKTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15903,20 +17369,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>CONTACT_ID</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="1" />
-                <size v="36" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="true" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>DATE_NEW</name>
                 <dbName></dbName>
@@ -15924,35 +17376,15 @@
                 <columnType v="93" />
                 <size v="29" />
                 <scale v="9" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
-            </entityFields>
-          </entityDb>
-          <entityDb>
-            <name>ACTIVITY</name>
-            <dbName></dbName>
-            <idColumn>ACTIVITYID</idColumn>
-            <idGeneratorType v="0" />
-            <idGeneratorInterval v="1" />
-            <documentation></documentation>
-            <title></title>
-            <description></description>
-            <auditSyncConfig>
-              <name>auditSyncConfig</name>
-              <auditMode v="0" />
-              <syncActive v="false" />
-              <syncComplete v="true" />
-              <syncDirection v="1" />
-              <syncIds></syncIds>
-            </auditSyncConfig>
-            <entityFields>
               <entityFieldDb>
-                <name>RESPONSIBLE</name>
+                <name>USER_NEW</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
@@ -15966,12 +17398,12 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_EDIT</name>
+                <name>URL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
+                <columnType v="12" />
+                <size v="512" />
+                <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -15980,11 +17412,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DIRECTION</name>
+                <name>USER_EDIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -15994,25 +17426,25 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>ENTRYDATE</name>
+                <name>WEBLINKID</name>
                 <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="93" />
-                <size v="29" />
-                <scale v="9" />
-                <notNull v="false" />
-                <isUnique v="false" />
+                <primaryKey v="true" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="true" />
+                <isUnique v="true" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>INFO</name>
+                <name>PLACEHOLDER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
-                <size v="2147483647" />
+                <columnType v="12" />
+                <size v="50" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -16022,11 +17454,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_EDIT</name>
+                <name>WORKFLOWPROCESSDEFINITION_KEY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="50" />
+                <size v="255" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -16035,8 +17467,28 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+            </entityFields>
+          </entityDb>
+          <entityDb>
+            <name>MAIL_RUN</name>
+            <dbName></dbName>
+            <idColumn>MAIL_RUNID</idColumn>
+            <idGeneratorType v="0" />
+            <idGeneratorInterval v="1" />
+            <documentation></documentation>
+            <title></title>
+            <description></description>
+            <auditSyncConfig>
+              <name>auditSyncConfig</name>
+              <auditMode v="0" />
+              <syncActive v="false" />
+              <syncComplete v="true" />
+              <syncDirection v="1" />
+              <syncIds></syncIds>
+            </auditSyncConfig>
+            <entityFields>
               <entityFieldDb>
-                <name>ACTIVITYID</name>
+                <name>MAIL_RUNID</name>
                 <dbName></dbName>
                 <primaryKey v="true" />
                 <columnType v="1" />
@@ -16050,7 +17502,7 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PARENT_ID</name>
+                <name>OBJECT_ROWID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="1" />
@@ -16058,17 +17510,17 @@
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="true" />
+                <index v="false" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>CATEGORY</name>
+                <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="36" />
+                <size v="100" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -16078,27 +17530,27 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>SUBJECT</name>
+                <name>INTEREST_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="254" />
+                <columnType v="1" />
+                <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title></title>
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>DATE_NEW</name>
+                <name>DATE_RUN_START</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
                 <scale v="9" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -16106,13 +17558,13 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>USER_NEW</name>
+                <name>TESTRUN</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
+                <columnType v="5" />
+                <size v="5" />
                 <scale v="0" />
-                <notNull v="true" />
+                <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
                 <documentation></documentation>
@@ -16120,11 +17572,11 @@
                 <description></description>
               </entityFieldDb>
               <entityFieldDb>
-                <name>PARENT_CONTEXT</name>
+                <name>OBJECT_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="12" />
-                <size v="64" />
+                <size v="63" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -16133,6 +17585,20 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>DATE_RUN_FINISHED</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="93" />
+                <size v="29" />
+                <scale v="9" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
         </entities>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 25b0e7dfca8fb6805941e079c2a1ac0e066fad53..37c97817e067204582488452a1ac42db3037abb2 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -204,10 +204,6 @@
                 <name>Interest</name>
                 <kind v="10077" />
               </entityNode>
-              <entityNode>
-                <name>CommunicationBlacklist</name>
-                <kind v="10077" />
-              </entityNode>
             </childNodes>
           </entityNode>
           <entityNode>
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/neworder/onActionProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/neworder/onActionProcess.js
index 5c2ee2f884482cf501dfb07b15cc008fc139bea3..eb125f5f59798144ae3b54ebca0d0a56939e4904 100644
--- a/entity/360Degree_entity/entityfields/newmodule/children/neworder/onActionProcess.js
+++ b/entity/360Degree_entity/entityfields/newmodule/children/neworder/onActionProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("Order_lib");
 
-OrderUtils.createNewOrder(null, null, JSON.parse(vars.get("$param.ObjectRowId_param"))[0]);
+OrderUtils.createNewOrder(null, null, JSON.parse(vars.get("$param.ObjectRowId_param"))[0]);
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/onDBDelete.js b/entity/Activity_entity/recordcontainers/db/onDBDelete.js
index 92347de26dd3d24f423e5b004237fdae89332c54..0ca888563415519b6b2287c7de07896d25d709f8 100644
--- a/entity/Activity_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Activity_entity/recordcontainers/db/onDBDelete.js
@@ -1,9 +1,12 @@
+import("Document_lib");
 import("Workflow_lib");
 import("Context_lib");
 import("system.vars");
 import("Sql_lib");
 import("Attribute_lib");
 
+DocumentUtil.deleteAllUploadedImages("INFO_IMAGE_UPLOAD");
+
 newWhere("ACTIVITYLINK.ACTIVITY_ID", "$field.ACTIVITYID").deleteData();
 
 new AttributeRelationQuery(vars.get("$field.ACTIVITYID"), null, ContextUtils.getCurrentContextId())
diff --git a/entity/Address_entity/entityfields/address_ws/titleProcess.js b/entity/Address_entity/entityfields/address_ws/titleProcess.js
index a4923c9cd04d58e2b46635653ad058c779ac8dac..e05306fb184568feaf817f59841beab935286a51 100644
--- a/entity/Address_entity/entityfields/address_ws/titleProcess.js
+++ b/entity/Address_entity/entityfields/address_ws/titleProcess.js
@@ -1,3 +1,4 @@
+import("system.translate");
 import("system.result");
 import("system.vars");
 import("KeywordRegistry_basic");
@@ -6,5 +7,5 @@ import("Keyword_lib");
 var key = vars.get("$field.ADDR_TYPE");
 if (key == $KeywordRegistry.addressType$post())
 {
-    result.string("Post office box number");
+    result.string(translate.text("Post office box number"));
 }
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
index a43dd1134fefe62920ca5f7ec6941dba89da5cb8..e7f67f8f1e2cfa915f71c98dd05e7dbe3620ea36 100644
--- a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
+++ b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
@@ -8,10 +8,6 @@
     <entityProvider>
       <name>#PROVIDER</name>
     </entityProvider>
-    <entityField>
-      <name>UID</name>
-      <state>EDITABLE</state>
-    </entityField>
     <entityField>
       <name>recipientCountMessage</name>
       <state>EDITABLE</state>
@@ -39,10 +35,10 @@
       <expose v="true" />
     </entityParameter>
     <entityField>
-      <name>recipientContactIds</name>
+      <name>validContactIds</name>
       <description>the filtered contactIds (contactIds that are not already in the bulkmail and don't have a commrestriction)</description>
       <state>EDITABLE</state>
-      <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js</valueProcess>
+      <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/validcontactids/valueProcess.js</valueProcess>
     </entityField>
     <entityActionField>
       <name>addRecipients</name>
@@ -52,30 +48,25 @@
       <state>DISABLED</state>
       <stateProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/addrecipients/stateProcess.js</stateProcess>
     </entityActionField>
-    <entityField>
-      <name>recipientCount</name>
-      <documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/recipientcount/documentation.adoc</documentation>
-      <state>EDITABLE</state>
-      <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/recipientcount/valueProcess.js</valueProcess>
-    </entityField>
     <entityParameter>
       <name>ObjectType_param</name>
       <expose v="true" />
     </entityParameter>
     <entityField>
-      <name>currentRecipients</name>
-      <documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/documentation.adoc</documentation>
+      <name>currentRecipientCount</name>
+      <documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/currentrecipientcount/documentation.adoc</documentation>
       <title>Current Recipients</title>
-      <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/valueProcess.js</valueProcess>
+      <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/currentrecipientcount/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
-      <name>notAddedRecipients</name>
+      <name>notAddedCount</name>
+      <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/notaddedcount/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
-      <name>futureRecipients</name>
-      <documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/documentation.adoc</documentation>
+      <name>futureRecipientCount</name>
+      <documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/futurerecipientcount/documentation.adoc</documentation>
       <title>Recipients after adding</title>
-      <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js</valueProcess>
+      <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/futurerecipientcount/valueProcess.js</valueProcess>
     </entityField>
     <entityProvider>
       <name>#PROVIDER_AGGREGATES</name>
@@ -85,6 +76,10 @@
       <name>ContactFilter_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityField>
+      <name>proposedContactIds</name>
+      <valueProcess>%aditoprj%/entity/BulkMailAddRecipients_entity/entityfields/proposedcontactids/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/addrecipients/onActionProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/addrecipients/onActionProcess.js
index cce82d39abe4867c83b6b4289e6d5dfe284ace9a..d8057fbcaec0ce5c0094c723183b6d0538d0710c 100644
--- a/entity/BulkMailAddRecipients_entity/entityfields/addrecipients/onActionProcess.js
+++ b/entity/BulkMailAddRecipients_entity/entityfields/addrecipients/onActionProcess.js
@@ -1,7 +1,7 @@
 import("Bulkmail_lib");
 import("system.vars");
 
-var contactIds = JSON.parse(vars.getString("$field.recipientContactIds"));
+var contactIds = JSON.parse(vars.getString("$field.validContactIds"));
 var bulkMailId = vars.get("$field.BULKMAIL_ID");
 
 BulkMailUtils.addRecipients(bulkMailId, contactIds);
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/addrecipients/stateProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/addrecipients/stateProcess.js
index 361fb440599d3efccdfbb22747deae2b585fc3b0..8d4f43e10f0c76aaf98c0e64954bb2c5599015f4 100644
--- a/entity/BulkMailAddRecipients_entity/entityfields/addrecipients/stateProcess.js
+++ b/entity/BulkMailAddRecipients_entity/entityfields/addrecipients/stateProcess.js
@@ -1,9 +1,11 @@
+import("Util_lib");
 import("system.neon");
 import("system.result");
 import("system.vars");
-var count = vars.getString("$field.recipientCount");
 
-if (count == "0" || !count || vars.get("$sys.validationerrors"))
+var validContactIds = Utils.parseJSON(vars.get("$field.validContactIds"));
+
+if (Utils.isNullOrEmpty(validContactIds) || vars.get("$sys.validationerrors"))
     result.string(neon.COMPONENTSTATE_DISABLED);
 else
     result.string(neon.COMPONENTSTATE_EDITABLE);
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/documentation.adoc b/entity/BulkMailAddRecipients_entity/entityfields/currentrecipientcount/documentation.adoc
similarity index 100%
rename from entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/documentation.adoc
rename to entity/BulkMailAddRecipients_entity/entityfields/currentrecipientcount/documentation.adoc
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/currentrecipientcount/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/currentrecipientcount/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8aa9feddbe80e3c8a1d0286c93cb784cb0158c52
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/entityfields/currentrecipientcount/valueProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var currentCount = new SqlBuilder()
+    .selectCount()
+    .from("BULKMAILRECIPIENT")
+    .whereIfSet("BULKMAILRECIPIENT.BULKMAIL_ID", vars.get("$field.BULKMAIL_ID"))
+    .cell(true) || "0";
+    
+result.string(currentCount);
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/valueProcess.js
deleted file mode 100644
index ab684915b04cac155e1a7c5ef4e4f008443ab5fc..0000000000000000000000000000000000000000
--- a/entity/BulkMailAddRecipients_entity/entityfields/currentrecipients/valueProcess.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import("system.logging");
-import("system.result");
-import("system.vars");
-import("Sql_lib");
-
-var currentCount = newSelect("count(BULKMAILRECIPIENT.CONTACT_ID)")
-                            .from("BULKMAILRECIPIENT")
-                            .where("BULKMAILRECIPIENT.BULKMAIL_ID", vars.get("$field.BULKMAIL_ID"))
-                            .cell()
-if(currentCount)
-    result.string(currentCount)
-else
-    result.string("0")
-
-
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/documentation.adoc b/entity/BulkMailAddRecipients_entity/entityfields/futurerecipientcount/documentation.adoc
similarity index 100%
rename from entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/documentation.adoc
rename to entity/BulkMailAddRecipients_entity/entityfields/futurerecipientcount/documentation.adoc
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/futurerecipientcount/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/futurerecipientcount/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..afd4e40de1a73cfa8b96f4c937f413308fd4cc19
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/entityfields/futurerecipientcount/valueProcess.js
@@ -0,0 +1,8 @@
+import("Util_lib");
+import("system.vars");
+import("system.result");
+
+var currentCount = Number(vars.get("$field.currentRecipientCount"));
+var validIds = Utils.parseJSON(vars.get("$field.validContactIds")) || [];
+
+result.string(currentCount + validIds.length);
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js
deleted file mode 100644
index 9c50bb1b4d3e3e9076cff47ff37abfb2b665a600..0000000000000000000000000000000000000000
--- a/entity/BulkMailAddRecipients_entity/entityfields/futurerecipients/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.eMath")
-
-var res = eMath.addInt(vars.get("$field.recipientCount"), vars.get("$field.currentRecipients"));
-if(res)
-    result.string(res);
-else
-    result.string(0);
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/notaddedcount/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/notaddedcount/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..83d9b3c1ffd564ba0b8bc6c0b1c9dc7597f0a9ca
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/entityfields/notaddedcount/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("Util_lib");
+import("system.vars");
+
+var proposedIds = Utils.parseJSON(vars.get("$field.proposedContactIds")) || [];
+var validIds = Utils.parseJSON(vars.get("$field.validContactIds")) || [];
+
+result.string(proposedIds.length - validIds.length);
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/proposedcontactids/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/proposedcontactids/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..abc1e78c4e3211d5cbb9cfbb1440a276edc8f400
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/entityfields/proposedcontactids/valueProcess.js
@@ -0,0 +1,17 @@
+import("Util_lib");
+import("FilterViewAction_lib");
+import("system.result");
+import("system.vars");
+
+var bulkMailId = vars.get("$field.BULKMAIL_ID");
+var proposedRecipients = [];
+if (bulkMailId)
+{
+    var contactIds = Utils.parseJSON(vars.get("$param.ContactIds_param"));
+    var contactFilter = vars.get("$param.ContactFilter_param");
+    var context = vars.getString("$param.ObjectType_param");
+
+    proposedRecipients = FilterViewActionUtils.getUidsBySelectionOrFilter(context, contactIds, contactFilter);
+}
+
+result.string(JSON.stringify(proposedRecipients));
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
deleted file mode 100644
index 02d7fa1e679412972c3aca009bf79212db5b41e1..0000000000000000000000000000000000000000
--- a/entity/BulkMailAddRecipients_entity/entityfields/recipientcontactids/valueProcess.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import("Util_lib");
-import("system.eMath");
-import("FilterViewAction_lib");
-import("system.result");
-import("Bulkmail_lib");
-import("Sql_lib");
-import("system.vars");
-import("system.neon");
-
-var bulkMailId = vars.get("$field.BULKMAIL_ID");
-if (bulkMailId)
-{
-    var contactIds = Utils.parseJSON(vars.get("$param.ContactIds_param"));
-    var contactFilter = vars.get("$param.ContactFilter_param");
-    var context = vars.getString("$param.ObjectType_param");
-
-    contactIds = FilterViewActionUtils.getUidsBySelectionOrFilter(context, contactIds, contactFilter);
-
-    var recipients = BulkMailUtils.filterNewRecipients(bulkMailId, contactIds);
-    neon.setFieldValue("$field.notAddedRecipients", eMath.subInt(parseInt(contactIds.length), parseInt(recipients.length)));
-    result.string(JSON.stringify(recipients));
-}
-else
-    result.string(null);
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/recipientcount/documentation.adoc b/entity/BulkMailAddRecipients_entity/entityfields/recipientcount/documentation.adoc
deleted file mode 100644
index cb66eaab85eed332b2f4d5e7c5e7bce70540b357..0000000000000000000000000000000000000000
--- a/entity/BulkMailAddRecipients_entity/entityfields/recipientcount/documentation.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-This field contains the count of the participants that can be added as string.
-A value of null or empty string "" means that the count could not be determined (for example because no bulkmail was chosen).
-A value of "0" means that the count could be determined but none of the participants can be added (for example because all selected participants are already in the bulkmail).
-For example, a value of "12" means that 12 of the given participants can be added.
-
-This information is needed for disabling the action to proceed and to provide a message for the user.
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/recipientcount/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/recipientcount/valueProcess.js
deleted file mode 100644
index d04634f708b5331a305b800553ec8c5c9bd1b2fb..0000000000000000000000000000000000000000
--- a/entity/BulkMailAddRecipients_entity/entityfields/recipientcount/valueProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-var res = "";
-if (vars.get("$field.recipientContactIds"))
-{
-    res = JSON.parse(vars.getString("$field.recipientContactIds")).length;
-}
-
-result.string(res);
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js
index 80f08142f07db6851da182a44860374521000e27..67be7554841dc3d74cbef94a307675ee7e5b1c1d 100644
--- a/entity/BulkMailAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js
+++ b/entity/BulkMailAddRecipients_entity/entityfields/recipientcountmessage/valueProcess.js
@@ -1,22 +1,25 @@
+import("Util_lib");
 import("system.translate");
 import("system.result");
 import("system.vars");
 
-var count = vars.get("$field.recipientCount")
-var res = "";
-var resNotAdded = "\n\
-";
-if (count && !vars.get("$sys.validationerrors"))
+var validIdCount = (Utils.parseJSON(vars.get("$field.validContactIds")) || []).length;
+var message = "";
+if (!vars.get("$sys.validationerrors"))
 {
-    if (count == "0")
-        res = translate.text("No new recipients found that can be added to the bulk mail.");
+    if (validIdCount == 0)
+    {
+        message = translate.text("No new recipients found that can be added to the bulk mail.");
+    }
     else
     {
-        res = translate.withArguments("%0 new recipients will be added to the bulk mail.", [count]);
-        var notAdded = vars.get("$field.notAddedRecipients")
+        message = translate.withArguments("%0 new recipients will be added to the bulk mail.", [validIdCount]);
+        var notAdded = vars.get("$field.notAddedCount")
         if (notAdded > 0)
-            resNotAdded += translate.withArguments("%0 of the chosen records are already recipients or don't have an e-mail set", [notAdded]);
+        {
+            message += "\n" + translate.withArguments("%0 of the chosen records are already recipients or don't have an e-mail set", [notAdded]);
+        }
     }
 }
 
-result.string(res + resNotAdded);
\ No newline at end of file
+result.string(message);
\ No newline at end of file
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/validcontactids/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/validcontactids/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2df0a164747ae867eb2c6a645c4be5625ba9d21c
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/entityfields/validcontactids/valueProcess.js
@@ -0,0 +1,14 @@
+import("Util_lib");
+import("system.result");
+import("Bulkmail_lib");
+import("system.vars");
+
+var bulkMailId = vars.get("$field.BULKMAIL_ID");
+var validRecipients = [];
+if (bulkMailId)
+{
+    var proposedRecipients = Utils.parseJSON(vars.get("$field.proposedContactIds"));
+    validRecipients = BulkMailUtils.filterNewRecipients(bulkMailId, proposedRecipients);
+}
+
+result.string(JSON.stringify(validRecipients));
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index 337022169fdce959d28689ea9863bfbed69bc841..1166673b579a7d2992b701758f84b6f7d0e90f42 100644
--- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
@@ -313,16 +313,6 @@
           <readonly v="true" />
         </linkInformation>
       </linkInformation>
-      <filterExtensions>
-        <filterExtension>
-          <name>Blacklist_filter</name>
-          <title>Blacklist</title>
-          <contentType>BOOLEAN</contentType>
-          <filterValuesProcess>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/filterextensions/blacklist_filter/filterValuesProcess.js</filterValuesProcess>
-          <filterConditionProcess>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/filterextensions/blacklist_filter/filterConditionProcess.js</filterConditionProcess>
-          <filtertype>BASIC</filtertype>
-        </filterExtension>
-      </filterExtensions>
     </dbRecordContainer>
   </recordContainers>
 </entity>
diff --git a/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js b/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js
index da5905dd40d05e6350fa2decc5da91f870a689f7..fbbbe546a090687cf8aec7d09aa02854a48bbe63 100644
--- a/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js
@@ -7,7 +7,6 @@ import("Sql_lib");
 import("MarketingCondition_lib");
 
 var excludeWithCommunicationRejection = Utils.toBoolean(vars.get("$param.ExcludeCommunicationRejecting_param"));
-var excludeBlacklisted = Utils.toBoolean(vars.get("$param.ExcludeBlacklisted_param"));
 var excludedStatus = Utils.parseJSON(vars.get("$param.ExcludedStatus_param"));
 var isTestMail = Utils.toBoolean(vars.get("$param.IsTestMail_param"));
 
@@ -24,11 +23,7 @@ else
             .medium($KeywordRegistry.communicationMediumCampaign$mail(), "BULKMAILRECIPIENT.EMAIL_ADDRESS")
             .rejected()
             .existNoSettings()
-            .getCondition());
-    }
-    if (excludeBlacklisted)
-    {
-        condition.and("not (" + CommunicationBlacklist.getMailRecipientBlacklist().buildCondition() + ")");
+            .buildCondition());
     }
     if (!Utils.isNullOrEmpty(excludedStatus))
     {
diff --git a/entity/BulkMailRecipient_entity/recordcontainers/db/filterextensions/blacklist_filter/filterConditionProcess.js b/entity/BulkMailRecipient_entity/recordcontainers/db/filterextensions/blacklist_filter/filterConditionProcess.js
deleted file mode 100644
index 35124c1297165b4c16601cd12bce262eb098d07e..0000000000000000000000000000000000000000
--- a/entity/BulkMailRecipient_entity/recordcontainers/db/filterextensions/blacklist_filter/filterConditionProcess.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import("Sql_lib");
-import("system.result");
-import("Util_lib");
-import("system.vars");
-import("MarketingCondition_lib");
-
-var operator = vars.get("$local.operator2").trim();
-var fetchBlacklisted = Utils.toBoolean(vars.get("$local.rawvalue"));
-var condition = newWhere();
-
-if (operator == "<>")
-{
-    fetchBlacklisted = !fetchBlacklisted;
-    operator = "=";
-}
-if (operator == "=")
-{
-    var blacklistCondition = CommunicationBlacklist.getMailRecipientBlacklist().getCondition();
-    if (fetchBlacklisted && blacklistCondition.hasCondition())
-        condition.and(blacklistCondition);
-    else if (fetchBlacklisted)
-        condition.noResult();
-    else if (blacklistCondition.hasCondition())
-        condition.and(null, blacklistCondition, SqlBuilder.NOT());
-}
-else
-{
-    condition.noResult();
-}
-
-result.string(condition.toString("1=1"));
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/recordcontainers/db/filterextensions/blacklist_filter/filterValuesProcess.js b/entity/BulkMailRecipient_entity/recordcontainers/db/filterextensions/blacklist_filter/filterValuesProcess.js
deleted file mode 100644
index 25006aba8d3e6134f97bc10454a6d1888c2fa986..0000000000000000000000000000000000000000
--- a/entity/BulkMailRecipient_entity/recordcontainers/db/filterextensions/blacklist_filter/filterValuesProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.translate");
-
-result.object([
-    ["true", translate.text("Yes")], 
-    ["false", translate.text("No")]
-]);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index ea3b4e898599c3ed856f256d7d9d629d78b7bafc..c7e6b94645dc0d668cc1fadfa90a9a20140afdf3 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -352,6 +352,7 @@
     </entityConsumer>
     <entityConsumer>
       <name>BulkMailTestRecipients</name>
+      <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmailtestrecipients/stateProcess.js</stateProcess>
       <dependency>
         <name>dependency</name>
         <entityName>BulkMailTestRecipient_entity</entityName>
diff --git a/entity/BulkMail_entity/entityfields/bulkmailtestrecipients/stateProcess.js b/entity/BulkMail_entity/entityfields/bulkmailtestrecipients/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0e2b38fa2ad190ab5224e7a614c678073f0f5093
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/bulkmailtestrecipients/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("Bulkmail_lib");
+import("system.result");
+import("system.neon");
+
+if (BulkMailUtils.isStatusSendingOrSent(vars.get("$field.STATUS")))
+    result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/createactivities/valueProcess.js b/entity/BulkMail_entity/entityfields/createactivities/valueProcess.js
index 72e22f0a52f1d6439b67df5abc59a66280df8fd4..a4bf6a669269a2e2309090f21ac1975f35021774 100644
--- a/entity/BulkMail_entity/entityfields/createactivities/valueProcess.js
+++ b/entity/BulkMail_entity/entityfields/createactivities/valueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("system.result");
 
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-    result.string("1");
\ No newline at end of file
+    result.string("0");
\ No newline at end of file
diff --git a/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js b/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js
index 69fbfd853d241f4d4350edb4243837c849bbd16a..aaa02ff8073f59cb12e50e314b8e88b7a39f79cd 100644
--- a/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js
@@ -1,8 +1,12 @@
+import("Document_lib");
+import("Context_lib");
 import("Workflow_lib");
 import("system.vars");
 import("Binary_lib");
 import("Sql_lib");
 
+DocumentUtil.deleteAllUploadedImages("content_IMAGE_UPLOAD");
+
 newWhere("BULKMAILRECIPIENT.BULKMAIL_ID", "$local.uid").deleteData();
 
 SingleBinaryUtils.remove("BULKMAIL", "DOCUMENT", vars.get("$local.uid"));
diff --git a/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod b/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod
index 33a0522dbead26e0b28e023d1dab41f40ae0633c..e8509f21372a4aa38500c5264870ceeb330a1e44 100644
--- a/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod
+++ b/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod
@@ -96,6 +96,16 @@
       <title>Automatically</title>
       <contentType>BOOLEAN</contentType>
     </entityField>
+    <entityField>
+      <name>DONEDATE</name>
+      <title>Done on</title>
+      <contentType>DATE</contentType>
+      <resolution>MINUTE</resolution>
+    </entityField>
+    <entityField>
+      <name>DONEUSER</name>
+      <title>Done by</title>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
@@ -115,6 +125,12 @@
         <jDitoRecordFieldMapping>
           <name>CHECKLISTENTRY_ID.displayValue</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DONEUSER.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>DONEDATE.value</name>
+        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>IS_FULFILLED.value</name>
         </jDitoRecordFieldMapping>
diff --git a/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/children/setcompleted/onActionProcess.js b/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/children/setcompleted/onActionProcess.js
index ccff131335c861fe9e09bb9f170e0485cf631dcb..9ac4b995eb7e8f87127e037ef37566db7633c185 100644
--- a/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/children/setcompleted/onActionProcess.js
+++ b/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/children/setcompleted/onActionProcess.js
@@ -3,12 +3,18 @@ import("Sql_lib");
 import("system.vars");
 import("system.neon");
 
-var fulfilledValue = Utils.toBoolean(vars.get("$field.IS_FULFILLED")) ? "0" : "1";
+var isFulfilled = Utils.toBoolean(vars.get("$field.IS_FULFILLED"));
+var fulfilledValue = isFulfilled ? "0" : "1";
+var fulfilledUser = isFulfilled ? "" : vars.get("$sys.user");
+var fulfilledDate = isFulfilled ? "" : vars.get("$sys.date");
+
 var cond = newWhere("CHECKLISTENTRYVALUE.CHECKLISTENTRYVALUEID", vars.get("$field.UID")).toString();
 
 if(Utils.toBoolean(newSelect("count(*)").from("CHECKLISTENTRYVALUE").where(cond).cell()))
 {
     newWhere(cond).updateFields({
+        DONEUSER:  fulfilledUser,
+        DONEDATE: fulfilledDate,
         IS_FULFILLED: fulfilledValue
     }, "CHECKLISTENTRYVALUE");
 }
@@ -17,6 +23,8 @@ else
     new SqlBuilder().insertFields({
         CHECKLISTENTRYVALUEID: vars.get("$field.UID"),
         CHECKLISTENTRY_ID: vars.get("$field.CHECKLISTENTRY_ID"),
+        DONEUSER:  fulfilledUser,
+        DONEDATE: fulfilledDate,
         IS_FULFILLED: fulfilledValue,
         OBJECT_TYPE: vars.get("$field.OBJECT_TYPE"),
         OBJECT_ROWID: vars.get("$field.OBJECT_ROWID"),
diff --git a/entity/ChecklistEntryValue_entity/recordcontainers/jdito/contentProcess.js b/entity/ChecklistEntryValue_entity/recordcontainers/jdito/contentProcess.js
index 16a48ff0220dc6c9f068c46556ac69b6eb2864f5..e1e1e87749e51d75a7b8090cd0df45d187441724 100644
--- a/entity/ChecklistEntryValue_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ChecklistEntryValue_entity/recordcontainers/jdito/contentProcess.js
@@ -10,6 +10,8 @@ var data = newSelect([
     "CHECKLISTENTRY.AUTO",
     "CHECKLISTENTRY.CHECKLISTENTRYID",
     "CHECKLISTENTRY.TITLE",
+    "CHECKLISTENTRYVALUE.DONEUSER",
+    "CHECKLISTENTRYVALUE.DONEDATE",
     "CHECKLISTENTRYVALUE.IS_FULFILLED",
     "CHECKLISTENTRYVALUE.OBJECT_ROWID",
     "CHECKLISTENTRYVALUE.OBJECT_TYPE",
@@ -29,17 +31,17 @@ var data = newSelect([
 for(let i = 0; i < data.length; i++)
 {
     data[i][0] = data[i][0] || util.getNewUUID();
-    data[i][4] = data[i][4] || "0";
-    data[i][5] = data[i][5] || vars.get("$param.ObjectRowId_param");
-    data[i][6] = data[i][6] || vars.get("$param.ObjectType_param");
-    data[i][8] = data[i][8] || datetime.date();
-    data[i][10] = data[i][10] || vars.get("$sys.user");
+    data[i][6] = data[i][6] || "0";
+    data[i][7] = data[i][7] || vars.get("$param.ObjectRowId_param");
+    data[i][8] = data[i][8] || vars.get("$param.ObjectType_param");
+    data[i][10] = data[i][10] || datetime.date();
+    data[i][12] = data[i][12] || vars.get("$sys.user");
     
     if(parseInt(data[i][1]))
     {
         var checklistEntry = $ChecklistEntryRegistry[data[i][3]]();
         data[i][3] = checklistEntry.title;
-        data[i][4] = checklistEntry.verifierFn(vars.get("$param.ObjectRowId_param")) ? "1" : "0";
+        data[i][6] = checklistEntry.verifierFn(vars.get("$param.ObjectRowId_param")) ? "1" : "0";
     }
 }
 
diff --git a/entity/ChecklistEntry_entity/entityfields/auto/displayValueProcess.js b/entity/ChecklistEntry_entity/entityfields/auto/displayValueProcess.js
index 94bb5f7e4d05d71c1b725767f2c128ea325687dd..afddf0e768df1b60a36f706193e2d563fc9f7f0a 100644
--- a/entity/ChecklistEntry_entity/entityfields/auto/displayValueProcess.js
+++ b/entity/ChecklistEntry_entity/entityfields/auto/displayValueProcess.js
@@ -2,9 +2,7 @@ import("system.translate");
 import("system.result");
 import("system.vars");
 
-var auto = vars.get("$field.AUTO");
-
-if(auto == 1)
+if(vars.get("$this.value") == 1)
 {
     result.string(translate.text("Automatically"));
 }
diff --git a/entity/ChecklistEntry_entity/entityfields/title/displayValueProcess.js b/entity/ChecklistEntry_entity/entityfields/title/displayValueProcess.js
index 13b9519c0cffd3cb0447a630c74ad989c3e62a41..b3faf49a58ac77eacc78015a3054bcf2fcef9ae6 100644
--- a/entity/ChecklistEntry_entity/entityfields/title/displayValueProcess.js
+++ b/entity/ChecklistEntry_entity/entityfields/title/displayValueProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
 import("system.result");
 import("system.vars");
 import("system.translate");
@@ -6,7 +7,7 @@ import("ChecklistEntryRegistry_basic");
 
 var title = vars.get("$field.TITLE");
 
-if (vars.get("$field.AUTO") == 1)
+if (Utils.toBoolean(vars.get("$field.AUTO")))
 {
     result.string($ChecklistEntryRegistry[title]().title);
 }
diff --git a/entity/ChecklistEntry_entity/recordcontainers/db/conditionProcess.js b/entity/ChecklistEntry_entity/recordcontainers/db/conditionProcess.js
index 6c25101de02357ff096464daebd0cb512ce138c8..fb47eb24c56e539ee2259dfed324a2de4f29c811 100644
--- a/entity/ChecklistEntry_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ChecklistEntry_entity/recordcontainers/db/conditionProcess.js
@@ -1,18 +1,5 @@
-import("system.result");
 import("system.vars");
+import("system.result");
 import("Sql_lib");
 
-
-var checklistId = vars.get("$param.ChecklistUid_param");
-var cond = newWhere();
-
-if (checklistId) 
-{
-    cond.and("CHECKLISTENTRY.CHECKLIST_ID", checklistId);
-}
-else
-{
-    cond.and("1 = 2");
-}
-
-result.string(cond.toString());
\ No newline at end of file
+result.string(newWhereIfSet("CHECKLISTENTRY.CHECKLIST_ID", vars.get("$param.ChecklistUid_param")));
diff --git a/entity/CommRestriction_Entity/CommRestriction_Entity.aod b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
index b1604aa94b0cfb68fd202ff113e3586b76268cfa..c685eb6e0ca3b9b24ddb01a5f44edd9bc6ba3389 100644
--- a/entity/CommRestriction_Entity/CommRestriction_Entity.aod
+++ b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
@@ -5,7 +5,6 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/CommRestriction_Entity/documentation.adoc</documentation>
   <contentTitleProcess>%aditoprj%/entity/CommRestriction_Entity/contentTitleProcess.js</contentTitleProcess>
-  <contentTitleProcess>%aditoprj%/entity/CommRestriction_Entity/contentTitleProcess.js</contentTitleProcess>
   <titlePlural>Advertising bans</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
@@ -77,20 +76,6 @@
     <entityProvider>
       <name>CommRestrictions</name>
       <documentation>%aditoprj%/entity/CommRestriction_Entity/entityfields/commrestrictions/documentation.adoc</documentation>
-      <dependencies>
-        <entityDependency>
-          <name>b50e33cd-e20f-4bdf-b0ee-2ecdab921ffd</name>
-          <entityName>Person_entity</entityName>
-          <fieldName>CommRestrictions</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>1108f15c-75e3-49a8-b1cd-03259bfbb8a0</name>
-          <entityName>Organisation_entity</entityName>
-          <fieldName>CommRestrictions</fieldName>
-          <isConsumer v="false" />
-        </entityDependency>
-      </dependencies>
     </entityProvider>
     <entityParameter>
       <name>ContactId_param</name>
diff --git a/entity/CommunicationBlacklist_entity/CommunicationBlacklist_entity.aod b/entity/CommunicationBlacklist_entity/CommunicationBlacklist_entity.aod
deleted file mode 100644
index 0b6d0eedc3e5dfada987166ab52fedb1ece253c0..0000000000000000000000000000000000000000
--- a/entity/CommunicationBlacklist_entity/CommunicationBlacklist_entity.aod
+++ /dev/null
@@ -1,130 +0,0 @@
-<?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.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
-  <name>CommunicationBlacklist_entity</name>
-  <title>Blacklist</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <onValidation>%aditoprj%/entity/CommunicationBlacklist_entity/onValidation.js</onValidation>
-  <iconId>VAADIN:BAN</iconId>
-  <recordContainer>db</recordContainer>
-  <entityFields>
-    <entityProvider>
-      <name>#PROVIDER</name>
-    </entityProvider>
-    <entityProvider>
-      <name>#PROVIDER_AGGREGATES</name>
-      <useAggregates v="true" />
-    </entityProvider>
-    <entityField>
-      <name>COMMUNICATIONBLACKLISTID</name>
-    </entityField>
-    <entityField>
-      <name>START_DATE</name>
-      <title>Start date</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-    </entityField>
-    <entityField>
-      <name>END_DATE</name>
-      <title>End date</title>
-      <contentType>DATE</contentType>
-      <resolution>DAY</resolution>
-    </entityField>
-    <entityField>
-      <name>BLACKLIST_FILTER</name>
-      <title>Condition</title>
-      <contentType>FILTER_TREE</contentType>
-      <stateProcess>%aditoprj%/entity/CommunicationBlacklist_entity/entityfields/blacklist_filter/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/CommunicationBlacklist_entity/entityfields/blacklist_filter/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>REASON</name>
-      <title>Reason</title>
-      <contentType>LONG_TEXT</contentType>
-      <mandatory v="true" />
-    </entityField>
-    <entityField>
-      <name>BLACKLIST_TYPE</name>
-      <title>Type</title>
-      <consumer>BlacklistTypeKeyword</consumer>
-      <mandatory v="true" />
-    </entityField>
-    <entityConsumer>
-      <name>BlacklistTypeKeyword</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/CommunicationBlacklist_entity/entityfields/blacklisttypekeyword/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>DATE_NEW</name>
-      <valueProcess>%aditoprj%/entity/CommunicationBlacklist_entity/entityfields/date_new/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>USER_NEW</name>
-      <valueProcess>%aditoprj%/entity/CommunicationBlacklist_entity/entityfields/user_new/valueProcess.js</valueProcess>
-    </entityField>
-  </entityFields>
-  <recordContainers>
-    <dbRecordContainer>
-      <name>db</name>
-      <alias>Data_alias</alias>
-      <recordFieldMappings>
-        <dbRecordFieldMapping>
-          <name>BLACKLIST_FILTER.value</name>
-          <recordfield>COMMUNICATIONBLACKLIST.BLACKLIST_FILTER</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>BLACKLIST_TYPE.value</name>
-          <recordfield>COMMUNICATIONBLACKLIST.BLACKLIST_TYPE</recordfield>
-          <isFilterable v="true" />
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>COMMUNICATIONBLACKLISTID.value</name>
-          <recordfield>COMMUNICATIONBLACKLIST.COMMUNICATIONBLACKLISTID</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>END_DATE.value</name>
-          <recordfield>COMMUNICATIONBLACKLIST.END_DATE</recordfield>
-          <isFilterable v="true" />
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>REASON.value</name>
-          <recordfield>COMMUNICATIONBLACKLIST.REASON</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>START_DATE.value</name>
-          <recordfield>COMMUNICATIONBLACKLIST.START_DATE</recordfield>
-          <isFilterable v="true" />
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>USER_NEW.value</name>
-          <recordfield>COMMUNICATIONBLACKLIST.USER_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>DATE_NEW.value</name>
-          <recordfield>COMMUNICATIONBLACKLIST.DATE_NEW</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>BLACKLIST_TYPE.displayValue</name>
-          <expression>%aditoprj%/entity/CommunicationBlacklist_entity/recordcontainers/db/recordfieldmappings/blacklist_type.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
-      </recordFieldMappings>
-      <linkInformation>
-        <linkInformation>
-          <name>007ad42a-0a7a-49a9-a71d-917ee3c94aa7</name>
-          <tableName>COMMUNICATIONBLACKLIST</tableName>
-          <primaryKey>COMMUNICATIONBLACKLISTID</primaryKey>
-          <isUIDTable v="true" />
-          <readonly v="false" />
-        </linkInformation>
-      </linkInformation>
-    </dbRecordContainer>
-  </recordContainers>
-</entity>
diff --git a/entity/CommunicationBlacklist_entity/entityfields/blacklist_filter/stateProcess.js b/entity/CommunicationBlacklist_entity/entityfields/blacklist_filter/stateProcess.js
deleted file mode 100644
index 234a26e9827c511b12b09fbbe1f5552bfd78f912..0000000000000000000000000000000000000000
--- a/entity/CommunicationBlacklist_entity/entityfields/blacklist_filter/stateProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.result");
-import("KeywordRegistry_basic");
-import("system.vars");
-import("system.neon");
-
-var state = neon.COMPONENTSTATE_INVISIBLE;
-if (vars.get("$field.BLACKLIST_TYPE") == $KeywordRegistry.communicationBlacklistType$emailRecipientFilter())
-{
-    state = neon.COMPONENTSTATE_EDITABLE;
-}
-
-result.string(state);
\ No newline at end of file
diff --git a/entity/CommunicationBlacklist_entity/entityfields/blacklist_filter/valueProcess.js b/entity/CommunicationBlacklist_entity/entityfields/blacklist_filter/valueProcess.js
deleted file mode 100644
index 0bb45e823a21888b77385d2950bfb48fc5d530d9..0000000000000000000000000000000000000000
--- a/entity/CommunicationBlacklist_entity/entityfields/blacklist_filter/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if (!vars.get("$this.value") && (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
-{
-    var emptyFilter = {entity: "BulkMailRecipient_entity", filter: {type: "group", operator: "AND", childs: []}};
-    result.string(JSON.stringify(emptyFilter));
-}
\ No newline at end of file
diff --git a/entity/CommunicationBlacklist_entity/entityfields/blacklisttypekeyword/children/containername_param/valueProcess.js b/entity/CommunicationBlacklist_entity/entityfields/blacklisttypekeyword/children/containername_param/valueProcess.js
deleted file mode 100644
index 1e28921b3c32d79d55a29aebe44878a9c766c91d..0000000000000000000000000000000000000000
--- a/entity/CommunicationBlacklist_entity/entityfields/blacklisttypekeyword/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("KeywordRegistry_basic");
-import("system.result");
-
-result.string($KeywordRegistry.communicationBlacklistType());
\ No newline at end of file
diff --git a/entity/CommunicationBlacklist_entity/entityfields/date_new/valueProcess.js b/entity/CommunicationBlacklist_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 1dbb1c3887f7cdc3e41fc6ddd1bcb3c4032843c5..0000000000000000000000000000000000000000
--- a/entity/CommunicationBlacklist_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/CommunicationBlacklist_entity/entityfields/user_new/valueProcess.js b/entity/CommunicationBlacklist_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 8d9eb72f007f3af16b698a9483ed117730ec3680..0000000000000000000000000000000000000000
--- a/entity/CommunicationBlacklist_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/CommunicationBlacklist_entity/onValidation.js b/entity/CommunicationBlacklist_entity/onValidation.js
deleted file mode 100644
index 0652d9c0f9ff0ba032e0b7561c04ee345ba99223..0000000000000000000000000000000000000000
--- a/entity/CommunicationBlacklist_entity/onValidation.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import("system.translate");
-import("Util_lib");
-import("system.result");
-import("KeywordRegistry_basic");
-import("system.vars");
-import("system.neon");
-import("JditoFilter_lib");
-
-if (vars.get("$field.BLACKLIST_TYPE") == $KeywordRegistry.communicationBlacklistType$emailRecipientFilter())
-{
-    var filter = Utils.parseJSON(vars.get("$field.BLACKLIST_FILTER"));
-    filter = new FilterConditionGroup(filter);
-    if (filter.isEmpty())
-        result.string(translate.text("Filter can't be empty"));
-}
\ No newline at end of file
diff --git a/entity/CommunicationBlacklist_entity/recordcontainers/db/recordfieldmappings/blacklist_type.displayvalue/expression.js b/entity/CommunicationBlacklist_entity/recordcontainers/db/recordfieldmappings/blacklist_type.displayvalue/expression.js
deleted file mode 100644
index 6cf151ddba7fdaa25222f92a4fe98aba79c4b803..0000000000000000000000000000000000000000
--- a/entity/CommunicationBlacklist_entity/recordcontainers/db/recordfieldmappings/blacklist_type.displayvalue/expression.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("KeywordRegistry_basic");
-import("system.result");
-import("Keyword_lib");
-    
-result.string(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.communicationBlacklistType(), "COMMUNICATIONBLACKLIST.BLACKLIST_TYPE"));
\ No newline at end of file
diff --git a/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod b/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
index 09065e34bb370b7d14806ff55e393df36c67093f..3c3d5fcfcec9ea062aa7822673fa8ec2743e9341 100644
--- a/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
+++ b/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
@@ -4,6 +4,7 @@
   <title>Communication Settings</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <contentTitleProcess>%aditoprj%/entity/CommunicationSettings_entity/contentTitleProcess.js</contentTitleProcess>
+  <onValidation>%aditoprj%/entity/CommunicationSettings_entity/onValidation.js</onValidation>
   <iconIdProcess>%aditoprj%/entity/CommunicationSettings_entity/iconIdProcess.js</iconIdProcess>
   <titlePlural>Communication Settings</titlePlural>
   <recordContainer>db</recordContainer>
@@ -24,6 +25,12 @@
           <fieldName>ContactCommunicationSettings</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>f94ce98a-46e1-4666-a7ef-2685baa3fcae</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>ContactCommunicationSettings</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
     </entityProvider>
     <entityField>
@@ -142,6 +149,10 @@
           <name>ContainerName_param</name>
           <valueProcess>%aditoprj%/entity/CommunicationSettings_entity/entityfields/mediumkeyword/children/containername_param/valueProcess.js</valueProcess>
         </entityParameter>
+        <entityParameter>
+          <name>BlacklistIds_param</name>
+          <valueProcess>%aditoprj%/entity/CommunicationSettings_entity/entityfields/mediumkeyword/children/blacklistids_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityConsumer>
@@ -203,12 +214,17 @@
       <name>VERSION</name>
       <valueProcess>%aditoprj%/entity/CommunicationSettings_entity/entityfields/version/valueProcess.js</valueProcess>
     </entityField>
+    <entityField>
+      <name>overrideInfo</name>
+      <valueProcess>%aditoprj%/entity/CommunicationSettings_entity/entityfields/overrideinfo/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
       <name>db</name>
       <fromClauseProcess>%aditoprj%/entity/CommunicationSettings_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
       <conditionProcess>%aditoprj%/entity/CommunicationSettings_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+      <orderClauseProcess>%aditoprj%/entity/CommunicationSettings_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
       <alias>Data_alias</alias>
       <recordFieldMappings>
         <dbRecordFieldMapping>
@@ -241,6 +257,7 @@
         <dbRecordFieldMapping>
           <name>CHANNEL_TYPE.displayValue</name>
           <expression>%aditoprj%/entity/CommunicationSettings_entity/recordcontainers/db/recordfieldmappings/channel_type.displayvalue/expression.js</expression>
+          <columnAlias>channelTypeName</columnAlias>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>MEDIUM.displayValue</name>
diff --git a/entity/CommunicationSettings_entity/entityfields/mediumkeyword/children/blacklistids_param/valueProcess.js b/entity/CommunicationSettings_entity/entityfields/mediumkeyword/children/blacklistids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..283448c24cc389d3355b6057a8c75a21d8ecdd37
--- /dev/null
+++ b/entity/CommunicationSettings_entity/entityfields/mediumkeyword/children/blacklistids_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string(JSON.stringify([$KeywordRegistry.communicationMediumCampaign$letter()]));
\ No newline at end of file
diff --git a/entity/CommunicationSettings_entity/entityfields/overrideinfo/valueProcess.js b/entity/CommunicationSettings_entity/entityfields/overrideinfo/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..be189450db2f690b7f43814a0cf1537bfee929f8
--- /dev/null
+++ b/entity/CommunicationSettings_entity/entityfields/overrideinfo/valueProcess.js
@@ -0,0 +1,40 @@
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+import("MarketingCondition_lib");
+
+var channelType = vars.get("$field.CHANNEL_TYPE");
+if (channelType == $KeywordRegistry.communicationChannelType$communication() || channelType == $KeywordRegistry.communicationChannelType$address())
+{
+    var channelIdSql = "'" + vars.get("$field.CHANNEL_ID") + "'";
+
+    var superSettingCondition = new CommunicationSettingsCondition()
+        .contactId(vars.get("$field.CONTACT_ID"))
+        .rejected();
+        
+    if (channelType == $KeywordRegistry.communicationChannelType$communication())
+    {
+        superSettingCondition.medium(vars.get("$field.MEDIUM"), channelIdSql);
+    }
+    else if (channelType == $KeywordRegistry.communicationChannelType$address())
+    {
+        superSettingCondition.address(channelIdSql);
+    }
+
+    var [superSettingId, superSettingChannelType, superSettingMedium, superSettingStatus] = superSettingCondition
+        .buildSelect(["COMMUNICATIONSETTINGSID", "CHANNEL_TYPE", "MEDIUM", "STATUS"])
+        .orderBy("CHANNEL_TYPE")
+        .arrayRow();
+
+    if (superSettingId && superSettingId != vars.get("$field.COMMUNICATIONSETTINGSID") && superSettingStatus != vars.get("$field.STATUS"))
+    {
+        var channelName = superSettingMedium 
+            ? KeywordUtils.getViewValue($KeywordRegistry.communicationMediumCampaign(), superSettingMedium)
+            : KeywordUtils.getViewValue($KeywordRegistry.communicationChannelType(), superSettingChannelType);
+        var settingTitle = channelName + " - " + KeywordUtils.getViewValue($KeywordRegistry.communicationSettingStatus(), superSettingStatus);
+        result.string(translate.withArguments("This setting is overridden by the setting '%0'", [settingTitle]));
+    }
+}
\ No newline at end of file
diff --git a/entity/CommunicationSettings_entity/onValidation.js b/entity/CommunicationSettings_entity/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..9641a12f5a4edec9e96b0f93da73cef3a1411947
--- /dev/null
+++ b/entity/CommunicationSettings_entity/onValidation.js
@@ -0,0 +1,38 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+var channelType = vars.get("$field.CHANNEL_TYPE");
+var medium = vars.get("$field.MEDIUM");
+var channelId = vars.get("$field.CHANNEL_ID");
+
+var alreadyExistsQuery = new SqlBuilder()
+    .selectCount()
+    .from("COMMUNICATIONSETTINGS")
+    .where("COMMUNICATIONSETTINGS.CONTACT_ID", vars.get("$field.CONTACT_ID"))
+    .and("COMMUNICATIONSETTINGS.COMMUNICATIONSETTINGSID", vars.get("$field.COMMUNICATIONSETTINGSID"), SqlBuilder.NOT_EQUAL())
+    .and("COMMUNICATIONSETTINGS.CHANNEL_TYPE", channelType);
+    
+if (medium)
+{
+    alreadyExistsQuery.and("COMMUNICATIONSETTINGS.MEDIUM", medium);
+}
+else
+{
+    alreadyExistsQuery.and("COMMUNICATIONSETTINGS.MEDIUM is null");
+}
+
+if (channelId)
+{
+    alreadyExistsQuery.and("COMMUNICATIONSETTINGS.CHANNEL_ID", channelId);
+}
+else
+{
+    alreadyExistsQuery.and("COMMUNICATIONSETTINGS.CHANNEL_ID is null");
+}
+
+if (alreadyExistsQuery.cell() > 0)
+{
+    result.string(translate.text("A communication setting for this channel already exists!"));
+}
\ No newline at end of file
diff --git a/entity/CommunicationSettings_entity/recordcontainers/db/conditionProcess.js b/entity/CommunicationSettings_entity/recordcontainers/db/conditionProcess.js
index 7e2c1224ac30a3a48370f694af38d97653922684..03ff6265427cd772e5b562a252ab1f7efaa6f62a 100644
--- a/entity/CommunicationSettings_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/CommunicationSettings_entity/recordcontainers/db/conditionProcess.js
@@ -1,6 +1,6 @@
 import("system.result");
 import("Sql_lib");
 
-var condition = newWhere("COMMUNICATIONSETTINGS.CONTACT_ID", "$param.ContactId_param");
+var condition = newWhereIfSet("COMMUNICATIONSETTINGS.CONTACT_ID", "$param.ContactId_param");
 
 result.string(condition.toString());
\ No newline at end of file
diff --git a/entity/CommunicationSettings_entity/recordcontainers/db/orderClauseProcess.js b/entity/CommunicationSettings_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..88d3371b95e19c0fa35060fe9cf63968b9494b8a
--- /dev/null
+++ b/entity/CommunicationSettings_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,8 @@
+import("system.db");
+import("system.result");
+
+result.object({
+    "channelTypeName": db.ASCENDING,
+    "MEDIUM": db.ASCENDING,
+    "CHANNEL_ID": db.ASCENDING
+});
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/reason/dropDownProcess.js b/entity/Competition_entity/entityfields/reason/dropDownProcess.js
index 8e12cae7f3fa1cc744096ce53b70005aebe91ef0..d134de8779c994a76f872c9c5ba49ae72ceaf699 100644
--- a/entity/Competition_entity/entityfields/reason/dropDownProcess.js
+++ b/entity/Competition_entity/entityfields/reason/dropDownProcess.js
@@ -5,7 +5,8 @@ import("system.result");
 
 var keyIds = newSelect("AB_KEYWORD_ENTRY.KEYID")
                         .from("AB_KEYWORD_ENTRY")
-                        .where("AB_KEYWORD_ENTRY.CONTAINER", "SalesprojectWonLost")
+                        .where("AB_KEYWORD_ENTRY.AB_KEYWORD_CATEGORY_ID",
+                            KeywordUtils.getCategoryIdByName($KeywordRegistry.salesprojectWonLost()))
                         .arrayColumn();
 
 var res = keyIds.map(function (keyId) {
diff --git a/entity/DSGVOConfiguration_entity/entityfields/reason/dropDownProcess.js b/entity/DSGVOConfiguration_entity/entityfields/reason/dropDownProcess.js
index 11968ec24ef3cae230df9e488fdc909dade2ef4b..a488f2d4c2827d59419c30c05460028da5d3fb53 100644
--- a/entity/DSGVOConfiguration_entity/entityfields/reason/dropDownProcess.js
+++ b/entity/DSGVOConfiguration_entity/entityfields/reason/dropDownProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
 import("system.result");
 import("KeywordRegistry_basic");
 import("Keyword_lib");
@@ -7,6 +6,4 @@ let keywords = KeywordUtils.getEntryNamesAndIdsByContainer($KeywordRegistry.dsgv
 
 keywords.shift();
 
-logging.log(JSON.stringify(keywords));
-
 result.object(keywords);
\ No newline at end of file
diff --git a/entity/DSGVOConfiguration_entity/recordcontainers/db/onDBDelete.js b/entity/DSGVOConfiguration_entity/recordcontainers/db/onDBDelete.js
index e291fe5c7e99d2b8cb2b8bc39621fd5dd980b8dc..f0ff8160c66e5bea01b2ec4971555b91b340aab0 100644
--- a/entity/DSGVOConfiguration_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/DSGVOConfiguration_entity/recordcontainers/db/onDBDelete.js
@@ -1,3 +1,4 @@
+import("system.SQLTYPES");
 import("KeywordRegistry_basic");
 import("Sql_lib");
 import("system.vars");
@@ -10,6 +11,9 @@ newWhereIfSet("CONTACT.STATUS", $KeywordRegistry.contactStatus$markToDelete())
             .from("DSGVODELETEFLAG")
             .where("DSGVODELETEFLAG.REASON", reason),
             SqlBuilder.IN())
+        .and(newSelect("COUNT(*)")
+                .from("DSGVODELETEFLAG")
+                .where("DSGVODELETEFLAG.CONTACT_ID = CONTACT.CONTACTID"), 1, SqlBuilder.EQUAL(), SQLTYPES.INTEGER)
         .updateData(true, "CONTACT", ["STATUS"], null, [$KeywordRegistry.contactStatus$active()]);
 
 newWhereIfSet("DSGVODELETEFLAG.REASON", reason)
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js
index e59e3a882a1511e371559c50a02ae6869b5d3e21..e462cebdbd5ea7a1e9c4e762e6c837302c2b4503 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js
@@ -5,12 +5,15 @@ import("system.vars");
 import("system.db");
 import("Attribute_lib");
 
-var binaryId = newSelect("ID", SqlUtils.getBinariesAlias())
+var binaryIds = newSelect("ID", SqlUtils.getBinariesAlias())
                     .from("ASYS_BINARIES")
                     .where("ASYS_BINARIES.ROW_ID", "$field.DOCUMENTTEMPLATEID")
-                    .cell();
-if (binaryId)
-    db.deleteBinary(binaryId, SqlUtils.getBinariesAlias());
+                    .arrayColumn();
+                    
+binaryIds.forEach(function(pIds) 
+{ //delete the connected binData
+    db.deleteBinary(pIds, SqlUtils.getBinariesAlias());
+});
 
 new AttributeRelationQuery(vars.get("$field.DOCUMENTTEMPLATEID"), null, ContextUtils.getCurrentContextId())
     .deleteAllAttributes();
diff --git a/entity/EmployeeToken_entity/EmployeeToken_entity.aod b/entity/EmployeeToken_entity/EmployeeToken_entity.aod
index bb7b9740621ddec0a55a5603a430d09a1a83b760..8f90eef25a348dc6043c261fb4611151ace8809e 100644
--- a/entity/EmployeeToken_entity/EmployeeToken_entity.aod
+++ b/entity/EmployeeToken_entity/EmployeeToken_entity.aod
@@ -3,6 +3,7 @@
   <name>EmployeeToken_entity</name>
   <title>User token</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/entity/EmployeeToken_entity/documentation.adoc</documentation>
   <titlePlural>User tokens</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
diff --git a/entity/EmployeeToken_entity/documentation.adoc b/entity/EmployeeToken_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..bae9bc62936159c0e26b0ee19d0878a4d4527bcc
--- /dev/null
+++ b/entity/EmployeeToken_entity/documentation.adoc
@@ -0,0 +1,12 @@
+= User Token
+
+.Definition
+This entity manages authentication tokens for users.
+Those tokens might be the token for the automatic login or other special tokens used for authentication.
+
+.Purpose
+Users or the admin can see which tokens are in the system for a particular user.
+Tokens might be removed manually for various reasons.
+
+.Other
+This entity belongs to the Employee_entity.
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 41dd1030625cf58109578092224a874c04ba1507..148a373040cd117345be41d95f1641dc582d1d15 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -732,6 +732,30 @@
           <fieldName>KeywordStatus</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>050100cf-7f48-4951-a1dc-343927e0a2af</name>
+          <entityName>SalesprojectPhaseDefinition_entity</entityName>
+          <fieldName>KeywordProbabilitySalesproject</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>6c34847b-56b1-4486-a31a-2279b15dfff0</name>
+          <entityName>Salesproject_entity</entityName>
+          <fieldName>KeywordProbabilitySalesproject</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>9b82186e-f230-4af9-b77e-72b750c68d27</name>
+          <entityName>Offer_entity</entityName>
+          <fieldName>KeywordProbabilityOffer</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>48d817dc-e0fd-4d4b-bb48-3567a570105d</name>
+          <entityName>Weblink_entity</entityName>
+          <fieldName>KeywordActionTypes</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>
diff --git a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
index 4cc143f137158ab3bc3da5e2940ffca3b264e299..515e42af17febbd4d13609e2a22f09130c244ea4 100644
--- a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
+++ b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
@@ -102,32 +102,32 @@
       <refreshParent v="true" />
       <state>EDITABLE</state>
       <onValidation>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/onValidation.js</onValidation>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KnowledgeManagementTags_entity</entityName>
+        <fieldName>ByKnowledgeManagementId</fieldName>
+      </dependency>
       <children>
         <entityParameter>
           <name>KnowledgeManagementId_param</name>
           <valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/children/knowledgemanagementid_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KnowledgeManagementTags_entity</entityName>
-        <fieldName>ByKnowledgeManagementId</fieldName>
-      </dependency>
     </entityConsumer>
     <entityConsumer>
       <name>DiscussionsByKnowledgeId</name>
       <refreshParent v="true" />
+      <dependency>
+        <name>dependency</name>
+        <entityName>KnowledgeDiscussion_entity</entityName>
+        <fieldName>ByKnowledgeId</fieldName>
+      </dependency>
       <children>
         <entityParameter>
           <name>KnowledgeId_param</name>
           <valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/discussionsbyknowledgeid/children/knowledgeid_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KnowledgeDiscussion_entity</entityName>
-        <fieldName>ByKnowledgeId</fieldName>
-      </dependency>
     </entityConsumer>
     <entityProvider>
       <name>Provider</name>
@@ -151,37 +151,42 @@
     </entityConsumer>
     <entityConsumer>
       <name>KeywordKnowledgeType</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
       <children>
         <entityParameter>
           <name>ContainerName_param</name>
           <valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/keywordknowledgetype/children/containername_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
+    </entityConsumer>
+    <entityConsumer>
+      <name>KeywordPublish</name>
       <dependency>
         <name>dependency</name>
         <entityName>KeywordEntry_entity</entityName>
         <fieldName>SpecificContainerKeywords</fieldName>
       </dependency>
-    </entityConsumer>
-    <entityConsumer>
-      <name>KeywordPublish</name>
       <children>
         <entityParameter>
           <name>ContainerName_param</name>
           <valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/keywordpublish/children/containername_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
     </entityConsumer>
     <entityField>
       <name>indexTag</name>
     </entityField>
     <entityConsumer>
       <name>LinkedDocuments</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Document_entity</entityName>
+        <fieldName>Documents</fieldName>
+      </dependency>
       <children>
         <entityParameter>
           <name>AssignmentTable_param</name>
@@ -192,11 +197,6 @@
           <valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/linkeddocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Document_entity</entityName>
-        <fieldName>Documents</fieldName>
-      </dependency>
     </entityConsumer>
     <entityActionField>
       <name>openEntryAsMail</name>
@@ -210,17 +210,17 @@
     <entityConsumer>
       <name>LinksByKnowledgeId</name>
       <refreshParent v="true" />
+      <dependency>
+        <name>dependency</name>
+        <entityName>KnowledgeLink_entity</entityName>
+        <fieldName>ByKnowledgeId</fieldName>
+      </dependency>
       <children>
         <entityParameter>
           <name>KnowledgeManagementId_param</name>
           <valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/linksbyknowledgeid/children/knowledgemanagementid_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KnowledgeLink_entity</entityName>
-        <fieldName>ByKnowledgeId</fieldName>
-      </dependency>
     </entityConsumer>
     <entityField>
       <name>LastChange</name>
@@ -229,17 +229,17 @@
     </entityField>
     <entityConsumer>
       <name>LogHistories</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>LogHistory_entity</entityName>
+        <fieldName>LogHistoryProvider</fieldName>
+      </dependency>
       <children>
         <entityParameter>
           <name>tablenames_param</name>
           <valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
-      <dependency>
-        <name>dependency</name>
-        <entityName>LogHistory_entity</entityName>
-        <fieldName>LogHistoryProvider</fieldName>
-      </dependency>
     </entityConsumer>
     <entityActionField>
       <name>exportHTML_action</name>
@@ -281,6 +281,11 @@
       <name>KnowledgeRoles</name>
       <stateProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/knowledgeroles/stateProcess.js</stateProcess>
       <onValidation>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/knowledgeroles/onValidation.js</onValidation>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KnowledgeRole_entity</entityName>
+        <fieldName>KnowledgeRole</fieldName>
+      </dependency>
       <children>
         <entityParameter>
           <name>KnowledgeManagement_param</name>
@@ -292,14 +297,14 @@
           <expose v="true" />
         </entityParameter>
       </children>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KnowledgeRole_entity</entityName>
-        <fieldName>KnowledgeRole</fieldName>
-      </dependency>
     </entityConsumer>
     <entityConsumer>
       <name>Tasks</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>Tasks</fieldName>
+      </dependency>
       <children>
         <entityParameter>
           <name>ObjectId_param</name>
@@ -314,11 +319,6 @@
           <valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Task_entity</entityName>
-        <fieldName>Tasks</fieldName>
-      </dependency>
     </entityConsumer>
     <entityField>
       <name>RESPONSIBLE_CONTACT_ID</name>
@@ -353,6 +353,7 @@
       <orderClauseProcess>%aditoprj%/entity/KnowledgeManagement_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
       <onDBInsert>%aditoprj%/entity/KnowledgeManagement_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
       <onDBUpdate>%aditoprj%/entity/KnowledgeManagement_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+      <onDBDelete>%aditoprj%/entity/KnowledgeManagement_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
       <alias>Data_alias</alias>
       <recordFieldMappings>
         <dbRecordFieldMapping>
diff --git a/entity/KnowledgeManagement_entity/recordcontainers/db/onDBDelete.js b/entity/KnowledgeManagement_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..2a22a7d643f73469bf2c7b64e3a770c378cb0bae
--- /dev/null
+++ b/entity/KnowledgeManagement_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,3 @@
+import("Document_lib");
+
+DocumentUtil.deleteAllUploadedImages("CONTENT_IMAGE_UPLOAD");
\ No newline at end of file
diff --git a/entity/Lead_entity/Lead_entity.aod b/entity/Lead_entity/Lead_entity.aod
index f4f73b84ea74b558b60dc4df4fc0f0a4993ac336..dd2b1c8875313da3a241831f7b0ef16ce97f72c4 100644
--- a/entity/Lead_entity/Lead_entity.aod
+++ b/entity/Lead_entity/Lead_entity.aod
@@ -66,7 +66,7 @@
       <expose v="true" />
     </entityParameter>
     <entityField>
-      <name>LEADID</name>
+      <name>LEADSID</name>
     </entityField>
     <entityField>
       <name>LEAD_SOURCE</name>
@@ -134,88 +134,88 @@
       <recordFieldMappings>
         <dbRecordFieldMapping>
           <name>LEAD_ADDRESS.value</name>
-          <recordfield>LEAD.ADDRESS</recordfield>
+          <recordfield>LEADS.ADDRESS</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_CITY.value</name>
-          <recordfield>LEAD.CITY</recordfield>
+          <recordfield>LEADS.CITY</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_COUNTRY.value</name>
-          <recordfield>LEAD.COUNTRY</recordfield>
+          <recordfield>LEADS.COUNTRY</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_FIRSTNAME.value</name>
-          <recordfield>LEAD.FIRSTNAME</recordfield>
+          <recordfield>LEADS.FIRSTNAME</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_LASTNAME.value</name>
-          <recordfield>LEAD.LASTNAME</recordfield>
+          <recordfield>LEADS.LASTNAME</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_NAME.value</name>
-          <recordfield>LEAD.NAME</recordfield>
+          <recordfield>LEADS.NAME</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_SALUTATION.value</name>
-          <recordfield>LEAD.SALUTATION</recordfield>
+          <recordfield>LEADS.SALUTATION</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_TITLE.value</name>
-          <recordfield>LEAD.TITLE</recordfield>
+          <recordfield>LEADS.TITLE</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_ZIP.value</name>
-          <recordfield>LEAD.ZIP</recordfield>
+          <recordfield>LEADS.ZIP</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>LEADID.value</name>
-          <recordfield>LEAD.LEADID</recordfield>
+          <name>LEADSID.value</name>
+          <recordfield>LEADS.LEADSID</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_SOURCE.value</name>
-          <recordfield>LEAD.SOURCE</recordfield>
+          <recordfield>LEADS.SOURCE</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEADDUP_STATUS.value</name>
-          <recordfield>LEAD.DUPSTATUS</recordfield>
+          <recordfield>LEADS.STATUS</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_PERSON.value</name>
-          <recordfield>LEAD.PERSON_ID</recordfield>
+          <recordfield>LEADS.PERSON_ID</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>LEAD_ORGANISATIONID.value</name>
-          <recordfield>LEAD.ORGANISATION_ID</recordfield>
+          <recordfield>LEADS.ORGANISATION_ID</recordfield>
         </dbRecordFieldMapping>
       </recordFieldMappings>
       <linkInformation>
         <linkInformation>
-          <name>c4a59fcc-2c94-4944-ae57-790a4adcca30</name>
-          <tableName>LEAD</tableName>
-          <primaryKey>LEADID</primaryKey>
+          <name>b0fe187f-a6e9-456b-a523-de40ea2d674d</name>
+          <tableName>LEADS</tableName>
+          <primaryKey>LEADSID</primaryKey>
           <isUIDTable v="true" />
           <readonly v="false" />
         </linkInformation>
diff --git a/entity/Lead_entity/recordcontainers/db/conditionProcess.js b/entity/Lead_entity/recordcontainers/db/conditionProcess.js
index fe9e31415a33cc2ab1916661060c308870f2dc52..898acc9967c48cf5086fcc2c771423fc529151e9 100644
--- a/entity/Lead_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Lead_entity/recordcontainers/db/conditionProcess.js
@@ -1,4 +1,4 @@
 import("system.result");
 import("Sql_lib");
 
-result.string(newWhere("LEAD.LEADIMPORT_ID", "$param.LeadImportId").toString());
\ No newline at end of file
+result.string(newWhere("LEADS.LEADIMPORT_ID", "$param.LeadImportId").toString());
\ No newline at end of file
diff --git a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
index da2f76e57b3a9489eba26332a54159fa4b4df186..52cbc29086bbe33a5df0efb4542ae253ae5fadd3 100644
--- a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
+++ b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
@@ -26,9 +26,9 @@ newWhere("LEADLOG.LEADIMPORT_ID", leadimportId)
     .from("LEADLOG")
     .deleteData();
 
-newWhere("LEAD.LEADIMPORT_ID", leadimportId)
-    .and("LEAD.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
-    .from("LEAD")
+newWhere("LEADS.LEADIMPORT_ID", leadimportId)
+    .and("LEADS.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
+    .from("LEADS")
     .deleteData();
 // Ändern des Status auf Created
 newWhere("LEADIMPORT.LEADIMPORTID", leadimportId).updateData(true, "LEADIMPORT", ["Status"], null, [$KeywordRegistry.importStatus$created()]);
diff --git a/entity/Leadimport_entity/recordcontainers/db/onDBDelete.js b/entity/Leadimport_entity/recordcontainers/db/onDBDelete.js
index 17ff5bbfc50c4ab8b2f59bfa43e530c9f6fbd6dd..0e876c9b6fd38f630f8cd94e0458a6fed6daef8a 100644
--- a/entity/Leadimport_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Leadimport_entity/recordcontainers/db/onDBDelete.js
@@ -27,7 +27,7 @@ if(leadImportId != "")//delete the connected importfields und der Mappings
 {
     newWhere("IMPORTFIELD.LEADIMPORT_ID", leadImportId).deleteData();
     newWhere("LEADTEMP.ROW_ID", leadImportId).deleteData();
-    newWhere("LEAD.LEADIMPORT_ID", leadImportId).deleteData();
+    newWhere("LEADS.LEADIMPORT_ID", leadImportId).deleteData();
     newWhere("LEADLOG.LEADIMPORT_ID", leadImportId).deleteData();
     newWhere("LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID", leadImportId).deleteData();
 }
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 4da3974ee653f99c331db00e1c7f75c28d293d0c..3ed24f67b2903c81146143771493d99ded25fb2c 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -66,7 +66,7 @@
     </entityField>
     <entityField>
       <name>DEST_OBJECT_TYPE</name>
-      <title>Context 2</title>
+      <title>Object type 2</title>
       <consumer>Contexts</consumer>
       <mandatoryProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/mandatoryProcess.js</mandatoryProcess>
       <stateProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/stateProcess.js</stateProcess>
@@ -74,7 +74,7 @@
     </entityField>
     <entityField>
       <name>SOURCE_OBJECT_TYPE</name>
-      <title>Context 1</title>
+      <title>Object type 1</title>
       <consumer>Contexts</consumer>
       <mandatory v="true" />
       <stateProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/source_object_type/stateProcess.js</stateProcess>
@@ -104,8 +104,19 @@
       <dependency>
         <name>dependency</name>
         <entityName>Context_entity</entityName>
-        <fieldName>Context</fieldName>
+        <fieldName>Exclusive</fieldName>
       </dependency>
+      <children>
+        <entityParameter>
+          <name>Blacklist_param</name>
+          <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/contexts/children/blacklist_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>InvertBlacklist_param</name>
+          <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
+          <documentation>%aditoprj%/entity/ObjectRelationType_entity/entityfields/contexts/children/invertblacklist_param/documentation.adoc</documentation>
+        </entityParameter>
+      </children>
     </entityConsumer>
     <entityField>
       <name>Type2Enabled_proxy</name>
diff --git a/entity/ObjectRelationType_entity/entityfields/contexts/children/blacklist_param/valueProcess.js b/entity/ObjectRelationType_entity/entityfields/contexts/children/blacklist_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a4c5350f954c8e1c2dc5a468fe8dcef540c2bd5c
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/contexts/children/blacklist_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(JSON.stringify(["Organisation", "Person"]));
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js b/entity/ObjectRelationType_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e5bfa3bbe7f58d2ffaf401248014a6d1a560d2de
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("true");
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index f3a46c5839d338501ef343806fcf249244a0490a..462a0a7c1575adc31562f0b6d1ce1965be3f8a34 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -18,6 +18,7 @@
       <name>TreeProvider</name>
       <targetContextField>TARGET_CONTEXT</targetContextField>
       <targetIdField>TARGET_ID</targetIdField>
+      <documentation>%aditoprj%/entity/ObjectTree_entity/entityfields/treeprovider/documentation.adoc</documentation>
       <dependencies>
         <entityDependency>
           <name>f4c0605f-3ccb-4ff1-b460-7268e8553857</name>
diff --git a/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js b/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js
index cd4083fad2fbb15ab6da846ce70808957582da6a..3e02447bb646e02e5628d0c43c8846e53dfc1bf3 100644
--- a/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js
+++ b/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js
@@ -6,8 +6,5 @@ import("ObjectRelation_lib");
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
 {
     var relationType = ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"));
-    if(relationType[3] == "reverse")
-        result.string(ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"))[5]);
-    else
-        result.string(ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"))[6]);
+    result.string(ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"))[6]);
 }
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/treeprovider/documentation.adoc b/entity/ObjectTree_entity/entityfields/treeprovider/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..3129116b5e8fc4593aba491b1c1f30feee06fbba
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/treeprovider/documentation.adoc
@@ -0,0 +1,3 @@
+Provides the data, which is needed for building the tree,
+which represents the relation between persons and organisations 
+(e.g.: person A "supports" person B and person B is "supported by" person A).
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 2e4d0172c3a4491f7491084b6f429aa92ebedfd3..88bd70bb61268202870e04752703dac9ca3f348d 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -75,12 +75,12 @@
     <entityField>
       <name>PROBABILITY</name>
       <title>Probability</title>
+      <consumer>KeywordProbabilityOffer</consumer>
       <contentType>NUMBER</contentType>
       <maxValue v="100" />
       <minValue v="0" />
-      <outputFormat>0.00'%'</outputFormat>
+      <outputFormat>0'%'</outputFormat>
       <groupable v="true" />
-      <dropDownProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/dropDownProcess.js</dropDownProcess>
       <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/valueProcess.js</valueProcess>
     </entityField>
@@ -1158,6 +1158,20 @@
       <name>TaskId_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityConsumer>
+      <name>KeywordProbabilityOffer</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordprobabilityoffer/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Offer_entity/entityfields/keywordprobabilityoffer/children/containername_param/valueProcess.js b/entity/Offer_entity/entityfields/keywordprobabilityoffer/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..919d72f4949f84b002bbb10f270a96245d081ce4
--- /dev/null
+++ b/entity/Offer_entity/entityfields/keywordprobabilityoffer/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.probabilityOffer());
diff --git a/entity/Offer_entity/entityfields/probability/dropDownProcess.js b/entity/Offer_entity/entityfields/probability/dropDownProcess.js
deleted file mode 100644
index 0ce6525ee92048543d83d251c2b289e710aa5e01..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/probability/dropDownProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-
-result.object([
-    ["0.00", "0%"],
-    ["25.00", "25%"],
-    ["50.00", "50%"],
-    ["75.00", "75%"],
-    ["100.00", "100%"]
-]);
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 4b11ba39e18f534dfcccf3a4fe05a4679f04416c..6b565529443f73da3bcaf29879476f274b13e90d 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -127,7 +127,6 @@
       <contentType>NUMBER</contentType>
       <outputFormat>0.00'%'</outputFormat>
       <inputFormat>0.00</inputFormat>
-      <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/vat/valueProcess.js</valueProcess>
     </entityField>
     <entityParameter>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 090bc46b1ac2b2383882f5ccdd94f06126ba58f1..5bf30a370aea27cc13f3d838275082c0b9d58d0f 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -175,6 +175,7 @@
       <consumer>Languages</consumer>
       <groupable v="true" />
       <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/isolanguage/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
@@ -519,6 +520,7 @@
       <mandatory v="true" />
       <mandatoryProcess>%aditoprj%/entity/Order_entity/entityfields/object_rowid/mandatoryProcess.js</mandatoryProcess>
       <titleProcess>%aditoprj%/entity/Order_entity/entityfields/object_rowid/titleProcess.js</titleProcess>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
       <onValueChangeTypes>
         <element>MASK</element>
diff --git a/entity/Order_entity/entityfields/contact_id/onValueChange.js b/entity/Order_entity/entityfields/contact_id/onValueChange.js
index 65ebe4338bb6690dbd09b396c412410910ede21a..f9eb528b6dc9d3dbd8d3a99ccaee424ebba0d4d7 100644
--- a/entity/Order_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Order_entity/entityfields/contact_id/onValueChange.js
@@ -32,7 +32,7 @@ if(contactId != "")
         neon.setFieldValue("$field.DELIVERYADDRESS", AddressUtils.getAddressById(defaultAddressId));
     }
     
-    var cond;hal
+    var cond;
     if(ContactUtils.isPersonOfOrganisation(contactId))//change contactId to contactId of organisation if needed
     {
         contactId = newSelect("CONTACT.CONTACTID")
diff --git a/entity/Order_entity/entityfields/isolanguage/valueProcess.js b/entity/Order_entity/entityfields/isolanguage/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..34f97d72165af718a0fc01e553581ab7167c8feb
--- /dev/null
+++ b/entity/Order_entity/entityfields/isolanguage/valueProcess.js
@@ -0,0 +1,16 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value") && vars.get("$field.CONTACT_ID"))
+{
+    var lang = newSelect("ISOLANGUAGE")
+                    .from("CONTACT")
+                    .where("CONTACT.CONTACTID", vars.get("$field.CONTACT_ID"))
+                    .cell();
+    if(lang != "") 
+    {
+        result.string(lang);
+    }
+}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/object_rowid/valueProcess.js b/entity/Order_entity/entityfields/object_rowid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2d2ca846a93d9699b21edd9cd1b1588ee72d7fdd
--- /dev/null
+++ b/entity/Order_entity/entityfields/object_rowid/valueProcess.js
@@ -0,0 +1,37 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Contact_lib");
+import("Sql_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+    var contactId = vars.get("$field.CONTACT_ID");
+    if(contactId)
+    {
+        if(ContactUtils.isPersonOfOrganisation(contactId))//change contactId to contactId of organisation if needed
+        {
+            contactId = newSelect("CONTACT.CONTACTID")
+                                .from("CONTACT")
+                                .where("CONTACT.ORGANISATION_ID", newSelect("CONTACT.ORGANISATION_ID")
+                                                                    .from("CONTACT")
+                                                                    .where("CONTACT.CONTACTID", contactId)
+                                                                    .cell())
+                                .and("CONTACT.PERSON_ID is null")
+                                .cell();
+        }
+
+        if(contactId)
+        {
+            //Salesproject Preset
+            var salesProjectIds = newSelect("SALESPROJECT.SALESPROJECTID")
+                                            .from("SALESPROJECT")
+                                            .where("SALESPROJECT.CONTACT_ID",  contactId)
+                                            .arrayColumn();
+            if(salesProjectIds.length == 1)
+            {
+                result.string(salesProjectIds[0]);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index e0b542fa6018fa159f9893c39c7452b98f2dd6c9..d851c8dec53bebe5cea879c60586c91464788af6 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -954,25 +954,11 @@
       <name>OnlyOwnSupervised_param</name>
       <expose v="true" />
     </entityParameter>
-    <entityConsumer>
-      <name>CommRestrictions</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CommRestriction_Entity</entityName>
-        <fieldName>CommRestrictions</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/commrestrictions/children/contactid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
     <entityField>
       <name>COMMRESTRICTIONS_ACTIVE</name>
       <title>Commrestrictions</title>
       <color>$priority-high-color</color>
-      <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/commrestrictions_active/displayValueProcess.js</displayValueProcess>
+      <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/commrestrictions_active/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>STANDARD_ADDRESS</name>
@@ -1481,6 +1467,20 @@
         <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
+    <entityConsumer>
+      <name>ContactCommunicationSettings</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>CommunicationSettings_entity</entityName>
+        <fieldName>SettingsForContact</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContactId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -1652,7 +1652,6 @@
         </consumerMapping>
         <dbRecordFieldMapping>
           <name>COMMRESTRICTIONS_ACTIVE.value</name>
-          <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/commrestrictions_active.value/expression.js</expression>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STANDARD_ADDRESS.value</name>
diff --git a/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js b/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
index aee05ab473a438d99830659e02d26be864a17c3f..8ab26e2080a446436766c55a45e57659f81f7af6 100644
--- a/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
@@ -5,6 +5,9 @@ import("system.result");
 var contactids = newSelect( "CONTACTID" )
         .from("CONTACT")
         .where("CONTACT.ORGANISATION_ID", vars.getString("$field.ORGANISATIONID"))
-        .orderBy("CONTACT.PERSON_ID DESC").arrayColumn();
+        // ordering is necessary because the 360DegreeObject_entity will use the first
+        // entry as default for creating offers, salesprojects and so on
+        .orderBy(new SqlMaskingUtils().isNull("PERSON_ID", "'0'"))
+        .arrayColumn();
 
 result.string( JSON.stringify(contactids) );
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/commrestrictions/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/commrestrictions/children/contactid_param/valueProcess.js
deleted file mode 100644
index 08da3b121c951607015025c5ed6ea3ea8de1a4cb..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/commrestrictions/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/commrestrictions_active/displayValueProcess.js b/entity/Organisation_entity/entityfields/commrestrictions_active/displayValueProcess.js
deleted file mode 100644
index 7ab26545fc8d0bb63d06c4382eca2e3ea68e0971..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/commrestrictions_active/displayValueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-if (vars.get("$field.COMMRESTRICTIONS_ACTIVE").trim())
-{                                                 // bug in SqlMaskingUtils.concat. -> use " " as seperator and replace " " by ", "
-    result.string(translate.text("No advertising by") + " " + ((vars.get("$field.COMMRESTRICTIONS_ACTIVE")).trim()).replace("/ +/g", ", "));
-}
diff --git a/entity/Organisation_entity/entityfields/commrestrictions_active/valueProcess.js b/entity/Organisation_entity/entityfields/commrestrictions_active/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..eb0180412d1da157d1c0c7c2b6cc9de3818d508b
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/commrestrictions_active/valueProcess.js
@@ -0,0 +1,9 @@
+import("Contact_lib");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
+{
+    result.string(ContactUtils.getCommunicationRejectionSummary(vars.get("$field.CONTACTID")));
+}
diff --git a/entity/Organisation_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7b6137b4d105e9ba592cf8ef6e796fb838a32b09
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/commrestrictions_active.value/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/commrestrictions_active.value/expression.js
deleted file mode 100644
index 5c633cb5d6343c9ab5546304ab34410b8062adc5..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/commrestrictions_active.value/expression.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Contact_lib");
-import("system.result");
-
-result.string(ContactUtils.getActiveCommRestrictionsSubselect());
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 308a22e1ef75d0cb10729aac9523990c8a024689..1426af8122b324117a06abacfc727d9d6882f1b5 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -874,20 +874,6 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
-    <entityConsumer>
-      <name>CommRestrictions</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>CommRestriction_Entity</entityName>
-        <fieldName>CommRestrictions</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/commrestrictions/children/contactid_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
     <entityConsumer>
       <name>DSGVOEntries</name>
       <stateProcess>%aditoprj%/entity/Person_entity/entityfields/dsgvoentries/stateProcess.js</stateProcess>
@@ -953,8 +939,7 @@
       <name>COMMRESTRICTIONS_ACTIVE</name>
       <title>Commrestrictions</title>
       <color>$priority-high-color</color>
-      <groupable v="true" />
-      <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/commrestrictions_active/displayValueProcess.js</displayValueProcess>
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/commrestrictions_active/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>STANDARD_ZIP</name>
@@ -1632,7 +1617,6 @@
         </consumerMapping>
         <dbRecordFieldMapping>
           <name>COMMRESTRICTIONS_ACTIVE.value</name>
-          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/commrestrictions_active.value/expression.js</expression>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STANDARD_ADDRESS.value</name>
@@ -1707,6 +1691,9 @@
           <isFilterable v="true" />
           <filtertype>EXTENDED</filtertype>
         </consumerMapping>
+        <consumerMapping>
+          <name>ContactCommunicationSettings</name>
+        </consumerMapping>
       </recordFieldMappings>
       <linkInformation>
         <linkInformation>
diff --git a/entity/Person_entity/entityfields/commrestrictions/children/contactid_param/valueProcess.js b/entity/Person_entity/entityfields/commrestrictions/children/contactid_param/valueProcess.js
deleted file mode 100644
index 375a85e730194ab84d2caa83bb173dd1131e8b10..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/commrestrictions/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/commrestrictions_active/displayValueProcess.js b/entity/Person_entity/entityfields/commrestrictions_active/displayValueProcess.js
deleted file mode 100644
index 89026aeebe7406ed9dd9fb3b6e618c9cb6dac561..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/commrestrictions_active/displayValueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-if (vars.get("$field.COMMRESTRICTIONS_ACTIVE").trim())
-{                                                 // bug in SqlMaskingUtils.concat. -> use " " as seperator and replace " " by ", "
-    result.string(translate.text("No advertising by") + " " + ((vars.get("$field.COMMRESTRICTIONS_ACTIVE")).trim()).replace(/ +/g, ", "));
-}
diff --git a/entity/Person_entity/entityfields/commrestrictions_active/valueProcess.js b/entity/Person_entity/entityfields/commrestrictions_active/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..eb0180412d1da157d1c0c7c2b6cc9de3818d508b
--- /dev/null
+++ b/entity/Person_entity/entityfields/commrestrictions_active/valueProcess.js
@@ -0,0 +1,9 @@
+import("Contact_lib");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
+{
+    result.string(ContactUtils.getCommunicationRejectionSummary(vars.get("$field.CONTACTID")));
+}
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/commrestrictions_active.value/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/commrestrictions_active.value/expression.js
deleted file mode 100644
index 5c633cb5d6343c9ab5546304ab34410b8062adc5..0000000000000000000000000000000000000000
--- a/entity/Person_entity/recordcontainers/db/recordfieldmappings/commrestrictions_active.value/expression.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Contact_lib");
-import("system.result");
-
-result.string(ContactUtils.getActiveCommRestrictionsSubselect());
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 0acf3ef262439b9abf72d47cb858eac6817b1f60..56050bde20f8453297db4f0728dc93d0f8c05734 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -5,7 +5,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation>
   <titlePlural>Parts list</titlePlural>
-  <recordContainer>jdito</recordContainer>
+  <recordContainer>jDito</recordContainer>
   <entityFields>
     <entityProvider>
       <name>#PROVIDER</name>
@@ -23,10 +23,6 @@
       <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/valueProcess.js</valueProcess>
       <onValueChange>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/onValueChange.js</onValueChange>
     </entityField>
-    <entityField>
-      <name>UID</name>
-      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/uid/valueProcess.js</valueProcess>
-    </entityField>
     <entityField>
       <name>QUANTITY</name>
       <title>Quantity</title>
@@ -42,7 +38,6 @@
       <title>Product</title>
       <consumer>Products</consumer>
       <mandatory v="true" />
-      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/source_id/valueProcess.js</valueProcess>
       <onValueChange>%aditoprj%/entity/Prod2prod_entity/entityfields/source_id/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
@@ -60,7 +55,6 @@
     </entityParameter>
     <entityField>
       <name>PROD2PRODID</name>
-      <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/prod2prodid/valueProcess.js</valueProcess>
     </entityField>
     <entityProvider>
       <name>ProductLinks</name>
@@ -138,9 +132,6 @@
       <title>Unit</title>
       <state>READONLY</state>
     </entityField>
-    <entityField>
-      <name>vat</name>
-    </entityField>
     <entityField>
       <name>currentPurchasePrice</name>
       <title>Curr. purchase price</title>
@@ -151,13 +142,17 @@
       <title>Curr. sales price</title>
       <state>READONLY</state>
     </entityField>
+    <entityField>
+      <name>PARENT_ID</name>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
-      <name>jdito</name>
+      <name>jDito</name>
       <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
-      <isRequireContainerFiltering v="true" />
-      <isSortable v="true" />
       <contentProcess>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <hasDependentRecords v="true" />
       <onInsert>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onInsert.js</onInsert>
@@ -168,22 +163,22 @@
           <name>UID.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
-          <name>SOURCE_ID.value</name>
+          <name>PROD2PRODID.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
-          <name>DEST_ID.value</name>
+          <name>PARENT_ID.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
-          <name>QUANTITY.value</name>
+          <name>SOURCE_ID.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
-          <name>PRODUCTCODE.value</name>
+          <name>SOURCE_ID.displayValue</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
-          <name>PRODUCTID.value</name>
+          <name>DEST_ID.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
-          <name>PROD2PRODID.value</name>
+          <name>QUANTITY.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>OPTIONAL.value</name>
@@ -192,11 +187,17 @@
           <name>TAKEPRICE.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
-          <name>SOURCE_ID.displayValue</name>
+          <name>PRODUCTID.value</name>
+        </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PRODUCTCODE.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>unit.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>unit.displayValue</name>
+        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>currentPurchasePrice.value</name>
         </jDitoRecordFieldMapping>
diff --git a/entity/Prod2prod_entity/entityfields/prod2prodid/valueProcess.js b/entity/Prod2prod_entity/entityfields/prod2prodid/valueProcess.js
deleted file mode 100644
index 86ef789e064a4016f2d12c432498dc23474807aa..0000000000000000000000000000000000000000
--- a/entity/Prod2prod_entity/entityfields/prod2prodid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/entityfields/source_id/valueProcess.js b/entity/Prod2prod_entity/entityfields/source_id/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Prod2prod_entity/entityfields/uid/valueProcess.js b/entity/Prod2prod_entity/entityfields/uid/valueProcess.js
deleted file mode 100644
index 884a038bbce84aa5a3bc93ac65bc962fd93f468d..0000000000000000000000000000000000000000
--- a/entity/Prod2prod_entity/entityfields/uid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.object([util.getNewUUID(), vars.get("$field.PROD2PRODID")]); // 1. is some random uid for uniqueness 2. is the prod2ProdID
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
index fb53ccb23f6522117378f94c664f60efbbf33c78..a65c4e001eedff9fc05cf32b52ec2be79445d73e 100644
--- a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
@@ -1,218 +1,76 @@
+import("Product_lib");
 import("system.text");
-import("KeywordRegistry_basic");
-import("Keyword_lib");
-import("Sql_lib");
 import("system.neon");
-import("system.result");
 import("system.vars");
-import("system.db");
-import("system.util");
-import("Product_lib");
-
-/**
- * Calculate the root elements for this tree.
- * 
- * @param productRootID string
- * @param rows TreeData[]
- * @return string[]
- */
-function calculateRootElements (productRootID, rows) {
-   return rows.filter(function (row) {
-       // Filter predicate if the DIST_ID matches.
-      return row[2] === productRootID;
-   }).map(function (row) {
-       // Map to PROD2PROD_ID.
-       return row[0];
-   });
-}
-
-/**
-* Calculates a mapping object which has the PROD2PROD_ID as
-* key and the full TreeData array as value.
-* 
-* @param rows TreeData[]
-* @return {[key: TreeData]}
-*/
-function buildProd2ProdIDMapping (rows) {
-    var mapping = {}
-    
-    rows.forEach(function(row) {
-        // Create new property which PROD2PROD_ID as key and data
-        // as value.
-       mapping[row[0]] = row;
-    });
-    
-    return mapping;
-}
-
-/**
- * Calcualtes the children mapping structure which has the DIST_ID
- * as key and an array of PROD2PROD_IDs as value.
- *
- * @param rows TreeData[]
- * @return {[key: string[]]}
- */
-function buildChildrenMapping(rows) {
-    var parrentMapping = {}
-    
-    rows.forEach(function (row) {
-        // Create empty array if not created previously.
-        if (parrentMapping[row[2]] === undefined)
-          parrentMapping[row[2]] = []
-      
-      // Push with DIST_ID as key and PROD2PROD_ID as value.
-      parrentMapping[row[2]].push(row[0]);
-    })
-    
-    return parrentMapping
-}
-
-/**
- * Calculates the graph starting from the given elementID.
- */
-function buildGraph (elementID, parentElementID, mappingStructure, prod2prodIdMapping) {
-    var elements = []
- 
-    // Get the PROD2PROD data array and copy it.
-    // Copying is requried due to mutability of arrays.
-    var elementData = prod2prodIdMapping[elementID].slice(0);
-    
-    // Just as an error prevention.
-    if (elementData === undefined)
-        return elements;
-    
-    // Generate new PROD2PROD_ID to create a uniqueness between the PROD2PROD objects.
-    var virtualProd2ProdId = util.getNewUUID();
-    
-    // Override actual PROD2PROD_ID with new ID.
-    elementData[0] = JSON.stringify([virtualProd2ProdId, elementData[0]]);
- 
-    // Override parent id to match overriden prod2prodId of parent
-    if (parentElementID === null || parentElementID === undefined)
-        // Describes an root element
-        elementData[2] = null;
-    else
-        elementData[2] = parentElementID;
- 
-    // Push element data to elements array of this graph.
-    elements.push(elementData);
-
-    // Search for children
-    var childrens = mappingStructure[elementData[1]];
+import("system.result");
+import("Sql_lib");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
 
-    if (childrens !== undefined && childrens.length > 0) {
-        // Build graph for each children
+var query = newSelect([
+    "PROD2PROD.PROD2PRODID",                // UID.value
+    "PROD2PROD.PROD2PRODID",                // PROD2PRODID.value
+    "''",                                   // PARENT_ID.value
+    "PROD2PROD.SOURCE_ID",                  // SOURCE_ID.value
+    "PRODUCT.PRODUCTNAME",                  // SOURCE_ID.displaValue
+    "PROD2PROD.DEST_ID",                    // DEST_ID.value
+    "PROD2PROD.QUANTITY",                   // QUANTITY.value
+    "PROD2PROD.OPTIONAL",                   // OPTIONAL.value
+    "PROD2PROD.TAKEPRICE",                  // TAKEPRICE.value
+    "PRODUCT.PRODUCTID",                    // PRODUCT.value
+    "PRODUCT.PRODUCTCODE",                  // PRODUCTCODE.value
+    "PRODUCT.UNIT",                         // unit.value
+    KeywordUtils.getResolvedTitleSqlPart(   // unit.displaValue
+        $KeywordRegistry.quantityUnit(),
+        "PRODUCT.UNIT"
+    )
+]).from("PROD2PROD")
+.join("PRODUCT", "PRODUCT.PRODUCTID = PROD2PROD.SOURCE_ID");
 
-        childrens.forEach(function(children) {
-            // Recursive function call (!)
-            
-            var graphResult = buildGraph(children, elementData[0], mappingStructure, prod2prodIdMapping);
-            
-            graphResult.forEach(function(res) {elements.push(res)})
-        });
+function _returnData(data) {
+    for(let i = 0; i < data.length; i++)
+    {
+        var productId = data[3];
+        
+        // currentPurchasePrice.value
+        var purchasePrice = ProductUtils.getCurrentProductPrice(productId, "PP", true);
+        data[i].push(
+            purchasePrice.length == 0 ? "" :
+            text.formatDouble(purchasePrice[0], "#,##0.00", true) + " " + purchasePrice[1]
+        );
+        
+        // currentSalesPrice.value
+        var salesPrice = ProductUtils.getCurrentProductPrice(productId, "SP", true);
+        data[i].push(
+            salesPrice.length == 0 ? "" :
+            text.formatDouble(salesPrice[0], "#,##0.00", true) + " " + salesPrice[1]
+        );
     }
-
-    return elements;
+    result.object(data);
 }
 
-/*
- * in the past at this point a check for the "recordstate" was done
- * this should not be necessery and in fact causes a problem:
- * When adding a new prod2prod entry and performing a cancel an error is raised that the variable does not exist.
- * 
- * So *IF* you need that check for the state, you should check if this error is thrown 
- * + add a comment why the check is needed here instead of this current comment
- */
-
-if (vars.get("$local.idvalues") && vars.get("$local.idvalues").length > 0)
+if(vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
 {
-    var prod2prodId = JSON.parse(vars.get("$local.idvalues")[0])[1];
-    if (prod2prodId)
-    {
-        var prodData = newSelect(["PROD2PROD.PROD2PRODID", 
-                                    "PROD2PROD.SOURCE_ID", 
-                                    "PROD2PROD.DEST_ID", 
-                                    "PROD2PROD.QUANTITY", 
-                                    "PRODUCT.PRODUCTCODE", 
-                                    "PRODUCT.PRODUCTID", 
-                                    "PROD2PROD.PROD2PRODID", 
-                                    "PROD2PROD.OPTIONAL", 
-                                    "PROD2PROD.TAKEPRICE", 
-                                    "PRODUCT.PRODUCTNAME",
-                                    KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.quantityUnit(), "PRODUCT.UNIT")])
-                        .from("PROD2PROD")
-                        .join("PRODUCT", "PROD2PROD.SOURCE_ID = PRODUCTID")
-                        .where("PROD2PROD.PROD2PRODID", prod2prodId)
-                        .arrayRow();
-                        
-        prodData[0] = vars.get("$local.idvalues")[0]; //only first one since whe have single selection as the selection mode
-        prodData[11] = "";
-        prodData[12] = "";
-
-        let purchasePrice = ProductUtils.getCurrentProductPrice(prodData[5], "PP", true);
-        if (purchasePrice.length > 0)
-        {
-            prodData[11] = text.formatDouble(purchasePrice[0], "#,##0.00", true) + " " + purchasePrice[1];
-        }
-        
-        let salesPrice = ProductUtils.getCurrentProductPrice(prodData[5], "SP", true);
-        if (salesPrice.length > 0)
-        {
-            prodData[12] = text.formatDouble(salesPrice[0], "#,##0.00", true) + " " + salesPrice[1];
-        }
-        result.object([prodData]);
-    }
+    _returnData(query.where("PROD2PROD.PROD2PRODID", vars.get("$local.idvalues"), SqlBuilder.IN()).table());
 }
 else
 {
-    var prodid = vars.exists("$param.ProductId_param") 
-             && vars.get("$param.ProductId_param") != null ? vars.get("$param.ProductId_param") : "";
-    if(prodid != "")
+    var prod2prod = query.table();
+    function _getChilds(pId, pProductId, pMaxRecursion)
     {
-        // First 3 columns are crucial, the rest is optional.
-        var data = newSelect(["PROD2PROD.PROD2PRODID",
-                                "PROD2PROD.SOURCE_ID", 
-                                "PROD2PROD.DEST_ID", 
-                                "PROD2PROD.QUANTITY", 
-                                "PRODUCT.PRODUCTCODE",
-                                "PRODUCT.PRODUCTID", 
-                                "PROD2PROD.PROD2PRODID", 
-                                "PROD2PROD.OPTIONAL", 
-                                "PROD2PROD.TAKEPRICE", 
-                                "PRODUCT.PRODUCTNAME",
-                                KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.quantityUnit(), "PRODUCT.UNIT")])
-            .from("PROD2PROD")
-            .join("PRODUCT", "PROD2PROD.SOURCE_ID = PRODUCTID")
-            .orderBy("PRODUCTCODE")
-            .table();
-
-        var prod2prodIdMapping = buildProd2ProdIDMapping(data);
-        var childrenMapping = buildChildrenMapping(data);
-        var rootElements = calculateRootElements(prodid, data);
-
-        var allData = [];
-
-        rootElements.forEach(function(rg) {
-            var graphData = buildGraph(rg, null, childrenMapping, prod2prodIdMapping)
-            graphData.forEach(function (gd) { allData.push(gd); })
-        })
-
-        for (let i = 0; i < allData.length; i++) {
-            allData[i][11] = "";
-            allData[i][12] = "";
-            
-            let purchasePrice = ProductUtils.getCurrentProductPrice(allData[i][5], "PP", true);
-            if (purchasePrice.length > 0)
-            {
-                allData[i][11] = text.formatDouble(purchasePrice[0], "#,##0.00", true) + " " + purchasePrice[1];
-            }
-            
-            let salesPrice = ProductUtils.getCurrentProductPrice(allData[i][5], "SP", true);
-            if (salesPrice.length > 0)
-            {
-                allData[i][12] = text.formatDouble(salesPrice[0], "#,##0.00", true) + " " + salesPrice[1];
-            }
+        if(pMaxRecursion == 0)
+        {
+            return [];
         }
-        result.object(allData);
+        var items = prod2prod.filter(function(p2p) {
+            return p2p[5] == pProductId;
+        });
+        var itemChilds = [];
+        items.forEach(function(p2p) {
+            p2p[2] = pId;
+            itemChilds.push(_getChilds(p2p[0], p2p[3], pMaxRecursion - 1));
+        });
+        return Array.prototype.concat.apply(items, itemChilds);
     }
-}
\ No newline at end of file
+    _returnData(_getChilds(null, vars.get("$param.ProductId_param"), 20));
+}
diff --git a/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js b/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js
index 94f252cf1229adcd080a63a58a821d873fc3ccc1..7cf6538eadb00ee62b1c3b7096b98fc81ec4bf6d 100644
--- a/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js
@@ -1,3 +1,4 @@
 import("Sql_lib");
+import("system.vars");
 
-newWhereIfSet("PROD2PROD.PROD2PRODID", "$field.PROD2PRODID").deleteData();
\ No newline at end of file
+newWhereIfSet("PROD2PROD.PROD2PRODID", vars.get("$local.uid")).deleteData();
diff --git a/entity/Prod2prod_entity/recordcontainers/jdito/onInsert.js b/entity/Prod2prod_entity/recordcontainers/jdito/onInsert.js
index d1adc28758e4d7e3d9d2c7dcc2e505e54039c03d..2e13aacb363ad913dfe9a7996dcd497d2af308a5 100644
--- a/entity/Prod2prod_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Prod2prod_entity/recordcontainers/jdito/onInsert.js
@@ -10,11 +10,11 @@ var cols = [ "PROD2PRODID"
            , "OPTIONAL"
            , "TAKEPRICE" ];
 
-var vals = [ vars.get("$field.PROD2PRODID")
+var vals = [ vars.get("$local.uid")
            , vars.get("$field.DEST_ID")
            , vars.get("$field.SOURCE_ID")
            , vars.get("$field.QUANTITY")
            , vars.get("$field.OPTIONAL")
            , vars.get("$field.TAKEPRICE") ];
 
-db.insertData("PROD2PROD", cols, null, vals);
\ No newline at end of file
+db.insertData("PROD2PROD", cols, null, vals);
diff --git a/entity/Prod2prod_entity/recordcontainers/jdito/onUpdate.js b/entity/Prod2prod_entity/recordcontainers/jdito/onUpdate.js
index c71a9c41db27fb3478fde565b44b9c5b7643c1c3..a98faf66d87ef816d36d0ac543e1245313c535a8 100644
--- a/entity/Prod2prod_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Prod2prod_entity/recordcontainers/jdito/onUpdate.js
@@ -1,6 +1,5 @@
-import("Sql_lib");
-import("system.datetime");
 import("system.vars");
+import("Sql_lib");
 
 var cols = [ "SOURCE_ID"
            , "QUANTITY"
@@ -12,5 +11,5 @@ var vals = [ vars.get("$field.SOURCE_ID")
            , vars.get("$field.OPTIONAL")
            , vars.get("$field.TAKEPRICE") ];
 
-newWhere("PROD2PROD.PROD2PRODID", "$field.PROD2PRODID")
-    .updateData(true, "PROD2PROD", cols, null, vals);
\ No newline at end of file
+newWhere("PROD2PROD.PROD2PRODID", vars.get("$local.uid"))
+    .updateData(true, "PROD2PROD", cols, null, vals);
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 740f556ee5bee37ebc380a6ef7e9a190f664aaac..7310a2e80ecd721da360acde752796f04736ef1d 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -201,6 +201,7 @@
     </entityProvider>
     <entityConsumer>
       <name>ProductLinks</name>
+      <selectionMode>MULTI</selectionMode>
       <dependency>
         <name>dependency</name>
         <entityName>Prod2prod_entity</entityName>
diff --git a/entity/Productprice_entity/entityfields/contact_id/valueProcess.js b/entity/Productprice_entity/entityfields/contact_id/valueProcess.js
index ebfa36528a52773185f164d4ecd96bc17b6e4a80..f8d1effa944871f3f72c5576a8aa3fa492c202fd 100644
--- a/entity/Productprice_entity/entityfields/contact_id/valueProcess.js
+++ b/entity/Productprice_entity/entityfields/contact_id/valueProcess.js
@@ -5,6 +5,8 @@ import("system.vars");
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
     if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
+    {
         result.string(vars.get("$param.ContactId_param"));    
+    }
 }
 
diff --git a/entity/Productprice_entity/onValidation.js b/entity/Productprice_entity/onValidation.js
index 2d96e9b5c19b0e339f8845561d5d4dac4de746e4..ce0a2761a6c1f43911190e21255145b012f4bafe 100644
--- a/entity/Productprice_entity/onValidation.js
+++ b/entity/Productprice_entity/onValidation.js
@@ -42,24 +42,25 @@ if(vars.getString("$param.IgnoreOnValidation_param") != "true")
         var validTo = vars.get("$field.VALID_TO");
         var currency = vars.get("$field.CURRENCY");
         var productPriceListId = vars.get("$field.PRODUCTPRICEID");
-
+        var quantity = vars.get("$field.FROMQUANTITY");
+        
         var priceListFilter = { currency: currency
-                                , quantity: vars.get("$field.FROMQUANTITY")
+                                , quantity: quantity
                                 , priceList: priceList
                                 , buySell: buySell
                                 , dateFrom: validFrom
                                 , dateTo: validTo};
         var ProductDetails = ProductUtils.getProductDetails(productId, priceListFilter);
 
-        var priceListsToPotentiallyReplace = ProductDetails.CurrentValidPriceLists;
+        var priceListsToPotentiallyReplace = ProductDetails.PriceLists;
         var priceListsToReplace1 = [];
         var priceListsToReplace2 = [];
-        
+
         var showMessage = false;
         for (var valPriceList in priceListsToPotentiallyReplace)
         {
             var currPriceList = priceListsToPotentiallyReplace[valPriceList];
-            if(currPriceList["priceList"] == priceList && currPriceList["buySell"] == buySell)
+            if(currPriceList["priceList"] == priceList && currPriceList["buySell"] == buySell && Number.parseInt(currPriceList["fromQuantity"]) == Number.parseInt(quantity))
             {
                 if(currPriceList["validFrom"] > validFrom && ((validTo == undefined || validTo == "") || 
                         (currPriceList["validTo"] != undefined && currPriceList["validTo"] != "" && currPriceList["validTo"] < validTo)))
@@ -72,6 +73,11 @@ if(vars.getString("$param.IgnoreOnValidation_param") != "true")
                     showMessage = true;
                     break;
                 }
+                else if(currPriceList["validFrom"] == validFrom && validTo == currPriceList["validTo"])
+                {
+                    showMessage = true;
+                    break;
+                }
             }
         }
         if(showMessage)
diff --git a/entity/Productprice_entity/recordcontainers/db/onDBInsert.js b/entity/Productprice_entity/recordcontainers/db/onDBInsert.js
index 62b572aaab1fd35c0b53c327d4d4f9a9b174d3dd..a67c60ee19fba912c468b6399be24380ea0312a3 100644
--- a/entity/Productprice_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Productprice_entity/recordcontainers/db/onDBInsert.js
@@ -35,11 +35,17 @@ var currency = vars.get("$field.CURRENCY");
 var oneDayPrior = eMath.subInt(validFrom, datetime.ONE_DAY);
 var oneDayAfter = eMath.addInt(validTo, datetime.ONE_DAY);
 var productPriceListId = vars.get("$field.PRODUCTPRICEID");
+var quantity = vars.get("$field.FROMQUANTITY");
 
-var PriceListFilter = { currency: currency, quantity: vars.get("$field.FROMQUANTITY"), priceList: priceList, buySell: buySell, dateFrom: validFrom, dateTo: validTo};
+var PriceListFilter = { currency: currency
+                        , quantity: quantity
+                        , priceList: priceList
+                        , buySell: buySell
+                        , dateFrom: validFrom
+                        , dateTo: validTo};
 var ProductDetails = ProductUtils.getProductDetails(productId, PriceListFilter);
 
-var priceListsToPotentiallyReplace = ProductDetails.CurrentValidPriceLists;
+var priceListsToPotentiallyReplace = ProductDetails.PriceLists;
 var priceListsUpdateValidTo = [];
 var priceListsUpdateValidFrom = [];
 var configValidTo = entities.createConfigForUpdatingRows().entity("Productprice_entity")
@@ -50,8 +56,8 @@ var configValidFrom = entities.createConfigForUpdatingRows().entity("Productpric
 for (var valPriceList in priceListsToPotentiallyReplace)
 {
     var currPriceList = priceListsToPotentiallyReplace[valPriceList];
-    if(currPriceList["priceListId"] != priceListId && currPriceList["priceList"] == priceList && currPriceList["buySell"] == buySell)
-        {
+    if(currPriceList["priceListId"] != priceListId && currPriceList["priceList"] == priceList && currPriceList["buySell"] == buySell && Number.parseInt(currPriceList["fromQuantity"]) == Number.parseInt(quantity))
+    {
         if(currPriceList["validFrom"] < validFrom && (!currPriceList["validTo"] || currPriceList["validTo"] > validFrom))
         {
             priceListsUpdateValidTo.push(currPriceList["priceListId"]);
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index 2c460f59b8748cc6d79d1046db867b5d3614130c..943a7dd66a10c27ff2da1ee6672abfb865f83bf7 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_entity.aod
@@ -223,6 +223,7 @@
       <name>leadQuickAcquisition</name>
       <title>{$QUICK_ENTRY_LEAD_QUICK_ACQUISITION}</title>
       <contentType>FILE</contentType>
+      <state>INVISIBLE</state>
       <stateProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/leadquickacquisition/stateProcess.js</stateProcess>
       <onValueChange>%aditoprj%/entity/QuickEntry_entity/entityfields/leadquickacquisition/onValueChange.js</onValueChange>
     </entityField>
@@ -249,6 +250,13 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityField>
+      <name>businessCardLanguage</name>
+      <title>Business Card Language</title>
+      <consumer>Languages</consumer>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/businesscardlanguage/stateProcess.js</stateProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/QuickEntry_entity/entityfields/businesscardlanguage/stateProcess.js b/entity/QuickEntry_entity/entityfields/businesscardlanguage/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..70bf57136fdac2315ef5cc58c2742cf952eeca41
--- /dev/null
+++ b/entity/QuickEntry_entity/entityfields/businesscardlanguage/stateProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.neon");
+import("LeadQuickAcquisition_lib");
+
+var isMailSigWebserviceEnabled = LeadQuickAcquisitionBusinessCardUtils.isEnabled();
+var isBusinessCardWebserviceEnabled = LeadQuickAcquisitionMailSigUtils.isEnabled();
+
+if (isBusinessCardWebserviceEnabled || isMailSigWebserviceEnabled)
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
diff --git a/entity/QuickEntry_entity/entityfields/leadquickacquisition/onValueChange.js b/entity/QuickEntry_entity/entityfields/leadquickacquisition/onValueChange.js
index b947b83417f285ad03738e8fd67ba59f1dd07162..c76bdbc402bb0c14ec2e2c0e5c61a33f067c3ba1 100644
--- a/entity/QuickEntry_entity/entityfields/leadquickacquisition/onValueChange.js
+++ b/entity/QuickEntry_entity/entityfields/leadquickacquisition/onValueChange.js
@@ -4,6 +4,7 @@ import("Entity_lib");
 import("system.entities");
 import("KeywordRegistry_basic");
 import("LeadQuickAcquisition_lib");
+import("Sql_lib");
 
 
 if(vars.get("$local.value"))
@@ -11,7 +12,11 @@ if(vars.get("$local.value"))
     //Get file, call web service and get response.
     var upload = new FileUpload(vars.get("$local.value"));
     var response = new WebserviceResponse();
-    response = LeadQuickAcquisition.callWebService(upload);
+    var lang = newSelect("AB_LANGUAGE.NAME_LATIN")
+                    .from("AB_LANGUAGE")
+                    .where("AB_LANGUAGE.ISO3", vars.get("$field.businessCardLanguage"))
+                    .cell();
+    response = LeadQuickAcquisition.callWebService(upload, lang);
     
     if (response != null)
     {
@@ -19,58 +24,15 @@ if(vars.get("$local.value"))
         EntityConsumerUtils.rmInsertedConsumerRows("Communications");
         
         //Filling necessary fields for company address
-        if (response.street && response.buildingNo && response.postalCode && response.city) 
-        {
-            var addressFields = {
-                "ADDRESS" : response.street,
-                "BUILDINGNO" : response.buildingNo,
-                "ZIP" : response.zip,
-                "CITY" : response.city 
-            };
-            
-            if (response.country && response.state) 
-            {
-                addressFields.COUNTRY = response.country;
-                addressFields.STATE = response.state;
-            }
-            
-            neon.addRecord("OrgAdresses", addressFields)
-        }
-        else if(response.address)
-        {
-            var orgAddressPresets = {
-                "AddressSearch" : response.address
-            };
-            
-            var getRowsConfig = entities.createConfigForLoadingRows()
-            .entity("AddressValidation_entity")
-            .provider("FullAddressValidation")
-            .fields(["CITY", "ZIP", "STREET"])
-            .addParameter("CurrentValue_param", response.address);
-                
-            var rows = entities.getRows(getRowsConfig);
-            
-            if (rows.length > 0)
-            {
-                var affectedRow = rows[0];
-                
-                if (affectedRow["CITY"])
-                    orgAddressPresets.CITY = affectedRow["CITY"];
-                
-                if (affectedRow["ZIP"]) 
-                {
-                    orgAddressPresets.ZIP = affectedRow["ZIP"];
-                }
-                
-                if (affectedRow["STREET"])
-                {
-                    orgAddressPresets.ADDRESS = affectedRow["STREET"];
-                }
-                
-            }
-            
-            neon.addRecord("OrgAddresses", orgAddressPresets);
-        }
+        var addressFields = {
+            "ADDRESS" : response.address,
+            "ZIP" : response.postalCode,
+            "CITY" : response.city,
+            "COUNTRY" : response.country,
+            "STATE" : response.state
+        };
+        
+        neon.addRecord("OrgAddresses", addressFields)
         
         if(response.companyName) neon.setFieldValue("$field.ORGANISATION_NAME", response.companyName);
     
@@ -120,7 +82,6 @@ if(vars.get("$local.value"))
         if(response.firstName) neon.setFieldValue("$field.FIRSTNAME", response.firstName);
         if(response.lastName) neon.setFieldValue("$field.LASTNAME", response.lastName);
     }
-
 }
 
 /**
diff --git a/entity/QuickEntry_entity/entityfields/leadquickacquisition/stateProcess.js b/entity/QuickEntry_entity/entityfields/leadquickacquisition/stateProcess.js
index 7376f4d25ace8fcbbe6139214369ecb85f05df79..4b5f20add3762cc585216cb2911a76c9b7779ba0 100644
--- a/entity/QuickEntry_entity/entityfields/leadquickacquisition/stateProcess.js
+++ b/entity/QuickEntry_entity/entityfields/leadquickacquisition/stateProcess.js
@@ -1,12 +1,12 @@
+import("system.vars");
 import("system.result");
 import("system.neon");
 import("LeadQuickAcquisition_lib");
 
 var isMailSigWebserviceEnabled = LeadQuickAcquisitionBusinessCardUtils.isEnabled();
 var isBusinessCardWebserviceEnabled = LeadQuickAcquisitionMailSigUtils.isEnabled();
-var state = null;
 
-if (isBusinessCardWebserviceEnabled || isMailSigWebserviceEnabled) state = neon.COMPONENTSTATE_AUTO;
-else state = neon.COMPONENTSTATE_INVISIBLE;
-
-result.string(state);
\ No newline at end of file
+if ((isBusinessCardWebserviceEnabled || isMailSigWebserviceEnabled) && vars.get("$field.businessCardLanguage"))
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/SalesprojectPhaseDefinition_entity/SalesprojectPhaseDefinition_entity.aod b/entity/SalesprojectPhaseDefinition_entity/SalesprojectPhaseDefinition_entity.aod
index a237428017ad212e1fd457d7982bb1bd5e3d35d9..1731b121034ab58d7d2eb2c9f02a7ff12ef9fd6f 100644
--- a/entity/SalesprojectPhaseDefinition_entity/SalesprojectPhaseDefinition_entity.aod
+++ b/entity/SalesprojectPhaseDefinition_entity/SalesprojectPhaseDefinition_entity.aod
@@ -62,6 +62,7 @@
     </entityProvider>
     <entityConsumer>
       <name>ChecklistEntries</name>
+      <refreshParent v="true" />
       <dependency>
         <name>dependency</name>
         <entityName>ChecklistEntry_entity</entityName>
@@ -88,6 +89,29 @@
       <title>Description</title>
       <contentType>LONG_TEXT</contentType>
     </entityField>
+    <entityField>
+      <name>AUTOPROBABILITY</name>
+      <title>Auto probability</title>
+      <consumer>KeywordProbabilitySalesproject</consumer>
+      <contentType>NUMBER</contentType>
+      <maxValue v="100" />
+      <minValue v="0" />
+      <outputFormat>0'%'</outputFormat>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordProbabilitySalesproject</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/SalesprojectPhaseDefinition_entity/entityfields/keywordprobabilitysalesproject/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -132,6 +156,10 @@
           <name>USER_NEW.value</name>
           <recordfield>SALESPROJECTPHASEDEFINITION.USER_NEW</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>AUTOPROBABILITY.value</name>
+          <recordfield>SALESPROJECTPHASEDEFINITION.AUTOPROBABILITY</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <linkInformation>
         <linkInformation>
diff --git a/entity/SalesprojectPhaseDefinition_entity/entityfields/keywordprobabilitysalesproject/children/containername_param/valueProcess.js b/entity/SalesprojectPhaseDefinition_entity/entityfields/keywordprobabilitysalesproject/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..79fdf41a10d8702af60dd889bde78c20248605c6
--- /dev/null
+++ b/entity/SalesprojectPhaseDefinition_entity/entityfields/keywordprobabilitysalesproject/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.probabilitySalesproject());
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index c55710d2e8104b1c34dadf75455035043648e687..a16be31103d880e2629a7b27dc4afe86c6dc476a 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -139,12 +139,12 @@
     <entityField>
       <name>PROBABILITY</name>
       <title>Probability</title>
+      <consumer>KeywordProbabilitySalesproject</consumer>
       <contentType>NUMBER</contentType>
       <maxValue v="100" />
       <minValue v="0" />
-      <outputFormat>0.00'%'</outputFormat>
+      <outputFormat>0'%'</outputFormat>
       <groupable v="true" />
-      <dropDownProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability/dropDownProcess.js</dropDownProcess>
     </entityField>
     <entityConsumer>
       <name>SalesprojectSources</name>
@@ -882,6 +882,20 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityConsumer>
+      <name>KeywordProbabilitySalesproject</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordprobabilitysalesproject/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js b/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js
index ac06e819274086b19cdb2c46e8b93252b4e6277d..0daeae79aa840b4f4acaa4c0f65adcdcbdab2858 100644
--- a/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/inactivetime/valueProcess.js
@@ -1,20 +1,28 @@
-import("system.datetime");
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("ActivityTask_lib");
-import("Date_lib");
-
-var entryDate = ActivityUtils.getLastActivityDate(vars.get("$field.SALESPROJECTID"));
-if (!entryDate)
-    entryDate = vars.get("$field.STARTDATE");
-    
-var roleoutDate = vars.getString("$field.ENDDATE");
-var daysPassed ;
-if (!roleoutDate ||  roleoutDate < datetime.date())
-    daysPassed  = 0;
-else
-    daysPassed = DateUtils.getDayDifference(entryDate);
-
-if (daysPassed != null)
-    result.string(daysPassed);
\ No newline at end of file
+import("system.datetime");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("ActivityTask_lib");
+import("Date_lib");
+
+var entryDate = ActivityUtils.getLastActivityDate(vars.get("$field.SALESPROJECTID"));
+if (!entryDate)
+{
+    entryDate = vars.get("$field.DATE_NEW");
+}
+    
+var roleoutDate = vars.getString("$field.ENDDATE");
+var daysPassed ;
+if (!roleoutDate ||  roleoutDate < datetime.date())
+{
+    daysPassed  = 0;
+}
+else
+{
+    daysPassed = DateUtils.getDayDifference(entryDate);
+}
+
+if (daysPassed != null)
+{
+    result.string(daysPassed);
+}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/keywordprobabilitysalesproject/children/containername_param/valueProcess.js b/entity/Salesproject_entity/entityfields/keywordprobabilitysalesproject/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..79fdf41a10d8702af60dd889bde78c20248605c6
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/keywordprobabilitysalesproject/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.probabilitySalesproject());
diff --git a/entity/Salesproject_entity/entityfields/probability/dropDownProcess.js b/entity/Salesproject_entity/entityfields/probability/dropDownProcess.js
deleted file mode 100644
index 0ce6525ee92048543d83d251c2b289e710aa5e01..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/probability/dropDownProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-
-result.object([
-    ["0.00", "0%"],
-    ["25.00", "25%"],
-    ["50.00", "50%"],
-    ["75.00", "75%"],
-    ["100.00", "100%"]
-]);
diff --git a/entity/Salesproject_entity/recordcontainers/db/filterextensions/competitor_filterextension/filterValuesProcess.js b/entity/Salesproject_entity/recordcontainers/db/filterextensions/competitor_filterextension/filterValuesProcess.js
index da7c6ab53f019279a547eceb717a2f49dc14a6a2..84000eea2406693953fc6b130871618cb3737c8a 100644
--- a/entity/Salesproject_entity/recordcontainers/db/filterextensions/competitor_filterextension/filterValuesProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/filterextensions/competitor_filterextension/filterValuesProcess.js
@@ -7,5 +7,8 @@ result.object(newSelect([
     "ORGANISATION.NAME"
 ])
 .from("ORGANISATION")
-.join("CONTACT", newWhere("ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID"))
+.join("CONTACT",
+    newWhere("ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+    .and("CONTACT.PERSON_ID is null")
+)
 .table());
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
index b81c1dd9c2cada650eca9c3555eb0c6cb51416aa..8c73baf3b59dff8e2e959923955c70e1fac50205 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
@@ -23,6 +23,16 @@ vars.get("$local.changed").forEach(function(fieldName) {
     switch (fieldName) {
         case "SALESPROJECT.PHASE":
             typeValue = "SalesprojectPhase";
+            var autoProbab = newSelect("SALESPROJECTPHASEDEFINITION.AUTOPROBABILITY")
+                .from("SALESPROJECTPHASEDEFINITION")
+                .where("SALESPROJECTPHASEDEFINITION.PHASE", vars.get("$field.PHASE")).cell();
+            if(!isNaN(parseInt(autoProbab)))
+            {
+                newWhere("SALESPROJECT.SALESPROJECTID", vars.get("$field.SALESPROJECTID"))
+                .updateFields({
+                    "PROBABILITY": autoProbab
+                }, "SALESPROJECT");
+            }
             break;
         case "SALESPROJECT.STATUS":
             // Milestone
diff --git a/entity/Weblink_entity/Weblink_entity.aod b/entity/Weblink_entity/Weblink_entity.aod
index 79e7260f731358ec5e0372fcb8e16d7e19f545b4..1cd2e681a6775e3294b54b5f7fb35c6ff0cb59ec 100644
--- a/entity/Weblink_entity/Weblink_entity.aod
+++ b/entity/Weblink_entity/Weblink_entity.aod
@@ -133,6 +133,31 @@
       <stateProcess>%aditoprj%/entity/Weblink_entity/entityfields/isredirect/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/Weblink_entity/entityfields/isredirect/valueProcess.js</valueProcess>
     </entityField>
+    <entityField>
+      <name>ACTION_TYPE</name>
+      <title>Action</title>
+      <consumer>KeywordActionTypes</consumer>
+      <stateProcess>%aditoprj%/entity/Weblink_entity/entityfields/action_type/stateProcess.js</stateProcess>
+    </entityField>
+    <entityConsumer>
+      <name>KeywordActionTypes</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>KeywordEntry_entity</entityName>
+        <fieldName>SpecificContainerKeywords</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContainerName_param</name>
+          <valueProcess>%aditoprj%/entity/Weblink_entity/entityfields/keywordactiontypes/children/containername_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>WORKFLOWSIGNAL_NAME</name>
+      <title>Signal</title>
+      <stateProcess>%aditoprj%/entity/Weblink_entity/entityfields/workflowsignal_name/stateProcess.js</stateProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -195,6 +220,14 @@
           <name>ISREDIRECT.value</name>
           <recordfield>WEBLINK.ISREDIRECT</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ACTION_TYPE.value</name>
+          <recordfield>WEBLINK.ACTION_TYPE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>WORKFLOWSIGNAL_NAME.value</name>
+          <recordfield>WEBLINK.WORKFLOWSIGNAL_NAME</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <linkInformation>
         <linkInformation>
diff --git a/entity/Weblink_entity/entityfields/action_type/stateProcess.js b/entity/Weblink_entity/entityfields/action_type/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..eb0cd9f7f6fe891ffaba649ba6e36d28a5b8c0bc
--- /dev/null
+++ b/entity/Weblink_entity/entityfields/action_type/stateProcess.js
@@ -0,0 +1,17 @@
+import("Util_lib");
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.neon");
+
+var linktype = vars.get("$field.LINKTYPE");
+var isRedirect = Utils.toBoolean(vars.get("$field.ISREDIRECT"));
+
+if (linktype == $KeywordRegistry.weblinkType$EMail() && isRedirect)
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/Weblink_entity/entityfields/keywordactiontypes/children/containername_param/valueProcess.js b/entity/Weblink_entity/entityfields/keywordactiontypes/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e2c2914556c6e5c59be1bec07528c80d65f520db
--- /dev/null
+++ b/entity/Weblink_entity/entityfields/keywordactiontypes/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.weblinkActionType());
\ No newline at end of file
diff --git a/entity/Weblink_entity/entityfields/placeholder/onValidation.js b/entity/Weblink_entity/entityfields/placeholder/onValidation.js
index 394f99c96f5cbe9c7a5111383550717079a7352e..8871cd11363addcacdd59d2d79ec312db1973437 100644
--- a/entity/Weblink_entity/entityfields/placeholder/onValidation.js
+++ b/entity/Weblink_entity/entityfields/placeholder/onValidation.js
@@ -14,7 +14,7 @@ if (vars.get("$local.value"))
                 
     var defaultPlaceholderNames = defaultPlaceholders.map(function(placeholder){return placeholder.placeholderName});
     
-    if(defaultPlaceholderNames.includes(vars.get("$local.value")) || linkPlaceholders.includes("$local.value"))
+    if(defaultPlaceholderNames.includes(vars.get("$local.value")) || linkPlaceholders.includes(vars.get("$local.value")))
     {
         result.string("Placeholders must be unique")
     }
diff --git a/entity/Weblink_entity/entityfields/url/stateProcess.js b/entity/Weblink_entity/entityfields/url/stateProcess.js
index bf56cc956c9ee7f08f53f30d9f1991838154bffc..d20b8d2ca5be994c533a30296e168cc01a62a9e2 100644
--- a/entity/Weblink_entity/entityfields/url/stateProcess.js
+++ b/entity/Weblink_entity/entityfields/url/stateProcess.js
@@ -1,8 +1,9 @@
 import("system.neon");
 import("system.result");
 import("system.vars");
+import("KeywordRegistry_basic");
 
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$field.LINKTYPE") == $KeywordRegistry.weblinkType$EMail())
     result.string(neon.COMPONENTSTATE_EDITABLE)
 else
     result.string(neon.COMPONENTSTATE_READONLY)
\ No newline at end of file
diff --git a/entity/Weblink_entity/entityfields/workflowprocessdefinition_key/stateProcess.js b/entity/Weblink_entity/entityfields/workflowprocessdefinition_key/stateProcess.js
index 177f86ce6cfe6bc584f4e6f3aba754c15d208220..0fa195d165620e2a55ad7a61c9e62d80733246d9 100644
--- a/entity/Weblink_entity/entityfields/workflowprocessdefinition_key/stateProcess.js
+++ b/entity/Weblink_entity/entityfields/workflowprocessdefinition_key/stateProcess.js
@@ -1,18 +1,18 @@
+import("Util_lib");
 import("system.result");
 import("system.vars");
 import("KeywordRegistry_basic");
 import("system.neon");
 
 var linktype = vars.get("$field.LINKTYPE");
-var redirect = vars.get("$field.ISREDIRECT");
+var isRedirect = Utils.toBoolean(vars.get("$field.ISREDIRECT"));
+var actionType = vars.get("$field.ACTION_TYPE");
 
-if (linktype == $KeywordRegistry.weblinkType$EMail() && redirect == "1")
+if (linktype == $KeywordRegistry.weblinkType$EMail() && isRedirect && actionType == $KeywordRegistry.weblinkActionType$startWorkflow())
 {
-
     result.string(neon.COMPONENTSTATE_EDITABLE);
 }
 else
 {
-
     result.string(neon.COMPONENTSTATE_INVISIBLE);
 }
\ No newline at end of file
diff --git a/entity/Weblink_entity/entityfields/workflowsignal_name/stateProcess.js b/entity/Weblink_entity/entityfields/workflowsignal_name/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a5de238dc97d0f34d8e98e709ed2c41aa6a36fba
--- /dev/null
+++ b/entity/Weblink_entity/entityfields/workflowsignal_name/stateProcess.js
@@ -0,0 +1,18 @@
+import("Util_lib");
+import("system.result");
+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.neon");
+
+var linktype = vars.get("$field.LINKTYPE");
+var isRedirect = Utils.toBoolean(vars.get("$field.ISREDIRECT"));
+var actionType = vars.get("$field.ACTION_TYPE");
+
+if (linktype == $KeywordRegistry.weblinkType$EMail() && isRedirect && actionType == $KeywordRegistry.weblinkActionType$sendWorkflowSignal())
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/linktype.displayvalue/expression.js b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/linktype.displayvalue/expression.js
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e452bc6e87a70c073b1eef5be3a7187eb894ffb4 100644
--- a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/linktype.displayvalue/expression.js
+++ b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/linktype.displayvalue/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+import("Keyword_lib");
+result.string(KeywordUtils.getResolvedTitleSqlPart("WeblinkType", "WEBLINK.LINKTYPE"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 25609bc12adf79abfdaf5b52b9944a6a0db3423d..8a73c7e6f4d3312b9340b159965afe27a30c491e 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -8533,6 +8533,48 @@
     <entry>
       <key>All of the chosen records are already in the campaignstep</key>
     </entry>
+    <entry>
+      <key>Placeholders must be unique</key>
+    </entry>
+    <entry>
+      <key>Auto probability</key>
+    </entry>
+    <entry>
+      <key>Done by</key>
+    </entry>
+    <entry>
+      <key>Done on</key>
+    </entry>
+    <entry>
+      <key>First customer conversation</key>
+    </entry>
+    <entry>
+      <key>Further customer meetings</key>
+    </entry>
+    <entry>
+      <key>Post office box number</key>
+    </entry>
+    <entry>
+      <key>Project team</key>
+    </entry>
+    <entry>
+      <key>Prioritization based on segmentation parameters</key>
+    </entry>
+    <entry>
+      <key>Source / origin of the generation of contacts</key>
+    </entry>
+    <entry>
+      <key>Object type 1</key>
+    </entry>
+    <entry>
+      <key>Object type 2</key>
+    </entry>
+    <entry>
+      <key>A communication setting for this channel already exists!</key>
+    </entry>
+    <entry>
+      <key>This setting is overridden by the setting '%0'</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 827c44f0eb0e86f04f369a2f32bef89b79bef0dd..38086e6169d73bfe153c219038577aedc22fdba1 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -38,6 +38,10 @@
       <key>%0 out of %1 records were changed to \"%2\".\n %3 record/s could not be updated.</key>
       <value>%0 von %1 Datensätze wurden auf \"%2\" geändert.\n%3 Datensätze konnten nicht akutualisiert werden.</value>
     </entry>
+    <entry>
+      <key>This setting is overridden by the setting '%0'</key>
+      <value>Diese Einstellung wird durch die Einstellung '%0' überschrieben</value>
+    </entry>
     <entry>
       <key>Value is too big, the maximum is %0</key>
       <value>Wert ist zu groß, das Maximum ist %0</value>
@@ -50,6 +54,10 @@
       <key>The max participants count can not be equal or less then 0</key>
       <value>Die maximale Teilnehmerzahl muss größer 0 sein!</value>
     </entry>
+    <entry>
+      <key>No advertising</key>
+      <value>Keine Werbung</value>
+    </entry>
     <entry>
       <key>Value is too small, the minimum is %0</key>
       <value>Wert ist zu klein, das Minimum ist %0</value>
@@ -7576,6 +7584,10 @@
       <key>Source duplicate</key>
       <value>Stammdublette</value>
     </entry>
+    <entry>
+      <key>Placeholders must be unique</key>
+      <value>Platzhalter müssen eindeutig sein</value>
+    </entry>
     <entry>
       <key>Person duplicates</key>
       <value>Personendublettencluster</value>
@@ -10265,6 +10277,10 @@ Bitte Datumseingabe prüfen</value>
       <key>entity</key>
       <value>Entität</value>
     </entry>
+    <entry>
+      <key>A communication setting for this channel already exists!</key>
+      <value>Für diesen Kanal gibt es bereits eine Werbeeinstellung!</value>
+    </entry>
     <entry>
       <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
     </entry>
@@ -11090,11 +11106,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>No customer since creation &gt; 3 years</key>
-      <value>Kein Kundenkontakt seit erzeugung &gt; 3 Jahre</value>
+      <value>Kein Kundenkontakt seit Erzeugung &gt; 3 Jahre</value>
     </entry>
     <entry>
       <key>No valid sales contract</key>
-      <value>Kein Kauvertrag vorhanden</value>
+      <value>Kein Kaufvertrag vorhanden</value>
     </entry>
     <entry>
       <key>Count Usage</key>
@@ -11102,11 +11118,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Marked for deletion</key>
-      <value>Makiert zum Löschen</value>
+      <value>Markiert zum Löschen</value>
     </entry>
     <entry>
       <key>Add Manual Delete Flag</key>
-      <value>Füge mauelles Löschkenzeichen hinzu</value>
+      <value>Füge manuelles Löschkennzeichen hinzu</value>
     </entry>
     <entry>
       <key>DSGVO Configuration</key>
@@ -11118,7 +11134,7 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Mark to Delete</key>
-      <value>Makieren zum Löschen</value>
+      <value>Markieren zum Löschen</value>
     </entry>
     <entry>
       <key>Is an active employee</key>
@@ -11145,11 +11161,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Mark all to delete</key>
-      <value>Makiere alle zum Löschen</value>
+      <value>Markiere alle zum Löschen</value>
     </entry>
     <entry>
       <key>Mark selection to delete</key>
-      <value>Makiere selectierte zum Löschen</value>
+      <value>Markiere selektierte zum Löschen</value>
     </entry>
     <entry>
       <key>consent pending</key>
@@ -11165,11 +11181,11 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Do you want to delete the flags of the already maked Persons?</key>
-      <value>Möchtest du die bereits gesetzten Makierungen löschen?</value>
+      <value>Möchtest du die bereits gesetzten Markierungen löschen?</value>
     </entry>
     <entry>
       <key>Do you really want to anonymize all marked persons?</key>
-      <value>Möchtest wirklich alle zur Löschung makrierten Personen anonymisieren?</value>
+      <value>Möchtest wirklich alle zur Löschung markierten Personen anonymisieren?</value>
     </entry>
     <entry>
       <key>FILE MISSING</key>
@@ -11203,6 +11219,34 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Starts the serverprocess manually, which will recalculate all classifications from scratch. Only do this after e.g importing data from elsewhere where the outdated flag couldn't been set correctly. Since this can take some time.</key>
     </entry>
+    <entry>
+      <key>Done by</key>
+      <value>Erledigt von</value>
+    </entry>
+    <entry>
+      <key>Done on</key>
+      <value>Erledigt am</value>
+    </entry>
+    <entry>
+      <key>Source / origin of the generation of contacts</key>
+      <value>Quelle / Herkunft der Kontaktgenerierung</value>
+    </entry>
+    <entry>
+      <key>Prioritization based on segmentation parameters</key>
+      <value>Priorisierung basierend auf Segmentierungsparametern</value>
+    </entry>
+    <entry>
+      <key>First customer conversation</key>
+      <value>Erstes Kundengespräch</value>
+    </entry>
+    <entry>
+      <key>Project team</key>
+      <value>Projektteam</value>
+    </entry>
+    <entry>
+      <key>Further customer meetings</key>
+      <value>Weitere Kundengespräche</value>
+    </entry>
     <entry>
       <key>Code</key>
     </entry>
@@ -11224,6 +11268,26 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Integer</key>
     </entry>
+    <entry>
+      <key>Auto probability</key>
+      <value>Automatische Wahrscheinlichkeit</value>
+    </entry>
+    <entry>
+      <key>Post office box number</key>
+      <value>Postfachnummer</value>
+    </entry>
+    <entry>
+      <key>Business Card Language</key>
+      <value>Visitenkarten Sprache</value>
+    </entry>
+    <entry>
+      <key>Object type 1</key>
+      <value>Objekttyp 1</value>
+    </entry>
+    <entry>
+      <key>Object type 2</key>
+      <value>Objekttyp 2</value>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index db9fcca19c623ee0ce0484bc21b17014d8813578..412cb297fe20cec4729f5d7864ca07b4621dfc13 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -8618,6 +8618,48 @@
     <entry>
       <key>Duplicaterow rebuild</key>
     </entry>
+    <entry>
+      <key>Placeholders must be unique</key>
+    </entry>
+    <entry>
+      <key>Auto probability</key>
+    </entry>
+    <entry>
+      <key>Done by</key>
+    </entry>
+    <entry>
+      <key>Done on</key>
+    </entry>
+    <entry>
+      <key>First customer conversation</key>
+    </entry>
+    <entry>
+      <key>Further customer meetings</key>
+    </entry>
+    <entry>
+      <key>Post office box number</key>
+    </entry>
+    <entry>
+      <key>Project team</key>
+    </entry>
+    <entry>
+      <key>Prioritization based on segmentation parameters</key>
+    </entry>
+    <entry>
+      <key>Source / origin of the generation of contacts</key>
+    </entry>
+    <entry>
+      <key>Object type 1</key>
+    </entry>
+    <entry>
+      <key>Object type 2</key>
+    </entry>
+    <entry>
+      <key>A communication setting for this channel already exists!</key>
+    </entry>
+    <entry>
+      <key>This setting is overridden by the setting '%0'</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonContext/CommunicationBlacklist/CommunicationBlacklist.aod b/neonContext/CommunicationBlacklist/CommunicationBlacklist.aod
deleted file mode 100644
index 9e69819413f07b0c7b52eb16983d9409f9226edf..0000000000000000000000000000000000000000
--- a/neonContext/CommunicationBlacklist/CommunicationBlacklist.aod
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext 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/neonContext/1.1.1">
-  <name>CommunicationBlacklist</name>
-  <title>Blacklist</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterView>CommunicationBlacklistFilter_view</filterView>
-  <editView>CommunicationBlacklistEdit_view</editView>
-  <entity>CommunicationBlacklist_entity</entity>
-  <references>
-    <neonViewReference>
-      <name>664796b3-d90b-439d-b960-a1f09e00c99d</name>
-      <view>CommunicationBlacklistFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>c08fe896-0181-4243-8639-cb96e302d3c8</name>
-      <view>CommunicationBlacklistEdit_view</view>
-    </neonViewReference>
-  </references>
-</neonContext>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index f3e985e7707b9387eb3b2ff38bf51ae6cb2a2bc2..fccd99b2964f1c91e161f5579d611ee0a11f2785 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -49,7 +49,7 @@
     </neonViewReference>
     <neonViewReference>
       <name>c72caf13-37cf-4af9-811d-832f43801369</name>
-      <view>OrganisationAttributeRestriction_view</view>
+      <view>OrganisationAttribute_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>ade0ed85-260d-4da5-bf4c-f838cfdcc693</name>
@@ -71,5 +71,9 @@
       <name>d9091127-4ad7-46bb-ba5f-988aa84c52b5</name>
       <view>OrganisationPlanningTurnoverChart_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>a6132e66-81b6-4350-a398-0d9d9c1bbafd</name>
+      <view>OrganisationMarketing_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonContext/Person/Person.aod b/neonContext/Person/Person.aod
index 987e28778162fd6550e11343ec919e3c59b21f5a..1f9f01bbf1edc780afb0212eb43d1321f56fe138 100644
--- a/neonContext/Person/Person.aod
+++ b/neonContext/Person/Person.aod
@@ -49,7 +49,7 @@
     </neonViewReference>
     <neonViewReference>
       <name>296af7da-1994-49a3-a26f-903f29609fae</name>
-      <view>PersonAttributeRestriction_view</view>
+      <view>PersonAttribute_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>dd102d90-0af3-4956-95f5-0175c50de3f4</name>
diff --git a/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod b/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod
index 4ecfda58d231870c07359fe28fb481de5cd1d367..383d48350eeac31dfdf62f5bdadfc99b7cca79be 100644
--- a/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod
+++ b/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod
@@ -18,11 +18,11 @@
       <fields>
         <entityFieldLink>
           <name>1b9e38a5-e921-48f7-ba04-71b758fa9ed3</name>
-          <entityField>currentRecipients</entityField>
+          <entityField>currentRecipientCount</entityField>
         </entityFieldLink>
         <entityFieldLink>
           <name>4578042c-9210-4dc4-870f-298a390aebd8</name>
-          <entityField>futureRecipients</entityField>
+          <entityField>futureRecipientCount</entityField>
         </entityFieldLink>
       </fields>
     </scoreCardViewTemplate>
diff --git a/neonView/BulkMailMain_view/BulkMailMain_view.aod b/neonView/BulkMailMain_view/BulkMailMain_view.aod
index 82edef3461108d64ecf2d010d1fc81e8b11ed35f..dfe012e30433e54ef325cdb8f1c4f5df0b2f7286 100644
--- a/neonView/BulkMailMain_view/BulkMailMain_view.aod
+++ b/neonView/BulkMailMain_view/BulkMailMain_view.aod
@@ -9,15 +9,20 @@
     </masterSlaveLayout>
   </layout>
   <children>
+    <neonViewReference>
+      <name>3222ace8-c6d6-4dab-ada1-1f50b983e7e7</name>
+      <entityField>#ENTITY</entityField>
+      <view>BulkMailContent_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>8be4ed02-1c54-41d0-9bba-3b785346a550</name>
       <entityField>Recipients</entityField>
       <view>BulkMailRecipientFilter_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>3222ace8-c6d6-4dab-ada1-1f50b983e7e7</name>
-      <entityField>#ENTITY</entityField>
-      <view>BulkMailContent_view</view>
+      <name>f78d044a-6246-49c0-a72c-03f54fc90fd2</name>
+      <entityField>BulkMailTestRecipients</entityField>
+      <view>BulkMailTestRecipientFilter_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>9e1e1137-f0a8-45d5-8b91-6e36411be6f1</name>
@@ -29,11 +34,6 @@
       <entityField>MailLogs</entityField>
       <view>MailLogFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>f78d044a-6246-49c0-a72c-03f54fc90fd2</name>
-      <entityField>BulkMailTestRecipients</entityField>
-      <view>BulkMailTestRecipientFilter_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>bd3876a9-492e-4e2e-bcca-e86455475dca</name>
       <entityField>Clicks</entityField>
diff --git a/neonView/ChecklistEntryValueList_view/ChecklistEntryValueList_view.aod b/neonView/ChecklistEntryValueList_view/ChecklistEntryValueList_view.aod
index 05829b4051870bcd2759ca41cbd9c0ccd1f1178d..3d6b1fee4f11118b2d5245a248b5b5831c745e79 100644
--- a/neonView/ChecklistEntryValueList_view/ChecklistEntryValueList_view.aod
+++ b/neonView/ChecklistEntryValueList_view/ChecklistEntryValueList_view.aod
@@ -30,6 +30,14 @@
           <name>56a78ef9-dcef-4d1c-b30d-5c89f38611ec</name>
           <entityField>CHECKLISTENTRY_ID</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>c3cf3919-e3ab-4595-9408-de061dc81883</name>
+          <entityField>DONEUSER</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ca57e40c-cf83-4c6c-91f9-4395f6eb1141</name>
+          <entityField>DONEDATE</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>
diff --git a/neonView/CommunicationBlacklistEdit_view/CommunicationBlacklistEdit_view.aod b/neonView/CommunicationBlacklistEdit_view/CommunicationBlacklistEdit_view.aod
deleted file mode 100644
index 7ca289f4bd074cc4bb8c460be628c7e0492d683b..0000000000000000000000000000000000000000
--- a/neonView/CommunicationBlacklistEdit_view/CommunicationBlacklistEdit_view.aod
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
-  <name>CommunicationBlacklistEdit_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <size>SMALL</size>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <genericViewTemplate>
-      <name>Generic</name>
-      <editMode v="true" />
-      <fields>
-        <entityFieldLink>
-          <name>5bf6cb8b-20da-4e64-ab86-e654e1f9f6a5</name>
-          <entityField>BLACKLIST_TYPE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>bad5d056-972e-4d10-b3c7-a25bf6233cb5</name>
-          <entityField>BLACKLIST_FILTER</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>f74c2a6a-1b70-4914-8059-8866a0e5db77</name>
-          <entityField>START_DATE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>2b2bb0e7-7cdf-42ca-8c0b-89d1d869fa44</name>
-          <entityField>END_DATE</entityField>
-        </entityFieldLink>
-        <entityFieldLink>
-          <name>947da750-50bd-47bb-af2d-7446b3756482</name>
-          <entityField>REASON</entityField>
-        </entityFieldLink>
-      </fields>
-    </genericViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/CommunicationBlacklistFilter_view/CommunicationBlacklistFilter_view.aod b/neonView/CommunicationBlacklistFilter_view/CommunicationBlacklistFilter_view.aod
deleted file mode 100644
index 232b308af1e76c7e8cfb74d7ba3b0c25fa595806..0000000000000000000000000000000000000000
--- a/neonView/CommunicationBlacklistFilter_view/CommunicationBlacklistFilter_view.aod
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
-  <name>CommunicationBlacklistFilter_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
-  <layout>
-    <groupLayout>
-      <name>layout</name>
-    </groupLayout>
-  </layout>
-  <children>
-    <tableViewTemplate>
-      <name>Table</name>
-      <columns>
-        <neonTableColumn>
-          <name>86497fa4-acda-4041-8cbc-8d11838b4876</name>
-          <entityField>BLACKLIST_TYPE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>304b2589-aabf-42f6-916f-a69cff5a1b00</name>
-          <entityField>START_DATE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>fd5077c1-942b-42f0-8f44-80e9c568db44</name>
-          <entityField>END_DATE</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>d7050f91-da78-4ffc-a31c-30985d808473</name>
-          <entityField>REASON</entityField>
-        </neonTableColumn>
-      </columns>
-    </tableViewTemplate>
-  </children>
-</neonView>
diff --git a/neonView/CommunicationSettingsPreview_view/CommunicationSettingsPreview_view.aod b/neonView/CommunicationSettingsPreview_view/CommunicationSettingsPreview_view.aod
index 8551f448c5fb966fd25c9bfb2ac700f35d584eac..80f84884292be22e8b9ac4ff85599d312047f574 100644
--- a/neonView/CommunicationSettingsPreview_view/CommunicationSettingsPreview_view.aod
+++ b/neonView/CommunicationSettingsPreview_view/CommunicationSettingsPreview_view.aod
@@ -15,6 +15,7 @@
       <titleField>#CONTENTTITLE</titleField>
       <subtitleField>STATUS</subtitleField>
       <isEditable v="false" />
+      <informationField>overrideInfo</informationField>
     </cardViewTemplate>
     <genericViewTemplate>
       <name>Infos</name>
diff --git a/neonView/OrganisationAttributeRestriction_view/OrganisationAttributeRestriction_view.aod b/neonView/OrganisationAttribute_view/OrganisationAttribute_view.aod
similarity index 71%
rename from neonView/OrganisationAttributeRestriction_view/OrganisationAttributeRestriction_view.aod
rename to neonView/OrganisationAttribute_view/OrganisationAttribute_view.aod
index 946e4932d34ce254e98376daadff0d7bae98bd40..a067a31a6b563296a7663bd567aba9a5d64ddfa5 100644
--- a/neonView/OrganisationAttributeRestriction_view/OrganisationAttributeRestriction_view.aod
+++ b/neonView/OrganisationAttribute_view/OrganisationAttribute_view.aod
@@ -1,6 +1,6 @@
 <?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
-  <name>OrganisationAttributeRestriction_view</name>
+  <name>OrganisationAttribute_view</name>
   <title>Attributes</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
@@ -14,10 +14,5 @@
       <entityField>AttributeTree</entityField>
       <view>AttributeRelationTree_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>2c260627-f087-4240-8a6d-e7aa25bbe812</name>
-      <entityField>CommRestrictions</entityField>
-      <view>CommRestrictionDrawer_view</view>
-    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 9457155195dafc5a55d96976ca5adb0ac88110a1..9cef248c5a7580e31e8529b4fffd149957d8bd28 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -53,7 +53,7 @@
     <neonViewReference>
       <name>486b4999-ac17-4560-9ce0-0f20a0028d02</name>
       <entityField>#ENTITY</entityField>
-      <view>OrganisationAttributeRestriction_view</view>
+      <view>OrganisationAttribute_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>c2b37e4d-3b5e-4e23-8b7c-6da02b27ffc0</name>
@@ -80,5 +80,10 @@
       <entityField>Duplicates</entityField>
       <view>DuplicateOrganisationFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>56eb7d7d-23e9-4ab8-8a77-d0a6d997d710</name>
+      <entityField>#ENTITY</entityField>
+      <view>OrganisationMarketing_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/OrganisationMarketing_view/OrganisationMarketing_view.aod b/neonView/OrganisationMarketing_view/OrganisationMarketing_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d5ae1fe81a3ad82703c2abab6ee94419de2f591c
--- /dev/null
+++ b/neonView/OrganisationMarketing_view/OrganisationMarketing_view.aod
@@ -0,0 +1,18 @@
+<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>OrganisationMarketing_view</name>
+  <title>Advertising</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>0561b125-ac76-4ee1-829c-8fd954204f7d</name>
+      <entityField>ContactCommunicationSettings</entityField>
+      <view>CommunicationSettingsFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/PersonAttributeRestriction_view/PersonAttributeRestriction_view.aod b/neonView/PersonAttribute_view/PersonAttribute_view.aod
similarity index 72%
rename from neonView/PersonAttributeRestriction_view/PersonAttributeRestriction_view.aod
rename to neonView/PersonAttribute_view/PersonAttribute_view.aod
index 5202135ce5090b7acdd0b2be53d567ff3c881579..47eb14656cfdd90bc2dfd75730344ac1777d7210 100644
--- a/neonView/PersonAttributeRestriction_view/PersonAttributeRestriction_view.aod
+++ b/neonView/PersonAttribute_view/PersonAttribute_view.aod
@@ -1,6 +1,6 @@
 <?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
-  <name>PersonAttributeRestriction_view</name>
+  <name>PersonAttribute_view</name>
   <title>Attributes</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
@@ -14,10 +14,5 @@
       <entityField>AttributeTree</entityField>
       <view>AttributeRelationTree_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>38199f7b-af85-4576-a6ee-3add0e6761aa</name>
-      <entityField>CommRestrictions</entityField>
-      <view>CommRestrictionDrawer_view</view>
-    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index d6983b3781d67841a8fa65e4ec8c11ff621d4290..5a8f4d9906d4807fa198ebdfc1a1f8b2c9561626 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -42,7 +42,7 @@
     <neonViewReference>
       <name>0470a456-1132-4802-ba69-4a1b562b8f14</name>
       <entityField>#ENTITY</entityField>
-      <view>PersonAttributeRestriction_view</view>
+      <view>PersonAttribute_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>19a5f9ed-228d-4352-9e82-e7aa690648e9</name>
@@ -55,29 +55,24 @@
       <view>DocumentFilter_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>5754fc3a-c81c-42ba-90ea-2859b10bb391</name>
-      <entityField>LogHistories</entityField>
-      <view>LogHistoryFilter_view</view>
+      <name>82f19c55-fa96-43de-9f26-46069b28db31</name>
+      <entityField>#ENTITY</entityField>
+      <view>PersonMarketing_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>f0895c2a-5517-4c7b-80ed-147e4078603d</name>
       <entityField>#ENTITY</entityField>
       <view>PersonDSGVO_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>82f19c55-fa96-43de-9f26-46069b28db31</name>
-      <entityField>#ENTITY</entityField>
-      <view>PersonMarketing_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>24ea8bc9-7ed0-4bed-a984-b1a9f3815c7c</name>
       <entityField>Duplicates</entityField>
       <view>DuplicatePersonFilter_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>78a658a3-680b-4420-85a2-6e99ccff9f94</name>
-      <entityField>DSGVOEntries</entityField>
-      <view>DSGVOFilter_view</view>
+      <name>5754fc3a-c81c-42ba-90ea-2859b10bb391</name>
+      <entityField>LogHistories</entityField>
+      <view>LogHistoryFilter_view</view>
     </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
index 7df0d8ad40546a5a1f45f10b4ae096553100605a..c009ab9b93b68c970edc4ed546fa70443de9a91b 100644
--- a/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
+++ b/neonView/Prod2prodFilter_view/Prod2prodFilter_view.aod
@@ -11,8 +11,7 @@
   <children>
     <treeTableViewTemplate>
       <name>PartlistTree</name>
-      <parentField>DEST_ID</parentField>
-      <entityField>#ENTITY</entityField>
+      <parentField>PARENT_ID</parentField>
       <favoriteActionGroup1>alter</favoriteActionGroup1>
       <devices>
         <element>MOBILE</element>
diff --git a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
index 63d495112b0504008b1ca9e4693ce557a6b0f9b1..c9ef652c01ba859d7b894e61ed588d9d7a91279e 100644
--- a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
+++ b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
@@ -21,6 +21,10 @@
       <editMode v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
+        <entityFieldLink>
+          <name>635e909b-a5f8-4afe-b16f-ad9ff0ffba03</name>
+          <entityField>businessCardLanguage</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>8ed8f12d-2a91-4009-8868-55a0c11880ff</name>
           <entityField>leadQuickAcquisition</entityField>
diff --git a/neonView/SalesprojectPhaseDefinitionEdit_view/SalesprojectPhaseDefinitionEdit_view.aod b/neonView/SalesprojectPhaseDefinitionEdit_view/SalesprojectPhaseDefinitionEdit_view.aod
index eae1779df434052cfd229767a2055813e6527285..b51922e319bb2f0901196ed947958d46772b43d1 100644
--- a/neonView/SalesprojectPhaseDefinitionEdit_view/SalesprojectPhaseDefinitionEdit_view.aod
+++ b/neonView/SalesprojectPhaseDefinitionEdit_view/SalesprojectPhaseDefinitionEdit_view.aod
@@ -21,6 +21,10 @@
           <name>f0aa8dd0-2cc1-4634-9509-db8b511e602d</name>
           <entityField>DESCRIPTION</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>b5e973f9-854e-4ddc-b980-2fac447cb292</name>
+          <entityField>AUTOPROBABILITY</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
     <neonViewReference>
diff --git a/neonView/SalesprojectPhaseDefinitionPreview_view/SalesprojectPhaseDefinitionPreview_view.aod b/neonView/SalesprojectPhaseDefinitionPreview_view/SalesprojectPhaseDefinitionPreview_view.aod
index 25f7dc657276031896bbb3329b0c962bdd1c2f40..d25d74cf44d19ccc4ae7db5988db9bcb0ea9b5e8 100644
--- a/neonView/SalesprojectPhaseDefinitionPreview_view/SalesprojectPhaseDefinitionPreview_view.aod
+++ b/neonView/SalesprojectPhaseDefinitionPreview_view/SalesprojectPhaseDefinitionPreview_view.aod
@@ -16,6 +16,17 @@
       <titleField>PHASE</titleField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <showDrawer v="true" />
+      <drawerCaption>Info</drawerCaption>
+      <fields>
+        <entityFieldLink>
+          <name>d12a93ac-5c83-4b79-8cb9-4a2852bb3082</name>
+          <entityField>AUTOPROBABILITY</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
     <neonViewReference>
       <name>786e8ccd-b846-4968-8b6c-9e8cf13ba63c</name>
       <entityField>ChecklistEntries</entityField>
diff --git a/neonView/WeblinkEdit_view/WeblinkEdit_view.aod b/neonView/WeblinkEdit_view/WeblinkEdit_view.aod
index 8a245fb3766020659cbcb7a1632f972442312024..5c1ae63aadc924030a8f5fd4aa8f9262c82d100c 100644
--- a/neonView/WeblinkEdit_view/WeblinkEdit_view.aod
+++ b/neonView/WeblinkEdit_view/WeblinkEdit_view.aod
@@ -35,10 +35,18 @@
           <name>2b22fb4a-5e7e-48ee-b6d1-3ee4381fb419</name>
           <entityField>ISREDIRECT</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>65495a4d-dccf-42ba-bba4-af15b9ad06aa</name>
+          <entityField>ACTION_TYPE</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>90ab2682-bc2d-4989-ab7b-b47045a3cbf3</name>
           <entityField>WORKFLOWPROCESSDEFINITION_KEY</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>8a33e22d-c607-4a56-8384-668cc225225d</name>
+          <entityField>WORKFLOWSIGNAL_NAME</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
     <neonViewReference>
diff --git a/neonView/WeblinkMain_view/WeblinkMain_view.aod b/neonView/WeblinkMain_view/WeblinkMain_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d768584685d2a8d1d45a3c704c78100ae8174e1a
--- /dev/null
+++ b/neonView/WeblinkMain_view/WeblinkMain_view.aod
@@ -0,0 +1,28 @@
+<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+  <name>WeblinkMain_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <masterSlaveLayout>
+      <name>layout</name>
+      <master>883c0abd-232c-4640-88f7-6723b43ae2c3</master>
+    </masterSlaveLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>883c0abd-232c-4640-88f7-6723b43ae2c3</name>
+      <entityField>#ENTITY</entityField>
+      <view>WeblinkPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>cc02a283-26ae-4076-8b64-7c03c23f5350</name>
+      <entityField>#ENTITY</entityField>
+      <view>WeblinkDrawer_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>efe46f0a-d3e9-4ae0-9626-8829acbfb027</name>
+      <entityField>Clicks</entityField>
+      <view>WeblinkClickFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index 6261b7d59664073cc80b657c534ff99346673c4f..5cc49e65fc92472708392e92bbbcf49c77c57ae3 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -117,12 +117,43 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun)
             "TESTRUN": pIsTestRun ? 1 : 0
         });
     
+    var mailLogIds = new Map();
+    var contactIds = recipientData.map(function (recipient) 
+    {
+        var contactId = recipient["CONTACT_ID"]; 
+        mailLogIds.set(contactId, util.getNewUUID());
+        return contactId;
+    });
+    
+    var baseUrl = vars.get("$sys.origin") + "/services/rest/redirect_rest?";
+    var linkPlaceholders = newSelect(["PLACEHOLDER", "WEBLINKID", "URL", "ISREDIRECT"])
+        .from("WEBLINK")
+        .table()
+        .map(function ([placeholder, weblinkId, url, isRedirect])
+        {
+            if (Utils.toBoolean(isRedirect))
+            {
+                var linkFn = function (pContactId)
+                    {
+                        return baseUrl + "link=" + weblinkId + "&log=" + mailLogIds.get(pContactId);
+                    }  
+                return new Placeholder(placeholder, Placeholder.types.CALLBACKFUNCTION, linkFn);
+            }
+            return new Placeholder(placeholder, Placeholder.types.FIXEDVALUE, url);
+        });
+    
+    var webviewFn = function(pContactId)
+        {
+            return vars.get("$sys.origin")+"/services/rest/webview_rest?" + "log=" + mailLogIds.get(pContactId);
+        }
+    var webviewPlaceholder = new Placeholder("webview", Placeholder.types.CALLBACKFUNCTION, webviewFn);   
+    
+    var additionalPlaceholders = [webviewPlaceholder].concat(linkPlaceholders);
     
-    var contactIds = recipientData.map(function (recipient) {return recipient["CONTACT_ID"];});
     var successIds = [];
     var failedIds = [];
     var sentDate = vars.get("$sys.date");
-    var mails = template.getReplacedEmailsByContactIds(contactIds);
+    var mails = template.getReplacedEmailsByContactIds(contactIds, additionalPlaceholders);
     
     var subjectTemplate = new DocumentTemplate(subject, DocumentTemplate.types.PLAIN);
     var subjects = subjectTemplate.getReplacedContentByContactIds(contactIds);
@@ -140,7 +171,7 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun)
             let personId = recipient["PERSON_ID"];
             let organisationId = recipient["ORGANISATION_ID"];
             let email = mails[contactId];
-            let mailLogId = util.getNewUUID();
+            let mailLogId = mailLogIds.get(contactId);
             if (email !== undefined && emailAddress)
             {
                 email.toRecipients = [emailAddress];
@@ -175,7 +206,7 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun)
                     subject : activitySubject,
                     content : email.body
                 };
-                let contactLink = [[ContactUtils.getContextByPersOrg(personId, organisationid), contactId]];
+                let contactLink = [[ContactUtils.getContextByPersOrg(personId, organisationId), contactId]];
                 ActivityUtils.insertNewActivity(activityData, bulkMailLink.concat(contactLink));
             }
         });
@@ -209,8 +240,9 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun)
         {
             
             let isSuccess = false;
-            let contactId = recipientData[i][1];
+            let contactId = recipientData[i]["CONTACT_ID"];
             let email = mails[contactId];
+            let currentMailLogId = mailLogIds.get(contactId);
 
             if (email !== undefined)
             {
@@ -218,20 +250,34 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun)
                 email.subject = "Test: "+subjects[contactId];
                 for (let j =0; j<testRecipientData.length;j++)
                 {
-                    if(testRecipientData[j][1]){
+                    if(testRecipientData[j][1])
+                    {
                         email.toRecipients = [testRecipientData[j][1]];
+                        let nextMailLogId = util.getNewUUID();
+                        email.body = email.body.replace(currentMailLogId,nextMailLogId);
+                        currentMailLogId = nextMailLogId;
                         isSuccess = email.send();
 
-                        Array.prototype.push.call(isSuccess ? successIds : failedIds, recipientData[i][0]);
+                        Array.prototype.push.call(isSuccess ? successIds : failedIds, recipientData[i]["BULKMAILRECIPIENTID"]);
 
                         if (testRecipientData[j][0])
                         {
-                            let mailLogId = util.getNewUUID();
-                            db.insertData("MAIL_LOG", ["MAIL_LOGID","MAIL_RUN_ID","CONTACT_ID","STATUS","SENDER_EMAIL","RECIPIENT_EMAIL","MAILING_SUBJECT","DATE_SEND"], null, [mailLogId,mailrunId,testRecipientData[j][0],(isSuccess ?$KeywordRegistry.bulkMailRecipientStatus$sent(): $KeywordRegistry.bulkMailRecipientStatus$failed()),emailSender,testRecipientData[j][1],email.subject,vars.get("$sys.date")]);
-                            this.storeEmlFile(pBulkMailId, mailrunId, mailLogId,email.getEML());
+                            new SqlBuilder()
+                            .tableName("MAIL_LOG")
+                            .insertFields({
+                                "MAIL_LOGID":nextMailLogId,
+                                "MAIL_RUN_ID":mailrunId,
+                                "CONTACT_ID":testRecipientData[j][0],
+                                "STATUS":(isSuccess ?$KeywordRegistry.bulkMailRecipientStatus$sent(): $KeywordRegistry.bulkMailRecipientStatus$failed()),
+                                "SENDER_EMAIL":emailSender,
+                                "RECIPIENT_EMAIL":testRecipientData[j][1],
+                                "MAILING_SUBJECT":email.subject,
+                                "DATE_SEND":vars.get("$sys.date")
+                            });
+                            this.storeEmlFile(pBulkMailId, mailrunId, nextMailLogId,email.getEML());
                         }
                     }
-            }
+                }
 
             }
         }
@@ -277,10 +323,13 @@ BulkMailUtils.removeCommRestrictionRecipients = function (pBulkMailId)
 {
     var recipientIds = newSelect("BULKMAILRECIPIENTID")
         .from("BULKMAILRECIPIENT")
-        .join("CONTACT", newWhere()
-                .and("BULKMAILRECIPIENT.CONTACT_ID = CONTACT.CONTACTID")
-                .and(ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$mail())))
+        .join("CONTACT", "BULKMAILRECIPIENT.CONTACT_ID = CONTACT.CONTACTID")
         .where("BULKMAILRECIPIENT.BULKMAIL_ID", pBulkMailId)
+        .and(new CommunicationSettingsCondition()
+            .emails("BULKMAILRECIPIENT.EMAIL_ADDRESS")
+            .rejected()
+            .existSettings()
+            .buildCondition())
         .arrayColumn();
 
     newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", recipientIds, SqlBuilder.IN())
@@ -415,7 +464,11 @@ BulkMailUtils.filterNewRecipients = function (pBulkMailId, pContactIds)
                                 .and("BULKMAILRECIPIENT.BULKMAIL_ID", pBulkMailId)
                         , SqlBuilder.NOT_EXISTS())
                 // check if there's a commrestriction
-                .and(ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$mail(), true))  
+                .and(new CommunicationSettingsCondition()
+                    .emails(CommUtil.getStandardSubSqlMail())
+                    .rejected()
+                    .existNoSettings()
+                    .buildCondition())
                 .arrayColumn();
 }
 
@@ -569,7 +622,7 @@ BulkMailUtils.getRedirectLink = function(pLinkId)
  *                                      The device type that was used to open the link.<br>                                                 
  **/
 
-BulkMailUtils.insertClick = function(pMailLogId,pIpAddress,pLinkId,pBrowsername,pOperatingSystemName,pDeviceType)
+BulkMailUtils.insertClick = function (pMailLogId,pIpAddress,pLinkId,pBrowsername,pOperatingSystemName,pDeviceType)
 {
     if (!pMailLogId || !pLinkId) 
     {
@@ -610,15 +663,29 @@ BulkMailUtils.startBulkmailWorkFlow = function(pMailLogId, pLinkId)
     {
         return
     }
-    var workFlowKey = newSelect("WORKFLOWPROCESSDEFINITION_KEY").from("WEBLINK").where("WEBLINK.WEBLINKID", pLinkId).cell();
-    if (workFlowKey)
+    var [actionType, workflowKey, signalName] = newSelect(["ACTION_TYPE", "WORKFLOWPROCESSDEFINITION_KEY", "WORKFLOWSIGNAL_NAME"])
+        .from("WEBLINK")
+        .where("WEBLINK.WEBLINKID", pLinkId)
+        .arrayRow();
+    
+    var contactId = newSelect("CONTACT_ID")
+        .from("MAIL_LOG")
+        .where("MAIL_LOG.MAIL_LOGID", pMailLogId)
+        .cell();
+    
+    var variables = {
+        "mailLogId": pMailLogId,
+        "linkId": pLinkId,
+        "contactId": contactId
+    };
+    if (actionType == $KeywordRegistry.weblinkActionType$startWorkflow() && workflowKey)
     {
-        var variables = {
-            "MAILLOGID": pMailLogId
-        };
-        workflow.startProcessByKey(workFlowKey, variables);
+        workflow.startProcessByKey(workflowKey, variables);
+    }
+    else if (actionType == $KeywordRegistry.weblinkActionType$sendWorkflowSignal() && signalName)
+    {
+        workflow.signalEventReceived(signalName, variables);
     }
-    
 }
 
 
@@ -713,7 +780,11 @@ SerialLetterUtils.buildSerialLetter = function (pSerialLetterId, pRecipientIds)
                         .from("LETTERRECIPIENT")
                         .join("CONTACT", newWhere("LETTERRECIPIENT.CONTACT_ID = CONTACT.CONTACTID"))
                         .where("LETTERRECIPIENT.SERIALLETTER_ID", pSerialLetterId)
-                        .andIfSet(ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$letter(), true));
+                        .andIfSet(new CommunicationSettingsCondition()
+                            .postalAddress("LETTERRECIPIENT.ADDRESS_ID")
+                            .rejected()
+                            .existNoSettings()
+                            .buildCondition());
 
     if (pRecipientIds && pRecipientIds.length > 0)
         contactIdsSelect.and("LETTERRECIPIENT.LETTERRECIPIENTID", pRecipientIds, SqlBuilder.IN());
@@ -838,6 +909,10 @@ SerialLetterUtils.filterNewRecipients = function (pSerialLetterId, pContactIds)
                                     .and("LETTERRECIPIENT.SERIALLETTER_ID", pSerialLetterId)
                         , SqlBuilder.NOT_EXISTS())
                 // check if there's a commrestriction
-                .and(ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$mail(), true))  
+                .and(new CommunicationSettingsCondition()
+                    .postalAddress("CONTACT.ADDRESS_ID")
+                    .rejected()
+                    .existNoSettings()
+                    .buildCondition())
                 .arrayColumn();
 }
diff --git a/process/ChecklistEntryRegistry_basic/process.js b/process/ChecklistEntryRegistry_basic/process.js
index 50d93855904af185fe9bce7b36dfa55ad59f2e6a..3cc7f7907d2f685181e985a1a7d1c827fa1ae44a 100644
--- a/process/ChecklistEntryRegistry_basic/process.js
+++ b/process/ChecklistEntryRegistry_basic/process.js
@@ -214,17 +214,21 @@ $ChecklistEntryRegistry.salesprojectRoleIntDist = function(){
     return{
         title: translate.text("Project team: \"Internal distribution\""),
         verifierFn: function(pSalesprojectId){
-            
             var spRows = $ChecklistEntryRegistry._getRows(pSalesprojectId, "Salesproject_entity", ["SALESPROJECTID", "MST_TEAM_ID", "PROJECTCODE"], null, "NoPhaseRequirementLoading");
-            var memberRows = $ChecklistEntryRegistry._getRows(null, "Member_entity", ["MEMBERROLE"], [["EnableMSTeams_param", spRows[0]["MST_TEAM_ID"]], ["ObjectRowId_param", spRows[0]["SALESPROJECTID"]]], "WithDistrictResponsibles");
+            var memberRows = $ChecklistEntryRegistry._getRows(null, "Member_entity", ["MEMBERROLE"], [["EnableMSTeams_param", spRows[0]["MST_TEAM_ID"]], 
+                                                                    ["ObjectRowId_param", spRows[0]["SALESPROJECTID"]]], "WithDistrictResponsibles");
+            var roles = ["MEMROLEINTSALES", "MEMROLEINTRESPONSIBLE"];
+            
             for (let i = 0; i < memberRows.length; i++) 
             {
-                if(memberRows[i]["MEMBERROLE"] == $KeywordRegistry.memberRoleIntenDistrib())
+                var role = memberRows[i]["MEMBERROLE"];
+                var index = roles.indexOf(role);
+                if (index !== -1)
                 {
-                    return true;
+                    roles.splice(index, 1);
                 }
             }
-                return false;
+            return roles.length == 0;
         }
     };
 }
@@ -421,6 +425,7 @@ $ChecklistEntryRegistry.salesprojectRoleProjectteam = function(){
             var memberRows = $ChecklistEntryRegistry._getRows(null, "Member_entity", ["MEMBERROLE"], [["EnableMSTeams_param", spRows[0]["MST_TEAM_ID"]], 
                                                                     ["ObjectRowId_param", spRows[0]["SALESPROJECTID"]]], "WithDistrictResponsibles");
             var roles = ["MEMROLEINITIATOR", "MEMROLEDECISIONMAKER", "MEMROLEADVISE", "MEMROLEUSER", "MEMROLEEXSALEMANAG"];
+            var halfLength = Math.floor(roles.length / 2);
             
             for (let i = 0; i < memberRows.length; i++) 
             {
@@ -431,7 +436,7 @@ $ChecklistEntryRegistry.salesprojectRoleProjectteam = function(){
                     roles.splice(index, 1);
                 }
             }
-            return roles.length == 0;
+            return roles.length <= halfLength;
         }
     };
 }
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index 2824ee403672033132486d51070529e44f28e9db..d154f286f514db3308097b02d05be777cedfe273 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -179,8 +179,15 @@ ContactUtils.getContactType = function(pContactId, pPersonId, pOrganisationId)
  */
 ContactUtils.isOrganisation = function(pContactId, pPersonId, pOrganisationId)
 {
-    var contactType = ContactUtils.getContactType(pContactId, pPersonId, pOrganisationId);
-    
+    var contactType;
+    if(pContactId)
+    {
+        contactType = ContactUtils.getContactTypeByContactId(pContactId);
+    }
+    else
+    {
+        contactType = ContactUtils.getContactTypeByPersOrg(pPersonId, pOrganisationId);
+    }
     return contactType == 1;
 }
 
@@ -199,8 +206,15 @@ ContactUtils.isOrganisation = function(pContactId, pPersonId, pOrganisationId)
  */
 ContactUtils.isPrivatePerson = function(pContactId, pPersonId, pOrganisationId)
 {
-    var contactType = ContactUtils.getContactType(pContactId, pPersonId, pOrganisationId);
-    
+    var contactType;
+    if(pContactId)
+    {
+        contactType = ContactUtils.getContactTypeByContactId(pContactId);
+    }
+    else
+    {
+        contactType = ContactUtils.getContactTypeByPersOrg(pPersonId, pOrganisationId);
+    }
     return contactType == 2;
 }
 
@@ -219,8 +233,15 @@ ContactUtils.isPrivatePerson = function(pContactId, pPersonId, pOrganisationId)
  */
 ContactUtils.isPersonOfOrganisation = function(pContactId, pPersonId, pOrganisationId)
 {
-    var contactType = ContactUtils.getContactType(pContactId, pPersonId, pOrganisationId);
-    
+    var contactType;
+    if(pContactId)
+    {
+        contactType = ContactUtils.getContactTypeByContactId(pContactId);
+    }
+    else
+    {
+        contactType = ContactUtils.getContactTypeByPersOrg(pPersonId, pOrganisationId);
+    }
     return contactType == 3;
 }
 
@@ -536,6 +557,8 @@ ContactUtils.getDefaultAddressId = function(pContactId)
  * @param {String|Number} [pStartDate=current date] date to check against the start date of the commrestriction
  * 
  * @return {SqlBuilder} the condition
+ * 
+ * @deprecated use CommunicationSettingsCondition
  */
 ContactUtils.getCommRestrictionCondition = function (pMedium, pNoRestriction, pStartDate)
 {
@@ -580,37 +603,41 @@ ContactUtils.hasCommRestriction = function(pContactId, pMedium, pStartDate)
 }
 
 /**
- * returns a sql subselect which concatenates all commrestriction displayvalues (translated).
- * The select needs the CONTACT.CONTACTID column.
+ * Generates a summary of communication settings with status 'rejected'.
  * 
- * @return {String} the resulting subselect
+ * @param {String} pContactId   contactId of the contact for the communication settings
+ * @return {String} description of all rejected communication channels
  */
-ContactUtils.getActiveCommRestrictionsSubselect = function()
+ContactUtils.getCommunicationRejectionSummary = function (pContactId)
 {
-    var mediumList = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.communicationMediumCampaign(), "COMMUNICATIONSETTINGS.MEDIUM");
-    var mask = new SqlMaskingUtils()
-
-    var orgContactSubselect = newSelect("orgContact.CONTACTID")
-                                    .from("CONTACT anyContact")
-                                    .join("CONTACT orgContact", newWhere("anyContact.ORGANISATION_ID = orgContact.ORGANISATION_ID")
-                                                                    .and("orgContact.PERSON_ID IS NULL"))
-                                    .where("anyContact.CONTACTID = CONTACT.CONTACTID")
+    var mediumTitleSql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.communicationMediumCampaign(), "COMMUNICATIONSETTINGS.MEDIUM");
+    var communicationRejections = newSelect(["CHANNEL_TYPE", "MEDIUM", mediumTitleSql])
+        .from("COMMUNICATIONSETTINGS")
+        .where("COMMUNICATIONSETTINGS.CONTACT_ID", pContactId)
+        .and("COMMUNICATIONSETTINGS.CHANNEL_TYPE", $KeywordRegistry.communicationChannelType$profiling(), SqlBuilder.NOT_EQUAL())
+        .and("COMMUNICATIONSETTINGS.STATUS", $KeywordRegistry.communicationSettingStatus$rejected())
+        .orderBy(mediumTitleSql)
+        .table();
 
-    var group = mask.getGroupConcat("DISTINCT "+mediumList, "', '");
-    var subselect = "''";
-    if(group)
+    if (communicationRejections.length > 0)
     {
-        var res = newSelect(group).from("COMMUNICATIONSETTINGS")
-                    .where("COMMUNICATIONSETTINGS.CONTACT_ID = CONTACT.CONTACTID")
-                    .and("COMMUNICATIONSETTINGS.STATUS", $KeywordRegistry.communicationSettingStatus$rejected())
-
-        var subres = newSelect(group).from("COMMUNICATIONSETTINGS")
-                    .where("COMMUNICATIONSETTINGS.CONTACT_ID in ( "+orgContactSubselect.toString()+")")
-                    .and("COMMUNICATIONSETTINGS.STATUS", $KeywordRegistry.communicationSettingStatus$rejected())
-                    
-        subselect = mask.concatWithSeparator(["("+res.toString()+")", "("+subres.toString()+")"], ", ", false);
+        var mediumTitles = [];
+        var hasGlobalRejection = communicationRejections.some(function ([channelType, medium, mediumTitle])
+        {
+            if (channelType == $KeywordRegistry.communicationChannelType$address())
+            {
+                mediumTitle = KeywordUtils.getViewValue($KeywordRegistry.communicationMediumCampaign(), $KeywordRegistry.communicationMediumCampaign$letter());
+            }
+            mediumTitles.push(mediumTitle);
+            return channelType == $KeywordRegistry.communicationChannelType$global();
+        });
+        if (hasGlobalRejection)
+        {
+            return translate.text("No advertising");
+        }
+        return translate.text("No advertising by") + " " + mediumTitles.join(", ")
     }
-    return subselect;
+    return "";
 }
 
 /**
diff --git a/process/Date_lib/process.js b/process/Date_lib/process.js
index bb454d912a881007811c2ddc2badc19bfd5612fd..faab5091a0ed1e47aeb1ae0e103d14fb3e746c38 100644
--- a/process/Date_lib/process.js
+++ b/process/Date_lib/process.js
@@ -95,7 +95,7 @@ DateUtils.getDayDifference = function (pPastDate, pCurrentDate)
     if (pCurrentDate == null)
         pCurrentDate = datetime.date();
     var millisecDiff = Math.abs(pCurrentDate - pPastDate);
-    var dayDiff = Math.floor(millisecDiff / datetime.ONE_DAY);
+    var dayDiff = Math.round(millisecDiff / datetime.ONE_DAY);
     
     return dayDiff;
 }
diff --git a/process/Dependency_lib/process.js b/process/Dependency_lib/process.js
index 76b94543fc436be99897773a884b33279c618644..54305d6527bdc2b883fe62e567a560c06684f0a6 100644
--- a/process/Dependency_lib/process.js
+++ b/process/Dependency_lib/process.js
@@ -718,7 +718,7 @@ Dependency.mapping = function ()
                 "options" : {
                     "isObservable" : true
                 },
-                "getUIDsfn" : Dependency.defaultFunctionForField("LEAD.LEADIMPORT_ID")
+                "getUIDsfn" : Dependency.defaultFunctionForField("LEADS.LEADIMPORT_ID")
             }
         }
     };
diff --git a/process/DocumentTemplate_lib/process.js b/process/DocumentTemplate_lib/process.js
index 2d2c94f233ccfac4d99840b457f803de64259134..99be3eedc81c09ad7456d7c39c77ff230301b0c9 100644
--- a/process/DocumentTemplate_lib/process.js
+++ b/process/DocumentTemplate_lib/process.js
@@ -65,10 +65,23 @@ DocumentTemplate.prototype.toString = function (pWithSubtemplates)
     if (this._stringCache[stringCachePosition] == null)
     {
         var content = pWithSubtemplates && this._subtemplateResolvedContent || this.content;
-        if (this.type == DocumentTemplate.types.PLAIN)
-            this._stringCache[stringCachePosition] = content;
-        else
-            this._stringCache[stringCachePosition] = text.parseDocument(content);
+        switch(this.type)
+        {
+            case DocumentTemplate.types.EML: //intended fallthrough 
+                if(this.options.onlyBody)
+                {
+                    var email = Email.fromRFC(content);
+                    content = util.encodeBase64String(email.body);
+                }  
+            case DocumentTemplate.types.HTML:
+                this._stringCache[stringCachePosition] = util.decodeBase64String(content);
+                break;
+            case DocumentTemplate.types.PLAIN:
+                this._stringCache[stringCachePosition] = content;
+                break;
+            default:
+                this._stringCache[stringCachePosition] = text.parseDocument(content);
+        }
     }
     return this._stringCache[stringCachePosition];
 }
@@ -425,7 +438,9 @@ DocumentTemplate.prototype.getReplacedContent = function (pReplacements)
         case DocumentTemplate.types.HTML:
             // replaces ä, ö, ü, ... with html escape signs
             for (let i in pReplacements)
+            {                
                 pReplacements[i] = text.text2html(pReplacements[i], false);
+            }
         case DocumentTemplate.types.TXT:
             let decodedContent = util.decodeBase64String(content);
             let encodedContent = this._replaceText(decodedContent, pReplacements);
@@ -555,7 +570,7 @@ DocumentTemplate.prototype.getReplacedEmailsByContactIds = function (pContactIds
     var emailObjects = {};
     var isEML = this.type == DocumentTemplate.types.EML;
     this.setOptions({base64 : isEML});
-    var emailContents = this.getReplacedContentByContactIds(pContactIds, PlaceholderUtils.getLinkPlaceholders());
+    var emailContents = this.getReplacedContentByContactIds(pContactIds, pAdditionalPlaceholders);
     
     for (let contactId in emailContents)
     {
diff --git a/process/Document_lib/process.js b/process/Document_lib/process.js
index ee264f730e597f0c4b8c305e11ad71a32d49e0f4..bf9a2ba925aded0949cd372c045c5c343e44673f 100644
--- a/process/Document_lib/process.js
+++ b/process/Document_lib/process.js
@@ -1,3 +1,4 @@
+import("Context_lib");
 import("system.util");
 import("system.translate");
 import("system.result");
@@ -34,7 +35,9 @@ DocumentUtil.downloadSelectedDocuments = function(pAssignmentName) {
         // check if multiplie Files are selected.
         // files get packed into a zip archive before downloading
         if(binaryContents.length > 1) {
-            var fileNames = rows.map(function(value) { return value["NAME"]; });
+            var fileNames = rows.map(function(value) {
+                return value["NAME"];
+            });
             neon.downloadToZip(translate.text("Files") + ".zip", binaryContents, fileNames);
         }
         else if(pAssignmentName == "ERRORLOG")
@@ -101,6 +104,23 @@ DocumentUtil.deleteCurrentDocument = function() {
     }
 }
 
+/**
+ * Utility function to delete all Uploaded Images of the current Context and uid.
+ * 
+ *  @param {String} pAssignmentName the name of the field of the HTML component + "_IMAGE_UPLOAD"
+ */
+DocumentUtil.deleteAllUploadedImages = function(pAssignmentName) {
+    // If the bin data is saved by the html-component, the tablename is the name of the entity!
+    var binMetadata = db.getBinaryMetadata(ContextUtils.getEntity(ContextUtils.getCurrentContextId()), pAssignmentName, vars.get("$sys.uid"), false, SqlUtils.getBinariesAlias());
+
+
+    binMetadata.forEach(function(pMeta) 
+    { //delete the connected binData
+        db.deleteBinary(pMeta.id, SqlUtils.getBinariesAlias());
+    });
+
+}
+
 /**
  * Utility function to retrieve the filename from an uploadcomponent value.
  * The value of an uploadcomponent contains filename + filedata separated by
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index defb4e85cb3a5ccdc2553cd3e1932668f03d7d26..8906c9fcaf483fcfca2de7223855d1398787402a 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -149,6 +149,9 @@ $KeywordRegistry.salesprojectPhase$sal = function(){return "SALPROJPHASESAL"};
 $KeywordRegistry.salesprojectPhase$sqo = function(){return "SALPROJPHASESQO"};
 $KeywordRegistry.salesprojectPhase$mqc = function(){return "SALPROJPHASEMQC"};
 
+$KeywordRegistry.probabilitySalesproject = function(){return "ProbabilitySalesproject";};
+$KeywordRegistry.probabilityOffer = function(){return "ProbabilityOffer";};
+
 $KeywordRegistry.taskPriority = function(){return "TaskPriority";};
 $KeywordRegistry.taskPriority$none = function(){return "TASKPRIONONE";};
 $KeywordRegistry.taskPriority$low = function(){return "TASKPRIOLOW";};
@@ -236,6 +239,8 @@ $KeywordRegistry.bulkMailStatus = function(){return "BulkMailStatus";};
 $KeywordRegistry.bulkMailStatus$notSent = function(){return "BULKMAILNOTSENT";};
 $KeywordRegistry.bulkMailStatus$beingSent = function(){return "BULKMAILBEINGSENT";};
 $KeywordRegistry.bulkMailStatus$sent = function(){return "BULKMAILSENT";};
+$KeywordRegistry.bulkMailStatus$planned = function(){return "BULKMAILPLANNED";};
+$KeywordRegistry.bulkMailStatus$missed = function(){return "BULKMAILMISSED";};
 
 $KeywordRegistry.serialLetterStatus = function(){return "SerialLetterStatus";};
 $KeywordRegistry.serialLetterStatus$notSent = function(){return "SERIALLETTERNOTSENT";};
@@ -400,5 +405,6 @@ $KeywordRegistry.interestLinkStatus$notSubscribed = function(){return "INTERESTL
 $KeywordRegistry.deviceType = function(){return "DeviceType";};
 $KeywordRegistry.interestLinkStatus$notSubscribed = function(){return "INTERESTLINK_NOTSUBSCRIBED";};
 
-$KeywordRegistry.communicationBlacklistType = function(){return "CommunicationBlacklistType";};
-$KeywordRegistry.communicationBlacklistType$emailRecipientFilter = function(){return "BLACKLIST_TYPE_EMAILRECIPIENT_FILTER";};
\ No newline at end of file
+$KeywordRegistry.weblinkActionType = function(){return "WeblinkActionType";};
+$KeywordRegistry.weblinkActionType$startWorkflow = function(){return "LINKACTION_STARTWORKFLOW";};
+$KeywordRegistry.weblinkActionType$sendWorkflowSignal = function(){return "LINKACTION_SENDSIGNAL";};
\ No newline at end of file
diff --git a/process/LeadQuickAcquisition_lib/process.js b/process/LeadQuickAcquisition_lib/process.js
index efb48f95f7ec27e1ecb289e918929a084d4d148a..80cf36921cd4df63f84f0c659fd5b4cfbfe51c72 100644
--- a/process/LeadQuickAcquisition_lib/process.js
+++ b/process/LeadQuickAcquisition_lib/process.js
@@ -1,4 +1,3 @@
-import("WsValidation_lib");
 import("system.logging");
 import("system.project");
 import("system.neon");
@@ -10,9 +9,11 @@ import("system.net");
 import("system.auth");
 import("system.util");
 import("system.fileIO");
+import("system.swing");
 import("KeywordRegistry_basic");
 import("Sql_lib");
 import("Email_lib");
+import("Util_lib");
 
 /**
  * Object for storing the webservice response and
@@ -49,9 +50,10 @@ function LeadQuickAcquisition(){}
 /**
  * Method which calls the web service and gives the information back as object.
  * @param pFile the file which will send to the webservice.
+ * @param pLang The language which will be used to recognize the business card.
  * @return {Object} the reply from the web service.
  */
-LeadQuickAcquisition.callWebService = function(pFile)
+LeadQuickAcquisition.callWebService = function(pFile, pLang)
 {
     var response = new WebserviceResponse();
     
@@ -63,7 +65,7 @@ LeadQuickAcquisition.callWebService = function(pFile)
         case "application/pdf":
         case "image/tiff":
         case "image/gif":
-            response = LeadQuickAcquisition.handleBusinessCard(pFile.bindata);
+            response = LeadQuickAcquisition.handleBusinessCard(pFile.bindata, pLang);
             break;
         case "message/rfc822":
             response = LeadQuickAcquisition.handleMailSig(Email.fromRFC(pFile.bindata));
@@ -80,16 +82,17 @@ LeadQuickAcquisition.callWebService = function(pFile)
 /**
  * Method which is especially for handling business cards.
  * @param pFile the file which will send to the webservice.
+ * @param pLang The language which will be used to recognize the business card.
  * @return {Object} the reply from the web service.
  */
-LeadQuickAcquisition.handleBusinessCard = function(pFile)
+LeadQuickAcquisition.handleBusinessCard = function(pFile, pLang)
 {
     var isEnabled = LeadQuickAcquisitionBusinessCardUtils.isEnabled();
     var response = null;
     
     if (isEnabled) 
     {
-        response = LeadQuickAcquisitionBusinessCardUtils._callWebServiceBusinessCard(pFile);
+        response = LeadQuickAcquisitionBusinessCardUtils._callWebServiceBusinessCard(pFile, pLang);
         response = LeadQuickAcquisitionBusinessCardUtils._transformToResponse(response);
     }
     
@@ -136,32 +139,66 @@ LeadQuickAcquisitionBusinessCardUtils.isEnabled = function()
 /**
  * Method which calls the webservice for business card.
  * @param pFile the file which will send to the webservice.
- * @return {Object} the reply from the web service.
+ * @param pLang The language which will be used to recognize the business card.
+ * @return {Array} Result array (0: recognized business card, 1: language which was used for recognition).
  */
-LeadQuickAcquisitionBusinessCardUtils._callWebServiceBusinessCard = function(pFile)
+LeadQuickAcquisitionBusinessCardUtils._callWebServiceBusinessCard = function(pFile, pLang)
 {
     var appId = project.getInstanceConfigValue("custom.abbyy.ocr.appId", "");
     var pwd = project.getInstanceConfigValue("custom.abbyy.ocr.password", "");
-    var language = "German";
-
-    //var reply = '{"Company":"eisner","Email":"mustermann@motyp.de","Address":"Hauptstraße 21 ■ 12345 Berlin","Web":null,"Phone":null,"Fax":"028 01 83 999 019","Job":"Fliesenverlegemeister","Mobile":"0171 23 456 78","Name":"Max Mustermann"}';
-    var reply = plugin.run(null,"de.adito.plugin.OCR.BusinessCardRecognizer", [appId, pwd, pFile ,language])[0];
-
-    //Error codes are defined in the java plugin.
-    if (reply == "552") 
-    {
-        throw new Error("Abbyy ocr plugin has not enough credits!");
-    }
-    else if (reply == "555")
-    {
-        throw new Error("The Abbyy ocr plugin request could not be completed!");
-    }
-    else if (reply == "550")
+    var authConf = auth.createConfigForBasicAuth()
+                            .userName(appId)
+                            .password(pwd);
+    var conf = net.createConfigForRestWebserviceCall()
+                        .url("https://cloud.ocrsdk.com/processBusinessCard")
+                        .actionType("POST")
+                        .addQueryParameter("language", pLang)
+                        .addQueryParameter("exportFormat", "xml")
+                        .addQueryParameter("xml:WriteFieldComponents", "true")
+                        .requestEntity(pFile);
+    
+    var response = util.decodeBase64String(net.callRestWebservice(conf, authConf));
+    var responseXml = response.substring(response.indexOf("<response>"), response.length);
+    var taskId = new XML(responseXml).task.@id;
+    var getStatus = function(pTaskId){
+        conf = net.createConfigForRestWebserviceCall()
+                        .url("https://cloud.ocrsdk.com/getTaskStatus")
+                        .addQueryParameter("taskId", pTaskId);
+        response = util.decodeBase64String(net.callRestWebservice(conf, authConf));
+        responseXml = response.substring(response.indexOf("<response>"));
+        return [new XML(responseXml).task.@resultUrl, new XML(responseXml).task.@status];
+    };
+    
+    if (taskId)
     {
-        throw new Error("The Abbyy ocr plugin credentials are wrong!")
+        var resultUrl = "";
+        var taskStatus = getStatus(taskId)[1];
+        
+        while(taskStatus != "Completed" && taskStatus != "ProcessingFailed" && taskStatus != "Deleted" && taskStatus != "NotEnoughCredits")
+        {
+            [resultUrl, taskStatus] = getStatus(taskId);
+        }
+        
+        switch(taskStatus.toString()){
+            case "Completed":
+                conf = net.createConfigForRestWebserviceCall()
+                                .url(resultUrl)
+                                .actionType("GET");
+                response = util.decodeBase64String(net.callRestWebservice(conf, auth.createConfigForNoAuth()));
+                response = new XML(response.substring(response.indexOf("<businessCard"), response.indexOf("</document>")));
+                break;
+            case "ProcessingFailed":
+                throw new Error("Abbyy: Processing of the business card failed!")
+                break;
+            case "Deleted":
+                throw new Error("Abbyy: The requested, recognized business card was deleted.")
+                break;
+            case "NotEnoughCredits":
+                throw new Error("Abbyy: Not enough credits!")
+                break;
+        }
     }
-    
-    return reply;
+    return [response, pLang];
 }
 
 /**
@@ -172,22 +209,32 @@ LeadQuickAcquisitionBusinessCardUtils._callWebServiceBusinessCard = function(pFi
 LeadQuickAcquisitionBusinessCardUtils._transformToResponse = function(pReply)
 {
     var response = new WebserviceResponse();
-    var parsedData = JSON.parse(pReply);
+    var lang = pReply[1];
+    pReply = pReply[0];
     
-    if(parsedData.Company) response.companyName = parsedData.Company;
-    if(parsedData.Email) response.emailAddress = parsedData.Email;
-    if(parsedData.Web) response.website = parsedData.Web;
-    if(parsedData.Phone) response.phoneNumber = parsedData.Phone;
-    if(parsedData.Mobile) response.mobilePhone = parsedData.Mobile;
-    if(parsedData.Name)
-    {
-        response.firstName = parsedData.Name.substring(0, parsedData.Name.indexOf(" ", 0));
-        response.lastName = parsedData.Name.substring(parsedData.Name.lastIndexOf(" ", parsedData.Name.indexOf(" ", 0))+1, parsedData.Name.length-1);
-    }
-    if (WsValidationUtils.isWsEnabled(WsValidationType.get().TYPE_ADDRESS_NOMINATIM) && parsedData.Address)
+    logging.log("Abbyy reponse: " + pReply.toString());
+    
+    var getNodesValue = function(pResponse, pType)
     {
-        response.address = parsedData.Address;
-    }
+        return Utils.isNotNullOrEmptyString(pResponse.field.(@type==pType).value[0]) ? pResponse.field.(@type==pType).value[0].toString() : "";
+    };
+    
+    response.companyName = getNodesValue(pReply, "Company");
+    response.emailAddress = getNodesValue(pReply, "Email");
+    response.website = getNodesValue(pReply, "Web");
+    response.phoneNumber = getNodesValue(pReply, "Phone");
+    response.mobilePhone = getNodesValue(pReply, "Mobile");
+    response.firstName = Utils.isNotNullOrEmptyString(pReply.field.(@type == "Name").fieldComponents.fieldComponent.(@type=="FirstName").value[0]) ? 
+                                pReply.field.(@type == "Name").fieldComponents.fieldComponent.(@type=="FirstName").value[0].toString() : "";
+    response.lastName = Utils.isNotNullOrEmptyString(pReply.field.(@type == "Name").fieldComponents.fieldComponent.(@type=="LastName").value[0]) ? 
+                                pReply.field.(@type == "Name").fieldComponents.fieldComponent.(@type=="LastName").value[0].toString() : "";
+    response.address = Utils.isNotNullOrEmptyString(pReply.field.(@type == "Address").fieldComponents.fieldComponent.(@type=="StreetAddress").value[0]) 
+                                ? pReply.field.(@type == "Address").fieldComponents.fieldComponent.(@type=="StreetAddress").value[0].toString() 
+                                    : "";
+    response.postalCode = Utils.isNotNullOrEmptyString(pReply.field.(@type == "Address").fieldComponents.fieldComponent.(@type=="ZipCode").value[0]) ? 
+                                pReply.field.(@type == "Address").fieldComponents.fieldComponent.(@type=="ZipCode").value[0].toString() : "";
+    response.city = Utils.isNotNullOrEmptyString(pReply.field.(@type == "Address").fieldComponents.fieldComponent.(@type=="City").value[0]) ? 
+                                pReply.field.(@type == "Address").fieldComponents.fieldComponent.(@type=="City").value[0].toString() : "";
     
     return response;
 }
diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index 1859595621f80e74f67d3b93cbd5959a5746cb60..9d57e38ddd2d803c9c12ce1660f873eae790895a 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -153,7 +153,7 @@ LeadImportUtils.loadImportFile = function(pBinId, pFieldSep, pFieldLimit, pRecor
  */
 LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pFieldValues, pImportDefID, pAttrObject, pSource, pUser, pDate)
 {
-    var LeadValues = LeadImportUtils.setValues(pDataFields["LEAD"], pFieldDef, pFieldValues); // set the Lead values
+    var LeadValues = LeadImportUtils.setValues(pDataFields["LEADS"], pFieldDef, pFieldValues); // set the Lead values
  
     var orgid = "";
     var persid = ""; 
@@ -214,7 +214,7 @@ LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pField
     LeadValues["ORGANISATION_ID"] = orgid;
     LeadValues["PERSON_ID"] = persid;
     
-    var leadId = LeadImportUtils.insertTable(pDataFields, pDataTypes ,LeadValues, "LEAD", pUser, pDate);//inserts the LEAD dataset
+    var leadId = LeadImportUtils.insertTable(pDataFields, pDataTypes ,LeadValues, "LEADS", pUser, pDate);//inserts the LEAD dataset
 
     LeadImportUtils.insertLeadAttr(pAttrObject, orgid, persid, LeadValues["DATE_NEW"], pUser, pDate, (orgRet && orgRet.length >= 4 && orgRet[3]));
     
@@ -698,11 +698,6 @@ LeadImportUtils.insertTable = function(pDataFields, pDataTypes, pValues, pTable,
         TableValues[i] = pValues[Fields[i]];
     }
     
-    if (db.getDatabaseType(vars.getString("$sys.dbalias")) == db.DBTYPE_MARIADB10)
-    {
-        pTable = "`" + pTable + "`";
-    }
-    
     db.insertData(pTable, Fields, Types, TableValues);
     
     return pValues[TableID];
@@ -898,7 +893,7 @@ LeadImportUtils.getEntityFieldsPers = function(pPersDataFields, pContactDataFiel
  */
 LeadImportUtils.scanLeadDups = function(pAllContactData)
 {
-    var dupUpdateLeadTable = "LEAD";
+    var dupUpdateLeadTable = "LEADS";
 
     var leadID = "";
     var toUpdate = [];
diff --git a/process/MarketingCondition_lib/process.js b/process/MarketingCondition_lib/process.js
index 2053acd67b4992dadcbb7c8048dbd530d4e80b3b..daad96cdd66b454d932358793322e704b7886d49 100644
--- a/process/MarketingCondition_lib/process.js
+++ b/process/MarketingCondition_lib/process.js
@@ -10,6 +10,7 @@ import("KeywordRegistry_basic");
 function CommunicationSettingsCondition ()
 {
     this._contactIdSql = "CONTACT.CONTACTID";
+    this._contactId = null;
     this._channelType = null;
     this._medium = null;
     this._channelIdSql = null;
@@ -20,6 +21,14 @@ function CommunicationSettingsCondition ()
 CommunicationSettingsCondition.prototype.contactIdField = function (pContactIdSql)
 {
     this._contactIdSql = pContactIdSql;
+    this._contactId = null;
+    return this;
+}
+
+CommunicationSettingsCondition.prototype.contactId = function (pContactId)
+{
+    this._contactId = pContactId;
+    this._contactIdSql = null;
     return this;
 }
 
@@ -47,7 +56,7 @@ CommunicationSettingsCondition.prototype.medium = function (pMedium, pAddressSql
     this._channelType = $KeywordRegistry.communicationChannelType$communication();
     this._medium = pMedium;
     if (pAddressSql)
-        this._channelIdSql = pAddressSql;
+        this._channelIdSql = "( "+ pAddressSql + " )";
     return this;
 }
 
@@ -71,7 +80,7 @@ CommunicationSettingsCondition.prototype.emails = function (pAddressSql)
 CommunicationSettingsCondition.prototype.address = function (pAddressSql)
 {
     this._channelType = $KeywordRegistry.communicationChannelType$address();
-    this._channelIdSql = pAddressSql;
+    this._channelIdSql = "( "+ pAddressSql + " )";
     return this;
 }
 
@@ -120,8 +129,16 @@ CommunicationSettingsCondition.prototype.buildSelect = function (pSelectFields)
         pSelectFields = "COMMUNICATIONSETTINGS.COMMUNICATIONSETTINGSID";
     var sql = newSelect(pSelectFields)
         .from("COMMUNICATIONSETTINGS")
-        .where("COMMUNICATIONSETTINGS.CONTACT_ID = " + this._contactIdSql)
-        .andIfSet("COMMUNICATIONSETTINGS.STATUS", this._settingStatus);
+        .whereIfSet("COMMUNICATIONSETTINGS.STATUS", this._settingStatus);
+    
+    if (this._contactIdSql)
+    {
+        sql.and("COMMUNICATIONSETTINGS.CONTACT_ID = " + this._contactIdSql)
+    }
+    else if (this._contactId)
+    {
+        sql.and("COMMUNICATIONSETTINGS.CONTACT_ID", this._contactId);
+    }
     
     var channelCondition = newWhere("COMMUNICATIONSETTINGS.CHANNEL_TYPE", $KeywordRegistry.communicationChannelType$global());
     if (this._channelType)
@@ -149,58 +166,3 @@ CommunicationSettingsCondition.prototype.buildCondition = function ()
 {
     return newWhere(null, this.buildSelect(), this._existsOperator);
 }
-
-
-/* required functionality:
- * - make communication settings condition
- * - make interest condition
- * - make blacklist condition
- * - make full condition
- * - check for single contact
- */
-
-function CommunicationBlacklist () 
-{
-    this.filter = null;
-}
-
-/**
- * @return {CommunicationBlacklist}
- */
-CommunicationBlacklist.getMailRecipientBlacklist = function ()
-{
-    var currentDate = vars.get("$sys.date");
-    var filters = newSelect("BLACKLIST_FILTER")
-        .from("COMMUNICATIONBLACKLIST")
-        .where("COMMUNICATIONBLACKLIST.BLACKLIST_TYPE", $KeywordRegistry.communicationBlacklistType$emailRecipientFilter())
-        .and(newWhere("COMMUNICATIONBLACKLIST.START_DATE", currentDate, SqlBuilder.GREATER_OR_EQUAL())
-            .or("COMMUNICATIONBLACKLIST.START_DATE is null"))
-        .and(newWhere("COMMUNICATIONBLACKLIST.END_DATE", currentDate, SqlBuilder.LESS_OR_EQUAL()))
-            .or("COMMUNICATIONBLACKLIST.END_DATE is null")
-        .table();
-    
-    var filterMappingFn = function ([blacklistFilter])
-    {
-        blacklistFilter = JSON.parse(blacklistFilter);
-        if (!blacklistFilter.filter || blacklistFilter.entity != "BulkMailRecipient_entity" || Utils.isNullOrEmpty(blacklistFilter.filter.childs))
-            return null;
-        
-        return blacklistFilter.filter;
-    };
-    
-    var blacklist = new CommunicationBlacklist();
-    blacklist.filter = {
-        type: "group",
-        operator: "AND",
-        childs: filters.map(filterMappingFn).filter(Utils.isObject)
-    };
-    return blacklist;
-}
-
-CommunicationBlacklist.prototype.getCondition = function ()
-{
-    return new FilterSqlTranslator()
-        .filter(this.filter)
-        .table("BULKMAILRECIPIENT")
-        .getSqlCondition();
-}
diff --git a/process/Observation_lib/process.js b/process/Observation_lib/process.js
index b2e80061c7b805fc9bcbfa405a8790c1bc257f5a..b67681a7849ecdad075089797c7084260d5934c7 100644
--- a/process/Observation_lib/process.js
+++ b/process/Observation_lib/process.js
@@ -637,22 +637,24 @@ Observation.actionState = function (pSelectedUIDs, pIsCancelAction)
  * If filter or entity are not set, they are set to an empty filter and the current entity.
  * 
  * @param {String} [pEntity]
- * @param {Object} [pFilter]
+ * @param {Object} [pFilterObj]
  * @return {Object} Object in Format: {"filter": {"type":"group","operator":"AND","childs":[...]}, "entity": "Entity_entity"}
  */
-Observation.getEntityFilter = function (pEntity, pFilter) 
+Observation.getEntityFilter = function (pEntity, pFilterObj) 
 {
     if (!pEntity)
         pEntity = ContextUtils.getEntity(ContextUtils.getCurrentContextId());
-    if (!pFilter)
-        pFilter = {
+    if (!pFilterObj)
+    {
+        pFilterObj = {
             "type":"group",
             "operator":"AND",
             "childs":[]
-        }
+        };
+    }
     
     return JSON.stringify({
-        "filter":pFilter,
+        "filter":pFilterObj,
         "entity":pEntity
     });
 }
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index 656902d6552080485721888117b0092791db81a1..70aee7aa9870bd982648daabff7fc23a95400894 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -322,8 +322,9 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
                     if(pSumUpPrices)//also build priceObject if pSumUpPrices is set to true
                     {
                         priceObject[newid] = {};
-                        priceObject[newid]["price"] = price*P2pObject["quantity"];
+                        priceObject[newid]["price"] = price;
                         priceObject[newid]["vat"] = vat;
+                        priceObject[newid]["quantity"] = P2pObject["quantity"];
                     }
                     
                 }
@@ -665,8 +666,13 @@ ItemUtils.sumUpPricesWhenInserting = function (pStatements, pCorrectOrder, pTree
         var vat = 0;
         for(var id in pTreeStructure[pTopItemId])
         {
-            calcPrice = eMath.addDec(pPriceObj[id]["price"], calcPrice);
-            if(pPriceObj[id]["vat"] !== null && pPriceObj[id]["vat"] !== undefined && pPriceObj[id]["vat"] > 0)
+            let price = 0;
+            if(pPriceObj[id])
+            {
+                price = pPriceObj[id]["price"]*pPriceObj[id]["quantity"];
+            }
+            calcPrice = eMath.addDec(price, calcPrice);
+            if(pPriceObj[id] && pPriceObj[id]["vat"] && pPriceObj[id]["vat"] > 0)
             {
                 vat = pPriceObj[id]["vat"];
             }
@@ -719,11 +725,11 @@ ItemUtils.sumUpPricesWhenInserting = function (pStatements, pCorrectOrder, pTree
                     var childPrice;
                     if(pPriceObj[child] != undefined)
                     {
-                        childPrice = pPriceObj[child]["price"]
+                        childPrice = priceObj[child]["price"]*priceObj[child]["quantity"]
                     }
-                    else if(summandObject[child][child] != undefined)
+                    else if(summandObject[child] != undefined && summandObject[child][child] != undefined)
                     {
-                        childPrice = pPriceObj[Object.keys(summandObject[child][child])[0]]["price"]
+                        childPrice = priceObj[Object.keys(summandObject[child][child])[0]]["price"]*priceObj[child]["quantity"]
                         vat = pPriceObj[Object.keys(summandObject[child][child])[0]]["vat"]
                     }
                     else
@@ -732,9 +738,9 @@ ItemUtils.sumUpPricesWhenInserting = function (pStatements, pCorrectOrder, pTree
                         vat = 0;
                     }
                     calcPrice = eMath.addDec(childPrice, calcPrice);
-                    if(pPriceObj[child]["vat"] !== null && pPriceObj[child]["vat"] !== undefined && pPriceObj[child]["vat"] > 0)
+                    if(pPriceObj[child] && priceObj[child]["vat"] !== null && priceObj[child]["vat"] !== undefined && priceObj[child]["vat"] > 0)
                     {
-                        vat = pPriceObj[child]["vat"];
+                        vat = priceObj[child]["vat"];
                     }
                 }
                 calcPrice = calcPrice/quantity;
@@ -760,8 +766,16 @@ ItemUtils.sumUpPricesWhenInserting = function (pStatements, pCorrectOrder, pTree
             }
             else
             {
-                pStatements[statement][3][7] = priceObj[pStatements[statement][3][0]]["price"] //price
-                pStatements[statement][3][8] = priceObj[pStatements[statement][3][0]]["vat"] //vat
+                if(priceObj[pStatements[statement][3][0]] == undefined)
+                {
+                    pStatements[statement][3][7] = 0; //price
+                    pStatements[statement][3][8] = 0; //vat
+                }
+                else
+                {
+                    pStatements[statement][3][7] = priceObj[pStatements[statement][3][0]]["price"]; //price
+                    pStatements[statement][3][8] = priceObj[pStatements[statement][3][0]]["vat"]; //vat
+                }
             }
         }
     }
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index cf20a1cf64911ee631f8de66c69d0ee86a2e135b..92cb931a3b2ba91ace549b09c770b8eec698953f 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -284,6 +284,13 @@ ProductUtils.getProductDetails = function(pid, pPriceListFilter, pAdditionalProd
             }, ProductDetails);
         }
 
+        //Pricelist (all)
+        var colIdx = colsProduct.length;
+        if (ProductData[i][colIdx] != "" && ProductDetails.PriceLists[ProductData[i][colIdx]] == undefined) //Pricelist found
+        {
+            ProductDetails.PriceLists[ProductData[i][colIdx]] = _getPriceListObject();
+        }
+
         //Pricelist (currently valid)
         colIdx = colsProduct.length + colsPricelistAll.length;
         if (validPriceLists)
diff --git a/process/SetCommunicationSetting_workflowService/SetCommunicationSetting_workflowService.aod b/process/SetCommunicationSetting_workflowService/SetCommunicationSetting_workflowService.aod
index ded82a9d7a27ef0c55d1456a27778be078d51da5..cec630dd26074c0e0a1d1f60e3b07537cf8a2886 100644
--- a/process/SetCommunicationSetting_workflowService/SetCommunicationSetting_workflowService.aod
+++ b/process/SetCommunicationSetting_workflowService/SetCommunicationSetting_workflowService.aod
@@ -4,6 +4,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <process>%aditoprj%/process/SetCommunicationSetting_workflowService/process.js</process>
   <alias>Data_alias</alias>
+  <serviceTaskParameterProcess>%aditoprj%/process/SetCommunicationSetting_workflowService/serviceTaskParameterProcess.js</serviceTaskParameterProcess>
   <variants>
     <element>WORKFLOW</element>
   </variants>
diff --git a/process/SetCommunicationSetting_workflowService/process.js b/process/SetCommunicationSetting_workflowService/process.js
index 8aa215483ef3c55f38b6b7eee051a878790e5a7e..093920c3f81f811076d1b245d37c34bdc764133f 100644
--- a/process/SetCommunicationSetting_workflowService/process.js
+++ b/process/SetCommunicationSetting_workflowService/process.js
@@ -6,19 +6,36 @@ import("system.vars");
 var variables = JSON.parse(vars.get("$local.value"));
 var contactId = variables.contactId || variables.targetId;
 var channelType = variables.channelType;
-var channelId = variables.channelId;
+var medium = variables.medium || "";
+var channelId = variables.channelId || "";
 var status = variables.status || $KeywordRegistry.communicationSettingStatus$rejected();
 
-var settingsId = newSelect("COMMUNICATIONSETTINGSID")
+var settingsIdSql = newSelect("COMMUNICATIONSETTINGSID")
     .from("COMMUNICATIONSETTINGS")
     .where("COMMUNICATIONSETTINGS.CONTACT_ID", contactId)
-    .and("COMMUNICATIONSETTINGS.CHANNEL_TYPE", channelType)
-    .and("COMMUNICATIONSETTINGS.CHANNEL_ID", channelId)
-    .cell();
-    
+    .and("COMMUNICATIONSETTINGS.CHANNEL_TYPE", channelType);
+
+if (medium)
+{
+    settingsIdSql.and("COMMUNICATIONSETTINGS.MEDIUM", medium);
+}
+else
+{
+    settingsIdSql.and("COMMUNICATIONSETTINGS.MEDIUM is null");
+}
+if (channelId)
+{
+    settingsIdSql.and("COMMUNICATIONSETTINGS.CHANNEL_ID", channelId);
+}
+else
+{
+    settingsIdSql.and("COMMUNICATIONSETTINGS.CHANNEL_ID is null");
+}
+var settingsId = settingsIdSql.cell();
+
 if (settingsId)
 {
-    newWhere("COMMUNICATIONSETTINGS.COMMUNICATIONSETTINGSID")
+    newWhere("COMMUNICATIONSETTINGS.COMMUNICATIONSETTINGSID", settingsId)
         .updateFields({"STATUS": status});
 }
 else
diff --git a/process/SetCommunicationSetting_workflowService/serviceTaskParameterProcess.js b/process/SetCommunicationSetting_workflowService/serviceTaskParameterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3b4e5b8a16918ac0ef83380957b3b5b2248443b0
--- /dev/null
+++ b/process/SetCommunicationSetting_workflowService/serviceTaskParameterProcess.js
@@ -0,0 +1,15 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("KeywordData_lib");
+import("Workflow_lib");
+  
+result.object([
+    new WorkflowServiceTaskParameter("channelType", "Channel type", WorkflowServiceTaskParameter.ENUM(), _getKeywords($KeywordRegistry.communicationChannelType())),
+    new WorkflowServiceTaskParameter("medium", "Medium", WorkflowServiceTaskParameter.ENUM(), _getKeywords($KeywordRegistry.communicationMediumCampaign())),
+    new WorkflowServiceTaskParameter("status", "Status", WorkflowServiceTaskParameter.ENUM(), _getKeywords($KeywordRegistry.communicationSettingStatus()))
+]);
+
+function _getKeywords (pContainer)
+{
+    return KeywordData.getSimpleData(pContainer).map(function (item) {return {id : item[0], name : item[1]};});
+}
\ No newline at end of file
diff --git a/process/emailWrite/documentation.adoc b/process/emailWrite/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..b26f9b3ea57c4c9a78c4454ecfde1186b0ecba81
--- /dev/null
+++ b/process/emailWrite/documentation.adoc
@@ -0,0 +1,18 @@
+= emailWrite process
+
+This process is called from the ADITO platform, in order to handle mouseclicks
+on email addresses in the client. If the originating Entity is
+"Communication_entity", the EmailEdit_view will be opened, in order to enable
+the user to write a new email. In all other cases, the "mailto:" URL will be
+opened, which in turn opens the standard email client of the user's device.
+ 
+
+Variables of this process are:
+- entity
+- context
+- address
+- value
+- uid
+ 
+[NOTE]
+There exists an equivalent for CTI calls, named ctiCall.
\ No newline at end of file
diff --git a/process/emailWrite/emailWrite.aod b/process/emailWrite/emailWrite.aod
index a752349818c0a8632c76c4167a1e9ed84af7cf51..008853153ce35a66a7aeb06750af00b6fdf20c4c 100644
--- a/process/emailWrite/emailWrite.aod
+++ b/process/emailWrite/emailWrite.aod
@@ -2,6 +2,7 @@
 <process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
   <name>emailWrite</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/process/emailWrite/documentation.adoc</documentation>
   <process>%aditoprj%/process/emailWrite/process.js</process>
   <alias>Data_alias</alias>
 </process>
diff --git a/process/importLead_serverProcess/process.js b/process/importLead_serverProcess/process.js
index 96f94dc8f09a1f7b2b868f99015e839e65025b46..83f67fedf898de6bd2696b89f68846af6e87eb36 100644
--- a/process/importLead_serverProcess/process.js
+++ b/process/importLead_serverProcess/process.js
@@ -45,7 +45,7 @@ var FieldDef = LeadImportUtils.addArray(ImportFieldDef, new Array(DataFieldCount
 FieldDef.push(new Array(DataFieldCount++, "DATE_NEW", ""));
 
 //  für Tabellen Felder und Typen ermitteln
-var DataTables = new Array("ORGANISATION", "PERSON", "CONTACT", "ADDRESS", "LEAD", "COMMUNICATION", "AB_ATTRIBUTERELATION");
+var DataTables = new Array("ORGANISATION", "PERSON", "CONTACT", "ADDRESS", "LEADS", "COMMUNICATION", "AB_ATTRIBUTERELATION");
 var DataFields = LeadImportUtils.getDataFields(DataTables);
 var DataTypes = LeadImportUtils.getDataTypes(DataFields, DataTables);
 
diff --git a/process/setMissingAddressLocations_serverProcess/process.js b/process/setMissingAddressLocations_serverProcess/process.js
index 38efd070554dc6d17d40bef2e82496faa433ad38..7cef5bfae4905e886a1464bbb29ef2cbdc4b7f1e 100644
--- a/process/setMissingAddressLocations_serverProcess/process.js
+++ b/process/setMissingAddressLocations_serverProcess/process.js
@@ -1,9 +1,12 @@
+import("system.logging");
+import("Util_lib");
 import("system.db");
 import("Sql_lib");
 import("Address_lib");
 import("Location_lib");
 
 var locationSearch = new LocationFinder();
+var malformedAddressData = [];
 
 if (locationSearch.isEnabled())
 {
@@ -18,14 +21,31 @@ if (locationSearch.isEnabled())
             addresses.forEach(function ([addressId, address, buildingno, zip, city, country, state])
             {
                 var addressData = new AddressObject(address, buildingno, zip, city, country, state);
-                var location = locationSearch.getGeoLocation(addressData);
-                if (location)
+                
+                try 
                 {
-                    locationUpdates.push(["ADDRESS", ["LAT", "LON"], null, [location.lat, location.lon], 
-                        newWhere("ADDRESS.ADDRESSID", addressId).buildCondition()]);
+                    var location = locationSearch.getGeoLocation(addressData);
+                    if (location)
+                    {
+                        locationUpdates.push(["ADDRESS", ["LAT", "LON"], null, [location.lat, location.lon], 
+                            newWhere("ADDRESS.ADDRESSID", addressId).buildCondition()]);
+                    }
+                } 
+                catch (pException) 
+                { 
+                    malformedAddressData.push(addressId);
                 }
             });
             if (locationUpdates.length > 0)
                 db.updates(locationUpdates);
         });
+    if (Utils.isNotNullOrEmptyString(malformedAddressData)) 
+    {
+        errMsg = "updateAllAddressLocations_serverProcess: Something went wrong, during updating address locations, with the following uids: ";
+        malformedAddressData.forEach(function(pMalformedData)
+        {
+            errMsg += pMalformedData + "\n";
+        });
+        logging.log(errMsg);
+    }
 }
\ No newline at end of file
diff --git a/process/updateAllAddressLocations_serverProcess/process.js b/process/updateAllAddressLocations_serverProcess/process.js
index 5341f47ddfb539cbd4af47400db6a154cb50ea2a..6239ba470a3f1cf50a35552c59bc374a1dadf86d 100644
--- a/process/updateAllAddressLocations_serverProcess/process.js
+++ b/process/updateAllAddressLocations_serverProcess/process.js
@@ -1,9 +1,12 @@
 import("system.db");
+import("system.logging");
 import("Sql_lib");
 import("Address_lib");
 import("Location_lib");
+import("Util_lib");
 
 var locationSearch = new LocationFinder();
+var malformedAddressData = [];
 
 if (locationSearch.isEnabled())
 {
@@ -16,14 +19,31 @@ if (locationSearch.isEnabled())
             addresses.forEach(function ([addressId, address, buildingno, zip, city, country, state])
             {
                 var addressData = new AddressObject(address, buildingno, zip, city, country, state);
-                var location = locationSearch.getGeoLocation(addressData);
-                if (location)
+                try 
                 {
-                    locationUpdates.push(["ADDRESS", ["LAT", "LON"], null, [location.lat, location.lon], 
-                        newWhere("ADDRESS.ADDRESSID", addressId).buildCondition()]);
+                    var location = locationSearch.getGeoLocation(addressData);
+                    
+                    if (location)
+                    {
+                        locationUpdates.push(["ADDRESS", ["LAT", "LON"], null, [location.lat, location.lon], 
+                            newWhere("ADDRESS.ADDRESSID", addressId).buildCondition()]);
+                    }
+                } 
+                catch (pException) 
+                { 
+                    malformedAddressData.push(addressId);
                 }
             });
             if (locationUpdates.length > 0)
                 db.updates(locationUpdates);
         });
+    if (Utils.isNotNullOrEmptyString(malformedAddressData)) 
+    {
+        errMsg = "updateAllAddressLocations_serverProcess: Something went wrong, during updating address locations, with the following uids: ";
+        malformedAddressData.forEach(function(pMalformedData)
+        {
+            errMsg += pMalformedData + "\n";
+        });
+        logging.log(errMsg);
+    }
 }
\ No newline at end of file
diff --git a/process/webview_rest/process.js b/process/webview_rest/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..ec9191374d7ca7dccb117faa3c98a3a5784df4a8
--- /dev/null
+++ b/process/webview_rest/process.js
@@ -0,0 +1,44 @@
+import("Email_lib");
+import("Sql_lib");
+import("Workflow_lib");
+import("Util_lib");
+import("system.util");
+import("Bulkmail_lib");
+
+function restget (pRequest)
+{
+    var request = JSON.parse(pRequest);
+    var mailLogId = request.query.log;
+   
+    
+    
+    if (mailLogId)
+    {
+        try 
+        {
+            var BulkMailId,MailRunId;
+            [BulkMailId,MailRunId] = newSelect(["MAIL_RUN.OBJECT_ROWID","MAIL_RUN.MAIL_RUNID"])
+                                     .from("MAIL_LOG")
+                                     .join("MAIL_RUN","MAIL_RUN.MAIL_RUNID = MAIL_LOG.MAIL_RUN_ID")
+                                     .where("MAIL_LOG.MAIL_LOGID",mailLogId)
+                                     .arrayRow();
+            var eml = BulkMailUtils.getEmlFile(BulkMailId, MailRunId, mailLogId);
+            var email = Email.fromRFC(eml);
+
+            request.response.httpStatusCode = 200; //Ok
+            request.response.header["Content-Type"] = "text/html";
+            request.response.body = email.body;
+   
+        } 
+        catch (ex) 
+        { 
+            request.response.httpStatusCode = 404; //not found
+        }   
+    }
+    else
+    {
+        request.response.httpStatusCode = 400; //bad request
+    }
+    
+    return JSON.stringify(request);
+}
diff --git a/process/webview_rest/webview_rest.aod b/process/webview_rest/webview_rest.aod
new file mode 100644
index 0000000000000000000000000000000000000000..75dd99189132ec8688d146be1f7d80eda100ebfe
--- /dev/null
+++ b/process/webview_rest/webview_rest.aod
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+  <name>webview_rest</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/webview_rest/process.js</process>
+  <publishAsWebservice v="true" />
+  <style>REST</style>
+  <loginTypeId>
+    <element>internal.none</element>
+  </loginTypeId>
+  <alias>Data_alias</alias>
+  <variants>
+    <element>EXECUTABLE</element>
+  </variants>
+</process>