diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/extendKeywordOrganisationType.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/extendKeywordOrganisationType.xml
index bb786527e4b9ae046d8e63dce9123e8ad696779f..98df295df48c2495602c943e560ca4ce794ceaac 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/extendKeywordOrganisationType.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/extendKeywordOrganisationType.xml
@@ -11,7 +11,7 @@
     </update>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="7ac75d3d-243c-49d2-9f50-25403fab003a"/>
-      <column name="KEYID" value="dbb3f596-bd2b-4e08-baef-ba28d7b752e9"/>
+      <column name="KEYID" value="ORGMANUF"/>
       <column name="TITLE" value="Manufacturer"/>
       <column name="CONTAINER" value="OrganisationType"/>
       <column name="SORTING" valueNumeric="3"/>
@@ -29,7 +29,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="45438bcf-74cf-408f-bc4d-5d70595369c8"/>
-      <column name="KEYID" value="e9f133a7-27b4-4ce1-ab93-03876ec3de61"/>
+      <column name="KEYID" value="ORGPARTNER"/>
       <column name="TITLE" value="Partner"/>
       <column name="CONTAINER" value="OrganisationType"/>
       <column name="SORTING" valueNumeric="5"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml
index c3b1b17794e650d31c496f887a3af8f594684d25..2e96c0c73f54b0f1bc0e2d46e18159c73cf9c5f5 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml
@@ -11,7 +11,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="94529505-1913-4827-9812-026053bfcb51"/>
 
-            <column name="KEYID" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+            <column name="KEYID" value="VISIT"/>
             <column name="TITLE" value="Visit"/>
             <column name="CONTAINER" value="ActivityCategory"/>
             <column name="SORTING" valueNumeric="0"/>
@@ -27,7 +27,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="3b677654-84e2-4b9c-b5d0-ed2b359c45af"/>
 
-            <column name="KEYID" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+            <column name="KEYID" value="MAIL"/>
             <column name="TITLE" value="E-Mail"/>
             <column name="CONTAINER" value="ActivityCategory"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -43,7 +43,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="6febeb71-a8a4-400c-80fd-da27ac935260"/>
 
-            <column name="KEYID" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+            <column name="KEYID" value="PHONE"/>
             <column name="TITLE" value="Phone"/>
             <column name="CONTAINER" value="ActivityCategory"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -59,7 +59,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="68c3b1f7-2555-4d3b-a252-7df978173884"/>
 
-            <column name="KEYID" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+            <column name="KEYID" value="ONLINE-MEETING"/>
             <column name="TITLE" value="Online-Meeting"/>
             <column name="CONTAINER" value="ActivityCategory"/>
             <column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml
index 05ba4b1d3994ba0f914d96dfc5ad2e08461876ee..38fae576ae0d2683bf922e746e4983b006a3c799 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml
@@ -18,7 +18,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="49bb6904-dd20-4ede-aaff-ae80131ed274"/>
 
-            <column name="KEYID" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+            <column name="KEYID" value="OFFICEADDR"/>
             <column name="TITLE" value="Office address"/>
             <column name="CONTAINER" value="AddressType"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -40,7 +40,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="5213a48a-b6d2-47ee-8409-a4af7477535f"/>
 
-            <column name="KEYID" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+            <column name="KEYID" value="HOMEADDR"/>
             <column name="TITLE" value="Home address"/>
             <column name="CONTAINER" value="AddressType"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -62,7 +62,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="045d0567-4535-4d22-84f2-95b3b0e23000"/>
 
-            <column name="KEYID" value="cf1c4cab-d24e-4690-ba52-54bae711cd47"/>
+            <column name="KEYID" value="DELIVERADDR"/>
             <column name="TITLE" value="Delivery address"/>
             <column name="CONTAINER" value="AddressType"/>
             <column name="SORTING" valueNumeric="3"/>
@@ -84,7 +84,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="e62da2f2-6352-4660-b2ff-1e8a552d298a"/>
 
-            <column name="KEYID" value="dd0ddde2-9add-4309-b3ef-0f1dfb6d4aac"/>
+            <column name="KEYID" value="POSTADDR"/>
             <column name="TITLE" value="Post office box"/>
             <column name="CONTAINER" value="AddressType"/>
             <column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml
index 14da74fff976569710a26ebb18a7b23bded7a802..ed9f20af49d916c0070ce8664cbc6a440b7f4308 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml
@@ -18,7 +18,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="cc16d938-b95f-4e07-a3b4-73f8524bb664"/>
 
-            <column name="KEYID" value="1a4b1ebe-cf06-4bc1-b7af-e4633d38dc79"/>
+            <column name="KEYID" value="COMMMOBIL"/>
             <column name="TITLE" value="Mobil"/>
             <column name="CONTAINER" value="CommunicationMedium"/>
             <column name="SORTING" valueNumeric="0"/>
@@ -40,7 +40,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="66950de5-fa8b-465c-8db1-4eb7aac98bd3"/>
 
-            <column name="KEYID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+            <column name="KEYID" value="COMMEMAIL"/>
             <column name="TITLE" value="E-Mail"/>
             <column name="CONTAINER" value="CommunicationMedium"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -62,7 +62,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="aa2b9cc9-3e87-4fe9-98a2-a4e417a3324f"/>
 
-            <column name="KEYID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+            <column name="KEYID" value="COMMPHONE"/>
             <column name="TITLE" value="Phone"/>
             <column name="CONTAINER" value="CommunicationMedium"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -84,7 +84,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="cfebe176-0a64-428d-b0ec-bba454d2ca3e"/>
 
-            <column name="KEYID" value="d08956b8-369e-4b65-88fa-1c37b3368ae3"/>
+            <column name="KEYID" value="COMMINTERNET"/>
             <column name="TITLE" value="Internet"/>
             <column name="CONTAINER" value="CommunicationMedium"/>
             <column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml
index d8d795d2d8684c4ec60a7b1e728f93433efd5538..c9f6397ead225fa63119c38593e29da5df5ef2e1 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml
@@ -18,7 +18,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="2acd3694-ccef-4d0b-ae7a-b3d31f8d9cc0"/>
 
-            <column name="KEYID" value="97a53bf1-0862-4973-a774-d2b8eeb78006"/>
+            <column name="KEYID" value="CAMPAIGNPHONE"/>
             <column name="TITLE" value="Phone"/>
             <column name="CONTAINER" value="CommunicationMediumCampaign"/>
             <column name="SORTING" valueNumeric="0"/>
@@ -40,7 +40,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="cb07397b-a976-4960-b8e5-9edf189c5caf"/>
 
-            <column name="KEYID" value="8d25a426-808d-4f57-8637-7319f3b4be41"/>
+            <column name="KEYID" value="CAMPAIGNEMAIL"/>
             <column name="TITLE" value="E-Mail"/>
             <column name="CONTAINER" value="CommunicationMediumCampaign"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -62,7 +62,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="990a03e0-aeb4-4bdb-9d22-09b66eee6b85"/>
 
-            <column name="KEYID" value="accb9390-757a-4549-9c03-7c8219260055"/>
+            <column name="KEYID" value="CAMPAIGNLETTER"/>
             <column name="TITLE" value="Letter"/>
             <column name="CONTAINER" value="CommunicationMediumCampaign"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -84,7 +84,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="51085b8b-ded0-4d1d-9e85-ae89bd1480fe"/>
 
-            <column name="KEYID" value="1f1bd64b-da10-4c81-84fd-9fa57dff736e"/>
+            <column name="KEYID" value="CAMPAIGNFAX"/>
             <column name="TITLE" value="Fax"/>
             <column name="CONTAINER" value="CommunicationMediumCampaign"/>
             <column name="SORTING" valueNumeric="3"/>
@@ -106,7 +106,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="b72ba2f5-612b-4ef6-832e-62089892b8d7"/>
 
-            <column name="KEYID" value="fbf68c7e-655d-42ca-a279-6606004cafe4"/>
+            <column name="KEYID" value="CAMPAIGNSMS"/>
             <column name="TITLE" value="SMS"/>
             <column name="CONTAINER" value="CommunicationMediumCampaign"/>
             <column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactContactrole.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactContactrole.xml
index e63bb7ba7d4a32faf22bc6e1f01365c7672d7b33..24ac0fa622c7956d54eab284f100d13dd93b6b95 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactContactrole.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactContactrole.xml
@@ -4,7 +4,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="767b89c6-2461-4d0e-9b7a-dda33e5090c9"/>
 
-            <column name="KEYID" value="47abd1f8-d449-4d81-9e6d-c48783119b0b"/>
+            <column name="KEYID" value="CONTACTROLEMANAGING"/>
             <column name="TITLE" value="Managing director"/>
             <column name="CONTAINER" value="ContactContactrole"/>
             <column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="2fa7cddb-1e2c-438f-8f16-92f245af09f4"/>
 
-            <column name="KEYID" value="07ec8a18-c830-4982-a4c6-d2795841b07a"/>
+            <column name="KEYID" value="CONTACTROLEPURCHASING"/>
             <column name="TITLE" value="Purchasing manager"/>
             <column name="CONTAINER" value="ContactContactrole"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="67ea4d33-b683-4a04-b2e3-4af54d6debcb"/>
 
-            <column name="KEYID" value="91411987-8700-43d7-a101-4bd375c6e3af"/>
+            <column name="KEYID" value="CONTACTROLEEXECUTIVE"/>
             <column name="TITLE" value="Executive board"/>
             <column name="CONTAINER" value="ContactContactrole"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -34,7 +34,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="d7be200e-ffc0-47a7-b0bb-3da92f39b993"/>
 
-            <column name="KEYID" value="bd0c1b58-6c8c-42a4-b68b-7099ef05bc0e"/>
+            <column name="KEYID" value="CONTACTROLEMARKETING"/>
             <column name="TITLE" value="Marketing manager"/>
             <column name="CONTAINER" value="ContactContactrole"/>
             <column name="SORTING" valueNumeric="3"/>
@@ -44,7 +44,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="3b836d42-9ecf-49b9-8df9-570c27860c01"/>
 
-            <column name="KEYID" value="97d0d10d-14a2-4d85-908d-ea14624b2bfd"/>
+            <column name="KEYID" value="CONTACTROLESALES"/>
             <column name="TITLE" value="Sales manager"/>
             <column name="CONTAINER" value="ContactContactrole"/>
             <column name="SORTING" valueNumeric="4"/>
@@ -54,7 +54,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="2a4e6516-8493-4dde-a9df-bf2efd4db0c8"/>
 
-            <column name="KEYID" value="9c3aea50-b402-4e51-b48d-bfc50c107232"/>
+            <column name="KEYID" value="CONTACTROLESUPERVISORY"/>
             <column name="TITLE" value="Supervisory board"/>
             <column name="CONTAINER" value="ContactContactrole"/>
             <column name="SORTING" valueNumeric="5"/>
@@ -64,7 +64,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="3e7f2a42-ad8b-48da-aa11-95525ca36d01"/>
 
-            <column name="KEYID" value="7b71b7e0-fb4a-4557-a4ab-7122574b292b"/>
+            <column name="KEYID" value="CONTACTROLEADMIN"/>
             <column name="TITLE" value="Administrator"/>
             <column name="CONTAINER" value="ContactContactrole"/>
             <column name="SORTING" valueNumeric="6"/>
@@ -74,7 +74,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="11c05d41-78ec-4d7c-acbe-f94912f2386c"/>
 
-            <column name="KEYID" value="6d6f2261-2dbd-445a-9189-18418e7c44ef"/>
+            <column name="KEYID" value="CONTACTROLEIT"/>
             <column name="TITLE" value="IT manager"/>
             <column name="CONTAINER" value="ContactContactrole"/>
             <column name="SORTING" valueNumeric="7"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactDepartment.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactDepartment.xml
index 15f81f525dd0bcdd343a3849029af4d14c32df4b..88e2c5a79c3f3e35ae173398147de0fac4af2cc9 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactDepartment.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactDepartment.xml
@@ -4,7 +4,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="75bd97bc-56f3-4ea3-a132-df3cb9cda071"/>
 
-            <column name="KEYID" value="c58a028c-772a-444f-8109-37cfde3f60a0"/>
+            <column name="KEYID" value="CONTACTDEPMANAGE"/>
             <column name="TITLE" value="Management"/>
             <column name="CONTAINER" value="ContactDepartment"/>
             <column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="6e30d397-e31f-4ccb-96e9-51cf71d259fa"/>
 
-            <column name="KEYID" value="afc7a9b8-895d-41b9-b68c-e1bdb8ba878f"/>
+            <column name="KEYID" value="CONTACTDEPSALES"/>
             <column name="TITLE" value="Sales"/>
             <column name="CONTAINER" value="ContactDepartment"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="722e83bc-148a-4762-abda-d491bf590bd5"/>
 
-            <column name="KEYID" value="e00eb3fc-2c8d-46a9-990a-ed2bf1948ffe"/>
+            <column name="KEYID" value="CONTACTDEPPROD"/>
             <column name="TITLE" value="Production"/>
             <column name="CONTAINER" value="ContactDepartment"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -34,7 +34,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="191617b2-09cc-4fe6-bc02-1cee746285d5"/>
 
-            <column name="KEYID" value="bde6d083-517e-45bd-8326-d84e7f8aeba0"/>
+            <column name="KEYID" value="CONTACTDEPMARKETING"/>
             <column name="TITLE" value="Marketing"/>
             <column name="CONTAINER" value="ContactDepartment"/>
             <column name="SORTING" valueNumeric="3"/>
@@ -44,7 +44,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="87f97554-c335-4328-911a-345d8a9abd7d"/>
 
-            <column name="KEYID" value="b1113c19-2f1f-4d0a-806e-b0165ecc1b4a"/>
+            <column name="KEYID" value="CONTACTDEPIT"/>
             <column name="TITLE" value="IT"/>
             <column name="CONTAINER" value="ContactDepartment"/>
             <column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactPosition.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactPosition.xml
index 136f8bbd47dc2b9753b1cdb8d7d98cb2aa853673..a08e2ccf364093a113e9f455c7349be125af4da9 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactPosition.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactPosition.xml
@@ -4,7 +4,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="ba369295-c717-48eb-ae76-314087375e06"/>
 
-            <column name="KEYID" value="3308c1e5-cf4d-4934-86b7-981b8f026369"/>
+            <column name="KEYID" value="CONTACTPOSCEO"/>
             <column name="TITLE" value="CEO"/>
             <column name="CONTAINER" value="ContactPosition"/>
             <column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="dcacb175-4c8a-4941-a417-69a971f52583"/>
 
-            <column name="KEYID" value="a4952791-73e4-41a1-8a78-5a27640ff0fd"/>
+            <column name="KEYID" value="CONTACTPOSCSO"/>
             <column name="TITLE" value="CSO"/>
             <column name="CONTAINER" value="ContactPosition"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="1a508899-e2bf-409d-8a57-3ca31c9c832d"/>
 
-            <column name="KEYID" value="77dcf148-112e-4251-8a0e-9e8bd811f0b7"/>
+            <column name="KEYID" value="CONTACTPOSPROD"/>
             <column name="TITLE" value="Production manager"/>
             <column name="CONTAINER" value="ContactPosition"/>
             <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DeliveryTerm.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DeliveryTerm.xml
index 895edb0305d2c1564a21eaf218aa245b8f1cffb6..13fa0d7a9541be06be307326b98b0a194515e909 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DeliveryTerm.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DeliveryTerm.xml
@@ -14,7 +14,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="d713c45a-6f87-4516-ae21-1d8f1c217949"/>
 
-            <column name="KEYID" value="aa8713c9-ae12-4ce3-a588-0303cea11b44"/>
+            <column name="KEYID" value="DELIVERCIF"/>
             <column name="TITLE" value="CIF"/>
             <column name="CONTAINER" value="DeliveryTerm"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="410a389b-67d4-4155-8d9e-1e8d816ecfb9"/>
 
-            <column name="KEYID" value="a4d40341-a015-4c59-9bde-f8e59582269b"/>
+            <column name="KEYID" value="DELIVEREX"/>
             <column name="TITLE" value="ex works"/>
             <column name="CONTAINER" value="DeliveryTerm"/>
             <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml
index c80273b4d5a415896841963a2a809ad144912668..9887c9db19130091d058f422e1cb6d276bdbda6e 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml
@@ -11,7 +11,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="e14fab55-4a85-48c2-a109-125eaed9dc3f"/>
 
-            <column name="KEYID" value="834f814d-4e31-4289-be6c-fad2dea3f2f0"/>
+            <column name="KEYID" value="0"/>
             <column name="TITLE" value="0%"/>
             <column name="CONTAINER" value="OfferProbability"/>
             <column name="SORTING" valueNumeric="0"/>
@@ -27,7 +27,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="8f55a5e3-00a9-4691-ab79-309a3eda68ec"/>
 
-            <column name="KEYID" value="98ce5f41-90f5-434f-9e72-cdac4a0f5214"/>
+            <column name="KEYID" value="25"/>
             <column name="TITLE" value="25%"/>
             <column name="CONTAINER" value="OfferProbability"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -43,7 +43,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="808a55bc-5876-4deb-a78f-bb352c41d712"/>
 
-            <column name="KEYID" value="c510907f-8478-471e-b702-5008908504bd"/>
+            <column name="KEYID" value="50"/>
             <column name="TITLE" value="50%"/>
             <column name="CONTAINER" value="OfferProbability"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -59,7 +59,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="941e60df-a4f5-4ae8-9ca1-d9f2b2d01d9d"/>
 
-            <column name="KEYID" value="2dca6f38-b49a-4716-8c83-9d2183c5c065"/>
+            <column name="KEYID" value="75"/>
             <column name="TITLE" value="75%"/>
             <column name="CONTAINER" value="OfferProbability"/>
             <column name="SORTING" valueNumeric="3"/>
@@ -75,7 +75,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="2f21341b-9991-4967-a785-60216ec8c25e"/>
 
-            <column name="KEYID" value="dc7c62fe-ce4b-41e3-91ab-ce0b740ccaeb"/>
+            <column name="KEYID" value="100"/>
             <column name="TITLE" value="100%"/>
             <column name="CONTAINER" value="OfferProbability"/>
             <column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_PaymentTerm.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_PaymentTerm.xml
index dafc82509cd4f22c65d3d16cd3b944d899e18622..fb62eb621086fe8426d7ef2cba20482d05bd8977 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_PaymentTerm.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_PaymentTerm.xml
@@ -4,7 +4,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="b8409c4a-6447-408a-bd06-dfe67054a4f1"/>
 
-            <column name="KEYID" value="178aabbf-3f4c-415b-98bd-5f2510ea72b4"/>
+            <column name="KEYID" value="PAYTERM7"/>
             <column name="TITLE" value="7 days net"/>
             <column name="CONTAINER" value="PaymentTerm"/>
             <column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="edba1a8f-766b-4dfa-9360-1a2aca8569d6"/>
 
-            <column name="KEYID" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+            <column name="KEYID" value="PAYTERM30"/>
             <column name="TITLE" value="30 days net"/>
             <column name="CONTAINER" value="PaymentTerm"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="ed1b3d39-9cab-4c3c-84c5-438a8b67be53"/>
 
-            <column name="KEYID" value="860d8e1c-ea85-426d-91c2-a78dcd14df8d"/>
+            <column name="KEYID" value="PAYTERMDISCOUNT"/>
             <column name="TITLE" value="8 days 2% discount, 30 days net"/>
             <column name="CONTAINER" value="PaymentTerm"/>
             <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectCompetitionState.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectCompetitionState.xml
index 30333008faaeecbd5a76da221e63bb57ffe509d0..7de6baca0a1f969a3ecd70a04fd72c37c4f795ff 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectCompetitionState.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectCompetitionState.xml
@@ -4,7 +4,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="6a26d9c5-bc21-455e-828a-26e1b9b278da"/>
 
-            <column name="KEYID" value="90dabaf6-b62a-4a5b-a9ff-449e5a898a24"/>
+            <column name="KEYID" value="COMPSTATEOPEN"/>
             <column name="TITLE" value="Open"/>
             <column name="CONTAINER" value="CompetitionState"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -14,7 +14,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="946b9f7d-c667-47a2-90f4-57935347aac5"/>
 
-            <column name="KEYID" value="2709acc9-df9c-470b-840c-6ff89fe0bf4e"/>
+            <column name="KEYID" value="COMPSTATEPOST"/>
             <column name="TITLE" value="Postponed"/>
             <column name="CONTAINER" value="CompetitionState"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -24,7 +24,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="81a8a308-46e1-4cf6-8383-15736e45219c"/>
 
-            <column name="KEYID" value="fb9d270b-a62d-4a78-a3b8-a49dc5afe36d"/>
+            <column name="KEYID" value="COMPSTATEABORT"/>
             <column name="TITLE" value="Aborted"/>
             <column name="CONTAINER" value="CompetitionState"/>
             <column name="SORTING" valueNumeric="3"/>
@@ -34,7 +34,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="f4bcb779-ea53-4ad6-bbcd-8681a3813a4c"/>
 
-            <column name="KEYID" value="bae61bdf-ef67-4074-9db6-99a292dc8a6d"/>
+            <column name="KEYID" value="COMPSTATEPARTIAL"/>
             <column name="TITLE" value="Partial order"/>
             <column name="CONTAINER" value="CompetitionState"/>
             <column name="SORTING" valueNumeric="4"/>
@@ -44,7 +44,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="47272e85-ae18-4bd6-950f-449bc531c5c5"/>
 
-            <column name="KEYID" value="aa4aff7e-3c1a-4a48-95f6-297e341cb7aa"/>
+            <column name="KEYID" value="COMPSTATEORDER"/>
             <column name="TITLE" value="Order"/>
             <column name="CONTAINER" value="CompetitionState"/>
             <column name="SORTING" valueNumeric="5"/>
@@ -54,7 +54,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="c046313e-d7af-4440-a3c1-0cdf2b6220ca"/>
 
-            <column name="KEYID" value="ff73172c-8517-4b6e-98cb-43aebacd9af1"/>
+            <column name="KEYID" value="COMPSTATELOST"/>
             <column name="TITLE" value="Lost"/>
             <column name="CONTAINER" value="CompetitionState"/>
             <column name="SORTING" valueNumeric="6"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectPhase.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectPhase.xml
index f5216b4ba27d38367662c26a67ba838df31ed72b..9accbd43bd1c4752fce7b0a26b2582050e90e939 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectPhase.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectPhase.xml
@@ -4,7 +4,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="b42caac9-8f8f-46e5-9f1c-d121cdf3ad8f"/>
 
-            <column name="KEYID" value="9f7d1fa9-7c09-4037-8f7c-8458def14d89"/>
+            <column name="KEYID" value="SALPROJPHASENQC"/>
             <column name="TITLE" value="NQC"/>
             <column name="CONTAINER" value="SalesprojectPhase"/>
             <column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="8a2d19c9-bc32-437e-9261-78ed30110e92"/>
 
-            <column name="KEYID" value="292628f1-d9a5-432d-8130-f6690c14a5d4"/>
+            <column name="KEYID" value="SALPROJPHASEMAL"/>
             <column name="TITLE" value="MAL"/>
             <column name="CONTAINER" value="SalesprojectPhase"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="46f55a58-dbe4-40ae-9306-481df9095088"/>
 
-            <column name="KEYID" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+            <column name="KEYID" value="SALPROJPHASEMQL"/>
             <column name="TITLE" value="MQL"/>
             <column name="CONTAINER" value="SalesprojectPhase"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -34,7 +34,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="afa8cf58-07e8-4ee9-b24e-96cb6fa76aec"/>
 
-            <column name="KEYID" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+            <column name="KEYID" value="SALPROJPHASESAL"/>
             <column name="TITLE" value="SAL"/>
             <column name="CONTAINER" value="SalesprojectPhase"/>
             <column name="SORTING" valueNumeric="3"/>
@@ -44,7 +44,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="c9483fb9-c295-43d2-94e0-8c949cf6dc47"/>
 
-            <column name="KEYID" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
+            <column name="KEYID" value="SALPROJPHASESQO"/>
             <column name="TITLE" value="SQO"/>
             <column name="CONTAINER" value="SalesprojectPhase"/>
             <column name="SORTING" valueNumeric="4"/>
@@ -54,7 +54,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="0e8eab64-4c79-4eed-9746-0ac6fc397620"/>
 
-            <column name="KEYID" value="60d09bb1-7e02-4003-99bf-18b739a577ad"/>
+            <column name="KEYID" value="SALPROJPHASEOFFER"/>
             <column name="TITLE" value="Offer"/>
             <column name="CONTAINER" value="SalesprojectPhase"/>
             <column name="SORTING" valueNumeric="5"/>
@@ -64,7 +64,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="405e2b7b-20c2-4824-a8b5-c7a533784ef3"/>
 
-            <column name="KEYID" value="213c8184-f930-457e-8605-703baaf21d4a"/>
+            <column name="KEYID" value="SALPROJPHASENEGO"/>
             <column name="TITLE" value="Negotiation"/>
             <column name="CONTAINER" value="SalesprojectPhase"/>
             <column name="SORTING" valueNumeric="6"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectState.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectState.xml
index 19c59bfef3859b3736d8098ec846f1cc25ad3355..89f21df74c3819160a9939c1ee5db66dba382a5d 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectState.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectState.xml
@@ -14,7 +14,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="9212a797-4470-4170-b4d1-330a5d991625"/>
 
-            <column name="KEYID" value="8916e241-9452-4541-a323-d479ad5f2e4d"/>
+            <column name="KEYID" value="SALPROJSTATABORT"/>
             <column name="TITLE" value="Aborted"/>
             <column name="CONTAINER" value="SalesprojectState"/>
             <column name="SORTING" valueNumeric="3"/>
@@ -24,7 +24,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="1f857be1-7de0-479f-bac8-59b22d48fe39"/>
 
-            <column name="KEYID" value="1606cf46-a87b-4797-830e-55ebdd70a001"/>
+            <column name="KEYID" value="SALPROJSTATPARTIAL"/>
             <column name="TITLE" value="Partial order"/>
             <column name="CONTAINER" value="SalesprojectState"/>
             <column name="SORTING" valueNumeric="4"/>
@@ -34,7 +34,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="19997ffa-bfe3-4f6a-82f8-e862acb24655"/>
 
-            <column name="KEYID" value="130bb53a-a97e-455e-8f34-8d445e985474"/>
+            <column name="KEYID" value="SALPROJSTATLOST"/>
             <column name="TITLE" value="Order"/>
             <column name="CONTAINER" value="SalesprojectState"/>
             <column name="SORTING" valueNumeric="5"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml
index aff35a4847b45ed0876ea7792fa44dca7a2bd2a8..30192dcbe9d125d1c9e9fb2acb02d34095d65859 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml
@@ -11,7 +11,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="97ec9a7e-a1dd-4167-bf7d-57ee3d79d46f"/>
 
-            <column name="KEYID" value="f587f53a-72cc-4b76-9e39-276a26cab2e0"/>
+            <column name="KEYID" value="TASKPRIONONE"/>
             <column name="TITLE" value="{$TASK_PRIORITY_NONE}"/>
             <column name="CONTAINER" value="TaskPriority"/>
             <column name="SORTING" valueNumeric="0"/>
@@ -27,7 +27,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="798c1720-901e-4eae-bab3-80f334830601"/>
 
-            <column name="KEYID" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
+            <column name="KEYID" value="TASKPRIOLOW"/>
             <column name="TITLE" value="{$TASK_PRIORITY_LOW}"/>
             <column name="CONTAINER" value="TaskPriority"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -43,7 +43,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="53a01187-5306-4980-8c40-153e910dd115"/>
 
-            <column name="KEYID" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+            <column name="KEYID" value="TASKPRIOMEDIUM"/>
             <column name="TITLE" value="{$TASK_PRIORITY_NORMAL}"/>
             <column name="CONTAINER" value="TaskPriority"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -59,7 +59,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="3d17defd-5b6e-4e19-816c-f9a19aca3cc0"/>
 
-            <column name="KEYID" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+            <column name="KEYID" value="TASKPRIOHIGH"/>
             <column name="TITLE" value="{$TASK_PRIORITY_HIGH}"/>
             <column name="CONTAINER" value="TaskPriority"/>
             <column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskProgress.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskProgress.xml
index 3ece432b8883adb68b8a781a7c0a2f1295cbffa4..08f991c7c26189569e5a9c7df9821eaf47d43184 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskProgress.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskProgress.xml
@@ -4,7 +4,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="9887b380-8e6a-4fab-a99c-46172cb9ecc5"/>
 
-            <column name="KEYID" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+            <column name="KEYID" value="TASKPROG0"/>
             <column name="TITLE" value="0%"/>
             <column name="CONTAINER" value="TaskProgress"/>
             <column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="c228d007-5f1b-41a9-baaf-4bac444e2d63"/>
 
-            <column name="KEYID" value="5098fde4-660f-4381-9ff5-6d29a858e68e"/>
+            <column name="KEYID" value="TASKPROG25"/>
             <column name="TITLE" value="25%"/>
             <column name="CONTAINER" value="TaskProgress"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="9c24af78-bb51-4706-ae3c-35f450fc4034"/>
 
-            <column name="KEYID" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+            <column name="KEYID" value="TASKPROG50"/>
             <column name="TITLE" value="50%"/>
             <column name="CONTAINER" value="TaskProgress"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -34,7 +34,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="612acb5c-9cde-4229-8910-6ca6eb7bed8c"/>
 
-            <column name="KEYID" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+            <column name="KEYID" value="TASKPROG75"/>
             <column name="TITLE" value="75%"/>
             <column name="CONTAINER" value="TaskProgress"/>
             <column name="SORTING" valueNumeric="3"/>
@@ -44,7 +44,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="711db73d-eed2-43a6-ac57-a608a831eb8d"/>
 
-            <column name="KEYID" value="5928d5ec-d256-4088-be0c-2cdfd5a8f7fa"/>
+            <column name="KEYID" value="TASKPROG100"/>
             <column name="TITLE" value="100%"/>
             <column name="CONTAINER" value="TaskProgress"/>
             <column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_YesNo.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_YesNo.xml
index 6d6ecabeeacc14d3d4b104e2a65ccdf4e4a9302b..d87cd04380a4c04e7e2765c6f7d4cad8c35dd70f 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_YesNo.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_YesNo.xml
@@ -3,7 +3,7 @@
     <changeSet author="n.bugl" id="65c6bfc8-5de5-479e-8d64-a93cffe8ce89">
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="eadf3ecb-ac35-4a94-879a-f6e85a72fa29"/>
-            <column name="KEYID" value="d657755e-50e8-409b-8b1e-2d8315c2307a"/>
+            <column name="KEYID" value="YESNOYES"/>
             <column name="TITLE" value="Yes"/>
             <column name="CONTAINER" value="YesNo"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -12,7 +12,7 @@
         </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="4dcc3315-8a38-42d9-ba34-f8899b86ca85"/>
-            <column name="KEYID" value="3389c206-5916-401b-8aa5-6ebaf012a09b"/>
+            <column name="KEYID" value="YESNONO"/>
             <column name="TITLE" value="No"/>
             <column name="CONTAINER" value="YesNo"/>
             <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_offer_status_keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_offer_status_keyword.xml
