diff --git a/.liquibase/Data_alias/basic/2020.0.0/changelog.xml b/.liquibase/Data_alias/basic/2020.0.0/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1e11d3f682b2178b6bc793aeab8b2fe4ffdf8a62
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.0.0/changelog.xml
@@ -0,0 +1,7 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    
+    <include relativeToChangelogFile="true" file="drop_relationship.xml"/>
+    
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.0.0/drop_relationship.xml b/.liquibase/Data_alias/basic/2020.0.0/drop_relationship.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b308f0ba853b1f97fcea4cc795087f36575edf0c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.0.0/drop_relationship.xml
@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermann" id="fa512b82-fbe3-41c5-bd44-600fec5df6bc">
+        <dropColumn tableName="CONTACT" columnName="RELATIONSHIP"/>
+        <dropColumn tableName="OBJECTMEMBER" columnName="RELATIONSHIP"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index 2580416d2d79f2493b5791bbee2bc31a6792f1dd..a47583e5bf0827fc20a65afb7eb140eb16afeb7f 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -5,6 +5,7 @@
     <include relativeToChangelogFile="true" file="basic/2019.2.1/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2019.3.0/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2019.3.1/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="basic/2020.0.0/changelog.xml"/>
     
     <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index f6a6c646c85bfb5ae03fcf10ee47ff721a4f4644..82d9edf7cae234dfb3516210bb8ba3205cb2f469 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -49,7 +49,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -89,7 +89,7 @@
                 <name>KIND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -150,7 +150,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -164,7 +164,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -204,7 +204,7 @@
                 <name>PICTURE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2004" />
+                <columnType v="-2" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -314,7 +314,7 @@
                 <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -465,7 +465,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -493,7 +493,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -633,7 +633,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -692,7 +692,7 @@
                 <name>GENDER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -739,7 +739,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -767,7 +767,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -793,7 +793,7 @@
                 <name>PICTURE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2004" />
+                <columnType v="-2" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -873,7 +873,7 @@
                 <name>ADDR_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -1110,7 +1110,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1138,7 +1138,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1196,7 +1196,7 @@
                 <name>MEDIUM_ID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -1290,7 +1290,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1304,7 +1304,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1365,7 +1365,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1383,7 +1383,7 @@
                 <name>PAYMENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -1403,7 +1403,7 @@
                 <name>CONTRACTSTATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -1425,7 +1425,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1476,7 +1476,7 @@
                 <name>CONTRACTTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -1518,7 +1518,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1536,7 +1536,7 @@
                 <name>REMARK</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -1575,7 +1575,7 @@
                 <name>UNIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -1765,7 +1765,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1793,7 +1793,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -1819,7 +1819,7 @@
                 <name>PICTURE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2004" />
+                <columnType v="-2" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -1998,7 +1998,7 @@
                 <name>CURRENCY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
@@ -2058,7 +2058,7 @@
                 <name>PRICELIST</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2132,7 +2132,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -2192,7 +2192,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -2275,7 +2275,7 @@
                 <name>WAREHOUSE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2317,7 +2317,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -2539,7 +2539,7 @@
                 <name>FLAG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2004" />
+                <columnType v="-2" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2579,7 +2579,7 @@
                 <name>CURRENCY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2626,7 +2626,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -2677,7 +2677,7 @@
                 <name>PROBABILITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2702,7 +2702,7 @@
                 <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2777,7 +2777,7 @@
                 <name>HEADER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2839,7 +2839,7 @@
                 <name>ADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2860,7 +2860,7 @@
                 <name>PAYMENTTERMS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2886,7 +2886,7 @@
                 <name>DELIVERYTERMS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2912,7 +2912,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -2935,7 +2935,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -2963,7 +2963,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -3017,7 +3017,7 @@
                 <name>FOOTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3078,7 +3078,7 @@
                 <name>UNIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3371,7 +3371,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3413,7 +3413,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -3451,7 +3451,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3473,7 +3473,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -3491,7 +3491,7 @@
                 <name>PHASE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3594,7 +3594,7 @@
                 <name>PROBABILITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3646,7 +3646,7 @@
                 <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3735,7 +3735,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3793,7 +3793,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -3824,7 +3824,7 @@
                 <name>DIRECTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3868,7 +3868,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