index 4fd7389268c4484ffa9c4768b3656607cae7cf1a..dd23fa1799c42a394d4e45357febda02958eee67 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_offer_status_keyword.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_offer_status_keyword.xml
@@ -3,7 +3,7 @@
     <changeSet author="j.hoermann" id="3e9548bd-2c3e-413f-a8b0-405d926f2790">       
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="3c734077-8677-4732-86ef-7df01d9646b3"/>
-            <column name="KEYID" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+            <column name="KEYID" value="OFFERSTATOPEN"/>
             <column name="TITLE" value="Open"/>
             <column name="CONTAINER" value="OfferStatus"/>
             <column name="SORTING" valueNumeric="-1"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_salesproject_state_keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_salesproject_state_keyword.xml
index ba9ff8eababab916e26ccb7f0c959ee8cee040f5..6365b074fa3130d0b9dc8b90bda7a7be15f06975 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_salesproject_state_keyword.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_salesproject_state_keyword.xml
@@ -3,7 +3,7 @@
     <changeSet author="j.hoermann" id="cfe5294c-5f89-4527-bd1d-ebe9d0597f63">       
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="b0123a07-0d21-4365-9aa2-c8be18c56141"/>
-            <column name="KEYID" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+            <column name="KEYID" value="SALPROJSTATOPEN"/>
             <column name="TITLE" value="Open"/>
             <column name="CONTAINER" value="SalesprojectState"/>
             <column name="SORTING" valueNumeric="-1"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignCostCategory.xml b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignCostCategory.xml
index cce303ee3c6e5cd61f3707199c572e452cb9ab84..4693175f3eef993091d04963a813400d1735c368 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignCostCategory.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignCostCategory.xml
@@ -3,7 +3,7 @@
     <changeSet author="j.hoermann" id="17b2f361-6d08-4cd7-80da-53ebf84d06fe">
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="62cb479d-70b2-4cb4-91f5-5d1352f2131b"/>
-            <column name="KEYID" value="74aabda2-fb1f-4ed3-adcc-9509c533b52c"/>
+            <column name="KEYID" value="PRINTCOST"/>
             <column name="TITLE" value="Printing costs"/>
             <column name="CONTAINER" value="CampaignManagementCostCategory"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -12,7 +12,7 @@
         </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="73b34a7c-5921-461c-8cf5-17e3aba01bd0"/>
-            <column name="KEYID" value="3c28d838-8bca-4b2d-82af-335f8a48984f"/>
+            <column name="KEYID" value="SHIPCOST"/>
             <column name="TITLE" value="Shipping costs"/>
             <column name="CONTAINER" value="CampaignManagementCostCategory"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -21,7 +21,7 @@
         </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="7ef45db6-9151-45da-adb9-8e7759390ecd"/>
-            <column name="KEYID" value="94e04ba5-3cd4-42c2-85d7-6488dba75cf2"/>
+            <column name="KEYID" value="LAYOUTCOST"/>
             <column name="TITLE" value="Layout costs"/>
             <column name="CONTAINER" value="CampaignManagementCostCategory"/>
             <column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignState.xml b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignState.xml
index ead502807aa3d421af1242ce059178ce8c2085ac..94a799f1352992698e96df34fea6da26fcbdbfec 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignState.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignState.xml
@@ -4,7 +4,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="8d95cad1-3ab2-4b6c-9b38-064cb914216d"/>
 
-            <column name="KEYID" value="e04c9c59-0590-463c-a10e-e25c583e9cf2"/>
+            <column name="KEYID" value="PLANNING"/>
             <column name="TITLE" value="In planning"/>
             <column name="CONTAINER" value="CampaignManagementStates"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -14,7 +14,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="3e5036a1-43a1-4bb1-ad56-ed42df7c9538"/>
 
-            <column name="KEYID" value="42e1ee2b-0108-4ccf-ab43-29cbcb0377bf"/>
+            <column name="KEYID" value="APPROVED"/>
             <column name="TITLE" value="Approved"/>
             <column name="CONTAINER" value="CampaignManagementStates"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -24,7 +24,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="0759da45-5a5b-4163-a3a1-6a19f5a196c5"/>
 
-            <column name="KEYID" value="db1f6e61-07ed-4185-abdb-f9103e5ee3e6"/>
+            <column name="KEYID" value="COMPLETED"/>
             <column name="TITLE" value="Completed"/>
             <column name="CONTAINER" value="CampaignManagementStates"/>
             <column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignStepState.xml b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignStepState.xml
index c7560f94c6359a13bcad0a3982955f6a4a49cc2f..3b4e82b84a84a880ec56ebc49e36cb0a26211561 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignStepState.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignStepState.xml
@@ -4,7 +4,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="0dc9b27b-56d8-4650-92ee-bf85a3c67cb3"/>
 
-            <column name="KEYID" value="bbf69673-2ec6-46f8-b231-684a31be9fbd"/>
+            <column name="KEYID" value="OPEN"/>
             <column name="TITLE" value="Open"/>
             <column name="CONTAINER" value="CampaignManagementStepStates"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -14,7 +14,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="b1f5ea38-1b8c-47a8-a8ad-4c6ed9c26cda"/>
 
-            <column name="KEYID" value="1df0f89b-836d-4242-99cb-334764a7abac"/>
+            <column name="KEYID" value="ACTIVE"/>
             <column name="TITLE" value="Active"/>
             <column name="CONTAINER" value="CampaignManagementStepStates"/>
             <column name="SORTING" valueNumeric="2"/>
@@ -24,7 +24,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="98f4cab1-74b8-4a23-a99a-c3624711beab"/>
 
-            <column name="KEYID" value="2b9904ad-41d0-411c-8c3a-6f31d8e742b3"/>
+            <column name="KEYID" value="COMPLETED"/>
             <column name="TITLE" value="Completed"/>
             <column name="CONTAINER" value="CampaignManagementStepStates"/>
             <column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Classification/insert_classification_types.xml b/.liquibase/Data_alias/basic/2019.1.4/Classification/insert_classification_types.xml
index ff442c628537faf786a46eeef49c72f179bc4039..2444aa086b7adef665ea576a58e8e8a22ab6fd97 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/Classification/insert_classification_types.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Classification/insert_classification_types.xml
@@ -3,7 +3,7 @@
       
     <insert tableName="AB_KEYWORD_ENTRY">
         <column name="AB_KEYWORD_ENTRYID" value="789667fe-519f-4dea-b691-62c14447d694"/>
-        <column name="KEYID" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+        <column name="KEYID" value="SALESPROJ"/>
         <column name="TITLE" value="Salesproject"/>
         <column name="CONTAINER" value="ClassificationType"/>
         <column name="SORTING" valueNumeric="1"/>
@@ -13,67 +13,67 @@
       
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONTYPEID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
-      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONGROUP" value="1. Classification"/>
       <column name="SCORETYPE" value="ScoreBased"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONTYPEID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
-      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONGROUP" value="1. Classification"/>
       <column name="SCORETYPE" value="ScoreBranch"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONTYPEID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
-      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONGROUP" value="1. Classification"/>
       <column name="SCORETYPE" value="ScoreUsers"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONTYPEID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
-      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONGROUP" value="2. Classification"/>
       <column name="SCORETYPE" value="ScoreBudget"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONTYPEID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
-      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONGROUP" value="2. Classification"/>
       <column name="SCORETYPE" value="ScoreCustomizing"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONTYPEID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
-      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONGROUP" value="2. Classification"/>
       <column name="SCORETYPE" value="ScoreStandard"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONTYPEID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
-      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
       <column name="SCORETYPE" value="ScoreCloud"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONTYPEID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
-      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
       <column name="SCORETYPE" value="ScoreDepartment"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONTYPEID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
-      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
       <column name="SCORETYPE" value="ScoreDecisionPhase"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONTYPEID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
-      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
       <column name="SCORETYPE" value="ScorePosition"/>
     </insert>
     <insert tableName="CLASSIFICATIONTYPE">
       <column name="CLASSIFICATIONTYPEID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
-      <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+      <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
       <column name="CLASSIFICATIONGROUP" value="3. Classification"/>
       <column name="SCORETYPE" value="ScoreProjectStart"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/ActivityCategory.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/ActivityCategory.xml
index 35a9a912338a915f9a6dc684e2154e445d267de6..d77e73ac2fd023413b662d4c982529f7c9d31ed0 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/ActivityCategory.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/ActivityCategory.xml
@@ -6,19 +6,19 @@
             <column name="CATEGORY" type="CHAR(36)"/>
 	</addColumn> 
         <update tableName="ACTIVITY">
-            <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+            <column name="CATEGORY" value="VISIT"/>
             <where>CATEGORY_OLD = 0</where>
         </update>
         <update tableName="ACTIVITY">
-            <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+            <column name="CATEGORY" value="MAIL"/>
             <where>CATEGORY_OLD = 1</where>
         </update>
         <update tableName="ACTIVITY">
-            <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+            <column name="CATEGORY" value="PHONE"/>
             <where>CATEGORY_OLD = 2</where>
         </update>
         <update tableName="ACTIVITY">
-            <column name="CATEGORY" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+            <column name="CATEGORY" value="ONLINE-MEETING"/>
             <where>CATEGORY_OLD = 3</where>
         </update>
         <dropColumn tableName="ACTIVITY" columnName="CATEGORY_OLD"/>
@@ -30,19 +30,19 @@
             </addColumn>   
             <update tableName="ACTIVITY">
                 <column name="CATEGORY" valueNumeric="0"/>
-                <where>CATEGORY_OLD = '12ef155a-7be2-405a-af26-d357e5a61c25'</where>
+                <where>CATEGORY_OLD = 'VISIT'</where>
             </update>
             <update tableName="ACTIVITY">
                 <column name="CATEGORY" valueNumeric="1"/>
-                <where>CATEGORY_OLD = '7c5c8f92-d40e-4204-859c-fd07467e6f8b'</where>
+                <where>CATEGORY_OLD = 'MAIL'</where>
             </update>
             <update tableName="ACTIVITY">
                 <column name="CATEGORY" valueNumeric="2"/>
-                <where>CATEGORY_OLD = 'f925a037-e869-43c2-8a26-b0a7ade1964e'</where>
+                <where>CATEGORY_OLD = 'PHONE'</where>
             </update>
             <update tableName="ACTIVITY">
                 <column name="CATEGORY" valueNumeric="3"/>
-                <where>CATEGORY_OLD = '150bae94-1175-4131-9320-a88dadbffcda'</where>
+                <where>CATEGORY_OLD = 'ONLINE-MEETING'</where>
             </update>
             <dropColumn tableName="ACTIVITY" columnName="CATEGORY_OLD"/>
         </rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/AddressType.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/AddressType.xml
index 8b4d8e7886f04889101b906b026c473b42875045..740c7e534d9db725b18ef15b6bff02b955ab2e84 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/AddressType.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/AddressType.xml
@@ -6,7 +6,7 @@
             <column name="ADDR_TYPE" type="CHAR(36)"/>
 	</addColumn> 
         <update tableName="ADDRESS">
-            <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+            <column name="ADDR_TYPE" value="OFFICEADDR"/>
             <where>ADDR_TYPE_OLD = 1</where>
         </update>
         <update tableName="ADDRESS">
@@ -18,7 +18,7 @@
             <where>ADDR_TYPE_OLD = 3</where>
         </update>
         <update tableName="ADDRESS">
-            <column name="ADDR_TYPE" value="dd0ddde2-9add-4309-b3ef-0f1dfb6d4aac"/>
+            <column name="ADDR_TYPE" value="POSTADDR"/>
             <where>ADDR_TYPE_OLD = 4</where>
         </update>
         <dropColumn tableName="ADDRESS" columnName="ADDR_TYPE_OLD"/>
@@ -30,7 +30,7 @@
             </addColumn>   
             <update tableName="ADDRESS">
                 <column name="ADDR_TYPE" valueNumeric="1"/>
-                <where>ADDR_TYPE_OLD = 'b3292432-bca2-4674-8b06-b78b2b06351e'</where>
+                <where>ADDR_TYPE_OLD = 'OFFICEADDR'</where>
             </update>
             <update tableName="ADDRESS">
                 <column name="ADDR_TYPE" valueNumeric="2"/>
@@ -42,7 +42,7 @@
             </update>
             <update tableName="ADDRESS">
                 <column name="ADDR_TYPE" valueNumeric="4"/>
-                <where>ADDR_TYPE_OLD = 'dd0ddde2-9add-4309-b3ef-0f1dfb6d4aac'</where>
+                <where>ADDR_TYPE_OLD = 'POSTADDR'</where>
             </update>
             <dropColumn tableName="ADDRESS" columnName="ADDR_TYPE_OLD"/>
         </rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/CommunicationMedium.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/CommunicationMedium.xml
index 56d6b71209b8c6cf46150dfb50202f0908860369..318b57592f287c4f07d566bd24b8558af27ebffb 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/CommunicationMedium.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/CommunicationMedium.xml
@@ -6,19 +6,19 @@
             <column name="MEDIUM_ID" type="CHAR(36)"/>
 	</addColumn> 
         <update tableName="COMMUNICATION">
-            <column name="MEDIUM_ID" value="1a4b1ebe-cf06-4bc1-b7af-e4633d38dc79"/>
+            <column name="MEDIUM_ID" value="COMMMOBIL"/>
             <where>MEDIUM_OLD = 0</where>
         </update>
         <update tableName="COMMUNICATION">
-            <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+            <column name="MEDIUM_ID" value="COMMEMAIL"/>
             <where>MEDIUM_OLD = 1</where>
         </update>
         <update tableName="COMMUNICATION">
-            <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+            <column name="MEDIUM_ID" value="COMMPHONE"/>
             <where>MEDIUM_OLD = 2</where>
         </update>
         <update tableName="COMMUNICATION">
-            <column name="MEDIUM_ID" value="d08956b8-369e-4b65-88fa-1c37b3368ae3"/>
+            <column name="MEDIUM_ID" value="COMMINTERNET"/>
             <where>MEDIUM_OLD = 3</where>
         </update>
         <dropColumn tableName="COMMUNICATION" columnName="MEDIUM_OLD"/>
@@ -30,19 +30,19 @@
             </addColumn>   
             <update tableName="COMMUNICATION">
                 <column name="MEDIUM_ID" valueNumeric="0"/>
-                <where>MEDIUM_OLD = '1a4b1ebe-cf06-4bc1-b7af-e4633d38dc79'</where>
+                <where>MEDIUM_OLD = 'COMMMOBIL'</where>
             </update>
             <update tableName="COMMUNICATION">
                 <column name="MEDIUM_ID" valueNumeric="1"/>
-                <where>MEDIUM_OLD = '85ee16dd-c878-4463-be6a-324c25e76764'</where>
+                <where>MEDIUM_OLD = 'COMMEMAIL'</where>
             </update>
             <update tableName="COMMUNICATION">
                 <column name="MEDIUM_ID" valueNumeric="2"/>
-                <where>MEDIUM_OLD = '2f48600a-5c3f-4201-a0c6-5ce1eb9fee13'</where>
+                <where>MEDIUM_OLD = 'COMMPHONE'</where>
             </update>
             <update tableName="COMMUNICATION">
                 <column name="MEDIUM_ID" valueNumeric="3"/>
-                <where>MEDIUM_OLD = 'd08956b8-369e-4b65-88fa-1c37b3368ae3'</where>
+                <where>MEDIUM_OLD = 'COMMINTERNET'</where>
             </update>
             <dropColumn tableName="COMMUNICATION" columnName="MEDIUM_OLD"/>
         </rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/OfferProbability.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/OfferProbability.xml
index e6b9f3298ee8e0de24f9a3f830787f3ddf32c2cc..6ce36416580b1571631f77f1caa2a06e44a590d7 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/OfferProbability.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/OfferProbability.xml
@@ -6,23 +6,23 @@
             <column name="PROBABILITY" type="CHAR(36)"/>
 	</addColumn> 
         <update tableName="OFFER">
-            <column name="PROBABILITY" value="834f814d-4e31-4289-be6c-fad2dea3f2f0"/>
+            <column name="PROBABILITY" value="0"/>
             <where>PROBABILITY_OLD = 1</where>
         </update>
         <update tableName="OFFER">
-            <column name="PROBABILITY" value="98ce5f41-90f5-434f-9e72-cdac4a0f5214"/>
+            <column name="PROBABILITY" value="25"/>
             <where>PROBABILITY_OLD = 2</where>
         </update>
         <update tableName="OFFER">
-            <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+            <column name="PROBABILITY" value="50"/>
             <where>PROBABILITY_OLD = 3</where>
         </update>
         <update tableName="OFFER">
-            <column name="PROBABILITY" value="2dca6f38-b49a-4716-8c83-9d2183c5c065"/>
+            <column name="PROBABILITY" value="75"/>
             <where>PROBABILITY_OLD = 4</where>
         </update>
         <update tableName="OFFER">
-            <column name="PROBABILITY" value="dc7c62fe-ce4b-41e3-91ab-ce0b740ccaeb"/>
+            <column name="PROBABILITY" value="100"/>
             <where>PROBABILITY_OLD = 5</where>
         </update>
         <dropColumn tableName="OFFER" columnName="PROBABILITY_OLD"/>
@@ -34,23 +34,23 @@
             </addColumn>   
             <update tableName="OFFER">
                 <column name="PROBABILITY" valueNumeric="1"/>
-                <where>PROBABILITY_OLD = '834f814d-4e31-4289-be6c-fad2dea3f2f0'</where>
+                <where>PROBABILITY_OLD = '0'</where>
             </update>
             <update tableName="OFFER">
                 <column name="PROBABILITY" valueNumeric="2"/>
-                <where>PROBABILITY_OLD = '98ce5f41-90f5-434f-9e72-cdac4a0f5214'</where>
+                <where>PROBABILITY_OLD = '25'</where>
             </update>
             <update tableName="OFFER">
                 <column name="PROBABILITY" valueNumeric="3"/>
-                <where>PROBABILITY_OLD = 'c510907f-8478-471e-b702-5008908504bd'</where>
+                <where>PROBABILITY_OLD = '50'</where>
             </update>
             <update tableName="OFFER">
                 <column name="PROBABILITY" valueNumeric="4"/>
-                <where>PROBABILITY_OLD = '2dca6f38-b49a-4716-8c83-9d2183c5c065'</where>
+                <where>PROBABILITY_OLD = '75'</where>
             </update>
             <update tableName="OFFER">
                 <column name="PROBABILITY" valueNumeric="5"/>
-                <where>PROBABILITY_OLD = 'dc7c62fe-ce4b-41e3-91ab-ce0b740ccaeb'</where>
+                <where>PROBABILITY_OLD = '100'</where>
             </update>
             <dropColumn tableName="OFFER" columnName="PROBABILITY_OLD"/>
         </rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
index 22a289d2cea610e547f33c32bf3c72ff8dbc7526..c32de811b1cce224362353cc40b2e5a98cfaa510 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
@@ -6,31 +6,31 @@
             <column name="PHASE" type="CHAR(36)"/>
 	</addColumn> 
         <update tableName="SALESPROJECT_COMPETITION">
-            <column name="PHASE" value="9f7d1fa9-7c09-4037-8f7c-8458def14d89"/>
+            <column name="PHASE" value="SALPROJPHASENQC"/>
             <where>PHASE_OLD = 1</where>
         </update>
         <update tableName="SALESPROJECT_COMPETITION">
-            <column name="PHASE" value="292628f1-d9a5-432d-8130-f6690c14a5d4"/>
+            <column name="PHASE" value="SALPROJPHASEMAL"/>
             <where>PHASE_OLD = 2</where>
         </update>
         <update tableName="SALESPROJECT_COMPETITION">
-            <column name="PHASE" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+            <column name="PHASE" value="SALPROJPHASEMQL"/>
             <where>PHASE_OLD = 3</where>
         </update>
         <update tableName="SALESPROJECT_COMPETITION">
-            <column name="PHASE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+            <column name="PHASE" value="SALPROJPHASESAL"/>
             <where>PHASE_OLD = 4</where>
         </update>
         <update tableName="SALESPROJECT_COMPETITION">
-            <column name="PHASE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
+            <column name="PHASE" value="SALPROJPHASESQO"/>
             <where>PHASE_OLD = 5</where>
         </update>
         <update tableName="SALESPROJECT_COMPETITION">
-            <column name="PHASE" value="60d09bb1-7e02-4003-99bf-18b739a577ad"/>
+            <column name="PHASE" value="SALPROJPHASEOFFER"/>
             <where>PHASE_OLD = 6</where>
         </update>
         <update tableName="SALESPROJECT_COMPETITION">
-            <column name="PHASE" value="213c8184-f930-457e-8605-703baaf21d4a"/>
+            <column name="PHASE" value="SALPROJPHASENEGO"/>
             <where>PHASE_OLD = 7</where>
         </update>
         <update tableName="SALESPROJECT_COMPETITION">
@@ -78,31 +78,31 @@
             </addColumn>   
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="PHASE" valueNumeric="1"/>
-                <where>PHASE_OLD = '9f7d1fa9-7c09-4037-8f7c-8458def14d89'</where>
+                <where>PHASE_OLD = 'SALPROJPHASENQC'</where>
             </update>
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="PHASE" valueNumeric="2"/>
-                <where>PHASE_OLD = '292628f1-d9a5-432d-8130-f6690c14a5d4'</where>
+                <where>PHASE_OLD = 'SALPROJPHASEMAL'</where>
             </update>
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="PHASE" valueNumeric="3"/>
-                <where>PHASE_OLD = '4467b33c-3a68-4c8b-ba4a-1eb666a6c774'</where>
+                <where>PHASE_OLD = 'SALPROJPHASEMQL'</where>
             </update>
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="PHASE" valueNumeric="4"/>
-                <where>PHASE_OLD = '1e42f183-fb97-415f-9917-b43ca159fde4'</where>
+                <where>PHASE_OLD = 'SALPROJPHASESAL'</where>
             </update>
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="PHASE" valueNumeric="5"/>
-                <where>PHASE_OLD = '972a41dc-a8ae-43cd-a03b-522ea84efbfb'</where>
+                <where>PHASE_OLD = 'SALPROJPHASESQO'</where>
             </update>
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="PHASE" valueNumeric="6"/>
-                <where>PHASE_OLD = '60d09bb1-7e02-4003-99bf-18b739a577ad'</where>
+                <where>PHASE_OLD = 'SALPROJPHASEOFFER'</where>
             </update>
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="PHASE" valueNumeric="7"/>
-                <where>PHASE_OLD = '213c8184-f930-457e-8605-703baaf21d4a'</where>
+                <where>PHASE_OLD = 'SALPROJPHASENEGO'</where>
             </update>
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="PHASE" valueNumeric="8"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectPhase.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectPhase.xml
index 63c6e4c7f6380ddef196273619356662a86da879..249e610ff9a461dd748f361b3a507b62e29d3876 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectPhase.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectPhase.xml
@@ -6,31 +6,31 @@
             <column name="PHASE" type="CHAR(36)"/>
 	</addColumn> 
         <update tableName="SALESPROJECT">
-            <column name="PHASE" value="9f7d1fa9-7c09-4037-8f7c-8458def14d89"/>
+            <column name="PHASE" value="SALPROJPHASENQC"/>
             <where>PHASE_OLD = 1</where>
         </update>
         <update tableName="SALESPROJECT">
-            <column name="PHASE" value="292628f1-d9a5-432d-8130-f6690c14a5d4"/>
+            <column name="PHASE" value="SALPROJPHASEMAL"/>
             <where>PHASE_OLD = 2</where>
         </update>
         <update tableName="SALESPROJECT">
-            <column name="PHASE" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+            <column name="PHASE" value="SALPROJPHASEMQL"/>
             <where>PHASE_OLD = 3</where>
         </update>
         <update tableName="SALESPROJECT">
-            <column name="PHASE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+            <column name="PHASE" value="SALPROJPHASESAL"/>
             <where>PHASE_OLD = 4</where>
         </update>
         <update tableName="SALESPROJECT">
-            <column name="PHASE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
+            <column name="PHASE" value="SALPROJPHASESQO"/>
             <where>PHASE_OLD = 5</where>
         </update>
         <update tableName="SALESPROJECT">
-            <column name="PHASE" value="60d09bb1-7e02-4003-99bf-18b739a577ad"/>
+            <column name="PHASE" value="SALPROJPHASEOFFER"/>
             <where>PHASE_OLD = 6</where>
         </update>
         <update tableName="SALESPROJECT">
-            <column name="PHASE" value="213c8184-f930-457e-8605-703baaf21d4a"/>
+            <column name="PHASE" value="SALPROJPHASENEGO"/>
             <where>PHASE_OLD = 7</where>
         </update>
         <update tableName="SALESPROJECT">
@@ -78,31 +78,31 @@
             </addColumn>   
             <update tableName="SALESPROJECT">
                 <column name="PHASE" valueNumeric="1"/>
-                <where>PHASE_OLD = '9f7d1fa9-7c09-4037-8f7c-8458def14d89'</where>
+                <where>PHASE_OLD = 'SALPROJPHASENQC'</where>
             </update>
             <update tableName="SALESPROJECT">
                 <column name="PHASE" valueNumeric="2"/>
-                <where>PHASE_OLD = '292628f1-d9a5-432d-8130-f6690c14a5d4'</where>
+                <where>PHASE_OLD = 'SALPROJPHASEMAL'</where>
             </update>
             <update tableName="SALESPROJECT">
                 <column name="PHASE" valueNumeric="3"/>
-                <where>PHASE_OLD = '4467b33c-3a68-4c8b-ba4a-1eb666a6c774'</where>
+                <where>PHASE_OLD = 'SALPROJPHASEMQL'</where>
             </update>
             <update tableName="SALESPROJECT">
                 <column name="PHASE" valueNumeric="4"/>
-                <where>PHASE_OLD = '1e42f183-fb97-415f-9917-b43ca159fde4'</where>
+                <where>PHASE_OLD = 'SALPROJPHASESAL'</where>
             </update>
             <update tableName="SALESPROJECT">
                 <column name="PHASE" valueNumeric="5"/>
-                <where>PHASE_OLD = '972a41dc-a8ae-43cd-a03b-522ea84efbfb'</where>
+                <where>PHASE_OLD = 'SALPROJPHASESQO'</where>
             </update>
             <update tableName="SALESPROJECT">
                 <column name="PHASE" valueNumeric="6"/>
-                <where>PHASE_OLD = '60d09bb1-7e02-4003-99bf-18b739a577ad'</where>
+                <where>PHASE_OLD = 'SALPROJPHASEOFFER'</where>
             </update>
             <update tableName="SALESPROJECT">
                 <column name="PHASE" valueNumeric="7"/>
-                <where>PHASE_OLD = '213c8184-f930-457e-8605-703baaf21d4a'</where>
+                <where>PHASE_OLD = 'SALPROJPHASENEGO'</where>
             </update>
             <update tableName="SALESPROJECT">
                 <column name="PHASE" valueNumeric="8"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectState.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectState.xml
index 773dc4868aec13a097420a2435f82dbe96020bfb..931bd328935f7899110b370fb8c0bdcd454f8ea8 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectState.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectState.xml
@@ -6,7 +6,7 @@
             <column name="STATE" type="CHAR(36)"/>
 	</addColumn> 
         <update tableName="SALESPROJECT">
-            <column name="STATE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+            <column name="STATE" value="SALPROJSTATOPEN"/>
             <where>STATE_OLD = 1</where>
         </update>
         <update tableName="SALESPROJECT">
@@ -14,15 +14,15 @@
             <where>STATE_OLD = 2</where>
         </update>
         <update tableName="SALESPROJECT">
-            <column name="STATE" value="8916e241-9452-4541-a323-d479ad5f2e4d"/>
+            <column name="STATE" value="SALPROJSTATABORT"/>
             <where>STATE_OLD = 3</where>
         </update>
         <update tableName="SALESPROJECT">
-            <column name="STATE" value="1606cf46-a87b-4797-830e-55ebdd70a001"/>
+            <column name="STATE" value="SALPROJSTATPARTIAL"/>
             <where>STATE_OLD = 4</where>
         </update>
         <update tableName="SALESPROJECT">
-            <column name="STATE" value="130bb53a-a97e-455e-8f34-8d445e985474"/>
+            <column name="STATE" value="SALPROJSTATLOST"/>
             <where>STATE_OLD = 5</where>
         </update>
         <update tableName="SALESPROJECT">
@@ -38,7 +38,7 @@
             </addColumn>   
             <update tableName="SALESPROJECT">
                 <column name="STATE" valueNumeric="1"/>
-                <where>STATE_OLD = '483bcaeb-1e5b-4772-b54e-7d7d8aa65712'</where>
+                <where>STATE_OLD = 'SALPROJSTATOPEN'</where>
             </update>
             <update tableName="SALESPROJECT">
                 <column name="STATE" valueNumeric="2"/>
@@ -46,15 +46,15 @@
             </update>
             <update tableName="SALESPROJECT">
                 <column name="STATE" valueNumeric="3"/>
-                <where>STATE_OLD = '8916e241-9452-4541-a323-d479ad5f2e4d'</where>
+                <where>STATE_OLD = 'SALPROJSTATABORT'</where>
             </update>
             <update tableName="SALESPROJECT">
                 <column name="STATE" valueNumeric="4"/>
-                <where>STATE_OLD = '1606cf46-a87b-4797-830e-55ebdd70a001'</where>
+                <where>STATE_OLD = 'SALPROJSTATPARTIAL'</where>
             </update>
             <update tableName="SALESPROJECT">
                 <column name="STATE" valueNumeric="5"/>
-                <where>STATE_OLD = '130bb53a-a97e-455e-8f34-8d445e985474'</where>
+                <where>STATE_OLD = 'SALPROJSTATLOST'</where>
             </update>
             <update tableName="SALESPROJECT">
                 <column name="STATE" valueNumeric="6"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectStrength.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectStrength.xml
index a5c255d5cb7b4fb3d2dde94a15d8d9c049e19669..cab0f1faf60fcd912fe79dc513a4668666a973b2 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectStrength.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectStrength.xml
@@ -6,15 +6,15 @@
             <column name="STRENGTH" type="CHAR(36)"/>
 	</addColumn> 
         <update tableName="ORGANISATION">
-            <column name="STRENGTH" value="a30e5d5c-88e2-4674-98d3-8a88622a62a8"/>
+            <column name="STRENGTH" value="SALPROJSTPRICEPOL"/>
             <where>STRENGTH_OLD = 0</where>
         </update>
         <update tableName="ORGANISATION">
-            <column name="STRENGTH" value="b5def5d7-a843-4e5e-b56e-e18e26fd0bc1"/>
+            <column name="STRENGTH" value="SALPROJSTPERSAPP"/>
             <where>STRENGTH_OLD = 1</where>
         </update>
         <update tableName="ORGANISATION">
-            <column name="STRENGTH" value="2eda4875-53e6-4359-b367-464d006cf9b3"/>
+            <column name="STRENGTH" value="SALPROJSTPROD"/>
             <where>STRENGTH_OLD = 2</where>
         </update>
         <dropColumn tableName="ORGANISATION" columnName="STRENGTH_OLD"/>