@@ -3887,7 +3887,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3922,7 +3922,7 @@
                 <name>CATEGORY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -3987,7 +3987,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -4015,7 +4015,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -4081,7 +4081,7 @@
                 <name>CURRENCY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4144,7 +4144,7 @@
                 <name>FOOTER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4165,7 +4165,7 @@
                 <name>HEADER</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4209,7 +4209,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -4359,7 +4359,7 @@
                 <name>NOTICE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4375,7 +4375,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -4403,7 +4403,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -4415,7 +4415,7 @@
                 <name>DUNNINGTEXT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4443,7 +4443,7 @@
                 <name>DUNNINGLEVEL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4459,7 +4459,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -4471,7 +4471,7 @@
                 <name>PAYMENTTERMS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4485,7 +4485,7 @@
                 <name>DELIVERYTERMS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4513,7 +4513,7 @@
                 <name>PAYMENTADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4527,7 +4527,7 @@
                 <name>ORDERTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4555,7 +4555,7 @@
                 <name>DELIVERYADDRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4602,7 +4602,7 @@
                 <name>UNIT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4913,7 +4913,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4953,7 +4953,7 @@
                 <name>PRIORITY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -4981,7 +4981,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -5040,7 +5040,7 @@
                 <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -5066,7 +5066,7 @@
                 <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -5162,7 +5162,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -5181,7 +5181,7 @@
                 <name>KIND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -5249,7 +5249,7 @@
                 <name>PROGRESS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -5350,7 +5350,7 @@
                 <name>AB_OBJECTRELATIONTYPE1</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -5371,7 +5371,7 @@
                 <name>AB_OBJECTRELATIONTYPE2</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -5392,7 +5392,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -5570,7 +5570,7 @@
                 <name>ATTRIBUTE_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
@@ -5689,7 +5689,7 @@
                 <name>ATTRIBUTE_INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -5766,7 +5766,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -5883,7 +5883,7 @@
                 <name>ID_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -5906,7 +5906,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -5934,7 +5934,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -6038,9 +6038,9 @@
                 <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
-                <notNull v="false" />
+                <notNull v="true" />
                 <isUnique v="false" />
-                <index v="false" />
+                <index v="true" />
                 <documentation></documentation>
                 <title>Activity Id</title>
                 <description></description>
@@ -6079,7 +6079,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -6093,7 +6093,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -6463,7 +6463,7 @@
                 <name>KIND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
@@ -6643,7 +6643,7 @@
                 <name>LONG_CHAR_VALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -6905,7 +6905,7 @@
                 <name>RELATION_TYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
@@ -7044,7 +7044,7 @@
                 <name>SEX</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -7220,7 +7220,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7513,7 +7513,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7532,7 +7532,7 @@
                 <name>LOCKED</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="16" />
+                <columnType v="-7" />
                 <size v="1" />
                 <scale v="0" />
                 <notNull v="true" />
@@ -7621,7 +7621,7 @@
                 <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -7707,7 +7707,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7741,7 +7741,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7783,7 +7783,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -7844,7 +7844,7 @@
                 <name>MILESTONEVALUE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -7907,7 +7907,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -7935,7 +7935,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -8012,7 +8012,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8052,7 +8052,7 @@
                 <name>CLASSIFICATION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -8068,7 +8068,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8136,7 +8136,7 @@
                 <name>KIND</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -8185,7 +8185,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8198,7 +8198,7 @@
                 <name>DOCUMENTTEMPLATE_ID_PARENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -8213,7 +8213,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -8268,7 +8268,7 @@
                 <name>DOCUMENTTEMPLATE_ID_CHILD</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -8303,7 +8303,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8345,7 +8345,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -8414,7 +8414,7 @@
                 <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