@@ -26,15 +26,15 @@
             </addColumn>   
             <update tableName="ORGANISATION">
                 <column name="STRENGTH" valueNumeric="0"/>
-                <where>STRENGTH_OLD = 'a30e5d5c-88e2-4674-98d3-8a88622a62a8'</where>
+                <where>STRENGTH_OLD = 'SALPROJSTPRICEPOL'</where>
             </update>
             <update tableName="ORGANISATION">
                 <column name="STRENGTH" valueNumeric="1"/>
-                <where>STRENGTH_OLD = 'b5def5d7-a843-4e5e-b56e-e18e26fd0bc1'</where>
+                <where>STRENGTH_OLD = 'SALPROJSTPERSAPP'</where>
             </update>
             <update tableName="ORGANISATION">
                 <column name="STRENGTH" valueNumeric="2"/>
-                <where>STRENGTH_OLD = '2eda4875-53e6-4359-b367-464d006cf9b3'</where>
+                <where>STRENGTH_OLD = 'SALPROJSTPROD'</where>
             </update>
             <dropColumn tableName="ORGANISATION" columnName="STRENGTH_OLD"/>
         </rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
index d4aa8de109c8ceaba72b9e87dacf19098876bf50..5bfcf69fae5f2cde4dad9a077671f7b318bca405 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
@@ -6,27 +6,27 @@
             <column name="STATUS" type="CHAR(36)"/>
 	</addColumn> 
         <update tableName="SALESPROJECT_COMPETITION">
-            <column name="STATUS" value="90dabaf6-b62a-4a5b-a9ff-449e5a898a24"/>
+            <column name="STATUS" value="COMPSTATEOPEN"/>
             <where>STATUS_OLD = 1</where>
         </update>
         <update tableName="SALESPROJECT_COMPETITION">
-            <column name="STATUS" value="2709acc9-df9c-470b-840c-6ff89fe0bf4e"/>
+            <column name="STATUS" value="COMPSTATEPOST"/>
             <where>STATUS_OLD = 2</where>
         </update>
         <update tableName="SALESPROJECT_COMPETITION">
-            <column name="STATUS" value="fb9d270b-a62d-4a78-a3b8-a49dc5afe36d"/>
+            <column name="STATUS" value="COMPSTATEABORT"/>
             <where>STATUS_OLD = 3</where>
         </update>
         <update tableName="SALESPROJECT_COMPETITION">
-            <column name="STATUS" value="bae61bdf-ef67-4074-9db6-99a292dc8a6d"/>
+            <column name="STATUS" value="COMPSTATEPARTIAL"/>
             <where>STATUS_OLD = 4</where>
         </update>
         <update tableName="SALESPROJECT_COMPETITION">
-            <column name="STATUS" value="aa4aff7e-3c1a-4a48-95f6-297e341cb7aa"/>
+            <column name="STATUS" value="COMPSTATEORDER"/>
             <where>STATUS_OLD = 5</where>
         </update>
         <update tableName="SALESPROJECT_COMPETITION">
-            <column name="STATUS" value="ff73172c-8517-4b6e-98cb-43aebacd9af1"/>
+            <column name="STATUS" value="COMPSTATELOST"/>
             <where>STATUS_OLD = 6</where>
         </update>
         <dropColumn tableName="SALESPROJECT_COMPETITION" columnName="STATUS_OLD"/>
@@ -38,27 +38,27 @@
             </addColumn>   
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="STATUS" valueNumeric="1"/>
-                <where>STATUS_OLD = '90dabaf6-b62a-4a5b-a9ff-449e5a898a24'</where>
+                <where>STATUS_OLD = 'COMPSTATEOPEN'</where>
             </update>
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="STATUS" valueNumeric="2"/>
-                <where>STATUS_OLD = '2709acc9-df9c-470b-840c-6ff89fe0bf4e'</where>
+                <where>STATUS_OLD = 'COMPSTATEPOST'</where>
             </update>
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="STATUS" valueNumeric="3"/>
-                <where>STATUS_OLD = 'fb9d270b-a62d-4a78-a3b8-a49dc5afe36d'</where>
+                <where>STATUS_OLD = 'COMPSTATEABORT'</where>
             </update>
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="STATUS" valueNumeric="4"/>
-                <where>STATUS_OLD = 'bae61bdf-ef67-4074-9db6-99a292dc8a6d'</where>
+                <where>STATUS_OLD = 'COMPSTATEPARTIAL'</where>
             </update>
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="STATUS" valueNumeric="5"/>
-                <where>STATUS_OLD = 'aa4aff7e-3c1a-4a48-95f6-297e341cb7aa'</where>
+                <where>STATUS_OLD = 'COMPSTATEORDER'</where>
             </update>
             <update tableName="SALESPROJECT_COMPETITION">
                 <column name="STATUS" valueNumeric="6"/>
-                <where>STATUS_OLD = 'ff73172c-8517-4b6e-98cb-43aebacd9af1'</where>
+                <where>STATUS_OLD = 'COMPSTATELOST'</where>
             </update>
             <dropColumn tableName="SALESPROJECT_COMPETITION" columnName="STATUS_OLD"/>
         </rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/TaskPriority.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/TaskPriority.xml
index cf600a9052afad01691051b9535c4735826070e9..e9e3c416ccc2e1a5fd2e8bfc401bc57ab40b2d7a 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/TaskPriority.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/TaskPriority.xml
@@ -6,19 +6,19 @@
             <column name="PRIORITY" type="CHAR(36)"/>
 	</addColumn> 
         <update tableName="TASK">
-            <column name="PRIORITY" value="f587f53a-72cc-4b76-9e39-276a26cab2e0"/>
+            <column name="PRIORITY" value="TASKPRIONONE"/>
             <where>PRIORITY_OLD = 0</where>
         </update>
         <update tableName="TASK">
-            <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
+            <column name="PRIORITY" value="TASKPRIONORMAL"/>
             <where>PRIORITY_OLD = 1</where>
         </update>
         <update tableName="TASK">
-            <column name="PRIORITY" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+            <column name="PRIORITY" value="SALPROJPHASEMQL"/>
             <where>PRIORITY_OLD = 2</where>
         </update>
         <update tableName="TASK">
-            <column name="PRIORITY" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+            <column name="PRIORITY" value="SALPROJPHASESAL"/>
             <where>PRIORITY_OLD = 3</where>
         </update>
         <dropColumn tableName="TASK" columnName="PRIORITY_OLD"/>
@@ -29,19 +29,19 @@
             </addColumn>   
             <update tableName="TASK">
                 <column name="PRIORITY" valueNumeric="0"/>
-                <where>PRIORITY_OLD = 'f587f53a-72cc-4b76-9e39-276a26cab2e0'</where>
+                <where>PRIORITY_OLD = 'TASKPRIONONE'</where>
             </update>
             <update tableName="TASK">
                 <column name="PRIORITY" valueNumeric="1"/>
-                <where>PRIORITY_OLD = '09072b59-d12f-469b-acbd-18a28232ff70'</where>
+                <where>PRIORITY_OLD = 'TASKPRIONORMAL'</where>
             </update>
             <update tableName="TASK">
                 <column name="PRIORITY" valueNumeric="2"/>
-                <where>PRIORITY_OLD = '4467b33c-3a68-4c8b-ba4a-1eb666a6c774'</where>
+                <where>PRIORITY_OLD = 'SALPROJPHASEMQL'</where>
             </update>
             <update tableName="TASK">
                 <column name="PRIORITY" valueNumeric="3"/>
-                <where>PRIORITY_OLD = '1e42f183-fb97-415f-9917-b43ca159fde4'</where>
+                <where>PRIORITY_OLD = 'SALPROJPHASESAL'</where>
             </update>
             <dropColumn tableName="TASK" columnName="PRIORITY_OLD"/>
         </rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/ORGANISATION_private.xml b/.liquibase/Data_alias/basic/2019.1.4/ORGANISATION_private.xml
index 396afa3108f89c7676306554c938882bca21393f..77e650768a11c404c698a720b08e0be8a34f80de 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/ORGANISATION_private.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/ORGANISATION_private.xml
@@ -5,13 +5,13 @@
             <column name="ORGANISATIONID" value="0"/>
             <column name="NAME" value="privat"/>
             <column name="CUSTOMERCODE" value=""/>
-            <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+            <column name="TYPE" value="ORGCUTOMER"/>
 	</insert>
         <insert tableName="CONTACT">
             <column name="CONTACTID" value="0"/>
             <column name="ORGANISATION_ID" value="0"/>
             <column name="LANGUAGE" value="deu"/>
-            <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+            <column name="STATUS" value="CONTACTSTATACTIVE"/>
             <column name="ADDRESS_ID" value="0"/>
         </insert>
 	<rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TaskType_Task.xml b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TaskType_Task.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/update_TaskStatus_add_icon_and_new_status.xml b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/update_TaskStatus_add_icon_and_new_status.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/.liquibase/Data_alias/basic/2019.1.4/fix_sp_phases.xml b/.liquibase/Data_alias/basic/2019.1.4/fix_sp_phases.xml
index 0e36cda05c7f4a9b8437307a4baa25356b31aa66..9b1749bd2918fe4ecd31525b2169516c8680a2a7 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/fix_sp_phases.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/fix_sp_phases.xml
@@ -17,7 +17,7 @@
         </delete>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="028af5dd-1071-4108-8685-ed7124376706"/>
-            <column name="KEYID" value="4814b51b-40f5-49bc-897b-f0933b9fc12c"/>
+            <column name="KEYID" value="SALPROJPHASEMQC"/>
             <column name="TITLE" value="MQC"/>
             <column name="CONTAINER" value="SalesprojectPhase"/>
             <column name="SORTING" valueNumeric="1"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/update_Keyword_Essentials.xml b/.liquibase/Data_alias/basic/2019.1.4/update_Keyword_Essentials.xml
index c390891c147e17a7184e9c5f656db6f0167a3b2e..24f34510bf8d4c4fe72d0635a8cf1a70e599d4c9 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/update_Keyword_Essentials.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/update_Keyword_Essentials.xml
@@ -3,14 +3,14 @@
   <changeSet author="a.loreth" id="b1629529-92ab-437d-b864-0fd68fe5ceab">
     <update tableName="AB_KEYWORD_ENTRY">
       <column name="ISESSENTIAL" valueNumeric="1" />
-      <where>KEYID in ('548ffe3b-466b-4c8f-97d6-e3ad23e33344', 'BSICacti-0dir-0inc-b8a3-f43e2c73df65', 'BSICacti-0dir-outg-8337-909b0f93143a', 'BSIC0rel-stat-actv-ae03-b6b04430e90b', '21bc4d20-1a87-4247-8f7c-8d3a09631850', '4dee8727-8299-422e-ae41-6cdf9de2dfd7', '02553fc7-4611-4914-8ff5-0b7c4e7531c9', '09072b59-d12f-469b-acbd-18a28232ff70', 'ec92271b-eac2-4ec2-be24-ab4abde7e939')</where>
+      <where>KEYID in ('QUANTITYPIECES', 'iox', 'oox', 'CONTACTSTATACTIVE', 'TASKSTATNEW', 'TASKTYPETASK', 'PRICELISTDEFAULT', 'TASKPRIONORMAL', 'TASKPROG0')</where>
     </update>
 
 
     <rollback>
       <update tableName="AB_KEYWORD_ENTRY">
         <column name="ISESSENTIAL" valueNumeric="0" />
-        <where>KEYID in ('548ffe3b-466b-4c8f-97d6-e3ad23e33344', 'BSICacti-0dir-0inc-b8a3-f43e2c73df65', 'BSICacti-0dir-outg-8337-909b0f93143a', 'BSIC0rel-stat-actv-ae03-b6b04430e90b', '21bc4d20-1a87-4247-8f7c-8d3a09631850', '4dee8727-8299-422e-ae41-6cdf9de2dfd7', '02553fc7-4611-4914-8ff5-0b7c4e7531c9', '09072b59-d12f-469b-acbd-18a28232ff70', 'ec92271b-eac2-4ec2-be24-ab4abde7e939')</where>
+        <where>KEYID in ('QUANTITYPIECES', 'iox', 'oox', 'CONTACTSTATACTIVE', 'TASKSTATNEW', 'TASKTYPETASK', 'PRICELISTDEFAULT', 'TASKPRIONORMAL', 'TASKPROG0')</where>
       </update>
     </rollback>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/update_Milestone_to_new_Keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/update_Milestone_to_new_Keyword.xml
index 78058cb375498026ca1ab75ec33e674970b569f2..9d79ee64c1a69c2855f927681cf5c9a590b2d7ed 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/update_Milestone_to_new_Keyword.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/update_Milestone_to_new_Keyword.xml
@@ -9,7 +9,7 @@
             </whereParams>
         </update>
         <update tableName="SALESPROJECT_MILESTONE">
-            <column name="VALUE" value="9f7d1fa9-7c09-4037-8f7c-8458def14d89"/>
+            <column name="VALUE" value="SALPROJPHASENQC"/>
             <where>TYPE = ? and VALUE in (?,?,?,?,?,?,?,?,?,?,?)</where>
             <whereParams>
                 <param value="SalesprojectPhase" />
@@ -27,7 +27,7 @@
             </whereParams>
         </update>
         <update tableName="SALESPROJECT_MILESTONE">
-            <column name="VALUE" value="292628f1-d9a5-432d-8130-f6690c14a5d4"/>
+            <column name="VALUE" value="SALPROJPHASEMAL"/>
             <where>TYPE = ? and VALUE = ?</where>
             <whereParams>
                 <param value="SalesprojectPhase" />
@@ -35,7 +35,7 @@
             </whereParams>
         </update>
         <update tableName="SALESPROJECT_MILESTONE">
-            <column name="VALUE" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+            <column name="VALUE" value="SALPROJPHASEMQL"/>
             <where>TYPE = ? and VALUE = ?</where>
             <whereParams>
                 <param value="SalesprojectPhase" />
@@ -43,7 +43,7 @@
             </whereParams>
         </update>
         <update tableName="SALESPROJECT_MILESTONE">
-            <column name="VALUE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+            <column name="VALUE" value="SALPROJPHASESAL"/>
             <where>TYPE = ? and VALUE = ?</where>
             <whereParams>
                 <param value="SalesprojectPhase" />
@@ -51,7 +51,7 @@
             </whereParams>
         </update>
         <update tableName="SALESPROJECT_MILESTONE">
-            <column name="VALUE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
+            <column name="VALUE" value="SALPROJPHASESQO"/>
             <where>TYPE = ? and VALUE = ?</where>
             <whereParams>
                 <param value="SalesprojectPhase" />
@@ -59,7 +59,7 @@
             </whereParams>
         </update>
         <update tableName="SALESPROJECT_MILESTONE">
-            <column name="VALUE" value="60d09bb1-7e02-4003-99bf-18b739a577ad"/>
+            <column name="VALUE" value="SALPROJPHASEOFFER"/>
             <where>TYPE = ? and VALUE = ?</where>
             <whereParams>
                 <param value="SalesprojectPhase" />
@@ -67,7 +67,7 @@
             </whereParams>
         </update>
         <update tableName="SALESPROJECT_MILESTONE">
-            <column name="VALUE" value="213c8184-f930-457e-8605-703baaf21d4a"/>
+            <column name="VALUE" value="SALPROJPHASENEGO"/>
             <where>TYPE = ? and VALUE = ?</where>
             <whereParams>
                 <param value="SalesprojectPhase" />
@@ -84,7 +84,7 @@
             </whereParams>
         </update>
         <update tableName="SALESPROJECT_MILESTONE">
-            <column name="VALUE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+            <column name="VALUE" value="SALPROJSTATOPEN"/>
             <where>TYPE = ? and VALUE = ?</where>
             <whereParams>
                 <param value="SalesprojectState" />
@@ -92,7 +92,7 @@
             </whereParams>
         </update>
         <update tableName="SALESPROJECT_MILESTONE">
-            <column name="VALUE" value="23d38486-4cce-41ce-a8df-164ad44df706"/>
+            <column name="VALUE" value="SALPROJSTATPOST"/>
             <where>TYPE = ? and VALUE = ?</where>
             <whereParams>
                 <param value="SalesprojectState" />
@@ -100,7 +100,7 @@
             </whereParams>
         </update>
         <update tableName="SALESPROJECT_MILESTONE">
-            <column name="VALUE" value="8916e241-9452-4541-a323-d479ad5f2e4d"/>
+            <column name="VALUE" value="SALPROJSTATABORT"/>
             <where>TYPE = ? and VALUE = ?</where>
             <whereParams>
                 <param value="SalesprojectState" />
@@ -108,7 +108,7 @@
             </whereParams>
         </update>
         <update tableName="SALESPROJECT_MILESTONE">
-            <column name="VALUE" value="1606cf46-a87b-4797-830e-55ebdd70a001"/>
+            <column name="VALUE" value="SALPROJSTATPARTIAL"/>
             <where>TYPE = ? and VALUE = ?</where>
             <whereParams>
                 <param value="SalesprojectState" />
@@ -116,7 +116,7 @@
             </whereParams>
         </update>
         <update tableName="SALESPROJECT_MILESTONE">
-            <column name="VALUE" value="130bb53a-a97e-455e-8f34-8d445e985474"/>
+            <column name="VALUE" value="SALPROJSTATLOST"/>
             <where>TYPE = ? and VALUE = ?</where>
             <whereParams>
                 <param value="SalesprojectState" />
diff --git a/.liquibase/Data_alias/basic/2019.1.4/update_TaskType_Task.xml b/.liquibase/Data_alias/basic/2019.1.4/update_TaskType_Task.xml
index ed33a9a787fbd2360d9d172df1640a1f6fdb69a6..09e6058cdee6c9d6404719fccd16b69f4ab0201b 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/update_TaskType_Task.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/update_TaskType_Task.xml
@@ -13,7 +13,7 @@
         
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
-            <column name="KEYID" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+            <column name="KEYID" value="TASKTYPETASK"/>
             <column name="TITLE" value="Task"/>
             <column name="CONTAINER" value="TaskType"/>
             <column name="SORTING" valueNumeric="0"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml
index f74f3dfe59befa66077dd62c92d98e3c4aa633ec..f76dac9dddb7339e4490e1cad17f2d080271cc0e 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml
@@ -42,7 +42,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="7a7736db-8b68-4865-a212-bd603af51370"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
-      <column name="ID_VALUE" value="572cf973-ddf5-4081-af30-af6e10986a81"/>
+      <column name="ID_VALUE" value="SALPROJPOLLOW"/>
       <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -60,7 +60,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="76967a63-8322-484b-b603-d3cb5ce27d6d"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
-      <column name="ID_VALUE" value="572cf973-ddf5-4081-af30-af6e10986a81"/>
+      <column name="ID_VALUE" value="SALPROJPOLLOW"/>
       <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -69,7 +69,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="7a291363-9a75-4dd5-aa64-34a1801aeb92"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
-      <column name="ID_VALUE" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+      <column name="ID_VALUE" value="PAYTERM30"/>
       <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -167,7 +167,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="f7824359-7f2c-4942-b959-465bf776ef7e"/>
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
-      <column name="ID_VALUE" value="a30e5d5c-88e2-4674-98d3-8a88622a62a8"/>
+      <column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
       <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -185,7 +185,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="44bd5ab6-0b4f-4655-a276-ed172240643b"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:43:59"/>
-      <column name="ID_VALUE" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+      <column name="ID_VALUE" value="PAYTERM30"/>
       <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -194,7 +194,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="2261ef33-50af-445a-bc19-27367cc6ff7a"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:44:08"/>
-      <column name="ID_VALUE" value="9e59dec2-3c72-4532-a9a9-8c979b610a49"/>
+      <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
       <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -203,7 +203,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="7abc6537-b254-4a36-8315-2e44a5b10fad"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:44:47"/>
-      <column name="ID_VALUE" value="34cbd70d-f163-416b-9ec7-68797ba0dd55"/>
+      <column name="ID_VALUE" value="SALPROJPOLABO"/>
       <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -212,7 +212,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="edddb76a-348d-497b-9665-21acbe0bed0b"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:44:55"/>
-      <column name="ID_VALUE" value="9e59dec2-3c72-4532-a9a9-8c979b610a49"/>
+      <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
       <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -221,7 +221,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="086ff454-e407-433a-9124-496de7fef1cb"/>
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:09"/>
-      <column name="ID_VALUE" value="58ec6146-087d-4664-8887-b44a9f46a3e1"/>
+      <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
       <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -239,7 +239,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="0563ec4f-6f85-469d-89a1-5fc807f4dc9f"/>
       <column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:34"/>
-      <column name="ID_VALUE" value="aa8713c9-ae12-4ce3-a588-0303cea11b44"/>
+      <column name="ID_VALUE" value="DELIVERCIF"/>
       <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -248,7 +248,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="fedc492c-cc5d-48cb-a7ee-0cef061facec"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:45:57"/>
-      <column name="ID_VALUE" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+      <column name="ID_VALUE" value="PAYTERM30"/>
       <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -266,7 +266,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="ce75da6e-b946-4a8c-a9dc-fb76cc20f0a1"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:46:30"/>
-      <column name="ID_VALUE" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+      <column name="ID_VALUE" value="PAYTERM30"/>
       <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -275,7 +275,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="924e8914-6275-45d4-a36a-94f3b70a35b4"/>
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:46:41"/>
-      <column name="ID_VALUE" value="b5def5d7-a843-4e5e-b56e-e18e26fd0bc1"/>
+      <column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
       <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -293,7 +293,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="67f36d84-1997-4801-a4f6-94c9b8318e95"/>
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:08"/>
-      <column name="ID_VALUE" value="a30e5d5c-88e2-4674-98d3-8a88622a62a8"/>
+      <column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
       <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -302,7 +302,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="2d80654e-3bd5-46bb-af0b-f18f812d11e0"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:37"/>
-      <column name="ID_VALUE" value="9e59dec2-3c72-4532-a9a9-8c979b610a49"/>
+      <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
       <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -311,7 +311,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="25dac52d-de7e-47e1-b60c-22d252dae4c2"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:47:46"/>
-      <column name="ID_VALUE" value="178aabbf-3f4c-415b-98bd-5f2510ea72b4"/>
+      <column name="ID_VALUE" value="PAYTERM7"/>
       <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -329,7 +329,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="d5cb44f7-6500-47ca-9dac-784b07d0b5f5"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:10"/>
-      <column name="ID_VALUE" value="90a50e8e-afc0-4e96-9fcd-02f3032307d9"/>
+      <column name="ID_VALUE" value="SALPROJWEAKLIQUIDITY"/>
       <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -338,7 +338,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="7f0bccf2-bf10-4a64-8ae7-236bebc2505f"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:18"/>
-      <column name="ID_VALUE" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+      <column name="ID_VALUE" value="PAYTERM30"/>
       <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -356,7 +356,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="97429450-9cb5-4f8a-bd0f-c6c63c9afee9"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:40"/>
-      <column name="ID_VALUE" value="9e59dec2-3c72-4532-a9a9-8c979b610a49"/>
+      <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
       <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -365,7 +365,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="6907f00d-011d-4592-8f0e-26e52449658f"/>
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:48:46"/>
-      <column name="ID_VALUE" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="ID_VALUE" value="PRICELISTDEFAULT"/>
       <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -374,7 +374,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="f7a60ce6-39c5-43b6-a14d-24b838f541b9"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:02"/>
-      <column name="ID_VALUE" value="572cf973-ddf5-4081-af30-af6e10986a81"/>
+      <column name="ID_VALUE" value="SALPROJPOLLOW"/>
       <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -383,7 +383,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="6e8b96f9-de86-4dc1-b0c9-d5b99867d29c"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:10"/>
-      <column name="ID_VALUE" value="860d8e1c-ea85-426d-91c2-a78dcd14df8d"/>
+      <column name="ID_VALUE" value="PAYTERMDISCOUNT"/>
       <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -392,7 +392,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="f1f8c53a-46e9-40a9-8be2-8f0775cafa64"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:31"/>
-      <column name="ID_VALUE" value="572cf973-ddf5-4081-af30-af6e10986a81"/>
+      <column name="ID_VALUE" value="SALPROJPOLLOW"/>
       <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -401,7 +401,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="255571a4-2fda-49ec-baed-ea7b374895f1"/>
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:39"/>
-      <column name="ID_VALUE" value="58ec6146-087d-4664-8887-b44a9f46a3e1"/>
+      <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
       <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -410,7 +410,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="b2bb8ab7-0e64-49fc-8e18-372ec0a03822"/>
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:49:54"/>
-      <column name="ID_VALUE" value="b5def5d7-a843-4e5e-b56e-e18e26fd0bc1"/>
+      <column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
       <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -437,7 +437,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="1505bacf-c29a-48a7-8da5-5e969252309f"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:51:07"/>
-      <column name="ID_VALUE" value="90a50e8e-afc0-4e96-9fcd-02f3032307d9"/>
+      <column name="ID_VALUE" value="SALPROJWEAKLIQUIDITY"/>
       <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -482,7 +482,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="7b38959d-d0b7-434a-9316-58d4894982d2"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:52:18"/>
-      <column name="ID_VALUE" value="34cbd70d-f163-416b-9ec7-68797ba0dd55"/>
+      <column name="ID_VALUE" value="SALPROJPOLABO"/>
       <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
@@ -491,7 +491,7 @@
       <column name="AB_ATTRIBUTERELATIONID" value="25a53e28-d8a1-43d3-9af0-b34ce9c0bc06"/>
       <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:52:25"/>
-      <column name="ID_VALUE" value="58ec6146-087d-4664-8887-b44a9f46a3e1"/>
+      <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
       <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="USER_NEW" value="Admin"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml
index d7324f504e6a9950609a0c4b37ae56f95de0b93b..75a52554322caa83a81f1ebcf2cc30cc3823353d 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml
@@ -4,10 +4,10 @@
     <delete tableName="ACTIVITY"/>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
-      <column name="CATEGORY" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+      <column name="CATEGORY" value="ONLINE-MEETING"/>
       <column name="DATE_EDIT" valueDate="2019-05-15T03:48:22"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:46:08"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-02-04T03:46:00"/>
       <column name="INFO" value="&lt;p&gt;Erste Pr&amp;auml;sentation mit dem Interessenten. Der Verkaufsleiter scheint von unseren Produkten sehr angetan zu sein.&lt;/p&gt;&#10;&#10;&lt;p&gt;Wollte weitere Informationen zu unseren Produkten und ein erstes Angebot.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Erstkontakt mit dem Interessenten"/>
@@ -16,10 +16,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
-      <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_EDIT" valueDate="2019-05-15T03:58:00"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:52:31"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2019-01-14T03:52:00"/>
       <column name="INFO" value="&lt;p&gt;Hatte ersten Kontakt mit dem Projektzust&amp;auml;ndigen.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Erster Kontakt"/>
@@ -28,10 +28,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T04:04:05"/>
       <column name="DATE_NEW" valueDate="2019-05-15T04:57:48"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-01-14T04:57:00"/>
       <column name="INFO" value="&lt;p&gt;Sehr geehrter Herr Altinger,&lt;/p&gt;&#10;&#10;&lt;p&gt;wie soeben telefonisch vereinbart, erhalten Sie im Anhang die gew&amp;uuml;nschten Informationen.&lt;/p&gt;&#10;&#10;&lt;p&gt;Beste Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Lisa Sommer&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Information Produkt A"/>
@@ -40,10 +40,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
-      <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+      <column name="CATEGORY" value="VISIT"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T10:54:05"/>
       <column name="DATE_NEW" valueDate="2019-05-15T04:59:21"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-02-25T04:59:00"/>
       <column name="INFO" value="&lt;p&gt;Kunde hatte die erste Produktpr&amp;auml;sentation zu unseren Produkten&amp;nbsp;A und B.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Produktpräsentation"/>
@@ -52,9 +52,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:01:56"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-03-11T05:01:00"/>
       <column name="INFO" value="&lt;p&gt;Der potentielle K&amp;auml;ufer hat Produkte unseres Segments gekauft.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Produkt gekauft"/>
@@ -62,10 +62,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
-      <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+      <column name="CATEGORY" value="VISIT"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:04:33"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:05:47"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-04-08T05:05:00"/>
       <column name="INFO" value="&lt;p&gt;Folgende Sonderkondtionen wurden vereinbart:&lt;/p&gt;&#10;&#10;&lt;p&gt;- 10 % Rabatt auf die Produkte&lt;/p&gt;&#10;&#10;&lt;p&gt;- Sonderzahlungs- recht von 30 Tagen netto&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Konditionen und Preise verhandelt"/>
@@ -74,10 +74,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:06:09"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:13:38"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-05-15T05:13:38"/>
       <column name="INFO" value="&lt;p&gt;Sehr geehrter Herr Tannenbaum,&lt;/p&gt;&#10;&#10;&lt;p&gt;anbei erhalten Sie unser erneutes Angebot f&amp;uuml;r das gew&amp;uuml;nschte Produkt A.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Wir freuen uns auf die Best&amp;auml;tigung des Angebots und stehen Ihnen bei R&amp;uuml;ckfragen jederzeit zur Verf&amp;uuml;gung.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Beste Gr&amp;uuml;&amp;szlig;e&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Lisa Sommer&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Angebot an Interessenten versandt"/>
@@ -88,7 +88,7 @@
       <column name="ACTIVITYID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T10:49:59"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:21:44"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-02-19T05:21:00"/>
       <column name="INFO" value="&lt;p&gt;Die ersten Informationen zur derzeitigen Situation beim Interessenten gekl&amp;auml;rt.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Austausch zur aktuellen Situation "/>
@@ -97,10 +97,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:09:30"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:49:57"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-26T07:49:00"/>
       <column name="INFO" value="&lt;p&gt;Hallo Herr Altinger,&lt;/p&gt;&#10;&#10;&lt;p&gt;anbei erhalten Sie wie gew&amp;uuml;nscht und vereinbart unser Angebot zu dem Produkten A und B.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Bei Fragen zum Angebot erreichen Sie uns jederzeit unter den bekannten Kontaktdaten.&lt;/p&gt;&#10;&#10;&lt;p&gt;Wir freuen uns auf die Best&amp;auml;tigung des Angebots und auf die bevorstehende Zusammenarbeit.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Mit freundlichen Gr&amp;uuml;&amp;szlig;en&lt;/p&gt;&#10;&#10;&lt;p&gt;Lisa Sommer&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Unser Angebot"/>
@@ -109,10 +109,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
-      <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T03:41:30"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:55:08"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-01-14T07:55:00"/>
       <column name="INFO" value="&lt;p&gt;Kurzes Gespr&amp;auml;ch gef&amp;uuml;hrt mit Herr Altinger. Haben die ersten Fragen gekl&amp;auml;rt.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Telefonat"/>
@@ -121,10 +121,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T10:46:31"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:56:02"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2019-01-28T07:56:00"/>
       <column name="INFO" value="&lt;p&gt;Sehr geehrte Damen und Herren,&lt;/p&gt;&#10;&#10;&lt;p&gt;es freut uns Ihnen mitteilen zu k&amp;ouml;nnen, dass wir gerne mit Ihnen in die engere Auswahl gehen m&amp;ouml;chten.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Die n&amp;auml;chsten Schritte sind weitere Gespr&amp;auml;che sowie eine Pr&amp;auml;sentation Ihrer Produkte.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Viele Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Markus Altinger&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Auswahlprozess"/>
@@ -133,9 +133,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
-      <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+      <column name="CATEGORY" value="VISIT"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:57:15"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2019-02-04T07:57:00"/>
       <column name="INFO" value="&lt;p&gt;Der Interessent hat uns auf der Messe besucht. Hatten ein informatives Gespr&amp;auml;ch, konnten Fragestellungen kl&amp;auml;ren.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Besuch auf der Messe"/>
@@ -144,7 +144,7 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:59:28"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2019-03-13T07:59:00"/>
       <column name="INFO" value="&lt;p&gt;Kunde m&amp;ouml;chte mit uns in die n&amp;auml;chste Runde gehen.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Geheimhaltungsvereinbarung unterzeichnen"/>
@@ -152,10 +152,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:33:47"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:08:29"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-02-18T08:08:00"/>
       <column name="INFO" value="&lt;p&gt;Sehr geehrter Herr von Matterhorn,&lt;/p&gt;&#10;&#10;&lt;p&gt;gerne lassen ich Ihnen ein paar unserer Referenzen aus Ihrer Branche zukommen.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Sollten Sie Interesse an einem Referenzgespr&amp;auml;ch haben, k&amp;ouml;nnen Sie mir gerne Bescheid geben. Ich werde dann die Abstimmung mit einem passenden Kunden f&amp;uuml;r Sie in die Wege leiten.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Herzliche Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Lisa Sommer&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Referenzen - Zu unserem Produkt"/>
@@ -164,10 +164,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
-      <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+      <column name="CATEGORY" value="VISIT"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T08:07:03"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:12:04"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-01T08:12:00"/>
       <column name="INFO" value="&lt;p&gt;Konnten Vor-Ort Termin mit den Ansprechpartnern ausmachen.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Vor Ort Termin"/>
@@ -177,7 +177,7 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:15:11"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-03-13T08:15:00"/>
       <column name="INFO" value="&lt;p&gt;Die Pr&amp;auml;sentation fand in einer sehr konstruktiven und entspannten Atmosph&amp;auml;re statt.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Präsentation"/>
@@ -185,10 +185,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:37:38"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:16:32"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-03-29T08:16:00"/>
       <column name="INFO" value="&lt;p&gt;Hallo Herr von Matterhorn,&lt;/p&gt;&#10;&#10;&lt;p&gt;wie soeben telefonisch angek&amp;uuml;ndigt freue ich mich, Ihnen im Anhang dieser Nachricht nun die ausgearbeitete Stellungnahme sowie unser Angebot zukommen zu lassen.&lt;/p&gt;&#10;&#10;&lt;p&gt;Bei Fragen k&amp;ouml;nnen Sie mich jederzeit erreichen.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Viele Gr&amp;uuml;&amp;szlig;e,&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Lisa Sommer&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Stellungnahme"/>
@@ -197,10 +197,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
-      <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+      <column name="CATEGORY" value="VISIT"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:35:58"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:17:47"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-28T08:17:00"/>
       <column name="INFO" value="&lt;p&gt;Prim&amp;auml;r die Fragen gem&amp;auml;&amp;szlig; Agenda besprochen - Unterlagen befinden sich auf dem Filerverzeichnis.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Technischer Workshop bzgl. Produktanforderungen"/>
@@ -210,7 +210,7 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:47:30"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-14T08:47:00"/>
       <column name="INFO" value="&lt;p&gt;Haben weitere Informationen zu unseren Produkten runtergeladen.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Informationen von der Webseite runtergeladen"/>
@@ -220,7 +220,7 @@
       <column name="ACTIVITYID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
       <column name="DATE_EDIT" valueDate="2019-05-17T08:59:45"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:56:11"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2019-03-21T08:56:00"/>
       <column name="INFO" value="&lt;p&gt;Sind auf dem Stand gewesen. Haben&amp;nbsp;unsere Fragen gestellt, Unternehmen kurz vorgestellt. War ein angenehmes Gespr&amp;auml;ch.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Messebesuch"/>
@@ -231,7 +231,7 @@
       <column name="ACTIVITYID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:12:52"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:57:17"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2019-03-29T08:57:00"/>
       <column name="INFO" value="&lt;p&gt;15.02.2019: Definition einer Long list auf Basis einer umfassenden Marktstudie &amp;uuml;ber gew&amp;uuml;nschte Produkte&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;22.02.2019:&amp;nbsp;&lt;br /&gt;&#10;Information an potentielle Anbieter / Hersteller&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Produkt-Terminplanung"/>
@@ -242,7 +242,7 @@
       <column name="ACTIVITYID" value="a416d1f7-553a-43b6-a084-021ad1f92dd9"/>
       <column name="DATE_EDIT" valueDate="2019-05-17T10:48:04"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:46:27"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-05-01T10:46:00"/>
       <column name="INFO" value="&lt;p&gt;Besuchte Seiten:&lt;/p&gt;&#10;&#10;&lt;p&gt;http://www..&amp;nbsp; &amp;nbsp; &amp;nbsp;/ Besuchsdauer&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Lead über Webseite identifiziert"/>
@@ -253,7 +253,7 @@
       <column name="ACTIVITYID" value="36ec539c-a451-4166-b64d-fb98f1b73481"/>
       <column name="DATE_EDIT" valueDate="2019-05-17T10:49:17"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:48:15"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2019-05-10T10:48:00"/>
       <column name="INFO" value="&lt;p&gt;Anrede:&lt;/p&gt;&#10;&#10;&lt;p&gt;Name:&lt;/p&gt;&#10;&#10;&lt;p&gt;Vorname:&lt;/p&gt;&#10;&#10;&lt;p&gt;Position:&lt;/p&gt;&#10;&#10;&lt;p&gt;Kontaktaufnahme gew&amp;uuml;nscht: ja&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Kontaktformular Webseite"/>
@@ -262,10 +262,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-05-23T10:41:06"/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:51:27"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-05-17T10:51:27"/>
       <column name="INFO" value="&lt;p&gt;Hallo Herr Peterson,&lt;/p&gt;&#10;&#10;&lt;p&gt;anbei finden sie unser Informationsmaterial.&lt;/p&gt;&#10;&#10;&lt;p&gt;Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Frau Sommer&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Informationsmaterial"/>
@@ -276,7 +276,7 @@
       <column name="ACTIVITYID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T04:06:35"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:52:54"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-03-01T08:52:00"/>
       <column name="INFO" value="&lt;p&gt;Infobrosch&amp;uuml;re zu Produkt A runtergeladen.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Infobrochüre runtergeladen"/>
@@ -287,7 +287,7 @@
       <column name="ACTIVITYID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
       <column name="DATE_EDIT" valueDate="2019-05-19T08:57:49"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:55:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2018-12-26T08:55:00"/>
       <column name="INFO" value="&lt;p&gt;Anrede: Herr&lt;/p&gt;&#10;&#10;&lt;p&gt;Vorname:Markus&lt;/p&gt;&#10;&#10;&lt;p&gt;Nachname:Altinger&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail:maltinger@industrial-steel.de&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Kontaktaufnahme über Kontaktformular"/>
@@ -297,7 +297,7 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:40:13"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2019-01-09T05:40:00"/>
       <column name="INFO" value="&lt;p&gt;Frau Decker hat unsere Webseite nach Referenzen und Produkten durchsucht.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="War auf unserer Webseite - Website Tracking"/>
@@ -307,7 +307,7 @@
       <column name="ACTIVITYID" value="0cf02b72-a46a-4cd2-975f-15556618ea90"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T05:43:23"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:42:24"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-01-15T05:42:00"/>
       <column name="INFO" value="&lt;p&gt;Produktinformationen zu Produkt 1 runtergeladen.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Produktinformationen runtergeladen."/>
@@ -318,7 +318,7 @@
       <column name="ACTIVITYID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T04:12:42"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:44:17"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-01-18T05:44:00"/>
       <column name="INFO" value="&lt;p&gt;Neuer Kontakt hat Informationen von der Seite runtergeleaden.&lt;/p&gt;&#10;&#10;&lt;p&gt;Nachfassen und Potential abfragen.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Nachgefasst - Laut Leadmanagement"/>
@@ -329,7 +329,7 @@
       <column name="ACTIVITYID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T05:47:10"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:45:42"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-01-22T05:45:00"/>
       <column name="INFO" value="&lt;p&gt;Erstkontakt mit dem Au&amp;szlig;endienst vereinbart. Besonderes Interesse an Produkt 1 und 3&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Telefonat mit Frau Decker für den Außendienst vereinbart."/>
@@ -340,7 +340,7 @@
       <column name="ACTIVITYID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:36:40"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:47:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-02-08T05:47:00"/>
       <column name="INFO" value="&lt;p&gt;Hatte zusammen mit Frau Decker das erste Gespr&amp;auml;ch zu Produkten 1 und 3.&lt;/p&gt;&#10;&#10;&lt;p&gt;Konnten alle ersten Fragen kl&amp;auml;ren.&lt;/p&gt;&#10;&#10;&lt;p&gt;N&amp;auml;chster Schritt ist ein Termin vor Ort.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Gespräch mit Frau Decker"/>
@@ -351,7 +351,7 @@
       <column name="ACTIVITYID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:37:07"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:53:02"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-05T05:53:00"/>
       <column name="INFO" value="&lt;p&gt;Termin vor Ort bei Transatlantik Logistics.&lt;/p&gt;&#10;&#10;&lt;p&gt;War ein guter Termin, scheinen von den Produkten sehr angetan zu sein.&lt;/p&gt;&#10;&#10;&lt;p&gt;Weiteres Vorgehen wird n&amp;auml;chste Woche abgestimmt.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Termin vor Ort"/>
@@ -360,10 +360,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
-      <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:38:39"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:56:06"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-11T05:56:00"/>
       <column name="INFO" value="&lt;p&gt;Herr Morgenstern ist der verantwortliche Vertriebsleiter bei Transatlantik Logistics.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="2. Ansprechpartner kennengelernt"/>
@@ -373,7 +373,7 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:57:18"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2019-03-14T05:57:00"/>
       <column name="INFO" value="&lt;p&gt;Herr Morgenstern hat differenziert von Frau Decker nochmal Fragen zu Produkt 1 und 3.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Telefonat bzgl. offener Fragen"/>
@@ -381,10 +381,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
-      <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T09:04:33"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:55:01"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-03-12T08:55:00"/>
       <column name="INFO" value="&lt;p&gt;Weiteres Telefonat mit Herrn Altinger gef&amp;uuml;hrt.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Hr. Altinger ist sehr begeistert von den M&amp;ouml;glichkeiten des Produktes.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Telefonat mit Interessent"/>
@@ -393,10 +393,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:01:11"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:56:50"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2019-03-22T08:56:00"/>
       <column name="INFO" value="&lt;p&gt;Sehr geehrter Frau Sommer,&lt;/p&gt;&#10;&#10;&lt;p&gt;wie bereits telefonisch angek&amp;uuml;ndigt, bitten wir um ein Angebot f&amp;uuml;r die Produkte A und B.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Viele Gr&amp;uuml;&amp;szlig;e&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Markus Altinger&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Industrial Steel AG&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Interessent möchte Angebot zu dem Produkt"/>
@@ -405,10 +405,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
-      <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:01:47"/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:06:25"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2019-03-22T09:06:00"/>
       <column name="INFO" value="&lt;p&gt;Hr. Altinger hat ein Angebot f&amp;uuml;r die Produkte A und B angefordert. Schickt dazu auch noch eine E-Mail.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Angebot erstellen"/>
@@ -419,7 +419,7 @@
       <column name="ACTIVITYID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
       <column name="DATE_EDIT" valueDate="2019-05-23T09:30:46"/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:27:23"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-03-22T09:27:00"/>
       <column name="INFO" value="&lt;p&gt;Produktinformationen an Frau Linder weitergegeben.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Informationen an Frau Lindner weitergegeben."/>
@@ -430,7 +430,7 @@
       <column name="ACTIVITYID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T10:55:24"/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:29:25"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-03-20T09:29:00"/>
       <column name="INFO" value="&lt;p&gt;&amp;Uuml;ber die Landingpage von Produkt C&amp;nbsp;auf uns gekommen.&lt;/p&gt;&#10;&#10;&lt;p&gt;Es&amp;nbsp;besteht weiterhin Interesse an den Produkten&amp;nbsp;A und B.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Ãœber Online-Werbung auf uns aufmerksam geworden."/>
@@ -439,10 +439,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
-      <column name="CATEGORY" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+      <column name="CATEGORY" value="ONLINE-MEETING"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:19:12"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:48:08"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-04-08T10:48:00"/>
       <column name="INFO" value="&lt;p&gt;Gemeinsamer Termin mit allen Beteiligten der Produkteinf&amp;uuml;hrung:&lt;/p&gt;&#10;&#10;&lt;p&gt;- Definition Herausforderungen&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;- Definition weiterer Terminablauf zur Produkteinf&amp;uuml;hrung&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Erste Phase der Produkt-Planung gestartet"/>
@@ -453,7 +453,7 @@
       <column name="ACTIVITYID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:26:41"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:49:26"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-04-25T10:49:00"/>
       <column name="INFO" value="&lt;p&gt;Erste Phase der Planung&amp;nbsp;erfolgreich abgeschlossen.&lt;/p&gt;&#10;&#10;&lt;p&gt;Produktkonfiguration fertig gestellt.&lt;/p&gt;&#10;&#10;&lt;p&gt;Individuelles Produkt geht in die Produktion.&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Erste Phase der Produkt-Planung abgeschlossen"/>
@@ -462,10 +462,10 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T02:27:26"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:50:46"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2019-05-23T10:50:46"/>
       <column name="INFO" value="&lt;p&gt;Sehr geehrte Damen und Herren,&lt;/p&gt;&#10;&#10;&lt;p&gt;die Produktion des Produktes startet. &amp;Uuml;ber den Verlauf und den aktuellen Stand der Produktion k&amp;ouml;nnen Sie sich in unserem Kundenportal informieren.&lt;/p&gt;&#10;&#10;&lt;p&gt;Viele Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Lisa Sommer&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="2. Phase der Produkt-Planung startet"/>
@@ -475,16 +475,16 @@
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
       <column name="DATE_NEW" valueDate="2019-06-11T02:30:16"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+      <column name="DIRECTION" value="inx"/>
       <column name="ENTRYDATE" valueDate="2019-06-11T02:30:16"/>
       <column name="SUBJECT" value="Rahmenvertrag"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
-      <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_NEW" valueDate="2019-06-11T02:38:27"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2019-04-17T02:38:00"/>
       <column name="INFO" value="&lt;p&gt;Hr. von Matterhorn hatte die erfreuliche Nachricht, dass sie sich f&amp;uuml;r unser Produkt entschieden haben;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Vertrag kann nun fertig gemacht und zugesandt werden&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="SUBJECT" value="Rückmeldung zum Angebot "/>
@@ -492,9 +492,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
-      <column name="CATEGORY" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+      <column name="CATEGORY" value="ONLINE-MEETING"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2017-04-13T02:41:22"/>
       <column name="INFO" value="Informationen sind zu seiner Zufriedenheit gewesen, sendet eine Email mit einer konkreten Anfrage."/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -503,9 +503,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2018-02-22T03:41:22"/>
       <column name="INFO" value="erworben von Roboterabteilung"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -514,9 +514,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="de110a35-bcab-407e-9d60-7a65f028159b"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2018-06-03T02:41:22"/>
       <column name="INFO" value="Spezifikation ausgefüllt und abgeschickt"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -525,9 +525,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="aa110a35-bcab-407e-9d60-7a65f028159b"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2018-06-03T02:41:22"/>
       <column name="INFO" value="Angebot nachfassen, wir liegen vor Wettbewerb"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -536,9 +536,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2018-08-03T02:02:52"/>
       <column name="INFO" valueClobFile="ACTIVITY/INFO/clobFiles/908b219b-83e6-4148-84a8-84db75fe8683.txt"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -547,9 +547,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
-      <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2018-07-31T02:02:52"/>
       <column name="INFO" value="Aufzeichnungen zum Thema &quot;Transparentes Kampagnen- und Veranstaltungsmanagement&quot; verschickt."/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -558,9 +558,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
-      <column name="CATEGORY" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+      <column name="CATEGORY" value="ONLINE-MEETING"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2018-08-03T02:02:52"/>
       <column name="INFO" value="Hat uns Zusatzinfos geschickt - diese wurden an allen entsprechenden Stellen hinterlegt und final eingepflegt"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -569,9 +569,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
-      <column name="CATEGORY" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+      <column name="CATEGORY" value="ONLINE-MEETING"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2018-08-06T02:02:52"/>
       <column name="INFO" value="Abgleich der Bestandsdaten wurde gemacht."/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -580,9 +580,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
-      <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2018-08-04T02:02:52"/>
       <column name="INFO" value="Vertragsgrundlagen besprochen. Wird in den nächsten Tagen definiert"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -591,9 +591,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
-      <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+      <column name="CATEGORY" value="PHONE"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2018-08-09T02:02:52"/>
       <column name="INFO" value="Ein Standortwechsel steht an und die neuen Daten wurden erfasst."/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -602,9 +602,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2018-08-04T02:02:52"/>
       <column name="INFO" value="Messeeinladung und besondere Eintrittkarten zukommen lassen. Hat sich sehr gefreut"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -613,9 +613,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
-      <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+      <column name="CATEGORY" value="MAIL"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+      <column name="DIRECTION" value="iox"/>
       <column name="ENTRYDATE" valueDate="2018-08-12T02:02:52"/>
       <column name="INFO" value="Terminvorschlag gesendet. Aufgabe gestellt"/>
       <column name="RESPONSIBLE" value="Admin"/>
@@ -624,9 +624,9 @@
     </insert>
     <insert tableName="ACTIVITY">
       <column name="ACTIVITYID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
-      <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+      <column name="CATEGORY" value="VISIT"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+      <column name="DIRECTION" value="oox"/>
       <column name="ENTRYDATE" valueDate="2018-08-11T02:02:52"/>
       <column name="INFO" value="Einladung von Kunden, Interessenten und Zulieferern zu einer internen Veranstaltung in unserem Haus"/>
       <column name="RESPONSIBLE" value="Admin"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml
index bf76c0a5718b43d06f0980c17ec24f7bcdfcf7bd..81eed0ef0cb5d2435e4ca18dd0cdbc3457482b68 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml
@@ -5,7 +5,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Spresstrasse"/>
       <column name="ADDRESSID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
-      <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="67"/>
       <column name="CITY" value="Bielefeld Babenhausen"/>
       <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
@@ -19,7 +19,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Kurfürstendamm"/>
       <column name="ADDRESSID" value="85bc81b9-5553-42a8-a643-eb47e1ed3c42"/>
-      <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="95"/>
       <column name="CITY" value="Rostock"/>
       <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
@@ -33,7 +33,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Stahlstraße"/>
       <column name="ADDRESSID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="24"/>
       <column name="CITY" value="Hamburg"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
@@ -46,7 +46,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Hafenstraße"/>
       <column name="ADDRESSID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="12"/>
       <column name="CITY" value="Friedrichshafen"/>
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
@@ -59,7 +59,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Baustraße"/>
       <column name="ADDRESSID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="64"/>
       <column name="CITY" value="Stuttgart"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
@@ -72,7 +72,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Kronenstraße"/>
       <column name="ADDRESSID" value="8923fff3-4294-4892-b3f3-8470ae89555e"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="45"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
@@ -85,7 +85,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Grassstraße"/>
       <column name="ADDRESSID" value="2a03d8cb-ffb7-4d04-b8b2-e55354380fb7"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="32"/>
       <column name="CITY" value="Geisenhausen"/>
       <column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
@@ -98,7 +98,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Leasingstrasse"/>
       <column name="ADDRESSID" value="36723051-8a5f-47d3-8185-71c82d463eb3"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="78"/>
       <column name="CITY" value="Berlin"/>
       <column name="CONTACT_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
@@ -111,7 +111,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Eichenallee"/>
       <column name="ADDRESSID" value="1a20347c-ab56-41cb-a7dc-bd61de7e2106"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="45"/>
       <column name="CITY" value="München"/>
       <column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
@@ -124,7 +124,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Steinstraße"/>
       <column name="ADDRESSID" value="85ab4644-98f1-41ae-8678-67e76dd03706"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="35"/>
       <column name="CITY" value="Regensburg"/>
       <column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
@@ -137,7 +137,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Dotterblumenstrasse"/>
       <column name="ADDRESSID" value="25360df5-104e-4903-8440-f848d025a24b"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="CITY" value="Ingolstadt"/>
       <column name="CONTACT_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
       <column name="COUNTRY" value="DE"/>
@@ -149,7 +149,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Birkenstrasse"/>
       <column name="ADDRESSID" value="e1aef1b7-569b-46be-bc50-f02332a42ef1"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="78"/>
       <column name="CITY" value="Augsburg"/>
       <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
@@ -162,7 +162,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Bogenallee"/>
       <column name="ADDRESSID" value="e0a93855-d573-405b-8ee2-3b3927762d21"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="6"/>
       <column name="CITY" value="Bremen"/>
       <column name="CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
@@ -175,7 +175,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Grabweg"/>
       <column name="ADDRESSID" value="ea50cb02-7d4d-433d-9cd3-c262d5a0bb27"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="17a"/>
       <column name="CITY" value="Neumünster"/>
       <column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
@@ -191,7 +191,7 @@
       <column name="ADDRESS" value="Wilhelm-Straße"/>
       <column name="ADDRESSID" value="14d03432-985b-4efe-a634-da71ae482907"/>
       <column name="ADDRIDENTIFIER" value="Tor 1"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="2"/>
       <column name="CITY" value="München"/>
       <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
@@ -206,7 +206,7 @@
       <column name="ADDRESS" value="Laufertorgraben"/>
       <column name="ADDRESSID" value="14d01332-985b-4efe-a634-da71ae482907"/>
       <column name="ADDRIDENTIFIER" value="Tor 1"/>
-      <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="25"/>
       <column name="CITY" value="Nürnberg"/>
       <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
@@ -221,7 +221,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Neustadt"/>
       <column name="ADDRESSID" value="11d01332-985b-4efe-a634-da71ae482907"/>
-      <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="12"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
@@ -236,7 +236,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Neustadt"/>
       <column name="ADDRESSID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
-      <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="12"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
@@ -251,7 +251,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Neustadt"/>
       <column name="ADDRESSID" value="43b8aea1-2444-448f-87c5-f12fe1ef4ca0"/>
-      <column name="ADDR_TYPE" value="cf1c4cab-d24e-4690-ba52-54bae711cd47"/>
+      <column name="ADDR_TYPE" value="DELIVERADDR"/>
       <column name="BUILDINGNO" value="13"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
@@ -266,7 +266,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Hauptstraße"/>
       <column name="ADDRESSID" value="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8"/>
-      <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="110"/>
       <column name="CITY" value="Windach"/>
       <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
@@ -281,7 +281,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Rudolstaedter Strasse"/>
       <column name="ADDRESSID" value="0e6d2504-adda-453a-bb36-981e6d0f06c7"/>
-      <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="77"/>
       <column name="CITY" value="Heinrichsthal"/>
       <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
@@ -296,7 +296,7 @@
       <column name="ADDRESS" value="Muster-Straße"/>
       <column name="ADDRESSID" value="6a3f6232-7a66-4a72-8d2d-66a3a9f1b9ea"/>
       <column name="ADDRIDENTIFIER" value="Tor 1"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="3"/>
       <column name="CITY" value="München"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
@@ -311,7 +311,7 @@
       <column name="ADDRESS" value="Lützowplatz"/>
       <column name="ADDRESSID" value="f54606ee-ecdd-4859-ad7d-aa096c5e9596"/>
       <column name="ADDRIDENTIFIER" value="Tor 4"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="35"/>
       <column name="CITY" value="München"/>
       <column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
@@ -328,7 +328,7 @@
       <column name="ADDRESS" value="Hildburghausen"/>
       <column name="ADDRESSID" value="92a244c5-6065-458c-abc7-57d0dc955011"/>
       <column name="ADDRIDENTIFIER" value="Tor 1"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="48"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
@@ -345,7 +345,7 @@
       <column name="ADDRESS" value="Rudower Strasse"/>
       <column name="ADDRESSID" value="90726b19-f23c-42dd-847a-7eacf4c71d18"/>
       <column name="ADDRIDENTIFIER" value="Tor 1"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="6"/>
       <column name="CITY" value="München"/>
       <column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
@@ -359,7 +359,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Büsingstrasse"/>
       <column name="ADDRESSID" value="5773392d-cc7a-4170-8ffe-867807634c3c"/>
-      <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="32"/>
       <column name="CITY" value="Bergkirchen"/>
       <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
@@ -373,7 +373,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Landsberger Allee"/>
       <column name="ADDRESSID" value="8f6da43d-adc5-410e-8bc5-14adca88ebfe"/>
-      <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="83"/>
       <column name="CITY" value="München"/>
       <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
@@ -387,7 +387,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Grosse Praesidenten Str."/>
       <column name="ADDRESSID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
-      <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+      <column name="ADDR_TYPE" value="HOMEADDR"/>
       <column name="BUILDINGNO" value="48"/>
       <column name="CITY" value="Niederkirchen"/>
       <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
@@ -401,7 +401,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Lagerstraße"/>
       <column name="ADDRESSID" value="dd1a1831-b05a-41a7-a4e9-d73be9d77934"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="2"/>
       <column name="CITY" value="Augsburg"/>
       <column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
@@ -414,7 +414,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Großstraße"/>
       <column name="ADDRESSID" value="da05619e-47c6-4144-a698-f0f830d9f755"/>
-      <column name="ADDR_TYPE" value="cf1c4cab-d24e-4690-ba52-54bae711cd47"/>
+      <column name="ADDR_TYPE" value="DELIVERADDR"/>
       <column name="BUILDINGNO" value="6"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
@@ -427,7 +427,7 @@
     <insert tableName="ADDRESS">
       <column name="ADDRESS" value="Augsburger Straße"/>
       <column name="ADDRESSID" value="8ac42a08-6e71-4bc4-a46d-5cf17e4a941c"/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="6"/>
       <column name="CITY" value="Augsburg"/>
       <column name="CONTACT_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
@@ -441,7 +441,7 @@
       <column name="ADDRESS" value="Hildburghausen"/>
       <column name="ADDRESSID" value="2825d85f-879a-4899-a1bb-a6750ad2aee9"/>
       <column name="ADDRIDENTIFIER" value="Tor 1 "/>
-      <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+      <column name="ADDR_TYPE" value="OFFICEADDR"/>
       <column name="BUILDINGNO" value="48"/>
       <column name="CITY" value="Landshut"/>
       <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml
index a1cc024cc25ace344b254f15b1454cdf0ac4a5d3..3e395db266d55812729022b1e14c14b2b0f3b743 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml
@@ -8,7 +8,7 @@
       <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T03:48:55"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -19,7 +19,7 @@
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:46:11"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
-      <column name="MEDIUM_ID" value="d08956b8-369e-4b65-88fa-1c37b3368ae3"/>
+      <column name="MEDIUM_ID" value="COMMINTERNET"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -30,7 +30,7 @@
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="DATE_EDIT" valueDate="2019-06-06T02:50:34"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
-      <column name="MEDIUM_ID" value="d08956b8-369e-4b65-88fa-1c37b3368ae3"/>
+      <column name="MEDIUM_ID" value="COMMINTERNET"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -40,7 +40,7 @@
       <column name="COMMUNICATIONID" value="417ce25b-8d42-47b2-b7df-1dfcc28075be"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
-      <column name="MEDIUM_ID" value="d08956b8-369e-4b65-88fa-1c37b3368ae3"/>
+      <column name="MEDIUM_ID" value="COMMINTERNET"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -50,7 +50,7 @@
       <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:36:32"/>
       <column name="DATE_NEW" valueDate="2019-05-15T03:56:26"/>
-      <column name="MEDIUM_ID" value="1a4b1ebe-cf06-4bc1-b7af-e4633d38dc79"/>
+      <column name="MEDIUM_ID" value="COMMMOBIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -60,7 +60,7 @@
       <column name="COMMUNICATIONID" value="e076075c-1d67-4a9d-aed8-1a66bb1adfb2"/>
       <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:10:34"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -69,7 +69,7 @@
       <column name="COMMUNICATIONID" value="674a8118-31ef-492c-83c6-6ecfcebc9c9a"/>
       <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:13:19"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -78,7 +78,7 @@
       <column name="COMMUNICATIONID" value="ea561d25-863a-4666-bc57-00a414fa1bf2"/>
       <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:24:26"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -88,7 +88,7 @@
       <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:41:37"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:26:03"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -99,7 +99,7 @@
       <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:32:33"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:03:15"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -110,7 +110,7 @@
       <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T08:26:27"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:04:03"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -121,7 +121,7 @@
       <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T03:50:57"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:06:21"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -132,7 +132,7 @@
       <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:59:10"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:06:21"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -142,7 +142,7 @@
       <column name="COMMUNICATIONID" value="76a59a85-c04a-4f37-b276-d022c568e071"/>
       <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:10:21"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -152,17 +152,17 @@
       <column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:57:27"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:10:21"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
-      <column name="ADDR" value="jgrüner@web.de"/>
+      <column name="ADDR" value="jgrüner@web.de"/>
       <column name="COMMUNICATIONID" value="d5a90157-2c05-474c-aeda-0ab08d26075a"/>
       <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:11:20"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -171,7 +171,7 @@
       <column name="COMMUNICATIONID" value="56e9d5fe-b77d-4321-938c-d331cd5b3e1e"/>
       <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:13:02"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -181,7 +181,7 @@
       <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:35:59"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:14:38"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -192,7 +192,7 @@
       <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:39:42"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -203,7 +203,7 @@
       <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T10:41:56"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -213,7 +213,7 @@
       <column name="COMMUNICATIONID" value="00d07819-985b-4efe-a634-da71ae482907"/>
       <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="MEDIUM_ID" value="d08956b8-369e-4b65-88fa-1c37b3368ae3"/>
+      <column name="MEDIUM_ID" value="COMMINTERNET"/>
       <column name="STANDARD" valueNumeric="0"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -223,7 +223,7 @@
       <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T03:48:25"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -234,7 +234,7 @@
       <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:38:02"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -245,7 +245,7 @@
       <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T03:49:15"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -256,7 +256,7 @@
       <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:41:47"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -266,7 +266,7 @@
       <column name="COMMUNICATIONID" value="529cadf7-7e9c-4828-9497-6ce6effb1624"/>
       <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:14:38"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -276,7 +276,7 @@
       <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:36:21"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:16:40"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -286,7 +286,7 @@
       <column name="COMMUNICATIONID" value="bde2ff44-c2f1-421e-919f-6e7194c951ec"/>
       <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:16:40"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -296,7 +296,7 @@
       <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:59:17"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:20:04"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -307,7 +307,7 @@
       <column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T03:50:35"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:20:04"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -318,7 +318,7 @@
       <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:57:36"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:22:23"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -328,16 +328,16 @@
       <column name="COMMUNICATIONID" value="c7d84edf-1a48-45fd-8364-e29f45ac1739"/>
       <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:22:24"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