@@ -8428,7 +8428,7 @@
                 <name>CURRENCY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -8477,7 +8477,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8547,7 +8547,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -8589,7 +8589,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -8631,7 +8631,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -8658,7 +8658,7 @@
                 <name>STEPMEDIUM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -8672,7 +8672,7 @@
                 <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
@@ -8722,7 +8722,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8750,7 +8750,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -8867,7 +8867,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -8894,7 +8894,7 @@
                 <name>CATEGORY</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="true" />
@@ -8909,7 +8909,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -9026,7 +9026,7 @@
                 <name>CLASSIFICATIONTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -9268,7 +9268,7 @@
                 <name>GROUPCODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -9312,7 +9312,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9324,7 +9324,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -9386,7 +9386,7 @@
                 <name>PHASE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -9400,7 +9400,7 @@
                 <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -9442,7 +9442,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -9470,7 +9470,7 @@
                 <name>REASON</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -9486,7 +9486,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9532,7 +9532,7 @@
                 <name>MEDIUM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -9548,7 +9548,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9746,7 +9746,7 @@
                 <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -9836,7 +9836,7 @@
                 <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -9894,7 +9894,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -9906,7 +9906,7 @@
                 <name>PROBLEM</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -9996,7 +9996,7 @@
                 <name>TICKETTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10032,7 +10032,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10046,7 +10046,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10088,7 +10088,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10142,7 +10142,7 @@
                 <name>STATUORITYSOURCE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10156,7 +10156,7 @@
                 <name>PURPOSE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10170,7 +10170,7 @@
                 <name>DSGVOTYPE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10232,7 +10232,7 @@
                 <name>DESCRIPTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10260,7 +10260,7 @@
                 <name>LANG</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10294,7 +10294,7 @@
                 <name>MAIL</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10310,7 +10310,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10352,7 +10352,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10422,7 +10422,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="true" />
@@ -10468,7 +10468,7 @@
                 <name>ANSWERMODE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10498,7 +10498,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10540,7 +10540,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="true" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -10552,7 +10552,7 @@
                 <name>DIRECTION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10586,7 +10586,7 @@
                 <name>RECIPIENT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10600,7 +10600,7 @@
                 <name>GUARANTEE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10614,7 +10614,7 @@
                 <name>TRANSMISSION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10642,7 +10642,7 @@
                 <name>DATASOURCE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10834,7 +10834,7 @@
                 <name>STATUS</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -10952,7 +10952,7 @@
                 <name>MEMBERROLE</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -11000,7 +11000,7 @@
                 <name>TOUCHPOINT</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="12" />
+                <columnType v="1" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -11016,7 +11016,7 @@
                 <primaryKey v="false" />
                 <columnType v="93" />
                 <size v="29" />
-                <scale v="9" />
+                <scale v="6" />
                 <notNull v="false" />
                 <isUnique v="false" />
                 <index v="false" />
@@ -11028,7 +11028,7 @@
                 <name>INFO</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -11077,7 +11077,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11104,7 +11104,7 @@
                 <name>FILTER_CONDITION</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="2005" />
+                <columnType v="12" />
                 <size v="2147483647" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -11133,7 +11133,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -11237,7 +11237,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11265,7 +11265,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -11344,20 +11344,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>BLOCK_SIZE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
@@ -11535,7 +11521,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11563,7 +11549,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
@@ -11681,7 +11667,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="false" />
                 <isUnique v="false" />
@@ -11709,7 +11695,7 @@
                 <dbName></dbName>
                 <primaryKey v="false" />
                 <columnType v="91" />
-                <size v="10" />
+                <size v="13" />
                 <scale v="0" />
                 <notNull v="true" />
                 <isUnique v="false" />
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 5c13950f189eeb6f23a365b179f2d515048778fc..31e74cc643b87bcda5a4f9546f9a7e72f472004d 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -123,10 +123,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
       <name>STANDARD_PHONE_COMMUNICATION</name>
       <title>Phone</title>
     </entityField>
-    <entityField>
-      <name>RELATIONSHIP</name>
-      <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
-    </entityField>
     <entityField>
       <name>PERSON_MIDDLENAME</name>
     </entityField>