-      <column name="ADDR" value="fmüller@meine-firma.de"/>
+      <column name="ADDR" value="fmüller@meine-firma.de"/>
       <column name="COMMUNICATIONID" value="de32eb0c-672b-4ce5-a80e-63a8ac976599"/>
       <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:23:58"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -347,7 +347,7 @@
       <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:37:07"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:23:58"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -358,7 +358,7 @@
       <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:37:23"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:26:54"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -368,7 +368,7 @@
       <column name="COMMUNICATIONID" value="e21bc8d9-f546-4f97-9c4c-4e4de67512a7"/>
       <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:26:54"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -378,7 +378,7 @@
       <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:57:45"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:30:47"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -388,7 +388,7 @@
       <column name="COMMUNICATIONID" value="cc2f1e5f-9cd9-4bbb-87d4-a98d883ebbc1"/>
       <column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:30:48"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -398,7 +398,7 @@
       <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:41:28"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:31:51"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -408,7 +408,7 @@
       <column name="COMMUNICATIONID" value="4602f1f8-7a40-4c0d-bb92-649935d11bd6"/>
       <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:31:51"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -417,7 +417,7 @@
       <column name="COMMUNICATIONID" value="b3be54f7-884c-4a88-8c4b-b52a4595d547"/>
       <column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:32:30"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -427,7 +427,7 @@
       <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:59:36"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:35:38"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -437,7 +437,7 @@
       <column name="COMMUNICATIONID" value="82584c83-5a7d-4923-8907-2953240fb8e5"/>
       <column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:35:38"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -447,7 +447,7 @@
       <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:57:53"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:39:25"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -458,7 +458,7 @@
       <column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T03:51:51"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:39:25"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -469,7 +469,7 @@
       <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:59:26"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:41:21"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -479,7 +479,7 @@
       <column name="COMMUNICATIONID" value="38d42eff-c782-4ffa-80d7-db812cf1c6db"/>
       <column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:41:21"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -489,7 +489,7 @@
       <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
       <column name="DATE_EDIT" valueDate="2019-06-05T03:52:13"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:42:07"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -499,7 +499,7 @@
       <column name="COMMUNICATIONID" value="954a729a-dd11-4760-86a8-dc09e9c11d1a"/>
       <column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:09:20"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -508,7 +508,7 @@
       <column name="COMMUNICATIONID" value="ab6da5e4-bea2-4a66-b818-b8ad5c57a167"/>
       <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:10:07"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -517,7 +517,7 @@
       <column name="COMMUNICATIONID" value="786bdaba-c36d-4107-9c6f-abc15ebb4e25"/>
       <column name="CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:10:46"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -526,7 +526,7 @@
       <column name="COMMUNICATIONID" value="2f571583-f8d2-47ad-b183-8d9cab3b3c19"/>
       <column name="CONTACT_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:11:18"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -535,16 +535,16 @@
       <column name="COMMUNICATIONID" value="5ea00579-3eb5-4c1f-9396-63a15b134f60"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:19:53"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="COMMUNICATION">
-      <column name="ADDR" value="info@kältetechnik.de"/>
+      <column name="ADDR" value="info@kältetechnik.de"/>
       <column name="COMMUNICATIONID" value="86784334-c997-4305-8526-35db5047ce93"/>
       <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:20:31"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -554,7 +554,7 @@
       <column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:44:07"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:21:42"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -564,7 +564,7 @@
       <column name="COMMUNICATIONID" value="69c70cb5-276d-4983-9607-a5fd55196573"/>
       <column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:22:21"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -574,7 +574,7 @@
       <column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:43:55"/>
       <column name="DATE_NEW" valueDate="2019-05-21T09:24:31"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -584,7 +584,7 @@
       <column name="COMMUNICATIONID" value="a0ba95f9-c872-4bfc-9591-868aaa3b2ac3"/>
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:27:25"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -593,7 +593,7 @@
       <column name="COMMUNICATIONID" value="f2f8499d-2d00-485f-9d2f-381fd5e8f7ce"/>
       <column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:27:48"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -602,7 +602,7 @@
       <column name="COMMUNICATIONID" value="5f9aaf24-69d7-4089-a31d-e15d6d55dc92"/>
       <column name="CONTACT_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:30:12"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -612,7 +612,7 @@
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:41:44"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:31:52"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -622,7 +622,7 @@
       <column name="COMMUNICATIONID" value="4f3230c0-41e4-4861-880f-14ad0fcc5a35"/>
       <column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:32:15"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -632,7 +632,7 @@
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:41:08"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:32:54"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -643,7 +643,7 @@
       <column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
       <column name="DATE_EDIT" valueDate="2019-06-07T02:40:05"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:33:16"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -654,7 +654,7 @@
       <column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:43:26"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:34:41"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -665,7 +665,7 @@
       <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:43:37"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:45:42"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -676,7 +676,7 @@
       <column name="CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:43:48"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:46:23"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -687,7 +687,7 @@
       <column name="CONTACT_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:43:59"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:46:57"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -698,7 +698,7 @@
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="DATE_EDIT" valueDate="2019-05-23T11:23:53"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:48:09"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -709,7 +709,7 @@
       <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:44:31"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:48:35"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -720,7 +720,7 @@
       <column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:44:43"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:49:12"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -731,7 +731,7 @@
       <column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:44:52"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:49:30"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -742,7 +742,7 @@
       <column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:45:02"/>
       <column name="DATE_NEW" valueDate="2019-05-22T03:49:52"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -753,7 +753,7 @@
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:45:29"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:29:24"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -764,7 +764,7 @@
       <column name="CONTACT_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:45:57"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:30:33"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -775,7 +775,7 @@
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:57:16"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:31:22"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -786,7 +786,7 @@
       <column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:45:46"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:32:03"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -797,7 +797,7 @@
       <column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:46:14"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:32:40"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -808,7 +808,7 @@
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:58:59"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:36:18"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -819,7 +819,7 @@
       <column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:46:49"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:36:39"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -829,7 +829,7 @@
       <column name="COMMUNICATIONID" value="dead3100-379c-4ca3-958f-006ba17a78ad"/>
       <column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:42:41"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -839,7 +839,7 @@
       <column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
       <column name="DATE_EDIT" valueDate="2019-05-28T07:45:37"/>
       <column name="DATE_NEW" valueDate="2019-05-23T10:42:51"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
@@ -858,7 +858,7 @@
       <column name="COMMUNICATIONID" value="886854ab-635e-40e5-9427-c90a6642b964"/>
       <column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="DATE_NEW" valueDate="2019-06-05T03:52:59"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -867,7 +867,7 @@
       <column name="COMMUNICATIONID" value="c68be666-221e-46b4-8fad-d49bb1117c3a"/>
       <column name="CONTACT_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
       <column name="DATE_NEW" valueDate="2019-06-07T02:39:32"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -876,7 +876,7 @@
       <column name="COMMUNICATIONID" value="b9b0499c-ea37-4a41-9a0b-8ed570d91683"/>
       <column name="CONTACT_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
       <column name="DATE_NEW" valueDate="2019-06-07T02:39:32"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -885,7 +885,7 @@
       <column name="COMMUNICATIONID" value="5136702b-2898-4db3-98d2-436772febc35"/>
       <column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
       <column name="DATE_NEW" valueDate="2019-06-07T02:47:29"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -894,7 +894,7 @@
       <column name="COMMUNICATIONID" value="b9773f8a-97bf-4071-9b1e-32b5e89e526a"/>
       <column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
       <column name="DATE_NEW" valueDate="2019-06-07T02:47:29"/>
-      <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+      <column name="MEDIUM_ID" value="COMMEMAIL"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -903,7 +903,7 @@
       <column name="COMMUNICATIONID" value="2561b25b-1af2-4512-a77f-97d542c578b7"/>
       <column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
       <column name="DATE_NEW" valueDate="2019-06-11T08:26:11"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -912,7 +912,7 @@
       <column name="COMMUNICATIONID" value="9a440c7f-5f00-43f0-9c0b-fb1b8a35721e"/>
       <column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
       <column name="DATE_NEW" valueDate="2019-06-11T08:26:49"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -921,7 +921,7 @@
       <column name="COMMUNICATIONID" value="e2fcaf67-b1fd-4d2e-9848-ba45677cf494"/>
       <column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
       <column name="DATE_NEW" valueDate="2019-06-11T11:58:07"/>
-      <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+      <column name="MEDIUM_ID" value="COMMPHONE"/>
       <column name="STANDARD" valueNumeric="1"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml
index fa0d4e3440bf6d077fa158bc3be7bbbbdf6b7c5e..3336281524ec4bc6c4cb33f7995f2c083bf6fe02 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml
@@ -8,7 +8,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="0                                   "/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -17,7 +17,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -26,7 +26,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -35,7 +35,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -44,7 +44,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -53,7 +53,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -64,7 +64,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -75,7 +75,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -86,7 +86,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -97,7 +97,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -108,7 +108,7 @@
       <column name="ORGANISATION_ID" value="0                                   "/>
       <column name="PERSON_ID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -119,7 +119,7 @@
       <column name="ORGANISATION_ID" value="0                                   "/>
       <column name="PERSON_ID" value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -130,7 +130,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -141,7 +141,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -152,7 +152,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -163,7 +163,7 @@
       <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
       <column name="PERSON_ID" value="b16282bd-254e-4569-a56e-675449821467"/>
       <column name="RELATIONSHIP" valueNumeric="1"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -172,7 +172,7 @@
       <column name="DATE_NEW" valueDate="2019-05-15T03:16:58"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -181,7 +181,7 @@
       <column name="DATE_NEW" valueDate="2019-05-15T03:23:13"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -190,7 +190,7 @@
       <column name="DATE_NEW" valueDate="2019-05-15T03:33:57"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -203,7 +203,7 @@
       <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="PERSON_ID" value="08c36adc-cd2b-4ce9-a51b-944667084f7f"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -216,7 +216,7 @@
       <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="PERSON_ID" value="b4c37f47-b4b8-4fe4-812a-9043530cce84"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -229,7 +229,7 @@
       <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="PERSON_ID" value="c4e24800-e9f3-4226-afd7-cfd5dd670d93"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -242,7 +242,7 @@
       <column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
       <column name="POSITION" value="Produktionsleiter"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -255,7 +255,7 @@
       <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="PERSON_ID" value="e35de858-6eca-4328-9efb-dc705ca6792c"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -267,7 +267,7 @@
       <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="PERSON_ID" value="528d7307-295c-4829-a2e4-9b59e43cf3bb"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -280,7 +280,7 @@
       <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="PERSON_ID" value="9874de9b-d517-42f2-81b9-b5f3f0b0dae3"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -293,7 +293,7 @@
       <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="PERSON_ID" value="3660abd7-73de-4825-83a1-e1992469cf56"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -306,7 +306,7 @@
       <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="PERSON_ID" value="57ec6707-e4a4-4702-9356-ee43dd4c5b00"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -318,7 +318,7 @@
       <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="PERSON_ID" value="44c5d7db-b96e-4f67-a00f-c206cd3f7e1b"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -331,7 +331,7 @@
       <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="PERSON_ID" value="9f4528ce-3d83-4292-ae23-d9b314271f69"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -344,7 +344,7 @@
       <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="PERSON_ID" value="c41afea2-c4b5-45dd-a4a7-05826b9dd38c"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -355,7 +355,7 @@
       <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="PERSON_ID" value="22a497cb-39c3-4e72-9f88-423d7630c7e1"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -366,7 +366,7 @@
       <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="PERSON_ID" value="09514fe1-a0d6-465e-883b-6cc93cc758a2"/>
       <column name="RELATIONSHIP" valueNumeric="2"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -375,7 +375,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:39:15"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -384,7 +384,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -393,7 +393,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:42:16"/>
       <column name="LANGUAGE" value="eng"/>
       <column name="ORGANISATION_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -402,7 +402,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:44:27"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -411,7 +411,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -420,7 +420,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -429,7 +429,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:49:58"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -438,7 +438,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -447,7 +447,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
       <column name="LANGUAGE" value="eng"/>
       <column name="ORGANISATION_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -456,7 +456,7 @@
       <column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -465,7 +465,7 @@
       <column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
       <column name="LANGUAGE" value="eng"/>
       <column name="ORGANISATION_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="CONTACT">
@@ -474,7 +474,7 @@
       <column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="ORGANISATION_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
-      <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+      <column name="STATUS" value="CONTACTSTATACTIVE"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml
index 729114ee1926d70c5a3b87679cc6f6380143f1a2..55e7b7c0a8edcc11fd9077483a901271b87fcb54 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml
@@ -9,9 +9,9 @@
       <column name="CONTRACTEND" valueDate="2019-09-30T02:00:00"/>
       <column name="CONTRACTID" value="384c9d31-9923-4e6a-8a7f-2d2890470b70"/>
       <column name="CONTRACTSTART" valueDate="2018-10-01T02:00:00"/>
-      <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
-      <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
-      <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
@@ -20,9 +20,9 @@
       <column name="CONTRACTEND" valueDate="2018-09-15T02:00:00"/>
       <column name="CONTRACTID" value="8b95a074-086e-44c8-bd45-fb8e33803da3"/>
       <column name="CONTRACTSTART" valueDate="2017-05-01T02:00:00"/>
-      <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
-      <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
-      <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
@@ -31,9 +31,9 @@
       <column name="CONTRACTEND" valueDate="2020-09-15T02:00:00"/>
       <column name="CONTRACTID" value="eb182167-1e33-4290-a160-a86d09685cba"/>
       <column name="CONTRACTSTART" valueDate="2015-03-20T01:00:00"/>
-      <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
-      <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
-      <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
@@ -42,9 +42,9 @@
       <column name="CONTRACTEND" valueDate="2021-09-15T02:00:00"/>
       <column name="CONTRACTID" value="6fc9483c-fcfc-48fb-b48f-18e6b11f31fc"/>
       <column name="CONTRACTSTART" valueDate="2015-03-20T01:00:00"/>
-      <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
-      <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
-      <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
@@ -53,9 +53,9 @@
       <column name="CONTRACTEND" valueDate="2022-09-15T02:00:00"/>
       <column name="CONTRACTID" value="a944b07c-aaed-4bcf-820c-9e6031bc3d6c"/>
       <column name="CONTRACTSTART" valueDate="2015-03-20T01:00:00"/>
-      <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
-      <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
-      <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
@@ -64,8 +64,8 @@
       <column name="CONTRACTEND" valueDate="2021-02-11T01:00:00"/>
       <column name="CONTRACTID" value="af3dcbe7-c76f-47a2-8441-891fec6877b5"/>
       <column name="CONTRACTSTART" valueDate="2019-05-16T02:00:00"/>
-      <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
-      <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
       <column name="PAYMENT" value="69d24528-ee0b-4539-a695-cf351bd64212"/>
     </insert>
     <insert tableName="CONTRACT">
@@ -74,9 +74,9 @@
       <column name="CONTRACTDUE" valueDate="2020-06-01T02:00:00"/>
       <column name="CONTRACTID" value="b2c211a7-6dcf-450b-b420-9f04d790de7a"/>
       <column name="CONTRACTSTART" valueDate="2019-05-17T02:00:00"/>
-      <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
-      <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
-      <column name="PAYMENT" value="25faee74-d340-41f2-97f9-ed34c4f8ff42"/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+      <column name="PAYMENT" value="CONTRACTPAYANNUAL"/>
     </insert>
     <insert tableName="CONTRACT">
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
@@ -84,8 +84,8 @@
       <column name="CONTRACTEND" valueDate="2025-03-11T01:00:00"/>
       <column name="CONTRACTID" value="28234066-ad12-451d-9cd2-fbc9f8ee0412"/>
       <column name="CONTRACTSTART" valueDate="2019-03-11T01:00:00"/>
-      <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
-      <column name="CONTRACTTYPE" value="ee4c5e6e-b802-4c1c-8aed-a031a2a8126f"/>
+      <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEMAIN"/>
       <column name="PAYMENT" value="69d24528-ee0b-4539-a695-cf351bd64212"/>
     </insert>
     <insert tableName="CONTRACT">
@@ -95,7 +95,7 @@
       <column name="CONTRACTEND" valueDate="2022-05-17T02:00:00"/>
       <column name="CONTRACTID" value="5fcfa9a9-2f3d-43f0-8be0-21241a5f2ec3"/>
       <column name="CONTRACTSTART" valueDate="2019-05-17T02:00:00"/>
-      <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
+      <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
       <column name="PAYMENT" value="69d24528-ee0b-4539-a695-cf351bd64212"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml
index 9f09cc92b747343594ab739ff8addca2e5d84a77..d4f41b3d0622d99678b51814e73916dfed1a3f45 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml
@@ -6,7 +6,7 @@
     <delete tableName="FORECAST"/>
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2019-05-17T02:00:00"/>
-      <column name="GROUPCODE" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
       <column name="FORECASTID" value="2ba9de60-4c59-4441-96d8-2bee798b80fb"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
@@ -14,7 +14,7 @@
     </insert>
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2019-09-23T02:00:00"/>
-      <column name="GROUPCODE" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
       <column name="FORECASTID" value="6e36057c-1cf3-442a-ab7c-d608195c4290"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
@@ -22,7 +22,7 @@
     </insert>
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2019-12-23T01:00:00"/>
-      <column name="GROUPCODE" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODE" value="PRODUCTGROUP2"/>
       <column name="FORECASTID" value="02f21967-1303-4a82-b4f7-3959097dca9c"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
@@ -30,7 +30,7 @@
     </insert>
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2017-10-03T02:00:00"/>
-      <column name="GROUPCODE" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
       <column name="FORECASTID" value="fbddbffb-dca1-4a83-95ea-0c518ed63363"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
@@ -38,7 +38,7 @@
     </insert>
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2019-10-17T02:00:00"/>
-      <column name="GROUPCODE" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
       <column name="FORECASTID" value="b17a9912-07d3-46b7-90e3-cc912f3d85d8"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
@@ -46,7 +46,7 @@
     </insert>
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2019-05-22T02:00:00"/>
-      <column name="GROUPCODE" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODE" value="PRODUCTGROUP1"/>
       <column name="FORECASTID" value="3379d40c-a21c-42ba-a9db-29eef26fcb35"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
@@ -54,7 +54,7 @@
     </insert>
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2018-04-17T02:00:00"/>
-      <column name="GROUPCODE" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
       <column name="FORECASTID" value="5470f7bb-5917-4c11-8c24-b6c91cf4bd29"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
@@ -62,7 +62,7 @@
     </insert>
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2016-05-02T02:00:00"/>
-      <column name="GROUPCODE" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
       <column name="FORECASTID" value="b161df55-a04b-484f-b337-5e83bf4f38d3"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
@@ -70,7 +70,7 @@
     </insert>
     <insert tableName="FORECAST">
       <column name="DATE_START" valueDate="2019-05-23T02:00:00"/>
-      <column name="GROUPCODE" value="5b8b8e5f-2df8-4119-aae6-e224fb360d4e"/>
+      <column name="GROUPCODE" value="PRODUCTSERVICE"/>
       <column name="FORECASTID" value="a537b090-4292-446f-bdec-db491023a6bf"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml
index 08884e9e21cc898cb541a0276ef63797e4131a1c..ef913148dac322e74fe2273d2dfd0dd4f890e988 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml
@@ -9,14 +9,14 @@
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="MEMBERID" value="336e8c10-376c-422e-afd9-1faef77c6f0c"/>
-      <column name="ROLE" value="1d100fff-24ba-43fd-931d-cae24e10b41f"/>
+      <column name="ROLE" value="MEMROLEPROJMANAG"/>
     </insert>
     <insert tableName="MEMBER">
       <column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="MEMBERID" value="c3b8a835-e9b2-40d1-aa4d-83838c5714ba"/>
-      <column name="ROLE" value="8fb09614-5dc4-4d68-ac66-bf7bbebcb3ad"/>
+      <column name="ROLE" value="MEMROLEPROJASSIST"/>
     </insert>
     <insert tableName="MEMBER">
       <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
@@ -30,14 +30,14 @@
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="MEMBERID" value="685666f6-6545-4a51-8340-d98115b3d710"/>
-      <column name="ROLE" value="1d100fff-24ba-43fd-931d-cae24e10b41f"/>
+      <column name="ROLE" value="MEMROLEPROJMANAG"/>
     </insert>
     <insert tableName="MEMBER">
       <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="MEMBERID" value="3bd6db09-063c-43a5-828d-9fe6e958d142"/>
-      <column name="ROLE" value="28b9aaa2-325c-498f-8397-e20cffbfc215"/>
+      <column name="ROLE" value="MEMROLEADVISE"/>
     </insert>
     <insert tableName="MEMBER">
       <column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
@@ -51,14 +51,14 @@
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="MEMBERID" value="094fa52f-28ee-4988-9169-c4fcf0fd58e7"/>
-      <column name="ROLE" value="28b9aaa2-325c-498f-8397-e20cffbfc215"/>
+      <column name="ROLE" value="MEMROLEADVISE"/>
     </insert>
     <insert tableName="MEMBER">
       <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="MEMBERID" value="b91e741e-6e23-4a0a-a3de-06b9be398ed6"/>
-      <column name="ROLE" value="a8460c8e-24bd-4410-9704-e4865fdd57bf"/>
+      <column name="ROLE" value="MEMROLEEXSALEMANAG"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml
index 224a7dce263a8964a2ef1f4b533bb1ea40e51e36..40205da6d9d71232a5fd6351f56c157825c1094f 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml
@@ -9,18 +9,18 @@
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:35:17"/>
-      <column name="DELIVERYTERMS" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+      <column name="DELIVERYTERMS" value="DELIVERCARRIAGE"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="210.00"/>
       <column name="OFFERCODE" valueNumeric="1005"/>
       <column name="OFFERDATE" valueDate="2019-05-16T02:00:00"/>
       <column name="OFFERID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
-      <column name="PAYMENTTERMS" value="860d8e1c-ea85-426d-91c2-a78dcd14df8d"/>
-      <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
+      <column name="PROBABILITY" value="50"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="39.90"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -31,18 +31,18 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="DATE_EDIT" valueDate="2019-05-17T08:26:55"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:23:52"/>
-      <column name="DELIVERYTERMS" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+      <column name="DELIVERYTERMS" value="DELIVERFREE"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="3500.00"/>
       <column name="OFFERCODE" valueNumeric="1006"/>
       <column name="OFFERDATE" valueDate="2019-03-08T01:00:00"/>
       <column name="OFFERID" value="5abae3a9-8d96-4709-b6be-7fc7e87f002b"/>
-      <column name="PAYMENTTERMS" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
-      <column name="PROBABILITY" value="98ce5f41-90f5-434f-9e72-cdac4a0f5214"/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="PROBABILITY" value="25"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="0.00"/>
@@ -60,10 +60,10 @@
       <column name="OFFERCODE" valueNumeric="1007"/>
       <column name="OFFERDATE" valueDate="2019-05-17T02:00:00"/>
       <column name="OFFERID" value="3d13ef72-0f23-40fc-a66f-af29511a6ad9"/>
-      <column name="PAYMENTTERMS" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="0.00"/>
@@ -74,18 +74,18 @@
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:03:46"/>
-      <column name="DELIVERYTERMS" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+      <column name="DELIVERYTERMS" value="DELIVERCARRIAGE"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="192500.00"/>
       <column name="OFFERCODE" valueNumeric="1008"/>
       <column name="OFFERDATE" valueDate="2019-02-22T01:00:00"/>
       <column name="OFFERID" value="182d647a-addd-4ef5-9c42-3912596ad63e"/>
-      <column name="PAYMENTTERMS" value="178aabbf-3f4c-415b-98bd-5f2510ea72b4"/>
-      <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="PROBABILITY" value="50"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="0.00"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -96,18 +96,18 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="DATE_EDIT" valueDate="2019-05-22T11:43:39"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:27:12"/>
-      <column name="DELIVERYTERMS" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+      <column name="DELIVERYTERMS" value="DELIVERCARRIAGE"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="175000.00"/>
       <column name="OFFERCODE" valueNumeric="1009"/>
       <column name="OFFERDATE" valueDate="2018-08-14T02:00:00"/>
       <column name="OFFERID" value="fc02f9d0-06c5-4073-ac95-a59403988697"/>
-      <column name="PAYMENTTERMS" value="860d8e1c-ea85-426d-91c2-a78dcd14df8d"/>
-      <column name="PROBABILITY" value="2dca6f38-b49a-4716-8c83-9d2183c5c065"/>
+      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
+      <column name="PROBABILITY" value="75"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="0.00"/>
@@ -118,18 +118,18 @@
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="DATE_NEW" valueDate="2019-05-17T10:28:20"/>
-      <column name="DELIVERYTERMS" value="aa8713c9-ae12-4ce3-a588-0303cea11b44"/>
+      <column name="DELIVERYTERMS" value="DELIVERCIF"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="17500.00"/>
       <column name="OFFERCODE" valueNumeric="1010"/>
       <column name="OFFERDATE" valueDate="2019-05-17T02:00:00"/>
       <column name="OFFERID" value="a4fd6030-bb7e-419e-877c-816d343feea7"/>
-      <column name="PAYMENTTERMS" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
-      <column name="PROBABILITY" value="98ce5f41-90f5-434f-9e72-cdac4a0f5214"/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="PROBABILITY" value="25"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="0.00"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -145,11 +145,11 @@
       <column name="OFFERCODE" valueNumeric="1011"/>
       <column name="OFFERDATE" valueDate="2017-07-11T02:00:00"/>
       <column name="OFFERID" value="30ff28e2-062f-4950-b4a1-71e51ff71acf"/>
-      <column name="PAYMENTTERMS" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
-      <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="PROBABILITY" value="50"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="10165.00"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -159,18 +159,18 @@
       <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:00:44"/>
-      <column name="DELIVERYTERMS" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+      <column name="DELIVERYTERMS" value="DELIVERCARRIAGE"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="45000.00"/>
       <column name="OFFERCODE" valueNumeric="1012"/>
       <column name="OFFERDATE" valueDate="2019-03-25T01:00:00"/>
       <column name="OFFERID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
-      <column name="PAYMENTTERMS" value="178aabbf-3f4c-415b-98bd-5f2510ea72b4"/>
-      <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="PROBABILITY" value="50"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="8550.00"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -181,18 +181,18 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="DATE_EDIT" valueDate="2019-05-23T11:33:16"/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:04:28"/>
-      <column name="DELIVERYTERMS" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+      <column name="DELIVERYTERMS" value="DELIVERCARRIAGE"/>
       <column name="HEADER" value="Für die bisherigen Gespräche möchten wir uns bei Ihnen bedanken. Gerne bieten wir Ihnen wie folgt an:&#10;&#10;"/>
       <column name="LANGUAGE" value="deu"/>
       <column name="NET" valueNumeric="25000.00"/>
       <column name="OFFERCODE" valueNumeric="1013"/>
       <column name="OFFERDATE" valueDate="2019-03-25T01:00:00"/>
       <column name="OFFERID" value="2497128b-c07d-4fe8-b927-1bea929cce4d"/>
-      <column name="PAYMENTTERMS" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
-      <column name="PROBABILITY" value="2dca6f38-b49a-4716-8c83-9d2183c5c065"/>
+      <column name="PAYMENTTERMS" value="PAYTERM30"/>
+      <column name="PROBABILITY" value="75"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+      <column name="STATUS" value="OFFERSTATOPEN"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="4750.00"/>
@@ -208,10 +208,10 @@
       <column name="OFFERCODE" valueNumeric="1000"/>
       <column name="OFFERDATE" valueDate="2018-11-21T01:00:00"/>
       <column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
-      <column name="PROBABILITY" value="dc7c62fe-ce4b-41e3-91ab-ce0b740ccaeb"/>
+      <column name="PROBABILITY" value="100"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="e5d6b5a4-7576-440f-8332-bc40147c0335"/>
+      <column name="STATUS" value="OFFERSTATSENT"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="39.90"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -226,10 +226,10 @@
       <column name="OFFERCODE" valueNumeric="1001"/>
       <column name="OFFERDATE" valueDate="2018-08-12T02:00:00"/>
       <column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f21154dbe"/>
-      <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+      <column name="PROBABILITY" value="50"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="e5d6b5a4-7576-440f-8332-bc40147c0335"/>
+      <column name="STATUS" value="OFFERSTATSENT"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="79.80"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -244,10 +244,10 @@
       <column name="OFFERCODE" valueNumeric="1002"/>
       <column name="OFFERDATE" valueDate="2018-06-14T02:00:00"/>
       <column name="OFFERID" value="5561959c-88c5-4d79-9ac2-f41f21154dbe"/>
-      <column name="PROBABILITY" value="2dca6f38-b49a-4716-8c83-9d2183c5c065"/>
+      <column name="PROBABILITY" value="75"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="e5d6b5a4-7576-440f-8332-bc40147c0335"/>
+      <column name="STATUS" value="OFFERSTATSENT"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="119.70"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -262,10 +262,10 @@
       <column name="OFFERCODE" valueNumeric="1003"/>
       <column name="OFFERDATE" valueDate="2018-02-23T01:00:00"/>
       <column name="OFFERID" value="0461959c-11c5-4d79-9ac2-f41f21154dbe"/>
-      <column name="PROBABILITY" value="834f814d-4e31-4289-be6c-fad2dea3f2f0"/>
+      <column name="PROBABILITY" value="0"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="5134153d-2e18-452f-ab35-7a52f1aee7d1"/>
+      <column name="STATUS" value="OFFERSTATCHECK"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="79.80"/>
       <column name="VERSNR" valueNumeric="1"/>
@@ -280,10 +280,10 @@
       <column name="OFFERCODE" valueNumeric="1004"/>
       <column name="OFFERDATE" valueDate="2017-11-09T01:00:00"/>
       <column name="OFFERID" value="ab61911c-88c5-4d79-9ac2-f41f21154dbe"/>
-      <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+      <column name="PROBABILITY" value="50"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="5134153d-2e18-452f-ab35-7a52f1aee7d1"/>
+      <column name="STATUS" value="OFFERSTATCHECK"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="VAT" valueNumeric="159.60"/>
       <column name="VERSNR" valueNumeric="1"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml
index 229a5953171fdfd9d7e7c12811a5b32defb4d24c..2047f483d9fb0a0604837261606a147f306f8502 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml
@@ -3,7 +3,7 @@
   <changeSet author="autogenerated" id="ed3c0518-7df4-4d57-a72e-2a74f75f374a">
     <delete tableName="OFFERITEM"/>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -13,12 +13,12 @@
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX47"/>
       <column name="ITEMPOSITION" value="1.1"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -27,11 +27,11 @@
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.1"/>
       <column name="ITEMPOSITION" value="1.1.1"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -40,11 +40,11 @@
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="44b75a12-ae8b-4003-9347-9952843425a9"/>
-      <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
+      <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
       <column name="ITEMNAME" value="Sonderrabatt"/>
       <column name="ITEMPOSITION" value="1.1.1.1"/>
       <column name="ITEMSORT" valueNumeric="4"/>
@@ -53,11 +53,11 @@
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.2a"/>
       <column name="ITEMPOSITION" value="1.1.2"/>
       <column name="ITEMSORT" valueNumeric="5"/>
@@ -66,11 +66,11 @@
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.1"/>
       <column name="ITEMPOSITION" value="1.2"/>
       <column name="ITEMSORT" valueNumeric="6"/>
@@ -79,11 +79,11 @@
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
       <column name="QUANTITY" valueNumeric="2.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.2"/>
       <column name="ITEMPOSITION" value="1.3"/>
       <column name="ITEMSORT" valueNumeric="7"/>
@@ -92,10 +92,10 @@
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -105,11 +105,11 @@
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
       <column name="QUANTITY" valueNumeric="2.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -119,11 +119,11 @@
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -133,11 +133,11 @@
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
       <column name="QUANTITY" valueNumeric="2.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -147,11 +147,11 @@
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
       <column name="QUANTITY" valueNumeric="2.00"/>
-      <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -161,12 +161,12 @@
       <column name="PRICE" valueNumeric="210.00"/>
       <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX47"/>
       <column name="ITEMPOSITION" value="1.1"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -175,11 +175,11 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.1"/>
       <column name="ITEMPOSITION" value="1.1.1"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -188,11 +188,11 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="6c60f55e-27d3-44a5-a324-d184a067237a"/>
-      <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
+      <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
       <column name="ITEMNAME" value="Sonderrabatt"/>
       <column name="ITEMPOSITION" value="1.1.1.1"/>
       <column name="ITEMSORT" valueNumeric="4"/>
@@ -201,11 +201,11 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="bd35c94b-5ad8-43eb-a131-501e3577d9c9"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.2"/>
       <column name="ITEMPOSITION" value="1.1.1.1.1"/>
       <column name="ITEMSORT" valueNumeric="5"/>
@@ -214,11 +214,11 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.2a"/>
       <column name="ITEMPOSITION" value="1.1.2"/>
       <column name="ITEMSORT" valueNumeric="6"/>
@@ -227,11 +227,11 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.1"/>
       <column name="ITEMPOSITION" value="1.2"/>
       <column name="ITEMSORT" valueNumeric="7"/>
@@ -240,11 +240,11 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
       <column name="QUANTITY" valueNumeric="2.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.2"/>
       <column name="ITEMPOSITION" value="1.3"/>
       <column name="ITEMSORT" valueNumeric="8"/>
@@ -253,10 +253,10 @@
       <column name="OPTIONAL" valueNumeric="1"/>
       <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
       <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="Bremsscheiben"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -266,10 +266,10 @@
       <column name="PRICE" valueNumeric="1000.00"/>
       <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
       <column name="ITEMNAME" value="Klimaanlage 2-Zonen"/>
       <column name="ITEMPOSITION" value="2"/>
@@ -280,10 +280,10 @@
       <column name="PRICE" valueNumeric="2500.00"/>
       <column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="Turbolader"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -293,10 +293,10 @@
       <column name="PRICE" valueNumeric="3500.00"/>
       <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
       <column name="ITEMNAME" value="Klimaanlage 4-Zonen"/>
       <column name="ITEMPOSITION" value="2"/>
@@ -307,11 +307,11 @@
       <column name="PRICE" valueNumeric="5000.00"/>
       <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
       <column name="QUANTITY" valueNumeric="5.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
       <column name="DISCOUNT" valueNumeric="5.00"/>
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="Förderanlage"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -321,10 +321,10 @@
       <column name="PRICE" valueNumeric="150000.00"/>
       <column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
       <column name="ITEMNAME" value="Stahlträger Standard"/>
       <column name="ITEMPOSITION" value="2"/>
@@ -335,10 +335,10 @@
       <column name="PRICE" valueNumeric="5000.00"/>
       <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="QUANTITY" valueNumeric="10.00"/>
-      <column name="UNIT" value="fc4cee8f-b3ad-4b1e-ba87-df4a19a47e54"/>
+      <column name="UNIT" value="QUANTITYKGS"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ITEMNAME" value="Gipsplatten"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -348,10 +348,10 @@
       <column name="PRICE" valueNumeric="150.00"/>
       <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
       <column name="QUANTITY" valueNumeric="1000.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ITEMNAME" value="Standard Gerüst"/>
       <column name="ITEMPOSITION" value="2"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -361,10 +361,10 @@
       <column name="PRICE" valueNumeric="25000.00"/>
       <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ITEMNAME" value="Gipsplatten"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -374,10 +374,10 @@
       <column name="PRICE" valueNumeric="15000.00"/>
       <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ITEMNAME" value="Vollstange"/>
       <column name="ITEMPOSITION" value="2"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -387,10 +387,10 @@
       <column name="PRICE" valueNumeric="250.00"/>
       <column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
       <column name="QUANTITY" valueNumeric="10.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="WG2 Produkt 4"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -400,11 +400,11 @@
       <column name="PRICE" valueNumeric="2500.00"/>
       <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="5b8b8e5f-2df8-4119-aae6-e224fb360d4e"/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
       <column name="ITEMNAME" value="Service Einsatz"/>
       <column name="ITEMPOSITION" value="2"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -414,11 +414,11 @@
       <column name="PRICE" valueNumeric="1000.00"/>
       <column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="WG2 Proudkt 3"/>
       <column name="ITEMPOSITION" value="3"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -428,11 +428,11 @@
       <column name="PRICE" valueNumeric="50000.00"/>
       <column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Ersatzteil 1"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -442,11 +442,11 @@
       <column name="PRICE" valueNumeric="5000.00"/>
       <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
       <column name="ITEMNAME" value="WG1 Standardprodukt 1"/>
       <column name="ITEMPOSITION" value="2"/>
@@ -457,11 +457,11 @@
       <column name="PRICE" valueNumeric="10000.00"/>
       <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="fc4cee8f-b3ad-4b1e-ba87-df4a19a47e54"/>
+      <column name="UNIT" value="QUANTITYKGS"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="WG1 Standardprodukt 3"/>
       <column name="ITEMPOSITION" value="3"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -471,11 +471,11 @@
       <column name="PRICE" valueNumeric="30000.00"/>
       <column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="OFFERITEM">
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="WG2 Produkt 5"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -485,7 +485,7 @@
       <column name="PRICE" valueNumeric="25000.00"/>
       <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
       <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
index ddf8e4d0f3d4f09f7973631f4b0927ec060e3cb5..df4508e305ddbfde1432c5d968a2f1831767c70f 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
@@ -9,7 +9,7 @@
       <column name="INFO" value="Die Industrial Steal AG ist einer der führenden Stahlhersteller weltweit. Das Unternehmen agiert mit über 5.000 Mitarbeitern in über 30 Ländern. "/>
       <column name="NAME" value="Industrial Steel AG"/>
       <column name="ORGANISATIONID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+      <column name="TYPE" value="ORGCUTOMER"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -20,7 +20,7 @@
       <column name="INFO" value="Die Transatlantik Logistic Gruppe ist ein Zusammenschluss aus mehreren Logistik Unternehmen.  Über 3.000 Mitarbeiter sind bei dem europäischen Logistikriesen beschäftigt. "/>
       <column name="NAME" value="Transatlantik Logistics GmbH"/>
       <column name="ORGANISATIONID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
-      <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+      <column name="TYPE" value="ORGCUTOMER"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -30,7 +30,7 @@
       <column name="INFO" value="Die Skyscraper Bau GmbH zählt zu den führenden Unternehmen in der Baubranche. Mit ihrem breiten Portfolio überzeugen sie regelmäßig und diversifizieren sich von ihren Mitbewerbern. "/>
       <column name="NAME" value="Skyscraper Bau GmbH"/>
       <column name="ORGANISATIONID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
-      <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+      <column name="TYPE" value="ORGCUTOMER"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ORGANISATION">
@@ -47,7 +47,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
       <column name="NAME" value="JPM Touristik GmbH"/>
       <column name="ORGANISATIONID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
-      <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+      <column name="TYPE" value="ORGCUTOMER"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ORGANISATION">
@@ -57,7 +57,7 @@
       <column name="INFO" value="Automobilvermietung"/>
       <column name="NAME" value="Sevent SE"/>
       <column name="ORGANISATIONID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
-      <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+      <column name="TYPE" value="ORGCUTOMER"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -76,7 +76,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
       <column name="NAME" value="SuperBauer AG"/>
       <column name="ORGANISATIONID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
-      <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+      <column name="TYPE" value="ORGCUTOMER"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -86,7 +86,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
       <column name="NAME" value="Grobbe-Werk GmbH"/>
       <column name="ORGANISATIONID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
-      <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+      <column name="TYPE" value="ORGCUTOMER"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -104,7 +104,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
       <column name="NAME" value="Firmengruppe Matthias Bogen"/>
       <column name="ORGANISATIONID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
-      <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+      <column name="TYPE" value="ORGCUTOMER"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ORGANISATION">
@@ -113,7 +113,7 @@
       <column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
       <column name="NAME" value="Aquire GmbH"/>
       <column name="ORGANISATIONID" value="449080f6-b714-4189-a261-37439d0d4010"/>
-      <column name="TYPE" value="dbb3f596-bd2b-4e08-baef-ba28d7b752e9"/>
+      <column name="TYPE" value="ORGMANUF"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -123,7 +123,7 @@
       <column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
       <column name="NAME" value="Netro AG"/>
       <column name="ORGANISATIONID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
-      <column name="TYPE" value="dbb3f596-bd2b-4e08-baef-ba28d7b752e9"/>
+      <column name="TYPE" value="ORGMANUF"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -133,7 +133,7 @@
       <column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
       <column name="NAME" value="Glob Group"/>
       <column name="ORGANISATIONID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
-      <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+      <column name="TYPE" value="ORGCUTOMER"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -143,7 +143,7 @@
       <column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
       <column name="NAME" value="Schild AG"/>
       <column name="ORGANISATIONID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
-      <column name="TYPE" value="e9f133a7-27b4-4ce1-ab93-03876ec3de61"/>
+      <column name="TYPE" value="ORGPARTNER"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -151,7 +151,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="NAME" value="privat"/>
       <column name="ORGANISATIONID" value="0                                   "/>
-      <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+      <column name="TYPE" value="ORGCUTOMER"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="ORGANISATION">
@@ -160,7 +160,7 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="NAME" value="meine Firma"/>
       <column name="ORGANISATIONID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-      <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+      <column name="TYPE" value="ORGCUTOMER"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
index 9e50e3d7d08de98b067e804cb3dda99d6b103b6e..863a7e50edf77754af8b868e0a2f02456d3ae8e8 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
@@ -6,13 +6,13 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T11:13:33"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="MINSTOCK" valueNumeric="12"/>
       <column name="PRODUCTCODE" value="ET1006"/>
       <column name="PRODUCTID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
       <column name="PRODUCTNAME" value="Ersatzteil 1"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -20,13 +20,13 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T11:13:42"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="MINSTOCK" valueNumeric="10"/>
       <column name="PRODUCTCODE" value="ET1005"/>
       <column name="PRODUCTID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
       <column name="PRODUCTNAME" value="Ersatzteil 2"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -34,13 +34,13 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T11:14:05"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="MINSTOCK" valueNumeric="15"/>
       <column name="PRODUCTCODE" value="ET1004"/>
       <column name="PRODUCTID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
       <column name="PRODUCTNAME" value="Ersatzteil 3"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -48,13 +48,13 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T11:14:32"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="MINSTOCK" valueNumeric="50"/>
       <column name="PRODUCTCODE" value="ET1009"/>
       <column name="PRODUCTID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
       <column name="PRODUCTNAME" value="Ersatzteil 4"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -62,12 +62,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-22T11:22:20"/>
       <column name="DATE_NEW" valueDate="2019-05-22T11:20:28"/>
-      <column name="GROUPCODEID" value="5b8b8e5f-2df8-4119-aae6-e224fb360d4e"/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
       <column name="PRODUCTCODE" value="DL1005"/>
       <column name="PRODUCTID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
       <column name="PRODUCTNAME" value="Beratungsdienstleistung"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -75,14 +75,14 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:43:25"/>
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
       <column name="MINSTOCK" valueNumeric="10"/>
       <column name="PRODUCTCODE" value="WG0001"/>
       <column name="PRODUCTID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="PRODUCTNAME" value="WG1 Standardprodukt 1"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="fc4cee8f-b3ad-4b1e-ba87-df4a19a47e54"/>
+      <column name="UNIT" value="QUANTITYKGS"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -90,13 +90,13 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:48:31"/>
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
       <column name="PRODUCTCODE" value="WG2002"/>
       <column name="PRODUCTID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
       <column name="PRODUCTNAME" value="WG2 Produkt 1"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -104,13 +104,13 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:49:51"/>
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
       <column name="PRODUCTCODE" value="WG2003"/>
       <column name="PRODUCTID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
       <column name="PRODUCTNAME" value="WG2 Produkt 2"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -118,12 +118,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-16T01:53:18"/>
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="PRODUCTCODE" value="WG2004"/>
       <column name="PRODUCTID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
       <column name="PRODUCTNAME" value="WG2 Proudkt 3"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -131,12 +131,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:23:33"/>
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="PRODUCTCODE" value="WG2005"/>
       <column name="PRODUCTID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
       <column name="PRODUCTNAME" value="WG2 Produkt 4"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -144,36 +144,36 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:25:18"/>
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="PRODUCTCODE" value="WG2006"/>
       <column name="PRODUCTID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
       <column name="PRODUCTNAME" value="WG2 Produkt 5"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="PRODUCT">
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:30:01"/>
-      <column name="GROUPCODEID" value="5b8b8e5f-2df8-4119-aae6-e224fb360d4e"/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
       <column name="PRODUCTCODE" value="DL1001"/>
       <column name="PRODUCTID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
       <column name="PRODUCTNAME" value="Service Einsatz"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
     <insert tableName="PRODUCT">
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:32:19"/>
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="PRODUCTCODE" value="WG1005"/>
       <column name="PRODUCTID" value="155ac430-ccfc-4814-95fc-189631779064"/>
       <column name="PRODUCTNAME" value="WG1 Standardprodukt 3"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -181,12 +181,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:34:44"/>
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="PRODUCTCODE" value="WG1003"/>
       <column name="PRODUCTID" value="c8244502-73be-4ef7-9ef7-2b5ae95d3718"/>
       <column name="PRODUCTNAME" value="WG1 Standardprodukt 2"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -194,12 +194,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:14:18"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:37:31"/>
-      <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="PRODUCTCODE" value="WG3001"/>
       <column name="PRODUCTID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
       <column name="PRODUCTNAME" value="WG3 Produkt A"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -207,12 +207,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:14:27"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:39:37"/>
-      <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="PRODUCTCODE" value="WG3002"/>
       <column name="PRODUCTID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
       <column name="PRODUCTNAME" value="WG3 Produkt B"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
@@ -220,12 +220,12 @@
       <column name="ADVERTISING" value="N"/>
       <column name="DATE_EDIT" valueDate="2019-06-11T11:14:35"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:45:10"/>
-      <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="PRODUCTCODE" value="WG3003"/>
       <column name="PRODUCTID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
       <column name="PRODUCTNAME" value="WG3 Produkt C"/>
       <column name="STATUS" valueNumeric="1"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="USER_EDIT" value="Admin"/>
       <column name="USER_NEW" value="Admin"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml
index 2ac98ebb53a2a3ef085594f6f49e30fa0995d309..a0dbd2165bbd7fdc3ff48451210aa33bff3c3432 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml
@@ -7,7 +7,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="1060.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="c5b5bfce-2bec-4601-ba43-2567209bea04"/>
       <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
       <column name="VALID_FROM" valueDate="2018-11-01T01:00:00"/>
@@ -19,7 +19,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="1500.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="c0769e98-bf18-444c-92b0-fc5d17613ea8"/>
       <column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -30,7 +30,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="1000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="443b9532-7a41-481a-8f95-ffaf5e7949af"/>
       <column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -41,7 +41,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="2500.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="a75cc2e2-bb81-4e9f-9fa4-95c8531e966d"/>
       <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -52,7 +52,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="5000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="bb425e07-4238-4cb7-b20b-a0ba4ed8b1ae"/>
       <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -63,7 +63,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="7500.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="ad57ee30-4afe-4426-912b-c0b9d03107f7"/>
       <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -74,7 +74,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="10000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="a9b9097a-f664-4114-aa0a-ff2a01dddd04"/>
       <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -85,7 +85,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="20000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="a2c9954b-bda0-4f02-8269-96cb86cb2516"/>
       <column name="PRODUCT_ID" value="c8244502-73be-4ef7-9ef7-2b5ae95d3718"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -96,7 +96,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="30000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="43fa161c-0f85-4915-89be-6bb442143506"/>
       <column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -108,7 +108,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="10000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="4028dfb7-d0e4-493e-9676-6f14a24a9507"/>
       <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
       <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -120,7 +120,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="5000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="f90ff3d2-3e62-4b6f-bcfb-db4d4ecd8de8"/>
       <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
       <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -133,7 +133,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="2500.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="75365b30-fd09-4255-b1d7-f4c91e9d255e"/>
       <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
       <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -146,7 +146,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="25000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="1c5b6a5a-4aa0-499e-994f-278c7bdf87bf"/>
       <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
       <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -159,7 +159,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="15000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="bf8ef6ac-9f34-40fd-aa2e-9792fee9a970"/>
       <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
       <column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -171,7 +171,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="35000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="24d65d20-bf5c-474d-8351-2788431e0e1a"/>
       <column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -182,7 +182,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="50000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="df9fe0b0-4f16-4592-8066-fe9b3f41fdc1"/>
       <column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -193,7 +193,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="25000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="71d5a323-12d8-4d1b-8de6-6a7bf81d0b61"/>
       <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -204,7 +204,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="30000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="abfa7e4d-bd88-4186-a7ae-26385ea1d91c"/>
       <column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
       <column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -216,7 +216,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="10000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="ead04c9b-955e-4595-bb31-31685b3ceaec"/>
       <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
       <column name="VALID_FROM" valueDate="2019-05-23T02:00:00"/>
@@ -229,7 +229,7 @@
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FROMQUANTITY" valueNumeric="1.00"/>
       <column name="PRICE" valueNumeric="150000.00"/>
-      <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="PRICELIST" value="PRICELISTDEFAULT"/>
       <column name="PRODUCTPRICEID" value="2749f80a-f09b-4153-97dd-2284253e8228"/>
       <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
       <column name="VALID_FROM" valueDate="2019-05-23T02:00:00"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
index 0537b78d6d62e02389daf70453e7e6100b3a9af3..089b4a45a14d20c4337cead71bec7e744ae15599 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
@@ -11,7 +11,7 @@
       <column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
       <column name="SALESORDERID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
       <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+      <column name="STATUS" value="SALORDERSTATSENT"/>
       <column name="VAT" valueNumeric="39.90"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
@@ -24,7 +24,7 @@
       <column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
       <column name="SALESORDERID" value="41197800-027b-47f5-923a-f1004d09a969"/>
       <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+      <column name="STATUS" value="SALORDERSTATSENT"/>
       <column name="VAT" valueNumeric="79.80"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
@@ -37,7 +37,7 @@
       <column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
       <column name="SALESORDERID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
       <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+      <column name="STATUS" value="SALORDERSTATSENT"/>
       <column name="VAT" valueNumeric="119.70"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
@@ -50,7 +50,7 @@
       <column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
       <column name="SALESORDERID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
       <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+      <column name="STATUS" value="SALORDERSTATCHECK"/>
       <column name="VAT" valueNumeric="79.80"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
@@ -63,7 +63,7 @@
       <column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
       <column name="SALESORDERID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
       <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+      <column name="STATUS" value="SALORDERSTATCHECK"/>
       <column name="VAT" valueNumeric="79.80"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
@@ -76,7 +76,7 @@
       <column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
       <column name="SALESORDERID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
       <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+      <column name="STATUS" value="SALORDERSTATSENT"/>
       <column name="VAT" valueNumeric="39.90"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
@@ -89,7 +89,7 @@
       <column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
       <column name="SALESORDERID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
       <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+      <column name="STATUS" value="SALORDERSTATSENT"/>
       <column name="VAT" valueNumeric="79.80"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
@@ -102,7 +102,7 @@
       <column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
       <column name="SALESORDERID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
       <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+      <column name="STATUS" value="SALORDERSTATSENT"/>
       <column name="VAT" valueNumeric="119.70"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
@@ -115,7 +115,7 @@
       <column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
       <column name="SALESORDERID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
       <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+      <column name="STATUS" value="SALORDERSTATCHECK"/>
       <column name="VAT" valueNumeric="79.80"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
@@ -128,7 +128,7 @@
       <column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
       <column name="SALESORDERID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
       <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-      <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+      <column name="STATUS" value="SALORDERSTATCHECK"/>
       <column name="VAT" valueNumeric="79.80"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
@@ -156,7 +156,7 @@
       <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
       <column name="SALESORDERID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
       <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="STATUS" value="fc0e9ec2-194f-426b-a304-de8cce85ab7c"/>
+      <column name="STATUS" value="SALORDERSTATWON"/>
       <column name="VAT" valueNumeric="0.00"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
@@ -172,7 +172,7 @@
       <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
       <column name="SALESORDERID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
       <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="STATUS" value="fc0e9ec2-194f-426b-a304-de8cce85ab7c"/>
+      <column name="STATUS" value="SALORDERSTATWON"/>
       <column name="VAT" valueNumeric="0.00"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
@@ -188,7 +188,7 @@
       <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
       <column name="SALESORDERID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
       <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
-      <column name="STATUS" value="fc0e9ec2-194f-426b-a304-de8cce85ab7c"/>
+      <column name="STATUS" value="SALORDERSTATWON"/>
       <column name="VAT" valueNumeric="10165.00"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
@@ -204,7 +204,7 @@
       <column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
       <column name="SALESORDERID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
       <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
-      <column name="STATUS" value="fc0e9ec2-194f-426b-a304-de8cce85ab7c"/>
+      <column name="STATUS" value="SALORDERSTATWON"/>
       <column name="VAT" valueNumeric="0.00"/>
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml
index 1b8f1ed5c49e218793788cfe30f9e6867765d8a5..79a8a2edd879ee1764e9035fd402d8c9642a18fd 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml
@@ -3,7 +3,7 @@
   <changeSet author="autogenerated" id="6179af3a-4596-4389-b0d9-824b5c059006">
     <delete tableName="SALESORDERITEM"/>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -13,12 +13,12 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX47"/>
       <column name="ITEMPOSITION" value="1.1"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -27,11 +27,11 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.1"/>
       <column name="ITEMPOSITION" value="1.1.1"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -40,11 +40,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
-      <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
+      <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
       <column name="ITEMNAME" value="Sonderrabatt"/>
       <column name="ITEMPOSITION" value="1.1.1.1"/>
       <column name="ITEMSORT" valueNumeric="4"/>
@@ -53,11 +53,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="8772eb20-dbe8-4e12-8ea8-21fb28474c3e"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.2a"/>
       <column name="ITEMPOSITION" value="1.1.2"/>
       <column name="ITEMSORT" valueNumeric="5"/>
@@ -66,11 +66,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="8c60146f-e950-47ad-8fed-d7bb88947789"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.1"/>
       <column name="ITEMPOSITION" value="1.2"/>
       <column name="ITEMSORT" valueNumeric="6"/>
@@ -79,11 +79,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="21ee4b39-876e-44a8-8153-dc7f38957fc7"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.2"/>
       <column name="ITEMPOSITION" value="1.3"/>
       <column name="ITEMSORT" valueNumeric="7"/>
@@ -92,10 +92,10 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="f268cf96-7ba6-44aa-8357-42e0469afe79"/>
       <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -105,11 +105,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="ed7dcd27-0369-4196-894c-bfcce94b9e73"/>
       <column name="SALESORDER_ID" value="41197800-027b-47f5-923a-f1004d09a969"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -119,11 +119,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="17856c63-10f8-46c6-9295-5ad5bedff8ba"/>
       <column name="SALESORDER_ID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -133,11 +133,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="3b25eeb9-ea52-4c62-a22c-041a1a2a41c2"/>
       <column name="SALESORDER_ID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -147,11 +147,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="45422c17-9626-4435-80ef-58c24fdf7559"/>
       <column name="SALESORDER_ID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
-      <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -161,12 +161,12 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="92ebcce0-8970-42dc-b32f-b892fe7dbb52"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
       <column name="ITEMNAME" value="AX47"/>
       <column name="ITEMPOSITION" value="1.1"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -175,11 +175,11 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="2bf1eb1f-501c-4006-83cb-fb9783272e35"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.1"/>
       <column name="ITEMPOSITION" value="1.1.1"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -188,11 +188,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="dcb02f78-8305-462f-bbeb-f7b5cb102461"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
-      <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
+      <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
       <column name="ITEMNAME" value="Sonderrabatt"/>
       <column name="ITEMPOSITION" value="1.1.1.1"/>
       <column name="ITEMSORT" valueNumeric="4"/>
@@ -201,11 +201,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="a63b3fed-f7a4-4173-ba3e-a893f7186ed6"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname4.2a"/>
       <column name="ITEMPOSITION" value="1.1.2"/>
       <column name="ITEMSORT" valueNumeric="5"/>
@@ -214,11 +214,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="6d59b91d-bfac-46ac-be79-35fdeb793d0d"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.1"/>
       <column name="ITEMPOSITION" value="1.2"/>
       <column name="ITEMSORT" valueNumeric="6"/>
@@ -227,11 +227,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="b68656aa-84e1-4682-9c2e-2d9ec0810ecb"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
       <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="Produktname1.2"/>
       <column name="ITEMPOSITION" value="1.3"/>
       <column name="ITEMSORT" valueNumeric="7"/>
@@ -240,10 +240,10 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="fafb2b07-012e-4d20-b263-2b794e5370a7"/>
       <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -253,11 +253,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="45c38cca-86b7-46f1-aee8-635c8f0603bc"/>
       <column name="SALESORDER_ID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -267,11 +267,11 @@
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="SALESORDERITEMID" value="c64dc823-98cd-4159-a27d-7167f510fc57"/>
       <column name="SALESORDER_ID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -281,11 +281,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="5396e85b-3144-400f-8f5d-c01e875679f7"/>
       <column name="SALESORDER_ID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="GROUPCODEID" value="PRODUCTSPARE"/>
       <column name="ITEMNAME" value="AX45"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -295,11 +295,11 @@
       <column name="QUANTITY" valueNumeric="2.00"/>
       <column name="SALESORDERITEMID" value="709e37c9-0397-4b82-965c-e11416e6f090"/>
       <column name="SALESORDER_ID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
-      <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="Turbolader"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -309,10 +309,10 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="08de406a-79bf-468f-8fea-29acfc79a1e8"/>
       <column name="SALESORDER_ID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
       <column name="ITEMNAME" value="Klimaanlage 4-Zonen"/>
       <column name="ITEMPOSITION" value="2"/>
@@ -323,10 +323,10 @@
       <column name="QUANTITY" valueNumeric="5.00"/>
       <column name="SALESORDERITEMID" value="368569a0-4d4d-4535-b2a5-8e380d5612ef"/>
       <column name="SALESORDER_ID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="Bremsscheiben"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -336,10 +336,10 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="b4f02784-4593-4caf-a845-40b426d00082"/>
       <column name="SALESORDER_ID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
       <column name="ITEMNAME" value="Klimaanlage 2-Zonen"/>
       <column name="ITEMPOSITION" value="2"/>
@@ -350,10 +350,10 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="001410e8-f70b-4041-901c-02275ff6deb5"/>
       <column name="SALESORDER_ID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="WG2 Produkt 4"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -363,11 +363,11 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="e53aaecf-d8b6-4327-96cb-66f004e4b5fb"/>
       <column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="5b8b8e5f-2df8-4119-aae6-e224fb360d4e"/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
       <column name="ITEMNAME" value="Service Einsatz"/>
       <column name="ITEMPOSITION" value="2"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -377,11 +377,11 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="cd7c9255-0de8-4b15-a952-caf9669b447a"/>
       <column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
-      <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
       <column name="ITEMNAME" value="WG2 Proudkt 3"/>
       <column name="ITEMPOSITION" value="3"/>
       <column name="ITEMSORT" valueNumeric="3"/>
@@ -391,11 +391,11 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="468023b8-fb3e-4e4c-9d30-841d12888b73"/>
       <column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="VAT" valueNumeric="19.00"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ITEMNAME" value="Gipsplatten"/>
       <column name="ITEMPOSITION" value="1"/>
       <column name="ITEMSORT" valueNumeric="1"/>
@@ -405,10 +405,10 @@
       <column name="QUANTITY" valueNumeric="1000.00"/>
       <column name="SALESORDERITEMID" value="b5f17aaa-ffa7-4c8e-bbcb-d51cfecb06db"/>
       <column name="SALESORDER_ID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
     <insert tableName="SALESORDERITEM">
-      <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
       <column name="ITEMNAME" value="Standard Gerüst"/>
       <column name="ITEMPOSITION" value="2"/>
       <column name="ITEMSORT" valueNumeric="2"/>
@@ -418,7 +418,7 @@
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="SALESORDERITEMID" value="39da8def-662f-4904-b9bf-b4e97affbeb7"/>
       <column name="SALESORDER_ID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
-      <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="UNIT" value="QUANTITYPIECES"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml
index 6f9ff98230cba30489c52b4652499f38aacdc370..260013b8567e15beddf48f6b6602a52423edfb09 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml
@@ -5,61 +5,61 @@
     <insert tableName="SALESPROJECT">
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
       <column name="ENDDATE" valueDate="2020-05-16T02:00:00"/>
-      <column name="PHASE" value="4814b51b-40f5-49bc-897b-f0933b9fc12c"/>
-      <column name="PROBABILITY" value="b981a107-7e20-42a6-baf4-3fc09a939cd7"/>
+      <column name="PHASE" value="SALPROJPHASEMQC"/>
+      <column name="PROBABILITY" value="SALPROJPROB25"/>
       <column name="PROJECTCODE" valueNumeric="1002"/>
       <column name="PROJECTTITLE" value="Erstprojekt"/>
       <column name="SALESPROJECTID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="STARTDATE" valueDate="2019-05-16T02:00:00"/>
-      <column name="STATE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+      <column name="STATE" value="SALPROJSTATOPEN"/>
       <column name="VOLUME" valueNumeric="200000.00"/>
     </insert>
     <insert tableName="SALESPROJECT">
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="ENDDATE" valueDate="2020-05-17T02:00:00"/>
-      <column name="PHASE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
-      <column name="PROBABILITY" value="b981a107-7e20-42a6-baf4-3fc09a939cd7"/>
+      <column name="PHASE" value="SALPROJPHASESAL"/>
+      <column name="PROBABILITY" value="SALPROJPROB25"/>
       <column name="PROJECTCODE" valueNumeric="1003"/>
       <column name="PROJECTTITLE" value="Skyscraper / Pilotprojekt"/>
       <column name="SALESPROJECTID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="STARTDATE" valueDate="2019-05-17T02:00:00"/>