@@ -252,10 +248,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
           <name>STANDARD_PHONE_COMMUNICATION.value</name>
           <expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js</expression>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>RELATIONSHIP.value</name>
-          <recordfield>CONTACT.RELATIONSHIP</recordfield>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PERSON_MIDDLENAME.value</name>
           <recordfield>PERSON.MIDDLENAME</recordfield>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index c3aae1c51ac0feee54dcc9a5673916114e50a39a..0e54914de079223b1eaadd560b290ee1d4c0db8b 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -75,26 +75,6 @@
       <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/Member_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
     </entityField>
-    <entityField>
-      <name>RELATIONSHIP</name>
-      <title>Relationship</title>
-      <description>Overrules CONTACT_RELATIONSHIP
-
-TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... aktuell im edit mode auf leeres Feld, dann wird das aus contact angezeigt</description>
-      <contentType>NUMBER</contentType>
-      <displayValueProcess>%aditoprj%/entity/Member_entity/entityfields/relationship/displayValueProcess.js</displayValueProcess>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>PROCESS_SETVALUE</element>
-      </onValueChangeTypes>
-    </entityField>
-    <entityField>
-      <name>CONTACT_RELATIONSHIP</name>
-      <title>Relationship</title>
-      <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
-      <contentType>NUMBER</contentType>
-    </entityField>
     <entityConsumer>
       <name>Contacts</name>
       <dependency>
@@ -293,16 +273,6 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
           <recordfield>OBJECTMEMBER.CONTACT_ID</recordfield>
           <isFilterable v="true" />
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>RELATIONSHIP.value</name>
-          <recordfield>OBJECTMEMBER.RELATIONSHIP</recordfield>
-          <isFilterable v="true" />
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>CONTACT_RELATIONSHIP.value</name>
-          <recordfield>CONTACT.RELATIONSHIP</recordfield>
-          <isFilterable v="true" />
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ID.displayValue</name>
           <expression>%aditoprj%/entity/Member_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
diff --git a/entity/Member_entity/entityfields/relationship/displayValueProcess.js b/entity/Member_entity/entityfields/relationship/displayValueProcess.js
deleted file mode 100644
index a0ff6b6000b96dfdc8ae6f0450a5f6dba4dfe559..0000000000000000000000000000000000000000
--- a/entity/Member_entity/entityfields/relationship/displayValueProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("system.result");
-import("system.vars");
-
-var localRelationship = vars.get("$field.RELATIONSHIP");
-
-if (localRelationship)
-{
-    result.string(localRelationship);
-}
-else
-{
-    result.string(vars.get("$field.CONTACT_RELATIONSHIP"));
-}
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 5fb1612abc79b2a23c603c3092d5e09bf69592e4..ae9e3b679ebd5ff7c195473b7565e8c15767e646 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -365,14 +365,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
         </entityParameter>
       </children>
     </entityConsumer>
-    <entityField>
-      <name>REL_RELATIONSHIP</name>
-      <title>Relationship</title>
-      <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
-      <contentType>NUMBER</contentType>
-      <mandatory v="false" />
-      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/rel_relationship/valueProcess.js</valueProcess>
-    </entityField>
     <entityField>
       <name>STANDARD_EMAIL_COMMUNICATION</name>
       <title>E-Mail</title>
@@ -1223,11 +1215,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
           <recordfield>CONTACT.ORGANISATION_ID</recordfield>
           <isFilterable v="false" />
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>REL_RELATIONSHIP.value</name>
-          <recordfield>CONTACT.RELATIONSHIP</recordfield>
-          <isFilterable v="true" />
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STANDARD_EMAIL_COMMUNICATION.displayValue</name>
           <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression>
diff --git a/entity/Person_entity/entityfields/rel_relationship/valueProcess.js b/entity/Person_entity/entityfields/rel_relationship/valueProcess.js
deleted file mode 100644
index 7e646ec28f8eceb1f755d5a7e6832236cf49053a..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/rel_relationship/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.object(2);
\ No newline at end of file