-      <column name="STATE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+      <column name="STATE" value="SALPROJSTATOPEN"/>
       <column name="VOLUME" valueNumeric="120000.00"/>
     </insert>
     <insert tableName="SALESPROJECT">
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="ENDDATE" valueDate="2020-05-17T02:00:00"/>
-      <column name="PHASE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
-      <column name="PROBABILITY" value="b981a107-7e20-42a6-baf4-3fc09a939cd7"/>
+      <column name="PHASE" value="SALPROJPHASESQO"/>
+      <column name="PROBABILITY" value="SALPROJPROB25"/>
       <column name="PROJECTCODE" valueNumeric="1004"/>
       <column name="PROJECTTITLE" value="Transatlantik Initialprojekt"/>
       <column name="SALESPROJECTID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="STARTDATE" valueDate="2019-05-17T02:00:00"/>
-      <column name="STATE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+      <column name="STATE" value="SALPROJSTATOPEN"/>
       <column name="VOLUME" valueNumeric="250000.00"/>
     </insert>
     <insert tableName="SALESPROJECT">
       <column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
       <column name="ENDDATE" valueDate="2020-05-22T02:00:00"/>
-      <column name="PHASE" value="213c8184-f930-457e-8605-703baaf21d4a"/>
-      <column name="PROBABILITY" value="8ff82a56-af38-4f19-9dd7-21d8276bc8e4"/>
+      <column name="PHASE" value="SALPROJPHASENEGO"/>
+      <column name="PROBABILITY" value="SALPROJPROB50"/>
       <column name="PROJECTCODE" valueNumeric="1005"/>
       <column name="PROJECTTITLE" value="Kronen Pilotprojekt"/>
       <column name="SALESPROJECTID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="STARTDATE" valueDate="2017-05-16T02:00:00"/>
-      <column name="STATE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+      <column name="STATE" value="SALPROJSTATOPEN"/>
       <column name="VOLUME" valueNumeric="350000.00"/>
     </insert>
     <insert tableName="SALESPROJECT">
       <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
       <column name="ENDDATE" valueDate="2020-05-22T02:00:00"/>
-      <column name="PHASE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
-      <column name="PROBABILITY" value="8ff82a56-af38-4f19-9dd7-21d8276bc8e4"/>
+      <column name="PHASE" value="SALPROJPHASESQO"/>
+      <column name="PROBABILITY" value="SALPROJPROB50"/>
       <column name="PROJECTCODE" valueNumeric="1006"/>
       <column name="PROJECTTITLE" value="Buchner Neuprojekt"/>
       <column name="SALESPROJECTID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="STARTDATE" valueDate="2016-02-05T01:00:00"/>
-      <column name="STATE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+      <column name="STATE" value="SALPROJSTATOPEN"/>
       <column name="VOLUME" valueNumeric="450000.00"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
index e2481f3bcaad5e96eff18874ff364f8dee445e3b..2327b4f26414adcea4e22c3bc1145a1ab8ef4378 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
@@ -8,28 +8,28 @@
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_MILESTONEID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
       <column name="TYPE" value="SalesprojectPhase"/>
-      <column name="VALUE" value="9f7d1fa9-7c09-4037-8f7c-8458def14d89"/>
+      <column name="VALUE" value="SALPROJPHASENQC"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-16T01:34:58"/>
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_MILESTONEID" value="ae7fe604-2fea-4aa1-be75-e990e8f31c74"/>
       <column name="TYPE" value="SalesprojectState"/>
-      <column name="VALUE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+      <column name="VALUE" value="SALPROJSTATOPEN"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-17T08:08:07"/>
       <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="SALESPROJECT_MILESTONEID" value="737a988e-8779-4449-ba82-50f4361974eb"/>
       <column name="TYPE" value="SalesprojectPhase"/>
-      <column name="VALUE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+      <column name="VALUE" value="SALPROJPHASESAL"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-17T08:08:08"/>
       <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="SALESPROJECT_MILESTONEID" value="5189697c-5dbf-4d10-a163-dfde87e490ab"/>
       <column name="TYPE" value="SalesprojectState"/>
-      <column name="VALUE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+      <column name="VALUE" value="SALPROJSTATOPEN"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_END" valueDate="2019-05-23T10:44:48"/>
@@ -37,14 +37,14 @@
       <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="SALESPROJECT_MILESTONEID" value="4e764ba9-8f81-4e01-93de-f9769205dd3c"/>
       <column name="TYPE" value="SalesprojectPhase"/>
-      <column name="VALUE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+      <column name="VALUE" value="SALPROJPHASESAL"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-17T08:39:38"/>
       <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="SALESPROJECT_MILESTONEID" value="d77dc2ae-f12d-49ac-9a8f-ee0b5086f6ef"/>
       <column name="TYPE" value="SalesprojectState"/>
-      <column name="VALUE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+      <column name="VALUE" value="SALPROJSTATOPEN"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_END" valueDate="2019-05-23T10:44:26"/>
@@ -52,28 +52,28 @@
       <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="SALESPROJECT_MILESTONEID" value="d77a1712-bd57-4d4f-bc58-69ce58f31685"/>
       <column name="TYPE" value="SalesprojectPhase"/>
-      <column name="VALUE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+      <column name="VALUE" value="SALPROJPHASESAL"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-22T11:51:20"/>
       <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="SALESPROJECT_MILESTONEID" value="4529f6d1-2d4d-4dfc-b404-6a3d30e7153b"/>
       <column name="TYPE" value="SalesprojectState"/>
-      <column name="VALUE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+      <column name="VALUE" value="SALPROJSTATOPEN"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
       <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="SALESPROJECT_MILESTONEID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/>
       <column name="TYPE" value="SalesprojectPhase"/>
-      <column name="VALUE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
+      <column name="VALUE" value="SALPROJPHASESQO"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
       <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="SALESPROJECT_MILESTONEID" value="381b808e-d0a7-408b-a794-55c10b0399b5"/>
       <column name="TYPE" value="SalesprojectState"/>
-      <column name="VALUE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+      <column name="VALUE" value="SALPROJSTATOPEN"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_END" valueDate="2019-05-23T11:30:09"/>
@@ -81,28 +81,28 @@
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_MILESTONEID" value="47999521-d6ea-4a4d-959c-e72776ba5a25"/>
       <column name="TYPE" value="SalesprojectPhase"/>
-      <column name="VALUE" value="60d09bb1-7e02-4003-99bf-18b739a577ad"/>
+      <column name="VALUE" value="SALPROJPHASEOFFER"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-23T10:44:26"/>
       <column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="SALESPROJECT_MILESTONEID" value="61f7f5d6-01a6-4088-9387-820cb71ea526"/>
       <column name="TYPE" value="SalesprojectPhase"/>
-      <column name="VALUE" value="213c8184-f930-457e-8605-703baaf21d4a"/>
+      <column name="VALUE" value="SALPROJPHASENEGO"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-23T10:44:48"/>
       <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="SALESPROJECT_MILESTONEID" value="8a33dafb-4a1b-4ec9-a1cd-37a6c75e3721"/>
       <column name="TYPE" value="SalesprojectPhase"/>
-      <column name="VALUE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
+      <column name="VALUE" value="SALPROJPHASESQO"/>
     </insert>
     <insert tableName="SALESPROJECT_MILESTONE">
       <column name="DATE_START" valueDate="2019-05-23T11:30:10"/>
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_MILESTONEID" value="14da1165-ed6c-4f2a-8766-11d3533804cb"/>
       <column name="TYPE" value="SalesprojectPhase"/>
-      <column name="VALUE" value="4814b51b-40f5-49bc-897b-f0933b9fc12c"/>
+      <column name="VALUE" value="SALPROJPHASEMQC"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml
index a6afc0b6a5e8f2fb15eb0a2ce6701654761c8a41..cf63a8b5430e047a4bfa7faa86f2e4a7ed5e86f8 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml
@@ -7,40 +7,40 @@
       <column name="INFO" value="Kontakt über die Webseite"/>
       <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="SALESPROJECT_SOURCEID" value="2290111c-005b-4602-8adb-fb13844e065f"/>
-      <column name="SOURCE" value="67849bdb-f424-4c91-ad7d-48aa0aa9ee40"/>
+      <column name="SOURCE" value="SALPROJSCOWNWEB"/>
     </insert>
     <insert tableName="SALESPROJECT_SOURCE">
       <column name="ENTRYDATE" valueDate="2019-05-17T08:23:27"/>
       <column name="INFO" value="Besuch bei der Messe"/>
       <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="SALESPROJECT_SOURCEID" value="a3e94450-561f-43a8-bdec-64b093056187"/>
-      <column name="SOURCE" value="21becd8a-b0d4-4e4d-873d-2743e4e4dda4"/>
+      <column name="SOURCE" value="SALPROJSCFAIR"/>
     </insert>
     <insert tableName="SALESPROJECT_SOURCE">
       <column name="ENTRYDATE" valueDate="2019-03-12T01:00:00"/>
       <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="SALESPROJECT_SOURCEID" value="d178bb9e-0b6f-4f61-ac5e-f29b14488185"/>
-      <column name="SOURCE" value="21becd8a-b0d4-4e4d-873d-2743e4e4dda4"/>
+      <column name="SOURCE" value="SALPROJSCFAIR"/>
     </insert>
     <insert tableName="SALESPROJECT_SOURCE">
       <column name="ENTRYDATE" valueDate="2019-03-25T01:00:00"/>
       <column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="SALESPROJECT_SOURCEID" value="f42c0831-5f10-4b32-af21-62b334fd21d7"/>
-      <column name="SOURCE" value="67849bdb-f424-4c91-ad7d-48aa0aa9ee40"/>
+      <column name="SOURCE" value="SALPROJSCOWNWEB"/>
     </insert>
     <insert tableName="SALESPROJECT_SOURCE">
       <column name="ENTRYDATE" valueDate="2019-05-23T10:19:16"/>
       <column name="INFO" value="Die relevanten AP's waren am Stand. Hatten ein sehr produktives Gespräch."/>
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_SOURCEID" value="675253dd-0337-44c0-b230-71f030ee0246"/>
-      <column name="SOURCE" value="21becd8a-b0d4-4e4d-873d-2743e4e4dda4"/>
+      <column name="SOURCE" value="SALPROJSCFAIR"/>
     </insert>
     <insert tableName="SALESPROJECT_SOURCE">
       <column name="ENTRYDATE" valueDate="2019-05-23T10:33:18"/>
       <column name="INFO" value="Erster Kontakt mit uns."/>
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_SOURCEID" value="515ac173-4eab-4783-9c3f-e637c462f6b3"/>
-      <column name="SOURCE" value="67849bdb-f424-4c91-ad7d-48aa0aa9ee40"/>
+      <column name="SOURCE" value="SALPROJSCOWNWEB"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
index 8d62a085a76e4c320d163c2140217a49e1cc3f5c..f7e197ad804370f5f58e004aba15d11b5a113cf5 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
@@ -5,182 +5,182 @@
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Zu offenen Opportunities den Forecast anpassen"/>
       <column name="MATURITY_DATE" valueDate="2019-05-24T09:34:00"/>
-      <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
-      <column name="PROGRESS" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+      <column name="PRIORITY" value="TASKPRIONORMAL"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="START_DATE" valueDate="2019-05-17T09:34:00"/>
-      <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+      <column name="STATUS" value="TASKSTATNEW"/>
       <column name="SUBJECT" value="Forecast anpassen"/>
       <column name="TASKID" value="7d404da2-78bf-427b-8abb-4c7e953220ca"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Kunde wollte ein Angebot, hierzu die offenen Posten klären"/>
       <column name="MATURITY_DATE" valueDate="2019-05-15T09:36:00"/>
-      <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
-      <column name="PROGRESS" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+      <column name="PRIORITY" value="TASKPRIONORMAL"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="START_DATE" valueDate="2019-05-08T09:36:00"/>
-      <column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
+      <column name="STATUS" value="TASKSTATINPROC"/>
       <column name="SUBJECT" value="Nachfassen bei Kunden"/>
       <column name="TASKID" value="783f38b6-db71-42b5-9117-848553905c93"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
     <insert tableName="TASK">
       <column name="EDITOR_CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
       <column name="MATURITY_DATE" valueDate="2019-05-24T09:38:00"/>
-      <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
-      <column name="PROGRESS" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+      <column name="PRIORITY" value="TASKPRIONORMAL"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="START_DATE" valueDate="2019-05-17T09:38:00"/>
-      <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+      <column name="STATUS" value="TASKSTATNEW"/>
       <column name="SUBJECT" value="Besuch vorbereiten"/>
       <column name="TASKID" value="d6217dc5-5585-4919-a545-9cdc64a1ca58"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Kampagnenplanung für dieses Jahr beenden."/>
       <column name="MATURITY_DATE" valueDate="2019-05-22T10:25:00"/>
-      <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
-      <column name="PROGRESS" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+      <column name="PRIORITY" value="TASKPRIONORMAL"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="START_DATE" valueDate="2019-05-17T10:25:00"/>
-      <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+      <column name="STATUS" value="TASKSTATNEW"/>
       <column name="SUBJECT" value="Kampagne zu Akquise planen"/>
       <column name="TASKID" value="380c1ae1-c7d4-49b7-87e1-4fe2e16c4c52"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
     <insert tableName="TASK">
       <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="MATURITY_DATE" valueDate="2019-05-29T01:44:00"/>
-      <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
-      <column name="PROGRESS" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+      <column name="PRIORITY" value="TASKPRIONORMAL"/>
+      <column name="PROGRESS" value="TASKPROG50"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="START_DATE" valueDate="2019-05-22T01:44:00"/>
-      <column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
+      <column name="STATUS" value="TASKSTATINPROC"/>
       <column name="SUBJECT" value="Skyscraper VP für nächste Schritte"/>
       <column name="TASKID" value="f8fcdce1-da60-46d6-9ce3-3866e093730d"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
     <insert tableName="TASK">
       <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="MATURITY_DATE" valueDate="2019-05-24T01:46:00"/>
-      <column name="PRIORITY" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
-      <column name="PROGRESS" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+      <column name="PRIORITY" value="SALPROJPHASESAL"/>
+      <column name="PROGRESS" value="TASKPROG50"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
       <column name="START_DATE" valueDate="2019-05-22T01:46:00"/>
-      <column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
+      <column name="STATUS" value="TASKSTATINPROC"/>
       <column name="SUBJECT" value="Vorbereitung Präsentation"/>
       <column name="TASKID" value="2e50d2cd-9429-433c-8f6e-2e31a9e7908e"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Kunde ist sehr interessiert an unserem Produkten, weitere Produktabstimmung intern."/>
       <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="MATURITY_DATE" valueDate="2019-05-29T01:48:00"/>
-      <column name="PRIORITY" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
-      <column name="PROGRESS" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+      <column name="PRIORITY" value="SALPROJPHASEMQL"/>
+      <column name="PROGRESS" value="TASKPROG50"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="START_DATE" valueDate="2019-02-11T01:48:00"/>
-      <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+      <column name="STATUS" value="TASKSTATNEW"/>
       <column name="SUBJECT" value="Lead nachfassen"/>
       <column name="TASKID" value="67afcc4b-f71b-4da6-a8b3-e7947c411a2a"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
     <insert tableName="TASK">
       <column name="MATURITY_DATE" valueDate="2019-06-21T06:03:00"/>
-      <column name="PRIORITY" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
-      <column name="PROGRESS" value="5098fde4-660f-4381-9ff5-6d29a858e68e"/>
+      <column name="PRIORITY" value="SALPROJPHASEMQL"/>
+      <column name="PROGRESS" value="TASKPROG25"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="START_DATE" valueDate="2019-03-11T06:03:00"/>
-      <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+      <column name="STATUS" value="TASKSTATNEW"/>
       <column name="SUBJECT" value="Produkt Präsentation vorbereiten und mit Lisa Sommer abstimmen"/>
       <column name="TASKID" value="cf99cace-a6e1-46a6-ad83-c634e373f320"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Strategieevent 2-Tage"/>
       <column name="MATURITY_DATE" valueDate="2019-11-13T06:04:00"/>
-      <column name="PRIORITY" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
-      <column name="PROGRESS" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+      <column name="PRIORITY" value="SALPROJPHASESAL"/>
+      <column name="PROGRESS" value="TASKPROG75"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="START_DATE" valueDate="2019-05-22T06:04:00"/>
-      <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+      <column name="STATUS" value="TASKSTATNEW"/>
       <column name="SUBJECT" value="Event im Hause"/>
       <column name="TASKID" value="d8f35764-2c56-45be-93c7-f1e0695e2417"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Winterreifen draufmachen lassen"/>
       <column name="MATURITY_DATE" valueDate="2019-10-01T06:05:00"/>
-      <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
-      <column name="PROGRESS" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+      <column name="PRIORITY" value="TASKPRIONORMAL"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="START_DATE" valueDate="2019-05-22T06:05:00"/>
-      <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+      <column name="STATUS" value="TASKSTATNEW"/>
       <column name="SUBJECT" value="Autoreifen wechseln"/>
       <column name="TASKID" value="0d126a7e-4308-4857-9245-5a40f3e2b36e"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Preisabstimmung."/>
       <column name="MATURITY_DATE" valueDate="2019-04-05T09:08:00"/>
-      <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
-      <column name="PROGRESS" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+      <column name="PRIORITY" value="TASKPRIONORMAL"/>
+      <column name="PROGRESS" value="TASKPROG75"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="START_DATE" valueDate="2019-04-01T09:08:00"/>
-      <column name="STATUS" value="00595a73-22e2-4c3b-a21c-06bdec262d20"/>
+      <column name="STATUS" value="TASKSTATWAIT"/>
       <column name="SUBJECT" value="Mit der Vertriebsleitung abstimmen wie viel Prozent Rabatt gegeben werden kann."/>
       <column name="TASKID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
     <insert tableName="TASK">
       <column name="MATURITY_DATE" valueDate="2019-05-30T09:21:00"/>
-      <column name="PRIORITY" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
-      <column name="PROGRESS" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+      <column name="PRIORITY" value="SALPROJPHASEMQL"/>
+      <column name="PROGRESS" value="TASKPROG75"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
       <column name="START_DATE" valueDate="2019-05-23T09:21:00"/>
-      <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+      <column name="STATUS" value="TASKSTATNEW"/>
       <column name="SUBJECT" value="Präsentation vor Ort vorbereiten"/>
       <column name="TASKID" value="96ec8b48-9fac-4216-bc98-a8323f0592f9"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
     <insert tableName="TASK">
       <column name="MATURITY_DATE" valueDate="2019-05-30T11:50:00"/>
-      <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
-      <column name="PROGRESS" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+      <column name="PRIORITY" value="TASKPRIONORMAL"/>
+      <column name="PROGRESS" value="TASKPROG0"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="START_DATE" valueDate="2019-05-23T11:50:00"/>
-      <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+      <column name="STATUS" value="TASKSTATNEW"/>
       <column name="SUBJECT" value="Test"/>
       <column name="TASKID" value="81a4d411-f317-4080-84b6-55ed91d26d34"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
     <insert tableName="TASK">
       <column name="DESCRIPTION" value="Es sollen die effizienten Wertschöpfungsketten der Prozessdefinitionseinheiten im primären Schritt gebündelt und sekundär analysiert und verifiziert werden."/>
       <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="MATURITY_DATE" valueDate="2019-01-20T05:00:00"/>
-      <column name="PRIORITY" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+      <column name="PRIORITY" value="SALPROJPHASEMQL"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
       <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="START_DATE" valueDate="2019-01-20T03:00:00"/>
-      <column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
+      <column name="STATUS" value="TASKSTATINPROC"/>
       <column name="SUBJECT" value="effiziente Wertschöpfungsketten bündeln und anlaysieren"/>
       <column name="TASKID" value="e9cb198d-c420-4192-9c29-b23682457d8e"/>
-      <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+      <column name="TYPE" value="TASKTYPETASK"/>
     </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
index d89ba575404875202826a64b02160560f9c98984..a2b3720c23f67bdade4b0013d9a94015294881c9 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
@@ -4,7 +4,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="c564719a-18ef-4b9e-b130-dde8b2b518ad"/>
 
-            <column name="KEYID" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+            <column name="KEYID" value="iox"/>
             <column name="TITLE" value="Incoming"/>
             <column name="CONTAINER" value="ActivityDirection"/>
             <column name="SORTING" valueNumeric="0"/>
@@ -24,7 +24,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="bb386131-ee36-4835-b458-6751f137a941"/>
 
-            <column name="KEYID" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+            <column name="KEYID" value="inx"/>
             <column name="TITLE" value="Internal"/>
             <column name="CONTAINER" value="ActivityDirection"/>
             <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
index dcc9bdaa4c61075d9adf169dc70ad5df125bf780..d011a25db5fa43e88eae91fd4ba5313b2e0b3976 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
@@ -4,7 +4,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="d453609f-0229-4073-982a-9d6f753515b1"/>
 
-            <column name="KEYID" value="BSIC0rel-stat-iact-b56a-71432dd92e27"/>
+            <column name="KEYID" value="CONTACTSTATINACTIVE"/>
             <column name="TITLE" value="Inactive"/>
             <column name="CONTAINER" value="ContactStatus"/>
             <column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="5ce88207-6c9b-4f3e-9f97-d6ca219c6cb4"/>
 
-            <column name="KEYID" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+            <column name="KEYID" value="CONTACTSTATACTIVE"/>
             <column name="TITLE" value="Active"/>
             <column name="CONTAINER" value="ContactStatus"/>
             <column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="59a39f58-9ba1-4c2d-9d2b-43d43c6c8acd"/>
 
-            <column name="KEYID" value="BSIC0rel-stat-0673-840d-d3f6a4d4982b"/>
+            <column name="KEYID" value="CONTACTSTATREVIEW"/>
             <column name="TITLE" value="In review"/>
             <column name="CONTAINER" value="ContactStatus"/>
             <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
index f0832d87bce545c5419a4982d06c8ce302387d78..0289d9e49de37415290402ad90d445fdb01b8ad9 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="03a1e5b6-64d3-47fd-8085-08b9b95bab19"/>
-      <column name="KEYID" value="25faee74-d340-41f2-97f9-ed34c4f8ff42"/>
+      <column name="KEYID" value="CONTRACTPAYANNUAL"/>
       <column name="TITLE" value="Annually"/>
       <column name="CONTAINER" value="ContractPayment"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="539a4ed0-d3f1-4e2f-b3ff-339276045269"/>
-      <column name="KEYID" value="69d24528-ee0b-4539-a695-cf351bd64212"/>
+      <column name="KEYID" value="CONTRACTPAYSEMIANNUAL"/>
       <column name="TITLE" value="Semiannually"/>
       <column name="CONTAINER" value="ContractPayment"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="6bfb93b6-7940-4713-a053-16e17d875032"/>
-      <column name="KEYID" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+      <column name="KEYID" value="CONTRACTPAYQUARTER"/>
       <column name="TITLE" value="Quarterly"/>
       <column name="CONTAINER" value="ContractPayment"/>
       <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
index 40355683a58a28c6b4677c0b93a483eb3174cb3c..055532f0ccb6fd19fc505440e4767215bac607f3 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="c1c736a7-95af-417d-8993-3c6cbf065059"/>
-      <column name="KEYID" value="e12d37e9-3429-40b5-973b-c1569843ca46"/>
+      <column name="KEYID" value="CONTRACTSTATVALIDUNLI"/>
       <column name="TITLE" value="Valid, unlimited"/>
       <column name="CONTAINER" value="ContractStatus"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="41b15842-0d31-4023-b0b9-fa97f25bc444"/>
-      <column name="KEYID" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
+      <column name="KEYID" value="CONTRACTSTATVALIDLI"/>
       <column name="TITLE" value="Valid, limited"/>
       <column name="CONTAINER" value="ContractStatus"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="1bebbb3c-f412-4031-b533-f1e38c86eb17"/>
-      <column name="KEYID" value="4c63c82d-0276-4c12-9937-13fd361ad786"/>
+      <column name="KEYID" value="CONTRACTSTATSIGN"/>
       <column name="TITLE" value="Not signed yet"/>
       <column name="CONTAINER" value="ContractStatus"/>
       <column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="03f62e1e-0b9a-4e7e-a895-2d10bf57712f"/>
-      <column name="KEYID" value="bd809b1c-f6ef-42c0-8659-4800393f7280"/>
+      <column name="KEYID" value="CONTRACTSTATNONE"/>
       <column name="TITLE" value="None, individual count"/>
       <column name="CONTAINER" value="ContractStatus"/>
       <column name="SORTING" valueNumeric="3"/>
@@ -39,7 +39,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="4959d607-b218-4e45-9c4b-b28f3ae6b0ff"/>
-      <column name="KEYID" value="56ad22dd-4bca-4e5a-b1a4-1db2376d7ed9"/>
+      <column name="KEYID" value="CONTRACTSTATRESIGN"/>
       <column name="TITLE" value="Resigned"/>
       <column name="CONTAINER" value="ContractStatus"/>
       <column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
index d6673489e474bf021d22b3e1901f3a627668cb2a..bcce08c9a0bb726e0fe525778459f3254909f76b 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="2c440f87-292d-4ec3-8eb2-74821e251365"/>
-      <column name="KEYID" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
+      <column name="KEYID" value="CONTRACTTYPEFRAME"/>
       <column name="TITLE" value="Framework contract"/>
       <column name="CONTAINER" value="ContractType"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="8dc775f2-05e1-47b5-b372-54c261f1f9d8"/>
-      <column name="KEYID" value="5117d48e-d6cb-4402-9f87-590c68625cb7"/>
+      <column name="KEYID" value="CONTRACTTYPESERVICE"/>
       <column name="TITLE" value="Service contract"/>
       <column name="CONTAINER" value="ContractType"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="9c2a1b76-b9c4-486d-a1d2-d12970f20bd0"/>
-      <column name="KEYID" value="ee4c5e6e-b802-4c1c-8aed-a031a2a8126f"/>
+      <column name="KEYID" value="CONTRACTTYPEMAIN"/>
       <column name="TITLE" value="Maintenance contract"/>
       <column name="CONTAINER" value="ContractType"/>
       <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
index 5714d7f2722b9bcf4e3d69db73962ff271e0ff3d..de734a7782ebb83362dc501057a412cfd11a68d8 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="87bd1a28-d364-47ee-9a01-33714f6998ba"/>
-      <column name="KEYID" value="5134153d-2e18-452f-ab35-7a52f1aee7d1"/>
+      <column name="KEYID" value="OFFERSTATCHECK"/>
       <column name="TITLE" value="Checked"/>
       <column name="CONTAINER" value="OfferStatus"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="9912dcc6-edf1-4a68-b605-925a31b7f9a4"/>
-      <column name="KEYID" value="e5d6b5a4-7576-440f-8332-bc40147c0335"/>
+      <column name="KEYID" value="OFFERSTATSENT"/>
       <column name="TITLE" value="Sent"/>
       <column name="CONTAINER" value="OfferStatus"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="d3bd6272-d1d9-4a5c-9f5c-772f0ee2551e"/>
-      <column name="KEYID" value="b3538091-4714-4ed3-93fe-19a0862dd7a3"/>
+      <column name="KEYID" value="OFFERSTATWON"/>
       <column name="TITLE" value="Won"/>
       <column name="CONTAINER" value="OfferStatus"/>
       <column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="0cba2fe7-97c3-4eb4-9999-1fc4e8e93a7a"/>
-      <column name="KEYID" value="a5682630-01ae-4769-8f03-47dc1db44da4"/>
+      <column name="KEYID" value="OFFERSTATLOST"/>
       <column name="TITLE" value="Lost"/>
       <column name="CONTAINER" value="OfferStatus"/>
       <column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
index 57971e3f4877fcd8c95c6ab255ca546b0baf3b14..ec55179d084a6ea408cd4a501db60165faf696bb 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="b25309f8-d923-4b9e-9689-b14c3463c9e0"/>
-      <column name="KEYID" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+      <column name="KEYID" value="ORGCUTOMER"/>
       <column name="TITLE" value="Customer"/>
       <column name="CONTAINER" value="OrganisationType"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="17ef91a4-5af5-4ae1-86cd-49568a88a2a2"/>
-      <column name="KEYID" value="6fccd085-1200-4d98-aacb-e5ea8c9dcb2b"/>
+      <column name="KEYID" value="ORGPROSPECT"/>
       <column name="TITLE" value="Prospect"/>
       <column name="CONTAINER" value="OrganisationType"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="3ba58828-f27e-4342-b3e5-78d562756322"/>
-      <column name="KEYID" value="4dd007ac-d547-49db-b431-681f867f054e"/>
+      <column name="KEYID" value="ORGSUP"/>
       <column name="TITLE" value="Supplier"/>
       <column name="CONTAINER" value="OrganisationType"/>
       <column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="0e3b1e24-af88-4058-bd7c-23aba5d36e06"/>
-      <column name="KEYID" value="cf1d1fd8-4cee-481c-9da0-6d4e82826fe0"/>
+      <column name="KEYID" value="ORGTYPEOTHER"/>
       <column name="TITLE" value="${ORGTYPE_OTHER}"/>
       <column name="CONTAINER" value="OrganisationType"/>
       <column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
index 87e63f3f38597041b6b8b740aa8ea169d26e49b9..abfd573f74f48f87d78c66004ef9137c0a9abe79 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="b6079a56-594f-463d-8b85-67db622cf522"/>
-      <column name="KEYID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+      <column name="KEYID" value="PRODUCTGROUP1"/>
       <column name="TITLE" value="Commodity group 1"/>
       <column name="CONTAINER" value="ProductGroupcode"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="7c666a94-ef9a-42e9-83c8-de3a97123bce"/>
-      <column name="KEYID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+      <column name="KEYID" value="PRODUCTGROUP2"/>
       <column name="TITLE" value="Commodity group 2"/>
       <column name="CONTAINER" value="ProductGroupcode"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="72ffaa0b-9982-4614-93be-31ae76f91d19"/>
-      <column name="KEYID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+      <column name="KEYID" value="PRODUCTGROUP3"/>
       <column name="TITLE" value="Commodity group 3"/>
       <column name="CONTAINER" value="ProductGroupcode"/>
       <column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="688b91d3-3c5b-4704-9220-e11b4532c05c"/>
-      <column name="KEYID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
+      <column name="KEYID" value="PRODUCTDISCOUNT"/>
       <column name="TITLE" value="Discount"/>
       <column name="CONTAINER" value="ProductGroupcode"/>
       <column name="SORTING" valueNumeric="3"/>
@@ -39,7 +39,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="5f5a0927-5827-4948-bfe7-32e83d8cf3aa"/>
-      <column name="KEYID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+      <column name="KEYID" value="PRODUCTSPARE"/>
       <column name="TITLE" value="Spare parts"/>
       <column name="CONTAINER" value="ProductGroupcode"/>
       <column name="SORTING" valueNumeric="4"/>
@@ -48,7 +48,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="611cd178-c0fc-4d2a-a9ba-af747d571755"/>
-      <column name="KEYID" value="5b8b8e5f-2df8-4119-aae6-e224fb360d4e"/>
+      <column name="KEYID" value="PRODUCTSERVICE"/>
       <column name="TITLE" value="Service"/>
       <column name="CONTAINER" value="ProductGroupcode"/>
       <column name="SORTING" valueNumeric="5"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
index df02982b63eca4bf9d53f84311a05df810f7fd65..06b84f44d0c5c600fc36e740cb072f1fe61a4594 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="d0f5c21d-14ff-414b-9d51-2a2c5f49b50d"/>
-      <column name="KEYID" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+      <column name="KEYID" value="PRICELISTDEFAULT"/>
       <column name="TITLE" value="${PRICELIST_DEFAULT}"/>
       <column name="CONTAINER" value="ProductPricelist"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="a581bf7c-1cb7-4821-96f5-6eed9a0de58c"/>
-      <column name="KEYID" value="40564efc-ce12-456c-a461-3bb3c9c269be"/>
+      <column name="KEYID" value="PRICELISTKEY"/>
       <column name="TITLE" value="Key account"/>
       <column name="CONTAINER" value="ProductPricelist"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="b47478a1-1fac-4e74-921f-b47c146e034d"/>
-      <column name="KEYID" value="58ec6146-087d-4664-8887-b44a9f46a3e1"/>
+      <column name="KEYID" value="PRICELISTSPECIAL"/>
       <column name="TITLE" value="Special price list1"/>
       <column name="CONTAINER" value="ProductPricelist"/>
       <column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="932057b5-a2e1-4f0b-83be-28692d9e9e44"/>
-      <column name="KEYID" value="8dc9e27e-4fc3-43e2-b5cb-3b553df64990"/>
+      <column name="KEYID" value="PRICELISTSERVICE"/>
       <column name="TITLE" value="${PRICELIST_SERVICE}"/>
       <column name="CONTAINER" value="ProductPricelist"/>
       <column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
index 95225d336c6991ca6ce9443c042d8bb862769f83..d4994e0f0490ff34c2e1227ef5f506a3308ab947 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="392ee66d-f777-43ab-b8d5-344fd75e5454"/>
-      <column name="KEYID" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+      <column name="KEYID" value="QUANTITYPIECES"/>
       <column name="TITLE" value="Pieces"/>
       <column name="CONTAINER" value="QuantityUnit"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="a58987b7-a5f9-4f4a-8c1f-2553ff7bad60"/>
-      <column name="KEYID" value="fc4cee8f-b3ad-4b1e-ba87-df4a19a47e54"/>
+      <column name="KEYID" value="QUANTITYKGS"/>
       <column name="TITLE" value="Kgs"/>
       <column name="CONTAINER" value="QuantityUnit"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="74531aeb-7e01-4595-a5df-0ba3cad09071"/>
-      <column name="KEYID" value="f26f799d-9fcc-4b9e-a52f-78c1030bc9f1"/>
+      <column name="KEYID" value="QUANTITYLITER"/>
       <column name="TITLE" value="Liter"/>
       <column name="CONTAINER" value="QuantityUnit"/>
       <column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="a47f5661-6b71-43a5-a14f-42aff04fe8e4"/>
-      <column name="KEYID" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+      <column name="KEYID" value="QUANTITYHOUR"/>
       <column name="TITLE" value="Hours"/>
       <column name="CONTAINER" value="QuantityUnit"/>
       <column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
index 53e8f7814b1fbc1580d0a31d8a2c06fbd72fa995..aa4b1cefa0a2f842b39aa9b0792e80bd09d1c69a 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="8d9b0416-fee2-44d0-9334-1864ff78a824"/>
-      <column name="KEYID" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+      <column name="KEYID" value="SALORDERSTATCHECK"/>
       <column name="TITLE" value="Checked"/>
       <column name="CONTAINER" value="SalesorderState"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="6f5c01ad-f9d9-43b9-834b-139974a75115"/>
-      <column name="KEYID" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+      <column name="KEYID" value="SALORDERSTATSENT"/>
       <column name="TITLE" value="Sent"/>
       <column name="CONTAINER" value="SalesorderState"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="8bac5a6d-7810-469b-8fdb-0d3a0bf8e122"/>
-      <column name="KEYID" value="fc0e9ec2-194f-426b-a304-de8cce85ab7c"/>
+      <column name="KEYID" value="SALORDERSTATWON"/>
       <column name="TITLE" value="Won"/>
       <column name="CONTAINER" value="SalesorderState"/>
       <column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="f54b3c0b-bd80-4bc5-8a5c-55be2fd57017"/>
-      <column name="KEYID" value="5527bf9b-2cf8-49ea-bd1e-91a36f4f78e1"/>
+      <column name="KEYID" value="SALORDERSTATLOST"/>
       <column name="TITLE" value="Lost"/>
       <column name="CONTAINER" value="SalesorderState"/>
       <column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
index 3ed1316c978dd5917f4823d27f18d21757c8aa8f..a4a5b3823abf2e186feef69fff075d112d232fb5 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="9c421b0b-8529-4e07-9463-28d59fd027b6"/>
-      <column name="KEYID" value="1d100fff-24ba-43fd-931d-cae24e10b41f"/>
+      <column name="KEYID" value="MEMROLEPROJMANAG"/>
       <column name="TITLE" value="Project manager"/>
       <column name="CONTAINER" value="MemberRole"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="f78f229f-f809-4bd2-aca8-24e2f82fa220"/>
-      <column name="KEYID" value="8fb09614-5dc4-4d68-ac66-bf7bbebcb3ad"/>
+      <column name="KEYID" value="MEMROLEPROJASSIST"/>
       <column name="TITLE" value="Project assistant"/>
       <column name="CONTAINER" value="MemberRole"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="8cb1b843-713a-4193-aa50-9f5ca06820f8"/>
-      <column name="KEYID" value="28b9aaa2-325c-498f-8397-e20cffbfc215"/>
+      <column name="KEYID" value="MEMROLEADVISE"/>
       <column name="TITLE" value="Adviser"/>
       <column name="CONTAINER" value="MemberRole"/>
       <column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="039fd6ae-b4ad-431e-86bf-59ed2f4df0a9"/>
-      <column name="KEYID" value="a8460c8e-24bd-4410-9704-e4865fdd57bf"/>
+      <column name="KEYID" value="MEMROLEEXSALEMANAG"/>
       <column name="TITLE" value="External sales manager"/>
       <column name="CONTAINER" value="MemberRole"/>
       <column name="SORTING" valueNumeric="4"/>
@@ -39,7 +39,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="b72294cd-3a46-4f71-ab93-72824f63f7f4"/>
-      <column name="KEYID" value="67baabb5-abd0-43bd-aea1-cf7e606814a6"/>
+      <column name="KEYID" value="MEMROLINSALEMANAG"/>
       <column name="TITLE" value="Internal sales manager"/>
       <column name="CONTAINER" value="MemberRole"/>
       <column name="SORTING" valueNumeric="5"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
index d87bf321316e24712b24b2759910783b10b66796..a7bd7dbea673b0ce991222c7571689df606d9c66 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="c899faa1-6b89-4616-8640-cd2c8011d123"/>
-      <column name="KEYID" value="34cbd70d-f163-416b-9ec7-68797ba0dd55"/>
+      <column name="KEYID" value="SALPROJPOLABO"/>
       <column name="TITLE" value="Abomodel"/>
       <column name="CONTAINER" value="SalesprojectPricePolitics"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="4d97f540-79cc-41d7-8bf3-e45b3dfd3683"/>
-      <column name="KEYID" value="85cf976b-7356-4513-b7fe-a009e629248c"/>
+      <column name="KEYID" value="SALPROJPOLHIGH"/>
       <column name="TITLE" value="High price strategy"/>
       <column name="CONTAINER" value="SalesprojectPricePolitics"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="cbaeb1dc-493c-4811-b8bc-6654559c3ca6"/>
-      <column name="KEYID" value="572cf973-ddf5-4081-af30-af6e10986a81"/>
+      <column name="KEYID" value="SALPROJPOLLOW"/>
       <column name="TITLE" value="Low price strategy"/>
       <column name="CONTAINER" value="SalesprojectPricePolitics"/>
       <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
index a7a8e441bacbe747ab588f5ef7e726ea775fc327..7e65019260da433ee31ce735eb18fd1d113415e0 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="25ab05e0-51a9-4f6b-ae62-83d0583aef3b">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="ab44bd2c-dffa-4731-8a24-fad31f069c46"/>
-      <column name="KEYID" value="c5bfa55e-4e9b-4d57-88e1-e06dedb71764"/>
+      <column name="KEYID" value="SALPROJPROB0"/>
       <column name="TITLE" value="0 %"/>
       <column name="CONTAINER" value="SalesprojectProbability"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="e59169d3-c0d9-4718-b8b6-e315857948a0"/>
-      <column name="KEYID" value="b981a107-7e20-42a6-baf4-3fc09a939cd7"/>
+      <column name="KEYID" value="SALPROJPROB25"/>
       <column name="TITLE" value="25 %"/>
       <column name="CONTAINER" value="SalesprojectProbability"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="415f1cf0-8c5b-4b6e-9900-0d0d6d72381c"/>
-      <column name="KEYID" value="8ff82a56-af38-4f19-9dd7-21d8276bc8e4"/>
+      <column name="KEYID" value="SALPROJPROB50"/>
       <column name="TITLE" value="50 %"/>
       <column name="CONTAINER" value="SalesprojectProbability"/>
       <column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="6182cc48-df2b-4ba9-893a-bcedfd0e1e4b"/>
-      <column name="KEYID" value="67576cf1-29b3-4832-b8fe-9c7913e34ff4"/>
+      <column name="KEYID" value="SALPROJPROB75"/>
       <column name="TITLE" value="75 %"/>
       <column name="CONTAINER" value="SalesprojectProbability"/>
       <column name="SORTING" valueNumeric="3"/>
@@ -39,7 +39,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="f5b601a5-451b-4ab6-9167-b95077e90c62"/>
-      <column name="KEYID" value="ea30b4c3-1767-458a-98a4-2553c25fc5f9"/>
+      <column name="KEYID" value="SALPROJPROB100"/>
       <column name="TITLE" value="100 %"/>
       <column name="CONTAINER" value="SalesprojectProbability"/>
       <column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
index 7f6b027ab266e2d838215a95688b6e38e74c15e1..31af17f5b3aa430859cec7790a22c50b211e4b1c 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="f83c96e3-47be-4ca1-bc47-4a3a2fce7fca"/>
-      <column name="KEYID" value="67849bdb-f424-4c91-ad7d-48aa0aa9ee40"/>
+      <column name="KEYID" value="SALPROJSCOWNWEB"/>
       <column name="TITLE" value="Own website"/>
       <column name="CONTAINER" value="SalesprojectSource"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="1a197ade-0c61-4643-8287-159719d519b4"/>
-      <column name="KEYID" value="70f8bfe6-3b0c-4ac9-96ed-dd20684f391d"/>
+      <column name="KEYID" value="SALPROJSCRECOM"/>
       <column name="TITLE" value="Customer recommendation"/>
       <column name="CONTAINER" value="SalesprojectSource"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="f552b84a-b8e7-472a-9ce5-d64e7f14e74b"/>
-      <column name="KEYID" value="fb73eece-bde3-4817-9c9c-bca6a398586a"/>
+      <column name="KEYID" value="SALPROJSCPURCHASE"/>
       <column name="TITLE" value="Address purchase"/>
       <column name="CONTAINER" value="SalesprojectSource"/>
       <column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="7ea06933-94c9-4a05-ba7d-4266df9e4ab2"/>
-      <column name="KEYID" value="21becd8a-b0d4-4e4d-873d-2743e4e4dda4"/>
+      <column name="KEYID" value="SALPROJSCFAIR"/>
       <column name="TITLE" value="Fair"/>
       <column name="CONTAINER" value="SalesprojectSource"/>
       <column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
index 2affd4fe66bcabc30dd28a204f0f175331887b1c..10692436f588338c207424d48718de4654fa3377 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="7963d4ed-f7a7-4a9f-aa86-fea42167145f"/>
-      <column name="KEYID" value="a30e5d5c-88e2-4674-98d3-8a88622a62a8"/>
+      <column name="KEYID" value="SALPROJSTPRICEPOL"/>
       <column name="TITLE" value="Strength 1"/>
       <column name="CONTAINER" value="SalesprojectStrength"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="2cacfe09-7dcd-454a-b263-46aee796bc21"/>
-      <column name="KEYID" value="b5def5d7-a843-4e5e-b56e-e18e26fd0bc1"/>
+      <column name="KEYID" value="SALPROJSTPERSAPP"/>
       <column name="TITLE" value="Strength 2"/>
       <column name="CONTAINER" value="SalesprojectStrength"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="919cffee-5943-4105-a5bc-a14bd33b9f67"/>
-      <column name="KEYID" value="2eda4875-53e6-4359-b367-464d006cf9b3"/>
+      <column name="KEYID" value="SALPROJSTPROD"/>
       <column name="TITLE" value="Strength 3"/>
       <column name="CONTAINER" value="SalesprojectStrength"/>
       <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
index 9ff5daf237f602b4bf8ec03c453eb304766850ce..3fb2031cb3a14c59cb2b5b9047612376a960a17e 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="fd012937-8fe7-418e-8e55-80b3b5db331c"/>
-      <column name="KEYID" value="c85b5e9a-d27f-4ef4-b13c-3ab0a1fcc5dd"/>
+      <column name="KEYID" value="SALPROJWEAKKNOWHOW"/>
       <column name="TITLE" value="Weakness 1"/>
       <column name="CONTAINER" value="SalesprojectWeakness"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="b62e1a05-af41-4d2d-978c-6c2950b202d8"/>
-      <column name="KEYID" value="9e59dec2-3c72-4532-a9a9-8c979b610a49"/>
+      <column name="KEYID" value="SALPROJWEAKMARKET"/>
       <column name="TITLE" value="Weakness 2"/>
       <column name="CONTAINER" value="SalesprojectWeakness"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="294db00d-6237-4db8-b7b6-41c5dc79a1e4"/>
-      <column name="KEYID" value="90a50e8e-afc0-4e96-9fcd-02f3032307d9"/>
+      <column name="KEYID" value="SALPROJWEAKLIQUIDITY"/>
       <column name="TITLE" value="Weakness 3"/>
       <column name="CONTAINER" value="SalesprojectWeakness"/>
       <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
index fbfd60a74586914e3497d2959cb79b10b1224aa7..f52a3aa8ef8af7abcf433465f839debff64e7009 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="84574d45-8227-42dd-aea0-de2203517a2c"/>
-      <column name="KEYID" value="a9d71e3f-284a-4240-8cb4-77451105025a"/>
+      <column name="KEYID" value="SALPROJWLPROJVOL"/>
       <column name="TITLE" value="Project_volume"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="018a3bb8-5536-461f-8400-25e91550e51f"/>
-      <column name="KEYID" value="437ff0eb-4472-44e1-b019-e50404c4a253"/>
+      <column name="KEYID" value="SALPROJWLPROJDUR"/>
       <column name="TITLE" value="Project_duration"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="b4562d6b-9ff1-4884-8694-3339e760ddf1"/>
-      <column name="KEYID" value="8955b130-63a3-43da-a34b-4a97e205434a"/>
+      <column name="KEYID" value="SALPROJWLPROJREF"/>
       <column name="TITLE" value="Project_reference"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="cda9c073-25e4-4a90-b5b7-fe6514355d31"/>
-      <column name="KEYID" value="5fee1f8b-19ee-4bbd-845f-da1b9504cdf2"/>
+      <column name="KEYID" value="SALPROJWLPROJTECH"/>
       <column name="TITLE" value="Product_technic"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="3"/>
@@ -39,7 +39,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="e84b0059-2140-4911-bb3c-73e6f3875022"/>
-      <column name="KEYID" value="874a18d8-5f06-4d07-aa8c-7c250f5df0b8"/>
+      <column name="KEYID" value="SALPROJWLPROJFLEX"/>
       <column name="TITLE" value="Product_flexibility"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="4"/>
@@ -48,7 +48,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="b9216c02-7abd-43aa-a02e-89fa7d428e0c"/>
-      <column name="KEYID" value="b45bd85c-b945-4740-9971-934edb1ebd26"/>
+      <column name="KEYID" value="SALPROJWLPROJGUI"/>
       <column name="TITLE" value="Product_GUI"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="5"/>
@@ -57,7 +57,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="6efbc578-4b80-463f-9c4f-16db99a8a9d6"/>
-      <column name="KEYID" value="bf5bc111-f2eb-4daa-945d-028cc39aa0b3"/>
+      <column name="KEYID" value="SALPROJWLPROJFUNC"/>
       <column name="TITLE" value="Product_functionality"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="6"/>
@@ -66,7 +66,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="ad252ede-1e46-46ad-8ce1-6788b9103c92"/>
-      <column name="KEYID" value="c0455c55-ab02-4c54-8f02-73a2604d25f4"/>
+      <column name="KEYID" value="SALPROJWLPROJINDKOWHOW"/>
       <column name="TITLE" value="Product_industry knowhow"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="7"/>
@@ -75,7 +75,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="9fe99387-ea27-4f13-923c-f631486f7bcb"/>
-      <column name="KEYID" value="e7683eaa-befb-44be-9fb9-8b16b805a061"/>
+      <column name="KEYID" value="SALPROJWLPROJMOBIL"/>
       <column name="TITLE" value="Product_mobile use"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="8"/>
@@ -84,7 +84,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="d1987d3a-fc7f-4882-8292-36e9699f6368"/>
-      <column name="KEYID" value="2a7f092a-94c9-46ff-8818-b2835c3ff5a1"/>
+      <column name="KEYID" value="SALPROJWLPROJCOMPANYSIZE"/>
       <column name="TITLE" value="Company_size"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="9"/>
@@ -93,7 +93,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="d62db634-94ca-49e5-970a-67696d013ed6"/>
-      <column name="KEYID" value="d49e1af6-b7c0-49c1-b2cc-5d4842122c10"/>
+      <column name="KEYID" value="SALPROJWLPROJCOMPANYINT"/>
       <column name="TITLE" value="Company_internationality"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="10"/>
@@ -102,7 +102,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="148176ea-14ed-4a74-8290-e5dffcd71eaa"/>
-      <column name="KEYID" value="2effb3eb-715e-4aea-9f22-1c93c89d785c"/>
+      <column name="KEYID" value="SALPROJWLPROJCOMPANYINDKNOW"/>
       <column name="TITLE" value="Company_industry knowhow"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="11"/>
@@ -111,7 +111,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="d5827700-2ef1-43a1-a7f1-46a4de1ec6ec"/>
-      <column name="KEYID" value="ffe690be-b345-4f25-b513-398b555600ba"/>
+      <column name="KEYID" value="SALPROJWLPROJOTHERCUSTOM"/>
       <column name="TITLE" value="Other_existing Customer"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="12"/>
@@ -120,7 +120,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="1a0ae403-90c0-424c-a13a-8b1c4cfd314d"/>
-      <column name="KEYID" value="562669db-cfb8-4e02-b69b-9fa64ab4b8f5"/>
+      <column name="KEYID" value="SALPROJWLPROJUNKNOWN"/>
       <column name="TITLE" value="Other_unknown"/>
       <column name="CONTAINER" value="SalesprojectWonLost"/>
       <column name="SORTING" valueNumeric="13"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
index d66784db8352e5c9fb2ab02cffea0a698619de48..26d2b95a6c2a647fd1b80c4ff42dbf7849be4058 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="2613a00e-7c2d-4513-bb37-c375e3e26959"/>
-      <column name="KEYID" value="7885caba-8d58-4fe5-9774-1872fbad1dbe"/>
+      <column name="KEYID" value="STWAREWAREHOUSE1"/>
       <column name="TITLE" value="Warehouse 1"/>
       <column name="CONTAINER" value="StockWarehouse"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="9f20dcb7-6068-43d5-8aac-a29dcbba8fb2"/>
-      <column name="KEYID" value="6a2443cb-2d5c-42db-862c-a4e1a0bbdd72"/>
+      <column name="KEYID" value="STWAREWAREHOUSE2"/>
       <column name="TITLE" value="Warehouse 2"/>
       <column name="CONTAINER" value="StockWarehouse"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="4224ea44-ab84-4215-a1c3-6750ab07af03"/>
-      <column name="KEYID" value="dd3d51bb-ef7c-49e4-b2d4-b58151b38a83"/>
+      <column name="KEYID" value="STWAREWAREHOUSE3"/>
       <column name="TITLE" value="Warehouse 3"/>
       <column name="CONTAINER" value="StockWarehouse"/>
       <column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
index 1dfeec8913fa1e9d97b5e8a91c544a703da33752..238f95db34b774734c7a0a56ca7fc1cc124a0d43 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
@@ -3,7 +3,7 @@
   <changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="6ab0cc9e-021c-42ef-abfd-f9f7a58aa76c"/>
-      <column name="KEYID" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+      <column name="KEYID" value="TASKSTATNEW"/>
       <column name="TITLE" value="new"/>
       <column name="CONTAINER" value="TaskStatus"/>
       <column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="6a479d71-2c05-4496-9c6c-c9aeef929bcf"/>
-      <column name="KEYID" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
+      <column name="KEYID" value="TASKSTATINPROC"/>
       <column name="TITLE" value="in process"/>
       <column name="CONTAINER" value="TaskStatus"/>
       <column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="34701d4d-7435-43bc-8b2f-ad2a70065a75"/>
-      <column name="KEYID" value="00595a73-22e2-4c3b-a21c-06bdec262d20"/>
+      <column name="KEYID" value="TASKSTATWAIT"/>
       <column name="TITLE" value="waiting"/>
       <column name="CONTAINER" value="TaskStatus"/>
       <column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
     </insert>
     <insert tableName="AB_KEYWORD_ENTRY">
       <column name="AB_KEYWORD_ENTRYID" value="7311d8c5-edf2-492e-be4d-6f0469334611"/>
-      <column name="KEYID" value="7c9d6681-6cf5-4395-b276-3941b6fd0d57"/>
+      <column name="KEYID" value="TASKSTATEND"/>
       <column name="TITLE" value="ended"/>
       <column name="CONTAINER" value="TaskStatus"/>
       <column name="SORTING" valueNumeric="3"/>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index a9fc43c44efda9be1f85d38fc9e20cd6f0de117c..24a7eb598b9684ef1dc1e113e5627777d99705a2 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -24,41 +24,38 @@ $KeywordRegistry.contractStatus = function(){return "ContractStatus";};
 $KeywordRegistry.contractType = function(){return "ContractType";};
 
 $KeywordRegistry.activityDirection = function(){return "ActivityDirection";};
-$KeywordRegistry.activityDirection$incoming = function(){return "BSICacti-0dir-0inc-b8a3-f43e2c73df65";};
-$KeywordRegistry.activityDirection$outgoing = function(){return "BSICacti-0dir-outg-8337-909b0f93143a";};
+$KeywordRegistry.activityDirection$incoming = function(){return "iox";};
+$KeywordRegistry.activityDirection$outgoing = function(){return "oox";};
 
 $KeywordRegistry.contactStatus = function(){return "ContactStatus";};
-$KeywordRegistry.contactStatus$active = function(){return "BSIC0rel-stat-actv-ae03-b6b04430e90b";};
+$KeywordRegistry.contactStatus$active = function(){return "CONTACTSTATACTIVE";};
 
 $KeywordRegistry.currency = function(){return "Currency";};
 $KeywordRegistry.productGroupcode = function(){return "ProductGroupcode";};
 $KeywordRegistry.offerStatus = function(){return "OfferStatus";};
 
 $KeywordRegistry.organisationType = function(){return "OrganisationType";};
-$KeywordRegistry.organisationType$manufacturer = function(){return "dbb3f596-bd2b-4e08-baef-ba28d7b752e9";};
-$KeywordRegistry.organisationType$competitor = function(){return "eccaf9de-5c7b-4b6e-ab77-0b33d8486f29";};
+$KeywordRegistry.organisationType$manufacturer = function(){return "ORGMANUF";};
+$KeywordRegistry.organisationType$competitor = function(){return "ORGCOMP";};
 
 
 $KeywordRegistry.personGender = function(){return "PersonGender";};
 $KeywordRegistry.taskStatus = function(){return "TaskStatus";};
-$KeywordRegistry.taskStatus$new = function(){return "NEW                                 ";};
-$KeywordRegistry.taskStatus$inProcess = function(){return "IN-PROGRESS                         ";};
-$KeywordRegistry.taskStatus$waiting = function(){return "WAITING                             ";};
-$KeywordRegistry.taskStatus$ended = function(){return "ENDED                               ";};
+$KeywordRegistry.taskStatus$new = function(){return "TASKSTATNEW";};
+$KeywordRegistry.taskStatus$inProcess = function(){return "TASKSTATINPROC";};
+$KeywordRegistry.taskStatus$waiting = function(){return "TASKSTATWAIT";};
+$KeywordRegistry.taskStatus$ended = function(){return "TASKSTATEND";};
 
 $KeywordRegistry.taskType = function(){return "TaskType";};
-$KeywordRegistry.taskType$task = function(){return "4dee8727-8299-422e-ae41-6cdf9de2dfd7";};
-$KeywordRegistry.taskType$ticket = function(){return "f3da0edd-49d9-4061-98c1-8fda8631be7e";};
-$KeywordRegistry.taskType$supportTicket = function(){return "7bf77721-470f-4cdf-a6af-452bf05a405b";};
-
-$KeywordRegistry.ticketType = function(){return "TicketType";};
-$KeywordRegistry.ticketType$supportTicket = function(){return "SUPPORTTICKET                       ";};
+$KeywordRegistry.taskType$Task = function(){return "TASKTYPETASK";};
+$KeywordRegistry.taskType$bugTicket = function(){return "TASKTYPECOMPLAINT";};
+$KeywordRegistry.taskType$supportTicket = function(){return "TASKTYPESUPPORT";};
 
 $KeywordRegistry.productPricelist = function(){return "ProductPricelist";};
 $KeywordRegistry.productPricelist$standardList = function(){return "02553fc7-4611-4914-8ff5-0b7c4e7531c9";};
 
 $KeywordRegistry.quantityUnit = function(){return "QuantityUnit";};
-$KeywordRegistry.quantityUnit$pieces = function(){return "548ffe3b-466b-4c8f-97d6-e3ad23e33344";};
+$KeywordRegistry.quantityUnit$pieces = function(){return "QUANTITYPIECES";};
 $KeywordRegistry.MemberRole = function(){return "MemberRole";};
 $KeywordRegistry.salesprojectSource = function(){return "SalesprojectSource";};
 $KeywordRegistry.salesorderState = function(){return "SalesorderState";};
@@ -68,8 +65,8 @@ $KeywordRegistry.salesprojectProbability = function(){return "SalesprojectProbab
 $KeywordRegistry.activityCategory = function(){return "ActivityCategory";};
 
 $KeywordRegistry.addressType = function(){return "AddressType";};
-$KeywordRegistry.addressType$private = function(){return "a7466ee5-3fba-40bf-93cf-aa20a2b32ad6";};
-$KeywordRegistry.addressType$office = function(){return "b3292432-bca2-4674-8b06-b78b2b06351e";};
+$KeywordRegistry.addressType$private = function(){return "HOMEADDR";};
+$KeywordRegistry.addressType$office = function(){return "OFFICEADDR";};
 
 $KeywordRegistry.offerProbability = function(){return "OfferProbability";};
 $KeywordRegistry.communicationMedium = function(){return "CommunicationMedium";};
@@ -79,10 +76,10 @@ $KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght"
 $KeywordRegistry.salesprojectState = function(){return "SalesprojectState";};
 $KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase";};
 $KeywordRegistry.taskPriority = function(){return "TaskPriority";};
-$KeywordRegistry.taskPriority$none = function(){return "f587f53a-72cc-4b76-9e39-276a26cab2e0";};
-$KeywordRegistry.taskPriority$low = function(){return "09072b59-d12f-469b-acbd-18a28232ff70";};
-$KeywordRegistry.taskPriority$medium = function(){return "4467b33c-3a68-4c8b-ba4a-1eb666a6c774";};
-$KeywordRegistry.taskPriority$high = function(){return "1e42f183-fb97-415f-9917-b43ca159fde4";};
+$KeywordRegistry.taskPriority$none = function(){return "TASKPRIONONE";};
+$KeywordRegistry.taskPriority$low = function(){return "TASKPRIOLOW";};
+$KeywordRegistry.taskPriority$medium = function(){return "TASKPRIOMEDIUM";};
+$KeywordRegistry.taskPriority$high = function(){return "TASKPRIOHIGH";};
 $KeywordRegistry.taskProgress = function(){return "TaskProgress";};
 $KeywordRegistry.taskProgress$0 = function(){return "ec92271b-eac2-4ec2-be24-ab4abde7e939";};
 $KeywordRegistry.CompetitionState = function(){return "CompetitionState";};
@@ -93,9 +90,9 @@ $KeywordRegistry.contactDepartment = function(){return "ContactDepartment";};
 $KeywordRegistry.contactPosition = function(){return "ContactPosition";};
 $KeywordRegistry.contactContactrole = function(){return "ContactContactrole";};
 $KeywordRegistry.campaignState = function(){return "CampaignManagementStates";};
-$KeywordRegistry.campaignState$planning = function(){return "e04c9c59-0590-463c-a10e-e25c583e9cf2";};
+$KeywordRegistry.campaignState$planning = function(){return "PLANNING";};
 $KeywordRegistry.campaignStepState = function(){return "CampaignManagementStepStates";};
-$KeywordRegistry.campaignStepState$open = function(){return "bbf69673-2ec6-46f8-b231-684a31be9fbd";};
+$KeywordRegistry.campaignStepState$open = function(){return "OPEN";};
 $KeywordRegistry.campaignStepCostCategory = function(){return "CampaignManagementCostCategory";};
 $KeywordRegistry.documentTemplateType = function(){return "DocumentTemplateType";};
 $KeywordRegistry.documentTemplateType$letter = function(){return "LET                                 ";};
@@ -105,7 +102,7 @@ $KeywordRegistry.documentTemplateTypeCategory = function(){return "DocumentTempl
 $KeywordRegistry.documentTemplateTypeCategory$single = function(){return "1                                   ";};
 $KeywordRegistry.documentTemplateTypeCategory$serial = function(){return "2                                   ";};
 $KeywordRegistry.classificationType = function(){return "ClassificationType";};
-$KeywordRegistry.classificationType$salesproject = function(){return "968eafa3-3e76-4afa-8999-878e51cc3bab";};
+$KeywordRegistry.classificationType$salesproject = function(){return "SALESPROJ";};
 $KeywordRegistry.personGender = function(){return "PersonGender";};
 $KeywordRegistry.personGender$other = function(){return "o";};
 $KeywordRegistry.permissionCondType = function(){return "PermissionCondType";};
@@ -116,4 +113,4 @@ $KeywordRegistry.communicationMediumCampaign = function(){return "CommunicationM
 $KeywordRegistry.bulkMailSentStatus = function(){return "BulkMailSentStatus";};
 $KeywordRegistry.bulkMailSentStatus$pending = function(){return "9a0c5608-070e-49fb-92cd-f6abece9242d";};
 $KeywordRegistry.bulkMailSentStatus$sent = function(){return "147211fb-a1cf-49c8-8e08-c3cfe0404f9b";};
-$KeywordRegistry.bulkMailSentStatus$failed = function(){return "353e27e9-7491-4bfd-b9f9-f18f2cb2a36c";};
+$KeywordRegistry.bulkMailSentStatus$failed = function(){return "353e27e9-7491-4bfd-b9f9-f18f2cb2a36c";};
\ No newline at end of file