diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index c8deb1c8db7281f66222b175d0ee9da6cb367def..f0024a83bf8b842a582d39049682a1086d667fec 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -19,6 +19,7 @@
       <title>Entrydate</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrydate/valueProcess.js</valueProcess>
     </entityField>
@@ -151,7 +152,7 @@
     </entityParameter>
     <entityConsumer>
       <name>Links</name>
-      <title>Verknüpfungen</title>
+      <title>Connections</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -258,7 +259,7 @@
     </entityField>
     <entityConsumer>
       <name>ModuleTrees</name>
-      <title>Baum</title>
+      <title>Tree</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -279,16 +280,16 @@
     <entityActionField>
       <name>newActivity_action</name>
       <fieldType>ACTION</fieldType>
-      <title>Neue Aktivität</title>
+      <title>New activity</title>
       <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity_action/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:PLUS</iconId>
+      <iconId>NEON:HISTORY</iconId>
     </entityActionField>
     <entityActionField>
       <name>newTask_action</name>
       <fieldType>ACTION</fieldType>
-      <title>Neue Aufgabe</title>
+      <title>New task</title>
       <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newtask_action/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:PLUS</iconId>
+      <iconId>VAADIN:TASKS</iconId>
     </entityActionField>
     <entityParameter>
       <name>ParentId_param</name>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 79c2128496194e7cfc54affb681df4d27cd5e8bb..179c872d486998178606e9d4735e3f2b54eb07a5 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
   <name>AnyContact_entity</name>
-  <description>former Relation</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <titleProcess>%aditoprj%/entity/AnyContact_entity/titleProcess.js</titleProcess>
   <recordContainer>db</recordContainer>
@@ -56,7 +55,7 @@
     <entityField>
       <name>contactType</name>
       <description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERSON_ID.
-See RelationUtils.getRelationTypeByPersOrg for possible values</description>
+See ContactUtils.getRelationTypeByPersOrg for possible values</description>
       <contentType>NUMBER</contentType>
       <searchable v="false" />
       <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
@@ -92,7 +91,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
       </children>
     </entityConsumer>
     <entityField>
-      <name>ORG_NAME</name>
+      <name>ORGANISATION_NAME</name>
       <title>Organisation name</title>
     </entityField>
     <entityField>
@@ -152,6 +151,15 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
       <name>RELATIONSHIP</name>
       <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
     </entityField>
+    <entityField>
+      <name>PERSON_MIDDLENAME</name>
+    </entityField>
+    <entityField>
+      <name>PERSON_TITLE</name>
+    </entityField>
+    <entityField>
+      <name>PERSON_SALUTATION</name>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -214,7 +222,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
           <recordfield>CONTACT.STATUS</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>ORG_NAME.value</name>
+          <name>ORGANISATION_NAME.value</name>
           <recordfield>ORGANISATION.NAME</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
@@ -237,6 +245,18 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
           <name>RELATIONSHIP.value</name>
           <recordfield>CONTACT.RELATIONSHIP</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_MIDDLENAME.value</name>
+          <recordfield>PERSON.MIDDLENAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_TITLE.value</name>
+          <recordfield>PERSON.TITLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_SALUTATION.value</name>
+          <recordfield>PERSON.SALUTATION</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js b/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js
index 51fe974083978cb392d4f2c281c66687794d2d50..32bb8ca1976dad71cedfc90616c378fce1d9ccde 100644
--- a/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js
+++ b/entity/AnyContact_entity/entityfields/contacttype/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
 import("system.vars");
 import("Contact_lib")
 
-result.object(RelationUtils.getRelationType(vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
+result.object(ContactUtils.getRelationType(vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/image/valueProcess.js b/entity/AnyContact_entity/entityfields/image/valueProcess.js
index bc039e74557533bbb18b9efc1a7ebe573abcf3ee..d30dd86601985ac8a4812256a8365faf820353f4 100644
--- a/entity/AnyContact_entity/entityfields/image/valueProcess.js
+++ b/entity/AnyContact_entity/entityfields/image/valueProcess.js
@@ -7,7 +7,7 @@ import("Contact_lib");
 
 if (vars.get("$field.contactType") == 1) // 1 == org, 2 == person, 3 == person
 {
-    result.string(OrgUtils.getImage(vars.get("$field.ORGANISATION_ID"), vars.getString("$field.ORG_NAME")));
+    result.string(OrgUtils.getImage(vars.get("$field.ORGANISATION_ID"), vars.getString("$field.ORGANISATION_NAME")));
 }
 else
 {
diff --git a/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js b/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js
index 754b510a9579742a29e6c83c9960e86b34808e25..c2008fc0d19dfe96ca7074d6f2ceddf2c5941f78 100644
--- a/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,4 @@
 import("system.result");
 import("Contact_lib")
 
-result.string(RelationUtils.getFullRelationFromString());
\ No newline at end of file
+result.string(ContactUtils.getFullRelationString());
\ No newline at end of file
diff --git a/entity/AnyContact_entity/titleProcess.js b/entity/AnyContact_entity/titleProcess.js
index 383efef8d5428179a79ee3f5042f8cf5482b3843..54d51a48576dbc49bf35a56ce5cf570dd7cea087 100644
--- a/entity/AnyContact_entity/titleProcess.js
+++ b/entity/AnyContact_entity/titleProcess.js
@@ -1,8 +1,15 @@
 import("system.vars");
 import("system.result");
+import("Util_lib");
+import("Contact_lib");
 
-if(vars.get("$field.PERSON_FIRSTNAME")) {
-    result.string(vars.get("$field.PERSON_FIRSTNAME") + " " + vars.get("$field.PERSON_LASTNAME"));
-} else {
-    result.string(vars.get("$field.ORG_NAME"));
-}
+var contact = new Contact();
+contact.organisationName = vars.get("$field.ORGANISATION_NAME");
+contact.salutation = vars.get("$field.PERSON_SALUTATION");
+contact.title = vars.get("$field.PERSON_TITLE");
+contact.firstname = vars.get("$field.PERSON_FIRSTNAME");
+contact.middlename = vars.get("$field.PERSON_MIDDLENAME");
+contact.lastname = vars.get("$field.PERSON_LASTNAME");
+
+var renderer = new ContactTitleRenderer(contact);
+result.string(renderer.asString());
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 5bfa6074a61696279c275fb486a20291b69144ea..e1f914dbd98e1a510121261aa14c96e256443e68 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -183,6 +183,22 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityActionGroup>
+      <name>AttributeActions</name>
+      <children>
+        <entityActionField>
+          <name>newChildAttribute</name>
+          <fieldType>ACTION</fieldType>
+          <title>New attribute</title>
+          <onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js</onActionProcess>
+          <isMenuAction v="true" />
+          <isObjectAction v="false" />
+          <isSelectionAction v="true" />
+          <iconId>VAADIN:FILE_TREE_SMALL</iconId>
+          <tooltipProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js</tooltipProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ec2bc6c8d7639880db01b7e9d2bb1fa1794cda7
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
@@ -0,0 +1,14 @@
+import("system.vars");
+import("system.neon");
+import("Attribute_lib");
+
+var params = {};
+if (vars.exists("$local.rows"))
+{
+    var row = JSON.parse(vars.get("$local.rows"));
+    
+    var type = row[0].ATTRIBUTE_TYPE.trim();
+    if (type == $AttributeTypes.GROUP || type == $AttributeTypes.COMBO)
+        params["attrParentId_param"] = row[0].AB_ATTRIBUTEID;
+}
+neon.openContext("Attribute", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8e60c9408cea7253931ee12e4142673823cdfe3f
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("New attribute"));
\ No newline at end of file
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 06b6c814bcd645ef6bf7c946bab0a1698a8f501d..50bea07aae4582451358708b1555fdb12e57f6f8 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -23,6 +23,7 @@
       <title>Next due date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractdue/onValidation.js</onValidation>
     </entityField>
     <entityField>
@@ -31,6 +32,7 @@
       <title>Contract expiry date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValidation.js</onValidation>
       <onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValueChange.js</onValueChange>
     </entityField>
@@ -45,6 +47,7 @@
       <title>Contract start date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValidation.js</onValidation>
       <onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValueChange.js</onValueChange>
     </entityField>
@@ -377,10 +380,6 @@
           <name>CONTACT_PERSON_ID.value</name>
           <recordfield>CONTACT.PERSON_ID</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORG_NAME.value</name>
-          <recordfield>ORGANISATION.NAME</recordfield>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PERSON_FIRSTNAME.value</name>
           <recordfield>PERSON.FIRSTNAME</recordfield>
diff --git a/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js b/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js
index 5badfc772a90e1e057c0ed3a480063f68de010a9..85822946ab4fe0ba7730ca93fd6fca69250a5b33 100644
--- a/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js
+++ b/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("Contact_lib");
 import("system.neon");
 
-result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js b/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js
index 242297cdf0e97a6b0a61004ba62ca1301a6cc791..e678b842c5b6cf510473693a355fa7833dcf28e8 100644
--- a/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js
+++ b/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 import("Contact_lib");
 
-result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index cefdd4bdbb06f909dbcb10356eac9669ace50d3c..210404deb6e4c33919febb3b8d565869f6887468 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -20,26 +20,27 @@
     </entityProvider>
     <entityField>
       <name>NAME</name>
-      <title>Dateiname</title>
+      <title>Filename</title>
       <mandatory v="true" />
       <state>AUTO</state>
     </entityField>
     <entityField>
       <name>TYPE</name>
-      <title>Dateityp</title>
+      <title>Filetype</title>
       <state>READONLY</state>
     </entityField>
     <entityField>
       <name>SIZE</name>
-      <title>Dateigröße</title>
+      <title>Filesize</title>
       <contentType>FILESIZE</contentType>
       <state>READONLY</state>
     </entityField>
     <entityField>
       <name>DATE_EDIT</name>
-      <title>Datum</title>
+      <title>Date</title>
       <contentType>DATE</contentType>
       <resolution>MINUTE</resolution>
+      <outputFormat>dd.MM.yyyy HH:mm:ss</outputFormat>
       <state>READONLY</state>
     </entityField>
     <entityField>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index af308c2990e728ddaee76fe71d8c866b425d9687..f6f21582c8d3a20e7a4c19e40bae8ff182494fc7 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -31,6 +31,7 @@
       <title>Creation date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offerdate/valueProcess.js</valueProcess>
     </entityField>
diff --git a/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js b/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js
index ef417d00db927adfdb10354ec3346c74f15bceeb..08ad146eeefe97e12cfe29fc61672ae76f34c01b 100644
--- a/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js
+++ b/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js
@@ -4,4 +4,4 @@ import("Contact_lib");
 import("system.neon");
 
 
-result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js b/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js
index 242297cdf0e97a6b0a61004ba62ca1301a6cc791..e678b842c5b6cf510473693a355fa7833dcf28e8 100644
--- a/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js
+++ b/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 import("Contact_lib");
 
-result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js b/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
index 419ee8c0b688b7f9586fbd5b21184903cc66834c..05b1f9bd5c0c54e2c707e0ac6f2fce2ea12850e0 100644
--- a/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
+++ b/entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js
@@ -2,7 +2,7 @@ import("system.vars");
 import("system.result");
 import("Contact_lib");
 
-var type = RelationUtils.getRelationType(vars.get("$field.CONTACT_ID"), vars.get("$field.CONTACT_PERSON_ID"), vars.get("$field.CONTACT_ORG_ID"));
+var type = ContactUtils.getRelationType(vars.get("$field.CONTACT_ID"), vars.get("$field.CONTACT_PERSON_ID"), vars.get("$field.CONTACT_ORG_ID"));
 
 result.string(type != 2);
 
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index cf2282fb925fadbd380034305763903ce0d66283..7f15d48fa9d854c7fb7d10315dae9aa55e2d4a26 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -31,6 +31,7 @@
       <title>Creation date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderdate/valueProcess.js</valueProcess>
     </entityField>
diff --git a/entity/Order_entity/entityfields/contact_id/displayValueProcess.js b/entity/Order_entity/entityfields/contact_id/displayValueProcess.js
index 5badfc772a90e1e057c0ed3a480063f68de010a9..85822946ab4fe0ba7730ca93fd6fca69250a5b33 100644
--- a/entity/Order_entity/entityfields/contact_id/displayValueProcess.js
+++ b/entity/Order_entity/entityfields/contact_id/displayValueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("Contact_lib");
 import("system.neon");
 
-result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js b/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js
index 242297cdf0e97a6b0a61004ba62ca1301a6cc791..e678b842c5b6cf510473693a355fa7833dcf28e8 100644
--- a/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js
+++ b/entity/Order_entity/entityfields/contact_id/linkedContextProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 import("Contact_lib");
 
-result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index be0db2e3cb78f950af2cdb228ed3a9a1d13d1c73..3d0148e0b004605201f3371b242bec509c09e812 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -15,6 +15,7 @@
       <title>Date of birth</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
     </entityField>
     <entityField>
       <name>FIRSTNAME</name>
@@ -325,7 +326,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
         <element>FIRSTNAME</element>
         <element>MIDDLENAME</element>
         <element>LASTNAME</element>
-        <element>TITLESUFFIX</element>
       </fields>
     </entityFieldGroup>
     <entityProvider>
diff --git a/entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js b/entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js
index c39d231e9c0c04f41704c75149d3375291f45ecf..b3a098ff143cffbd6bd95e276a5b5c0ba689d3d7 100644
--- a/entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js
+++ b/entity/Person_entity/entityfields/full_name_fieldgroup/valueProcess.js
@@ -1,9 +1,14 @@
 import("system.vars");
 import("system.result");
+import("Util_lib");
+import("Contact_lib");
 
-result.string((vars.get("$field.SALUTATION") ? vars.get("$field.SALUTATION") + " " : "")
-            + (vars.get("$field.TITLE") ? vars.get("$field.TITLE") + " " : "")
-            + (vars.get("$field.FIRSTNAME") ? vars.get("$field.FIRSTNAME") + " " : "")
-            + (vars.get("$field.MIDDLENAME") ? vars.get("$field.MIDDLENAME") + " " : "")
-            + (vars.get("$field.LASTNAME") ? vars.get("$field.LASTNAME") + " " : "")
-            + vars.get("$field.TITLESUFFIX"))
\ No newline at end of file
+var contact = new Contact();
+contact.salutation = vars.get("$field.SALUTATION");
+contact.title = vars.get("$field.TITLE");
+contact.firstname = vars.get("$field.FIRSTNAME");
+contact.middlename = vars.get("$field.MIDDLENAME");
+contact.lastname = vars.get("$field.LASTNAME");
+
+var renderer = new ContactTitleRenderer(contact, null);
+result.string(renderer.asString());
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 2d02541216829cd9f4b6410658dd2239e70bca4b..5a38013798e0d3ee07dc4ffad661a4a803fb34cd 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -60,6 +60,7 @@
       <title>Valid from</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/valid_from/valueProcess.js</valueProcess>
       <onValidation>%aditoprj%/entity/Productprice_entity/entityfields/valid_from/onValidation.js</onValidation>
@@ -69,6 +70,7 @@
       <title>Valid until</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <onValidation>%aditoprj%/entity/Productprice_entity/entityfields/valid_to/onValidation.js</onValidation>
     </entityField>
     <entityField>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 0fdd5ef9d4212c2d106e47918bef84c24fa6c4df..a19aebab16211c9cfb9fe0f1e1948e87e64cbebf 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -13,6 +13,7 @@
       <title>Excreted</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
     </entityField>
     <entityField>
       <name>INFO</name>
@@ -71,7 +72,7 @@
       <linkedContext>Organisation</linkedContext>
     </entityField>
     <entityField>
-      <name>ORG_NAME</name>
+      <name>ORGANISATION_NAME</name>
       <state>READONLY</state>
       <onValueChangeTypes>
         <element>MASK</element>
@@ -261,7 +262,7 @@
           <recordfield>SALESPROJECT_COMPETITION.INFO</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>ORG_NAME.value</name>
+          <name>ORGANISATION_NAME.value</name>
           <recordfield>ORGANISATION.NAME</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
diff --git a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
index efe3d96a259014e1d298227f1d953da093d56c8d..86237f6e8636a7673196886a0e894cbc8540e0e3 100644
--- a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
+++ b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
@@ -13,6 +13,7 @@
       <title>End date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <searchable v="true" />
     </entityField>
     <entityField>
@@ -20,6 +21,7 @@
       <title>Date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
     </entityField>
     <entityField>
       <name>SALESPROJECT_CYCLEID</name>
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index 93bbe23ab87c45b974b1ae2a50e494fda67896f0..ac4410f847cf7bf4dae8f02f88799ea7ddb3d476 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -13,6 +13,7 @@
       <title>Planned</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
     </entityField>
     <entityField>
       <name>GROUPCODE</name>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 31b0b9d4890d99472d88db00f2eac713b8988894..5b62c806fc791e1213539998422d6e6391b3d296 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -56,7 +56,7 @@
       <description>PARAMETER</description>
     </entityParameter>
     <entityField>
-      <name>ORG_NAME</name>
+      <name>ORGANISATION_NAME</name>
       <title>Company</title>
       <state>READONLY</state>
     </entityField>
@@ -211,7 +211,7 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
       </linkInformation>
       <recordFieldMappings>
         <dbRecordFieldMapping>
-          <name>ORG_NAME.value</name>
+          <name>ORGANISATION_NAME.value</name>
           <recordfield>ORGANISATION.NAME</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 63774cba86c602cea3ea1ac99c03442e4d7b5433..ec08058c7701b5acf988f119331d09b85db9239d 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -39,6 +39,7 @@
       <title>Date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
     </entityField>
     <entityField>
       <name>INFO</name>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index b2c19d80712bae3de9b5aef884aae34844f2b462..550a25b68ca86e3248fe0d4ba3d30dd80f1d113e 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -29,6 +29,7 @@
       <title>Rollout</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/enddate/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
@@ -70,6 +71,7 @@
       <title>Project start</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startdate/valueProcess.js</valueProcess>
     </entityField>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index eca4ca8d10fb94cac460c04649583e2ad5ffb4dc..884e87652393a9fedb2087f9d50a16feaf304372 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -11,6 +11,7 @@
       <title>Date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/entrydate/valueProcess.js</valueProcess>
     </entityField>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 6d6d162fac3d22fe9840dd9053d305d2b6797eed..a959133c142642f6c7df649fab3b589254e3df0d 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -60,6 +60,7 @@
       <title>start date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <groupable v="true" />
       <valueProcess>%aditoprj%/entity/Task_entity/entityfields/start_date/valueProcess.js</valueProcess>
       <onValidation>%aditoprj%/entity/Task_entity/entityfields/start_date/onValidation.js</onValidation>
@@ -69,6 +70,7 @@
       <title>maturity date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <valueProcess>%aditoprj%/entity/Task_entity/entityfields/maturity_date/valueProcess.js</valueProcess>
       <onValidation>%aditoprj%/entity/Task_entity/entityfields/maturity_date/onValidation.js</onValidation>
     </entityField>
@@ -173,7 +175,7 @@
     </entityConsumer>
     <entityConsumer>
       <name>ModuleTrees</name>
-      <title>Baum</title>
+      <title>Tree</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -215,16 +217,16 @@
     <entityActionField>
       <name>newActivity_action</name>
       <fieldType>ACTION</fieldType>
-      <title>Neue Aktivität</title>
+      <title>New activity</title>
       <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newactivity_action/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:PLUS</iconId>
+      <iconId>NEON:HISTORY</iconId>
     </entityActionField>
     <entityActionField>
       <name>newTask_action</name>
       <fieldType>ACTION</fieldType>
-      <title>Neue Aufgabe</title>
+      <title>New task</title>
       <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newtask_action/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:PLUS</iconId>
+      <iconId>VAADIN:TASKS</iconId>
     </entityActionField>
     <entityParameter>
       <name>RowId_param</name>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index afb6fc572e29e8edde87c78277992f26aae13946..e4c846e28376cc90cabcc2f97b85e32f4929a6df 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -48,6 +48,7 @@
       <title>Date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/date/valueProcess.js</valueProcess>
     </entityField>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index f143950a67e8e8b0c25f8d38865c2e9b9bc43c6b..84ba642f70c11dcdddb2c7d132039f7f0ed297b5 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2541,6 +2541,15 @@
     <entry>
       <key>${SALESPROJECT_NEGOTIATION}</key>
     </entry>
+    <entry>
+      <key>Filesize</key>
+    </entry>
+    <entry>
+      <key>Filename</key>
+    </entry>
+    <entry>
+      <key>Filetype</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index c4aea4ea12caa9d6c663ba31c4eedbc17ec0ca5a..66a7a690183aac7b8cc1f898a84936bb4ebcf94d 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -62,6 +62,10 @@
       <key>${SALESPROJECT_NEGOTIATION}</key>
       <value>Negotiation</value>
     </entry>
+    <entry>
+      <key>Filename</key>
+      <value>Dateiname</value>
+    </entry>
     <entry>
       <key>Male</key>
       <value>Männlich</value>
@@ -1004,6 +1008,10 @@
       <key>Show all offers</key>
       <value>Alle Angebote anzeigen</value>
     </entry>
+    <entry>
+      <key>Filetype</key>
+      <value>Dateityp</value>
+    </entry>
     <entry>
       <key>child of</key>
       <value>Kind von</value>
@@ -1012,6 +1020,10 @@
       <key>Products</key>
       <value>Produkte</value>
     </entry>
+    <entry>
+      <key>Filesize</key>
+      <value>Dateigrösse</value>
+    </entry>
     <entry>
       <key>Industry 1</key>
       <value>Branche 1</value>
@@ -1404,7 +1416,7 @@
     </entry>
     <entry>
       <key>New activity</key>
-      <value>Aktivität erstellen</value>
+      <value>Neue Aktivität</value>
     </entry>
     <entry>
       <key>July</key>
@@ -1730,6 +1742,10 @@
     <entry>
       <key>Paraguay</key>
     </entry>
+    <entry>
+      <key>New attribute</key>
+      <value>Neues Attribut</value>
+    </entry>
     <entry>
       <key>Solomon Islands</key>
     </entry>
@@ -2837,6 +2853,7 @@
     </entry>
     <entry>
       <key>Tree</key>
+      <value>Baum</value>
     </entry>
     <entry>
       <key>100%</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index c1df1b38efaf640d6bff8e5aab2c687be4961556..c572b4d55ac4821daf82208c3acd7adf317cc25b 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -17,7 +17,6 @@
     </entry>
     <entry>
       <key>Activity</key>
-      <value></value>
     </entry>
     <entry>
       <key>Name</key>
@@ -69,7 +68,6 @@
     </entry>
     <entry>
       <key>Activities</key>
-      <value></value>
     </entry>
     <entry>
       <key>Female</key>
@@ -752,7 +750,6 @@
     </entry>
     <entry>
       <key>Offer report</key>
-      <value></value>
     </entry>
     <entry>
       <key>New offer</key>
@@ -2571,6 +2568,18 @@
       <key>${SALESPROJECT_NEGOTIATION}</key>
       <value>Negotiation</value>
     </entry>
+    <entry>
+      <key>Filesize</key>
+    </entry>
+    <entry>
+      <key>Filename</key>
+    </entry>
+    <entry>
+      <key>Filetype</key>
+    </entry>
+    <entry>
+      <key>Entrydate (Month)</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index 5c1f702b4d3c5bfd08ee3174cf04c44329c6dc64..3409dd71072b0365b04e4a66f649950932adbe10 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
   <name>ActivityDetail_view</name>
-  <title>Beschreibung</title>
+  <title>Description</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
     <boxLayout>
diff --git a/neonView/AnyContactLookup_view/AnyContactLookup_view.aod b/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
index 4273a0ee681dcf1f137be5d18a1b010ffc6b32bb..38784a6ed139aef0d434b543a766fd8a5deb80db 100644
--- a/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
+++ b/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
@@ -18,7 +18,7 @@
         </neonTableColumn>
         <neonTableColumn>
           <name>ca59a64a-adce-49c3-93ad-2978c81809f8</name>
-          <entityField>ORG_NAME</entityField>
+          <entityField>ORGANISATION_NAME</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>814b3f18-106a-443e-8415-762669f862e6</name>
diff --git a/neonView/AttributeFilter_view/AttributeFilter_view.aod b/neonView/AttributeFilter_view/AttributeFilter_view.aod
index dcfb1f1c364d26321ea368be84bdb69a9c4f88ec..626b9f0d2c86e82065ba3be5adb8e8222989920f 100644
--- a/neonView/AttributeFilter_view/AttributeFilter_view.aod
+++ b/neonView/AttributeFilter_view/AttributeFilter_view.aod
@@ -13,6 +13,7 @@
     <treetableViewTemplate>
       <name>Treetable_template</name>
       <parentField>ATTRIBUTE_PARENT_ID</parentField>
+      <favoriteActionGroup1>AttributeActions</favoriteActionGroup1>
       <titleField>ATTRIBUTE_NAME</titleField>
       <descriptionField>ATTRIBUTE_TYPE</descriptionField>
       <entityField>#ENTITY</entityField>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index ae395531ab792a06b8029ee086e108cddee63e3b..a46e953f3c5307e1248693928966ddaf93a78b68 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -11,7 +11,7 @@
     <cardViewTemplate>
       <name>PersHeader_template</name>
       <iconField>IMAGE</iconField>
-      <titleField>NAME_fieldGroup</titleField>
+      <titleField>FULL_NAME_fieldGroup</titleField>
       <descriptionField>ORGANISATION_ID</descriptionField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
diff --git a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
index bd7d56408d9e22ddf4829b409a028b2510d5efd0..325028978da8c455396bc3871c94340d38de2ee9 100644
--- a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
+++ b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
@@ -15,7 +15,7 @@
       <columns>
         <neonTableColumn>
           <name>27e658bc-c134-4fef-a3a5-b172852d606e</name>
-          <entityField>ORG_NAME</entityField>
+          <entityField>ORGANISATION_NAME</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>59e6aea1-9752-48b5-9d91-43edd0c1d670</name>
diff --git a/others/db_changes/data_alias/basic/2019.2/ActivityCategory.xml b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/ActivityCategory.xml
rename to others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/AddressType.xml b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/AddressType.xml
rename to others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/CommunicationMedium.xml b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/CommunicationMedium.xml
rename to others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/OfferProbability.xml b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/OfferProbability.xml
rename to others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/SalesProjectCompetitionPhase.xml b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/SalesProjectCompetitionPhase.xml
rename to others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/SalesProjectPhase.xml b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/SalesProjectPhase.xml
rename to others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/SalesProjectPricePolitics.xml b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/SalesProjectPricePolitics.xml
rename to others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/SalesProjectState.xml b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/SalesProjectState.xml
rename to others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/SalesProjectStrength.xml b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/SalesProjectStrength.xml
rename to others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/SalesProjectWeakness.xml b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/SalesProjectWeakness.xml
rename to others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/SalesprojectCompetitionState.xml b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/SalesprojectCompetitionState.xml
rename to others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/TaskPriority.xml b/others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/TaskPriority.xml
rename to others/db_changes/data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index 15abec1be64c0764af9502996f78f961be0ea884..58aa672f62bc47b2309ed95963e7927862fed133 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-    <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_privat.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/ORGANISATION_private.xml"/>
     <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_gfk.xml" context="example"/>
     <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_mnf.xml" context="example"/>
     <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_lichtenstein.xml" context="example"/>
@@ -51,17 +51,18 @@
     <include relativeToChangelogFile="true" file="drop_estimation_salesproject.xml"/>
     
     <!--References to the Keyword Values-->
-    <include relativeToChangelogFile="true" file="OfferProbability.xml"/>
-    <include relativeToChangelogFile="true" file="ActivityCategory.xml"/>
-    <include relativeToChangelogFile="true" file="CommunicationMedium.xml"/>
-    <include relativeToChangelogFile="true" file="AddressType.xml"/>
-    <include relativeToChangelogFile="true" file="SalesProjectStrength.xml"/>
-    <include relativeToChangelogFile="true" file="SalesProjectPhase.xml"/>
-    <include relativeToChangelogFile="true" file="SalesProjectState.xml"/>
-    <include relativeToChangelogFile="true" file="SalesProjectWeakness.xml"/>
-    <include relativeToChangelogFile="true" file="SalesProjectPricePolitics.xml"/>
-    <include relativeToChangelogFile="true" file="TaskPriority.xml"/>
-    <include relativeToChangelogFile="true" file="SalesprojectCompetitionState.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/OfferProbability.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/ActivityCategory.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/CommunicationMedium.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/AddressType.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectStrength.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectPhase.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectState.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectWeakness.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/TaskPriority.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml"/>
+    <include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml"/>
        
     <!--References to the reference files-->
     <include relativeToChangelogFile="true" file="AditoBasic/init_OfferProbability.xml"/>
@@ -73,7 +74,6 @@
     <include relativeToChangelogFile="true" file="AditoBasic/init_TaskPriority.xml"/>
     <include relativeToChangelogFile="true" file="AditoBasic/init_SalesprojectCompetitionState.xml"/>
     <include relativeToChangelogFile="true" file="AditoBasic/init_AttributeType.xml"/>
-    <include relativeToChangelogFile="true" file="SalesProjectCompetitionPhase.xml"/>
     <include relativeToChangelogFile="true" file="AttributeKeyword.xml"/>
     <include relativeToChangelogFile="true" file="Contact_add_columns.xml"/>
     <include relativeToChangelogFile="true" file="SalesOrder_source_offer.xml"/>
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_privat.xml b/others/db_changes/data_alias/basic/2019.2/data/ORGANISATION_private.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_privat.xml
rename to others/db_changes/data_alias/basic/2019.2/data/ORGANISATION_private.xml
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
index 89ae81c3850fcf27d14b01248cbd9f3d3bdbb27e..9ccc46c08d8a92dbf13ea0b33e0bbe3d1e85add3 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
@@ -3,890 +3,1038 @@
     <changeSet author="s.listl" id="f1b149fb-bd9d-44b7-a334-8f6d77261b95">
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
-	<column name="ATTRIBUTE_NAME" value="Mitbewerber"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Mitbewerber"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
 	<column name="ATTRIBUTE_NAME" value="Preispolitik"/>
-	<column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
 	<column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
 	<column name="KEYWORD_CONTAINER" value="SalesprojectPricePolitics"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="558419b2-6113-4060-b88d-cc6324754765"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
 	<column name="ATTRIBUTE_NAME" value="Stärke"/>
-	<column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
 	<column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
 	<column name="KEYWORD_CONTAINER" value="SalesprojectStrength"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
 	<column name="ATTRIBUTE_NAME" value="Schwäche"/>
-	<column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
 	<column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
 	<column name="KEYWORD_CONTAINER" value="SalesprojectWeakness"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
-	<column name="ATTRIBUTE_NAME" value="Interessen"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Interessen"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="53266a7c-58ed-47dc-bbe8-9e00b33cb344"/>
-	<column name="ATTRIBUTE_NAME" value="Kulanz"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Kulanz"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
-	<column name="ATTRIBUTE_NAME" value="Schadensart"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Schadensart"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
-	<column name="ATTRIBUTE_NAME" value="Regulierung"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Regulierung"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
-	<column name="ATTRIBUTE_NAME" value="Technische Merkmale"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Technische Merkmale"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="e7e05c6e-6108-44bd-824a-c076dfa5ae93"/>
-	<column name="ATTRIBUTE_NAME" value="B"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="B"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="ed4c3079-51b0-4bb5-b228-55de4309d5ab"/>
-	<column name="ATTRIBUTE_NAME" value="0 gering"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="0 gering"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="6266b41c-fa20-47b9-bd71-5633015d0796"/>
-	<column name="ATTRIBUTE_NAME" value="gut"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="gut"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
-	<column name="ATTRIBUTE_NAME" value="Stimmung"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Stimmung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 	<column name="SORTING" valueNumeric="6"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-	<column name="ATTRIBUTE_NAME" value="Risiko"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Risiko"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 	<column name="SORTING" valueNumeric="4"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="54018b5e-0e02-48d1-873c-1c934d2e97ed"/>
-	<column name="ATTRIBUTE_NAME" value="Rennrad"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Rennrad"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
-	<column name="ATTRIBUTE_NAME" value="A"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="A"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="4fcd8bb8-72fd-48d0-9e64-4c80e5177c36"/>
-	<column name="ATTRIBUTE_NAME" value="NPO"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="NPO"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="3"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
-	<column name="ATTRIBUTE_NAME" value="Doku Vorlagen Verwendung"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
 	<column name="ATTRIBUTE_INFO" value="Als Attribut ist der Name aus lib_frame z.B. 'ORG' 'PERS' 'OFFER' etc. zu verwenden."/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Doku Vorlagen Verwendung"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="2b6e3225-9447-4706-9313-62c9463d6671"/>
-	<column name="ATTRIBUTE_NAME" value="Handwerk"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Handwerk"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="be60e4b3-19b1-48a9-ad5c-c7d38698b4a1"/>
-	<column name="ATTRIBUTE_NAME" value="Dumpingpreis Wettbewerb"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Dumpingpreis Wettbewerb"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="6d15f683-389e-4915-9043-c4cfdf188095"/>
-	<column name="ATTRIBUTE_NAME" value="Vollberechnung"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Vollberechnung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="ab545654-1fce-4993-b763-0ec469781302"/>
-	<column name="ATTRIBUTE_NAME" value="Konditionen"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
 	<column name="ATTRIBUTE_INFO" value="Konditionen die bei Angebotserstellung übernommen werden"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Konditionen"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
-	<column name="ATTRIBUTE_NAME" value="Sonstiges"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Sonstiges"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 	<column name="SORTING" valueNumeric="3"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
-	<column name="ATTRIBUTE_NAME" value="Produkttyp"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Produkttyp"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 	<column name="SORTING" valueNumeric="6"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="b1c552a0-eab9-417d-9f12-039d41603f6d"/>
-	<column name="ATTRIBUTE_NAME" value="mittel"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="mittel"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="9e20d257-e2a7-4ef7-9253-1d8ed971b7b9"/>
-	<column name="ATTRIBUTE_NAME" value="D"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="D"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="3"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
-	<column name="ATTRIBUTE_NAME" value="1 mittel"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="1 mittel"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="32612c75-b32c-4043-88c4-e8237acf8d5c"/>
-	<column name="ATTRIBUTE_NAME" value="liebt Geselligkeit"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="liebt Geselligkeit"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="6db07a20-86bc-48da-8b27-b39bdd73b86b"/>
-	<column name="ATTRIBUTE_NAME" value="Projektverschiebung Kunde"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Projektverschiebung Kunde"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="85c9cdd8-f7a6-4210-840e-fab8628f4dbe"/>
-	<column name="ATTRIBUTE_NAME" value="Qualitätsproblem Kunde"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Qualitätsproblem Kunde"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="3"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="7c39913b-a07c-4332-96ff-7b34b566ff49"/>
-	<column name="ATTRIBUTE_NAME" value="Wein"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Wein"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="07fc6730-6c83-4996-bfd9-41c18765a10a"/>
-	<column name="ATTRIBUTE_NAME" value="Wechsel Entscheidungsträger"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Wechsel Entscheidungsträger"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="4"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="26385e16-6b2f-428c-9c28-1bfa9c2ccf6f"/>
-	<column name="ATTRIBUTE_NAME" value="Finanzdienstleistung"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Finanzdienstleistung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
-	<column name="ATTRIBUTE_NAME" value="Sport"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Sport"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="7f01bfa6-ce9d-4964-b1e2-3cd5464d076a"/>
-	<column name="ATTRIBUTE_NAME" value="Gerät/Maschine"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Gerät/Maschine"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
 	<column name="ATTRIBUTE_NAME" value="Jahresurlaub"/>
-	<column name="ATTRIBUTE_TYPE" value="NUMBER"/>
 	<column name="ATTRIBUTE_PARENT_ID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_TYPE" value="NUMBER                              "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="005b2ec8-68f3-4cbe-b9e5-783526e4c288"/>
-	<column name="ATTRIBUTE_NAME" value="Fernreisen"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Fernreisen"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="4dce5406-9a91-4a92-b55e-d1313c18f9c6"/>
-	<column name="ATTRIBUTE_NAME" value="Teilberechnung"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Teilberechnung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="9cfa5ce3-f1ae-4d18-9a65-0571f5ffb786"/>
-	<column name="ATTRIBUTE_NAME" value="PERS"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="PERS"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
-	<column name="ATTRIBUTE_NAME" value="Beurteilung"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Beurteilung"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-	<column name="ATTRIBUTE_NAME" value="Branche"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Branche"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
-	<column name="ATTRIBUTE_NAME" value="Zielgruppe"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Zielgruppe"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="bb0c6356-33be-4e7c-a409-9ef5145f7aae"/>
-	<column name="ATTRIBUTE_NAME" value="Dienstleistung"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Dienstleistung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="17746b46-2702-447a-b749-a92bfdf4bb38"/>
-	<column name="ATTRIBUTE_NAME" value="Kunde"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Kunde"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="d0a9eb78-6dcf-48e0-ba91-04a3ba104d26"/>
-	<column name="ATTRIBUTE_NAME" value="Interessent"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Interessent"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
-	<column name="ATTRIBUTE_NAME" value="Hersteller"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Hersteller"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
-	<column name="ATTRIBUTE_NAME" value="Wettbewerber"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Wettbewerber"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="3"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
-	<column name="ATTRIBUTE_NAME" value="Betreuung"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Betreuung"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
-	<column name="ATTRIBUTE_NAME" value="Kontaktierung"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Kontaktierung"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
-	<column name="ATTRIBUTE_NAME" value="Signatur"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Signatur"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="79ee6a0f-5192-4db3-9b05-156fd18b01b4"/>
-	<column name="ATTRIBUTE_NAME" value="Bier"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Bier"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
-	<column name="ATTRIBUTE_NAME" value="Genuss"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Genuss"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="a3972e57-d081-463a-a33c-5d4d3af6d8f2"/>
-	<column name="ATTRIBUTE_NAME" value="Motorrad"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Motorrad"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="4"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
-	<column name="ATTRIBUTE_NAME" value="Drehzahl (rpm)"/>
-	<column name="ATTRIBUTE_TYPE" value="NUMBER"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Drehzahl (rpm)"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+	<column name="ATTRIBUTE_TYPE" value="NUMBER                              "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="4c28a67b-dbc5-4399-bf33-b52e4cf82ffd"/>
-	<column name="ATTRIBUTE_NAME" value="ORG"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="ORG"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="2318607b-556a-4537-92f0-9870ee9a9201"/>
-	<column name="ATTRIBUTE_NAME" value="Zigarren"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Zigarren"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="43321e69-c8aa-4b0e-9c4e-8cde74f5c0fc"/>
-	<column name="ATTRIBUTE_NAME" value="Verschleißteil"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Verschleißteil"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="3"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
-	<column name="ATTRIBUTE_NAME" value="Maschinenbau"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Maschinenbau"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
-	<column name="ATTRIBUTE_NAME" value="Loyalität"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Loyalität"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 	<column name="SORTING" valueNumeric="5"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="b93fc811-e0dc-4e50-9ca6-107f43ac4c0c"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
 	<column name="ATTRIBUTE_NAME" value="Tabellen Daten"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT"/>
 	<column name="ATTRIBUTE_PARENT_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="915d566f-acbe-448c-a7b6-11898adc3880"/>
-	<column name="ATTRIBUTE_NAME" value="Liefersperre"/>
-	<column name="ATTRIBUTE_TYPE" value="BOOLEAN"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Liefersperre"/>
+	<column name="ATTRIBUTE_TYPE" value="BOOLEAN                             "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="d14f6eea-8760-43bf-ad3a-e7c3e4416392"/>
-	<column name="ATTRIBUTE_NAME" value="Partner"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Partner"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="4"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-	<column name="ATTRIBUTE_NAME" value="Geburtstagsliste"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Geburtstagsliste"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 	<column name="SORTING" valueNumeric="10"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="62b43c0f-9afb-4b57-8b7d-de38d43a9d47"/>
-	<column name="ATTRIBUTE_NAME" value="Nein"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Nein"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="ddf607c0-a45b-4255-bf4e-b2d515df4b86"/>
-	<column name="ATTRIBUTE_NAME" value="Ja"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Ja"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
-	<column name="ATTRIBUTE_NAME" value="Projektart"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Projektart"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="3265f271-2e85-42b2-84af-c9e23e8a1e8c"/>
-	<column name="ATTRIBUTE_NAME" value="Intern"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Intern"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="3"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="615d3850-ef32-4988-9a8d-7b702b489194"/>
-	<column name="ATTRIBUTE_NAME" value="Partner"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Partner"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="be3b5fe2-2146-4eab-80a4-3c1cf4d6156a"/>
-	<column name="ATTRIBUTE_NAME" value="Bestandskunde"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Bestandskunde"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="87204e4b-2db2-4eb4-b216-5e16b227561e"/>
-	<column name="ATTRIBUTE_NAME" value="Interessent"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Interessent"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="4a9625ed-0cd9-445f-ae13-5bdbfdf3f38c"/>
-	<column name="ATTRIBUTE_NAME" value="Fussball"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Fussball"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
-	<column name="ATTRIBUTE_NAME" value="Förderband"/>
-	<column name="ATTRIBUTE_TYPE" value="BOOLEAN"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Förderband"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+	<column name="ATTRIBUTE_TYPE" value="BOOLEAN                             "/>
 	<column name="SORTING" valueNumeric="3"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="fa0171cf-2e0d-4ff0-bbe7-8ff083a96593"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
 	<column name="ATTRIBUTE_NAME" value="weitere Daten"/>
-	<column name="ATTRIBUTE_TYPE" value="TEXT"/>
 	<column name="ATTRIBUTE_PARENT_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
-	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="974bbd28-08b3-41a4-bd74-7d9c3c778249"/>
-	<column name="ATTRIBUTE_NAME" value="kein Risiko"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="kein Risiko"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="5"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="9350afa2-7181-4eb4-b731-3699fe71b0f6"/>
-	<column name="ATTRIBUTE_NAME" value="schlecht"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="schlecht"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="d8949d8f-051b-4f5b-ba61-5af49e9499cc"/>
-	<column name="ATTRIBUTE_NAME" value="Ersatzteil"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Ersatzteil"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="23a4d394-9fae-4205-a811-730d5109c115"/>
-	<column name="ATTRIBUTE_NAME" value="Segeln"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Segeln"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="3"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
-	<column name="ATTRIBUTE_NAME" value="Werkzeugwechsler"/>
-	<column name="ATTRIBUTE_TYPE" value="BOOLEAN"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Werkzeugwechsler"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+	<column name="ATTRIBUTE_TYPE" value="BOOLEAN                             "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
-	<column name="ATTRIBUTE_NAME" value="Logistik"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Logistik"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="7"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="1a3c1c77-e57c-4481-a67f-adf7e084ea90"/>
-	<column name="ATTRIBUTE_NAME" value="IT"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="IT"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="953e3b5e-0ca7-4215-8dee-b0ba28ef1bf9"/>
-	<column name="ATTRIBUTE_NAME" value="Zahlungsproblem Kunde"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Zahlungsproblem Kunde"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="2bdb04cb-4cd3-4454-802c-8e2b4a5e2e36"/>
-	<column name="ATTRIBUTE_NAME" value="Behörde"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Behörde"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="6"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="30be2556-e09b-4169-be32-d4bafeb89a2f"/>
-	<column name="ATTRIBUTE_NAME" value="Tourismus"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Tourismus"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="3"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
-	<column name="ATTRIBUTE_NAME" value="Handel"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Handel"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="4"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="79378933-9f74-4391-b876-4528b582661f"/>
-	<column name="ATTRIBUTE_NAME" value="Bauwesen"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Bauwesen"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="5"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
-	<column name="ATTRIBUTE_NAME" value="2 gross"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="2 gross"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
-	<column name="ATTRIBUTE_NAME" value="Gewicht (kg)"/>
-	<column name="ATTRIBUTE_TYPE" value="NUMBER"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Gewicht (kg)"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+	<column name="ATTRIBUTE_TYPE" value="NUMBER                              "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
-	<column name="ATTRIBUTE_NAME" value="Bonität"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Bonität"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 	<column name="SORTING" valueNumeric="3"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
-	<column name="ATTRIBUTE_NAME" value="Beruf"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBO"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Beruf"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBO                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
-	<column name="ATTRIBUTE_NAME" value="Personal"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Personal"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="957d61a4-0038-46e0-b5a3-fc2a5d413004"/>
-	<column name="ATTRIBUTE_NAME" value="C"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="C"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
-	<column name="ATTRIBUTE_NAME" value="zusätzliche Daten"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="zusätzliche Daten"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="4d4ef830-68e6-4228-9e4f-13614d841328"/>
-	<column name="ATTRIBUTE_NAME" value="Wirtschaft"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Wirtschaft"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="bb62ae03-be34-4d34-885c-27591c5bf1b4"/>
-	<column name="ATTRIBUTE_NAME" value="Golf"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Golf"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="0afb463f-6ce4-4dfb-b093-09a8fcd925a3"/>
-	<column name="ATTRIBUTE_NAME" value="Bauteil"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+	<column name="ATTRIBUTE_NAME" value="Bauteil"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
-	<column name="ATTRIBUTE_NAME" value="Mitarbeiterkonto"/>
-	<column name="ATTRIBUTE_TYPE" value="GROUP"/>
-	<column name="ATTRIBUTE_PARENT_ID" value=""/>
-	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Mitarbeiterkonto"/>
+	<column name="ATTRIBUTE_TYPE" value="GROUP                               "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="97c6f6ec-2ed2-4c26-8612-b524e3ef15db"/>
-	<column name="ATTRIBUTE_NAME" value="DOCUMENT"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="DOCUMENT"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="fffbb6b5-05ea-4f76-83c6-cf2cb29ef576"/>
-	<column name="ATTRIBUTE_NAME" value="unvollständige Lieferung"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="unvollständige Lieferung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="3"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="5c188c8c-14b2-4c66-ad48-65b750e05353"/>
-	<column name="ATTRIBUTE_NAME" value="Qualitätsbeanstandung"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Qualitätsbeanstandung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="1"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="3600aba4-01d4-4ca3-a3e7-79e0b946a2b1"/>
-	<column name="ATTRIBUTE_NAME" value="fehlerhafte Lieferung"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="fehlerhafte Lieferung"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="2"/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="66b64741-a896-4404-874a-b83b3525fcff"/>
-	<column name="ATTRIBUTE_NAME" value="Transportschaden"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Transportschaden"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 </insert>
 <insert tableName="AB_ATTRIBUTE">
 	<column name="AB_ATTRIBUTEID" value="c0fb9a3a-89a5-46a4-9b95-f48c9481375e"/>
-	<column name="ATTRIBUTE_NAME" value="EVENT"/>
-	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
-	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
 	<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
 	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="EVENT"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+	<column name="ATTRIBUTE_TYPE" value="COMBOVALUE                          "/>
 	<column name="SORTING" valueNumeric="3"/>
 </insert>
-
-    <rollback>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Zahlungskondition"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Lieferkondition"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Preisliste"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="ATTRIBUTE_TYPE" value="KEYWORD                             "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="e7886e41-252e-414c-a169-5d1481d010c8"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Lieferant"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="44d53f3a-a8cd-4e79-bc09-a6e17d678e7e"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Rückantwort Kampagne"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="e8999504-5851-4934-a3f1-fb4b513d41e9"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="schreibt für"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="33cb83f1-aee2-469e-b57d-666ac6725f61"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="Unterkampagne von"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="093c7337-c134-4be5-a215-dc94804c3511"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+	<column name="ATTRIBUTE_NAME" value="übergeordnete Kampagne von"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="28fd7a4b-72d8-40ff-a893-a9479abcf19e"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Feiertag"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Innendienst"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Aussendienst"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Service"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="2f963668-9e8c-41d7-aee4-6beaf37492e4"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Besuchsfrequenz"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="ff84c147-27c7-4698-83ff-0e25b1d33851"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Vorgesetzter von"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="d637fc6c-9452-4498-8379-ec71d946cbab"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="berichtet an"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="6bdb658c-94bc-4e68-aefb-a38483ee68b1"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Gebiet"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="3e5736c4-93ff-4471-96f5-48bb34ab53d2"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Urlaubsgenehmigung durch"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+	<column name="AB_ATTRIBUTEID" value="3f119858-9d69-4903-a572-d286be151f73"/>
+	<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+	<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+	<column name="ATTRIBUTE_NAME" value="Urlaubsprüfung durch"/>
+	<column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="ATTRIBUTE_TYPE" value="TEXT                                "/>
+</insert>
+<rollback>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="558419b2-6113-4060-b88d-cc6324754765"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+	</whereParams>
+</delete>
 <delete tableName="AB_ATTRIBUTE">
 	<where>AB_ATTRIBUTEID = ?</where>
 	<whereParams>
@@ -1478,27 +1626,111 @@
 <delete tableName="AB_ATTRIBUTE">
 	<where>AB_ATTRIBUTEID = ?</where>
 	<whereParams>
-		<param value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+		<param value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
 	</whereParams>
 </delete>
 <delete tableName="AB_ATTRIBUTE">
 	<where>AB_ATTRIBUTEID = ?</where>
 	<whereParams>
-		<param value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+		<param value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
 	</whereParams>
 </delete>
 <delete tableName="AB_ATTRIBUTE">
 	<where>AB_ATTRIBUTEID = ?</where>
 	<whereParams>
-		<param value="558419b2-6113-4060-b88d-cc6324754765"/>
+		<param value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
 	</whereParams>
 </delete>
 <delete tableName="AB_ATTRIBUTE">
 	<where>AB_ATTRIBUTEID = ?</where>
 	<whereParams>
-		<param value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+		<param value="e7886e41-252e-414c-a169-5d1481d010c8"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="44d53f3a-a8cd-4e79-bc09-a6e17d678e7e"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="e8999504-5851-4934-a3f1-fb4b513d41e9"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="33cb83f1-aee2-469e-b57d-666ac6725f61"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="093c7337-c134-4be5-a215-dc94804c3511"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="28fd7a4b-72d8-40ff-a893-a9479abcf19e"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="2f963668-9e8c-41d7-aee4-6beaf37492e4"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="ff84c147-27c7-4698-83ff-0e25b1d33851"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="d637fc6c-9452-4498-8379-ec71d946cbab"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="6bdb658c-94bc-4e68-aefb-a38483ee68b1"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="3e5736c4-93ff-4471-96f5-48bb34ab53d2"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+	<where>AB_ATTRIBUTEID = ?</where>
+	<whereParams>
+		<param value="3f119858-9d69-4903-a572-d286be151f73"/>
 	</whereParams>
 </delete>
-    </rollback>
+</rollback>
     </changeSet>
 </databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
index 30e5cac58d680c19e70f29d3449c92566a330662..e6019bb9b660635d94b05846fc6b0673494611a9 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
@@ -3,246 +3,269 @@
     <changeSet author="s.listl" id="33bfbf9d-e3b9-4dd0-94e5-f22c74bc3014">
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="c4f2943f-a63c-4ede-815b-0d588f33d5fb"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="cf947eee-dc58-40ad-92b0-f30314a8b2a7"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="81426072-72e5-4a69-945e-754b7fd0bcf7"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="18d77833-d551-405c-8a96-9e99cb4d722d"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="900d4e93-0927-407b-a7bc-bb535fa0caa9"/>
-	<column name="OBJECT_TYPE" value="Salesproject"/>
 	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="OBJECT_TYPE" value="Salesproject"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="1f2749b3-1402-46fb-892a-e68b9a39065d"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
 	<column name="MIN_COUNT" valueNumeric="1"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="20f400fc-4709-4ecc-a8ca-d8fe405b5e2a"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="140b87a4-4f8e-4ae5-84d5-4bc26fa51901"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
 	<column name="MIN_COUNT" valueNumeric="1"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="5b9d5f38-4486-4586-8de0-9c607d51e698"/>
-	<column name="OBJECT_TYPE" value="Document_entity"/>
 	<column name="AB_ATTRIBUTE_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
+	<column name="OBJECT_TYPE" value="Document_entity"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="9216c562-b361-4a9d-be60-a6fdf9bdc07c"/>
-	<column name="OBJECT_TYPE" value="Person"/>
 	<column name="AB_ATTRIBUTE_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+	<column name="OBJECT_TYPE" value="Person"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="f06dd320-4757-4261-aace-cb827a313d28"/>
-	<column name="OBJECT_TYPE" value="Person"/>
 	<column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="OBJECT_TYPE" value="Person"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="8adfbc93-2daa-4e6b-a3ce-76110b46e458"/>
-	<column name="OBJECT_TYPE" value="Activity"/>
 	<column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="OBJECT_TYPE" value="Activity"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="6ad188dc-5e76-467a-9bc3-8c63f50862ae"/>
-	<column name="OBJECT_TYPE" value="Contract"/>
 	<column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="OBJECT_TYPE" value="Contract"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="31b6b6f1-b980-4b14-a382-a718be560009"/>
-	<column name="OBJECT_TYPE" value="Document_entity"/>
 	<column name="AB_ATTRIBUTE_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+	<column name="OBJECT_TYPE" value="Document_entity"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="c32d3322-5ff6-400a-82b6-4f8524ec7f6b"/>
-	<column name="OBJECT_TYPE" value="Product"/>
 	<column name="AB_ATTRIBUTE_ID" value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
+	<column name="OBJECT_TYPE" value="Product"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="e744c324-27ca-4d91-bf57-c487a904d8d6"/>
-	<column name="OBJECT_TYPE" value="Product"/>
 	<column name="AB_ATTRIBUTE_ID" value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
+	<column name="OBJECT_TYPE" value="Product"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="e5ccaa2e-1cae-4ac8-b76c-5c06eac0e53d"/>
-	<column name="OBJECT_TYPE" value="Person"/>
 	<column name="AB_ATTRIBUTE_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
+	<column name="OBJECT_TYPE" value="Person"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="9e9829fe-880d-4b65-b729-34a99b37c5bf"/>
-	<column name="OBJECT_TYPE" value="Person"/>
 	<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="OBJECT_TYPE" value="Person"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="86d385a6-f97f-4868-a65a-9b60940886f0"/>
-	<column name="OBJECT_TYPE" value="Product"/>
 	<column name="AB_ATTRIBUTE_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+	<column name="OBJECT_TYPE" value="Product"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="89be2b44-2766-4dea-9a73-725b84a20d6d"/>
-	<column name="OBJECT_TYPE" value="Contact"/>
 	<column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+	<column name="OBJECT_TYPE" value="Contact"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="0766ff88-304d-41a7-8224-642a0aee5587"/>
-	<column name="OBJECT_TYPE" value="Salesproject"/>
 	<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="OBJECT_TYPE" value="Salesproject"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="ef63620d-f247-4ca0-bd92-9efa0b14676e"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="512ef5be-3381-42ac-860a-b1fbb9be665b"/>
-	<column name="OBJECT_TYPE" value="Activity"/>
 	<column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	<column name="OBJECT_TYPE" value="Activity"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="dbb70409-43b2-4a94-b7f7-bbb4e4ba101d"/>
-	<column name="OBJECT_TYPE" value="Person"/>
 	<column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="OBJECT_TYPE" value="Person"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="f579e0d5-42f4-4682-99b5-358e06ffe4a1"/>
-	<column name="OBJECT_TYPE" value="Person"/>
 	<column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+	<column name="OBJECT_TYPE" value="Person"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
-	<column name="OBJECT_TYPE" value="Salesproject"/>
 	<column name="AB_ATTRIBUTE_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
 	<column name="MIN_COUNT" valueNumeric="1"/>
+	<column name="OBJECT_TYPE" value="Salesproject"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="d31efbea-3583-4772-9b5b-b900ab88c9a3"/>
-	<column name="OBJECT_TYPE" value="Product"/>
 	<column name="AB_ATTRIBUTE_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+	<column name="OBJECT_TYPE" value="Product"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="e79d1096-a2e0-4c4f-acca-2f5976699dcd"/>
-	<column name="OBJECT_TYPE" value="Person"/>
 	<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
 	<column name="MIN_COUNT" valueNumeric="1"/>
+	<column name="OBJECT_TYPE" value="Person"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="9a145e7f-bb66-4541-bb99-28c2dd944f3d"/>
-	<column name="OBJECT_TYPE" value="Document_entity"/>
 	<column name="AB_ATTRIBUTE_ID" value="fa0171cf-2e0d-4ff0-bbe7-8ff083a96593"/>
+	<column name="OBJECT_TYPE" value="Document_entity"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="37855ddd-c5cb-4692-86a5-3a94aae7c455"/>
-	<column name="OBJECT_TYPE" value="Product"/>
 	<column name="AB_ATTRIBUTE_ID" value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
+	<column name="OBJECT_TYPE" value="Product"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="fade7115-40fb-41a2-8f71-dbb6905176e9"/>
-	<column name="OBJECT_TYPE" value="Document_entity"/>
 	<column name="AB_ATTRIBUTE_ID" value="b93fc811-e0dc-4e50-9ca6-107f43ac4c0c"/>
+	<column name="OBJECT_TYPE" value="Document_entity"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="97dce2df-5757-4a2e-89a1-60a9a88d181c"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="66cac4bb-6dd9-4ddd-b329-14d4542bfd2e"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="05576033-1bee-4547-ab82-fdfcdd039642"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
-	<column name="MIN_COUNT" valueNumeric="2"/>
 	<column name="MAX_COUNT" valueNumeric="0"/>
+	<column name="MIN_COUNT" valueNumeric="2"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="6fd80f33-6d9a-4b95-b420-c3c5b249caf9"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="7c0f32be-d3f5-48be-8b7e-a80eb6ade28d"/>
-	<column name="OBJECT_TYPE" value="Person"/>
 	<column name="AB_ATTRIBUTE_ID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
+	<column name="OBJECT_TYPE" value="Person"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="4ff67f07-1aa7-47d4-8e5f-c4860793085a"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="915d566f-acbe-448c-a7b6-11898adc3880"/>
 	<column name="MIN_COUNT" valueNumeric="1"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="8593dbe5-617a-4f09-a789-02b54157b1d3"/>
-	<column name="OBJECT_TYPE" value="Person"/>
 	<column name="AB_ATTRIBUTE_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+	<column name="OBJECT_TYPE" value="Person"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="96d0c724-a00a-4d04-ad44-6a4014318e5a"/>
-	<column name="OBJECT_TYPE" value="Person"/>
 	<column name="AB_ATTRIBUTE_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+	<column name="OBJECT_TYPE" value="Person"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="ebb3b2a2-0fd2-4307-8f21-c118e7ad7b8e"/>
-	<column name="OBJECT_TYPE" value="Contact"/>
 	<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
 	<column name="MIN_COUNT" valueNumeric="1"/>
+	<column name="OBJECT_TYPE" value="Contact"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="755239d0-7fe3-46bc-8ec4-923977148455"/>
-	<column name="OBJECT_TYPE" value="Person"/>
 	<column name="AB_ATTRIBUTE_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+	<column name="OBJECT_TYPE" value="Person"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="4d649c71-ba74-4ee1-ba73-6155327190d4"/>
-	<column name="OBJECT_TYPE" value="Person"/>
 	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="OBJECT_TYPE" value="Person"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="0826cf13-f379-417d-9fed-302fe44a618e"/>
-	<column name="OBJECT_TYPE" value="Activity"/>
 	<column name="AB_ATTRIBUTE_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
 	<column name="MIN_COUNT" valueNumeric="1"/>
+	<column name="OBJECT_TYPE" value="Activity"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="2d2c7f0f-29aa-42e8-88f5-b6234d52e349"/>
-	<column name="OBJECT_TYPE" value="Organisation"/>
 	<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
 	<column name="MIN_COUNT" valueNumeric="1"/>
+	<column name="OBJECT_TYPE" value="Organisation"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="be7d0f5c-8941-4b3d-b128-bab67e1d609b"/>
-	<column name="OBJECT_TYPE" value="Product"/>
 	<column name="AB_ATTRIBUTE_ID" value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
+	<column name="OBJECT_TYPE" value="Product"/>
 </insert>
 <insert tableName="AB_ATTRIBUTEUSAGE">
 	<column name="AB_ATTRIBUTEUSAGEID" value="44398121-8b60-41ff-a657-84b2b5c1e034"/>
-	<column name="OBJECT_TYPE" value="Product"/>
 	<column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+	<column name="OBJECT_TYPE" value="Product"/>
 </insert>
-
-    <rollback>
+<rollback>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="c4f2943f-a63c-4ede-815b-0d588f33d5fb"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="cf947eee-dc58-40ad-92b0-f30314a8b2a7"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="81426072-72e5-4a69-945e-754b7fd0bcf7"/>
+	</whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+	<where>AB_ATTRIBUTEUSAGEID = ?</where>
+	<whereParams>
+		<param value="18d77833-d551-405c-8a96-9e99cb4d722d"/>
+	</whereParams>
+</delete>
 <delete tableName="AB_ATTRIBUTEUSAGE">
 	<where>AB_ATTRIBUTEUSAGEID = ?</where>
 	<whereParams>
@@ -495,30 +518,6 @@
 		<param value="44398121-8b60-41ff-a657-84b2b5c1e034"/>
 	</whereParams>
 </delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="c4f2943f-a63c-4ede-815b-0d588f33d5fb"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="cf947eee-dc58-40ad-92b0-f30314a8b2a7"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="81426072-72e5-4a69-945e-754b7fd0bcf7"/>
-	</whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
-	<where>AB_ATTRIBUTEUSAGEID = ?</where>
-	<whereParams>
-		<param value="18d77833-d551-405c-8a96-9e99cb4d722d"/>
-	</whereParams>
-</delete>
-    </rollback>
+</rollback>
     </changeSet>
 </databaseChangeLog>
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index 019c9557e71d7f258dd425977c6ef2ba61dbcfdf..dfe2c88b7b0f91219ea2f4fa54d047364d21bb25 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -3,6 +3,7 @@ import("system.vars");
 import("system.result");
 import("system.db");
 import("Sql_lib");
+import("Util_lib");
 import("Context_lib");
 
 /**
@@ -11,7 +12,7 @@ import("Context_lib");
  * Do not create an instance of this!
  * @class
  */
-function RelationUtils() {}
+function ContactUtils() {}
 
 /**
  * Get the type of contact. <br>
@@ -38,15 +39,15 @@ function RelationUtils() {}
  *                      2 if privat person <br>
  *                      3 if person of an organisation <br>
  */
-RelationUtils.getRelationType = function(pRelationId, pPersId, pOrgId)
+ContactUtils.getRelationType = function(pRelationId, pPersId, pOrgId)
 {
     if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
     {
-        return RelationUtils.getRelationTypeByRelation(pRelationId);
+        return ContactUtils.getRelationTypeByRelation(pRelationId);
     }
     else
     {
-        return RelationUtils.getRelationTypeByPersOrg(pPersId, pOrgId);
+        return ContactUtils.getRelationTypeByPersOrg(pPersId, pOrgId);
     }
 }
 
@@ -60,9 +61,9 @@ RelationUtils.getRelationType = function(pRelationId, pPersId, pOrgId)
  *                  2 if privat person <br>
  *                  3 if person of an organisation <br>
  */
-RelationUtils.getRelationTypeByRelation = function(pRelationId)
+ContactUtils.getRelationTypeByRelation = function(pRelationId)
 {
-    var relationData = RelationUtils.getPersOrgIds(pRelationId);
+    var relationData = ContactUtils.getPersOrgIds(pRelationId);
     if (relationData[0]) 
     {
         return this.getRelationTypeByPersOrg(relationData[1], relationData[2]);
@@ -95,7 +96,7 @@ RelationUtils.getRelationTypeByRelation = function(pRelationId)
  *                      2 if privat person <br>
  *                      3 if person of an organisation <br>
  */
-RelationUtils.getRelationTypeByPersOrg = function(pPersId, pOrgId)
+ContactUtils.getRelationTypeByPersOrg = function(pPersId, pOrgId)
 {
     if (!pPersId)
     {
@@ -138,9 +139,9 @@ RelationUtils.getRelationTypeByPersOrg = function(pPersId, pOrgId)
  * 
  * @return {String} contextname or "" if both ids are empty
  */
-RelationUtils.getContextByPersOrg = function(pPersId, pOrgId)
+ContactUtils.getContextByPersOrg = function(pPersId, pOrgId)
 {
-    switch (RelationUtils.getRelationTypeByPersOrg(pPersId, pOrgId))
+    switch (ContactUtils.getRelationTypeByPersOrg(pPersId, pOrgId))
     {
         case 1: // Org
             return ContextUtils.getContextName("Organisation");
@@ -159,10 +160,10 @@ RelationUtils.getContextByPersOrg = function(pPersId, pOrgId)
  * @param {String} pRelationId
  * @return {String} contextname or "" if contact not found
  */
-RelationUtils.getContextByRelationId = function(pRelationId)
+ContactUtils.getContextByRelationId = function(pRelationId)
 {
-    var relationData = RelationUtils.getPersOrgIds(pRelationId);
-    return RelationUtils.getContextByPersOrg(relationData[1], relationData[2])
+    var relationData = ContactUtils.getPersOrgIds(pRelationId);
+    return ContactUtils.getContextByPersOrg(relationData[1], relationData[2])
 }
 
 /**
@@ -171,7 +172,7 @@ RelationUtils.getContextByRelationId = function(pRelationId)
  * @param {String} pRelationId
  * @return {String[]} result as [persid, orgid] if one of them is null in the db, "" will be returned as the id.
  */
-RelationUtils.getPersOrgIds = function(pRelationId)
+ContactUtils.getPersOrgIds = function(pRelationId)
 {
     if (pRelationId) {
         return db.array(db.ROW, 
@@ -186,58 +187,27 @@ RelationUtils.getPersOrgIds = function(pRelationId)
 
 /**
  * get the name of the person or organisation
- * The parameters have to be selected from the same contact.
  * 
- * @param {String} pPersId value of the person_id selected from CONTACT
- * @param {String} pOrgId value of the org_id selected from CONTACT
- * @param {String} pPersFirstname value of the firstname selected from PERSON
- * @param {String} pPersLastname value of the lastname selected from PERSON
- * @param {String} pOrgname value of the name selected from ORGANISATION
- * @param {String} [pTitle=undefined] value of the title selected from PERSON. You can ommit this parameter if you do not want to append the title
+ * @param {String} pContactId the contact id where pers-name or orgname shall be loaded
  * 
  * @return {String} the name or ""
  */
-RelationUtils.getNameByPersOrg = function(pPersId, pOrgId, pPersFirstname, 
-                                            pPersLastname, pOrgname, pTitle)
+ContactUtils.getFullTitleByContactId = function(pContactId)
 {
-    if(!pPersId && !pOrgId)
-        return "";
-    else 
+    if (pContactId) 
     {
-        switch (RelationUtils.getRelationTypeByPersOrg(pPersId, pOrgId))
-        {
-            case 1: // Org   
-                return pOrgname;
-            case 2: // private Person
-            case 3: // Person
-                var name = "";
-                
-                if (pTitle != undefined && pTitle)
-                    name = pTitle + " ";
-               
-                return name + pPersFirstname.concat(" " , pPersLastname);
-            default:
-                return "";
-        }
-    }
-}
-
-/**
- * get the name of the person or organisation
- * 
- * @param {String} pRelationId the contact id
- * @param {Boolean} [pTitle=false] also add the title for persons
- * 
- * @return {String} the name or ""
- */
-RelationUtils.getNameByPersOrgWithRelationId = function(pRelationId, pTitle)
-{
-    if (pRelationId) {
         var data = db.array(db.ROW, SqlCondition.begin()
-                            .andPrepare("CONTACT.CONTACTID", pRelationId)
-                            .buildSql("select CONTACT.PERSON_ID, CONTACT.ORGANISATION_ID, PERSON.FIRSTNAME, PERSON.LASTNAME, PERSON.TITLE, ORGANISATION.NAME from CONTACT CONTACT join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID left join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID", "1 = 2"));                                    
- 
-        return RelationUtils.getNameByPersOrg(data[0], data[1], data[2], data[3], data[5], (pTitle ? data[4] : undefined));
+                .andPrepare("CONTACT.CONTACTID", pContactId)
+                .buildSql("select ORGANISATION.NAME, PERSON.SALUTATION, PERSON.TITLE, PERSON.FIRSTNAME, PERSON.MIDDLENAME, PERSON.LASTNAME "
+                    + "from CONTACT CONTACT "
+                    + "join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID "
+                    + "left join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID", "1 = 2"));
+        if (data.length == 0)
+            return "";
+        var contact = new Contact();
+        [contact.organisationName, contact.salutation, contact.title, contact.firstname, contact.middlename, contact.lastname] = data;
+        var renderer = new ContactTitleRenderer(contact);
+        return renderer.asString();
     }
     
     return "";
@@ -248,28 +218,165 @@ RelationUtils.getNameByPersOrgWithRelationId = function(pRelationId, pTitle)
  *
  * @return {String}
  */
-RelationUtils.getFullRelationFromString = function()
+ContactUtils.getFullRelationString = function()
 {
     return " CONTACT join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID"
     + " left join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID"
     + " left join ADDRESS on ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID";
 }
 
+
 /**
- * returns the select string for the contact joined with org, person, address 
- *  
- * @param {String} pIdField field used as id
+ * object for handling of a single contact
+ * provides static- and instance-functions
+ * 
+ * @class
  *
- * @return {String}
  */
-RelationUtils.getFullRelationSelectString = function(pIdField)
+function Contact()
 {
-    if(pIdField == undefined)
-        pIdField = "CONTACTID";
+    //storage for information
+    this.salutation = "";
+    this.title = "";
+    this.firstname= "";
+    this.middlename = "";
+    this.lastname = "";
+    this.suffix = "";
 
-    var maskingUtils = new SqlMaskingUtils();
+    this.customercode = "";
+    this.organisationName = "";
+    
+    this._contactType = Contact.TYPES.Auto;
+}
 
-    return " " + pIdField + ","
-    + maskingUtils.concat( [ maskingUtils.concat(["SALUTATION", "TITLE", "FIRSTNAME", "LASTNAME"]) , "NAME"], " - " ) +  " as anzeige, "
-    + "CUSTOMERCODE, NAME, ZIP, CITY, TITLE, FIRSTNAME, LASTNAME ";
-}
\ No newline at end of file
+/**
+ * sets the contactType of a contact
+ * reserved for future implementation
+ * 
+ * @param {String} pContactType contactType that shall be set; value of Contact.TYPES.
+ *
+ * @return void
+ */
+Contact.prototype.setContactType = function (pContactType)
+{
+    if (! ObjectUtils.existsValue(Contact.TYPES, pContactType))
+        throw new TypeError("the given contact type is not a valid value and not a contact type");
+    
+    this._contactType = pContactType;
+};
+
+/**
+ * returns the contactType of a contact
+ * reserved for future implementation
+ * 
+ * @return {String} the contactType is a value of Contact.TYPES.
+ */
+Contact.prototype.getContactType = function ()
+{
+    return this._contactType;
+};
+
+/**
+ * constants for types of Contacts
+ * use only within functions
+ * reserved for future implementation
+ * 
+ * @static
+ */
+Contact.TYPES = {
+    Organisation: "organisation",
+    Contact: "contact",
+    Private: "private",
+    Auto: null
+};
+
+/**
+ * creates a new Contact-object with a preset of DB-columns
+ * 
+ * @static
+ */
+Contact.createWithColumnPreset = function()
+{
+    var contact = new Contact();
+    contact.salutation = "PERSON.SALUTATION";
+    contact.title = "PERSON.TITLE";
+    contact.firstname= "PERSON.FIRSTNAME";
+    contact.middlename = "PERSON.MIDDLENAME";
+    contact.lastname = "PERSON.LASTNAME";
+    contact.suffix = "PERSON.TITLESUFFIX";
+    contact.customercode = "ORGANISATION.CUSTOMERCODE";
+    contact.organisationName = "ORGANISATION.NAME";
+    return contact;
+};
+
+/**
+ * object for rendering a Contact-object into text representation or an sql that represents the text
+ * provides static- and instance-functions
+ * 
+ * @param {Contact} pContact The Contact-object to render
+ * @param {Number} pOptions additional options for rendering; use values of ContactTitleRenderer.OPTIONS and pass them by bitwise OR concatination; e.g.:
+ *                  OPTION_1 | OPTION_2 | OPTION_5
+ * 
+ * @class
+ *
+ */
+function ContactTitleRenderer(pContact, pOptions)
+{
+    this.contact = pContact;
+    if (pOptions !== undefined)//null means null which is "no option"; so check exactly for undefined
+        this._options = pOptions;
+    else 
+        this._options = ContactTitleRenderer.OPTIONS.IncludeOrganisation;
+    
+    //function that renders the contact into a sql expression (e.g. for a subselect)
+    this._asSqlFn = function(){
+        var maskingUtil = new SqlMaskingUtils();
+        var res = maskingUtil.concat([this.contact.salutation, this.contact.title, this.contact.firstname, this.contact.middlename, this.contact.lastname].filter(function (e){
+            return e != "";
+        }), " ");
+        if (this._options & ContactTitleRenderer.OPTIONS.IncludeOrganisation && this.contact.organisationName)
+            res = maskingUtil.concat([res, this.contact.organisationName], " | ");
+        return res;
+    };
+    
+    //function that renders the contact into a text  (e.g. for a displayValue)
+    this._asStringFn = function (){
+        var res = StringUtils.concat(" ", [this.contact.salutation, this.contact.title, this.contact.firstname, this.contact.middlename, this.contact.lastname]);
+
+        if (this._options & ContactTitleRenderer.OPTIONS.IncludeOrganisation && this.contact.organisationName)
+            res = StringUtils.concat(" | ", [res, this.contact.organisationName]);
+        return res;
+    }
+}
+
+/**
+ * constants for options for the ContactTitleRenderer
+ * use only within functions
+ * 
+ * @static
+ */
+ContactTitleRenderer.OPTIONS = {
+    IncludeOrganisation: 1
+};
+
+/**
+ * function that renders the contact into a sql expression (e.g. for a subselect)
+ * what this function exactly does depends on specified values and options specified in the Renderer-object
+ * 
+ * @return {String} sql-expression that can be placed inside a select statement
+ */
+ContactTitleRenderer.prototype.asSql = function ()
+{
+    return this._asSqlFn.apply(this, arguments);
+};
+
+/**
+ * function that renders the contact into text
+ * what this function exactly does depends on specified values and options specified in the Renderer-object
+ * 
+ * @return {String} rendered values as text
+ */
+ContactTitleRenderer.prototype.asString = function ()
+{
+    return this._asStringFn.apply(this, arguments);
+};
diff --git a/process/Person_lib/process.js b/process/Person_lib/process.js
index c5ad5751f5658c861d30f4243e78295b96a07cc5..2fe262fac3ee20b20078c4ff90293500a8b77f16 100644
--- a/process/Person_lib/process.js
+++ b/process/Person_lib/process.js
@@ -1,6 +1,7 @@
 import("system.result");
 import("Binary_lib");
 import("Sql_lib");
+import("Contact_lib");
 
 /**
  * a static Utility class for the Person context.
@@ -55,9 +56,12 @@ PersUtils.removeImage = function(pPersId)
  */
 PersUtils.getResolvingDisplaySubSql = function(pRelationIdField)
 {
-    var maskingHelper = new SqlMaskingUtils();
-    //TODO: verify if there is a better solution for the usage of this as a displayValueExpression --> automatic use of #TITLE
-    return "select " + maskingHelper.concat(["PERSON.FIRSTNAME", "PERSON.LASTNAME"]) + "from PERSON \n\
+    var contact = Contact.createWithColumnPreset();
+    var renderer = new ContactTitleRenderer(contact, null);
+    var selectExpression = renderer.asSql();
+
+    //TODO: verify if there is a better solution for the usage of this as a displayValueExpression --> automatic use of #TITLE | waiting vor implementation
+    return "select " + selectExpression + "from PERSON \n\
         join CONTACT on (PERSON.PERSONID = CONTACT.PERSON_ID) \n\
         where CONTACT.CONTACTID = " + pRelationIdField;
 }
\ No newline at end of file
diff --git a/process/PostalAddress_lib/process.js b/process/PostalAddress_lib/process.js
index c18e69398a84f6f99591b495c4d5622167679884..2a57f0955fb759a48cfe8c3fee9ce37b171b7228 100644
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
@@ -3,6 +3,7 @@ import("system.db");
 import("Sql_lib");
 import("Contact_lib");
 import("Keyword_lib");
+import("Util_lib");
 /**
  * Methods for addresses.
  * Todo: evtl. übernahme / anpassung der Adresslib aus altem Basic. 1030856
@@ -26,17 +27,7 @@ function AddressUtils(){}
  */
 AddressUtils.formatOneline = function (pCountry, pAddressLine, pBuildingNo, pZipCode, pCity)
 {
-    var country = pCountry || "";
-    var addressLine = pAddressLine || "";
-    var buildingNo = pBuildingNo || "";
-    var zipCode = pZipCode || "";
-    var city = pCity || "";
-    return [country, addressLine, buildingNo, zipCode, city]
-    .filter(function (v)
-    {
-        return v != "";
-    })
-    .join(", ");
+    return StringUtils.concat(", ", [pCountry, pAddressLine, pBuildingNo, pZipCode, pCity]);
 };
 
 /**
@@ -47,7 +38,7 @@ AddressUtils.formatOneline = function (pCountry, pAddressLine, pBuildingNo, pZip
  * @return {String}
  */
 AddressUtils.getAddress = function(pRelationId) {
-    var address = db.array(db.ROW, SqlCondition.begin().andPrepare("CONTACT.CONTACTID", pRelationId).buildSql('select CONTACTID, ADDRESS, BUILDINGNO, ZIP, CITY, "NAME", FIRSTNAME, LASTNAME, TITLE from' + RelationUtils.getFullRelationFromString(), "1=0"));
+    var address = db.array(db.ROW, SqlCondition.begin().andPrepare("CONTACT.CONTACTID", pRelationId).buildSql('select CONTACTID, ADDRESS, BUILDINGNO, ZIP, CITY, "NAME", FIRSTNAME, LASTNAME, TITLE from' + ContactUtils.getFullRelationString(), "1=0"));
     
     // TODO: currently there are some relations without standard address. Use Hardcoded one.
     if (!address[1]) {
@@ -58,7 +49,7 @@ AddressUtils.getAddress = function(pRelationId) {
         address[4] = dummyAddress[3];
         
     }
-    var type = RelationUtils.getRelationTypeByRelation(pRelationId);
+    var type = ContactUtils.getRelationTypeByRelation(pRelationId);
     
     return AddressUtils.formatAddress(type, address[1], address[2], address[3], address[4], address[5], address[6], address[7], address[8]);
 }
@@ -86,7 +77,7 @@ AddressUtils.getAddressById = function(pAddressId) {
         address[4] = dummyAddress[4];
         
     }
-    var type = RelationUtils.getRelationTypeByRelation(address[0]);   
+    var type = ContactUtils.getRelationTypeByRelation(address[0]);   
 
     var names = db.array(db.ROW, SqlCondition.begin()
                                              .andPrepare("CONTACT.CONTACTID", address[0])
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index bfe2e05841546c263bffe7c908bec33834ff44f7..e677069ded29df17642361879c8b9d2fa146cd85 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -859,7 +859,10 @@ SqlMaskingUtils.prototype.concat = function(fields, separatorCharacter, autoTrim
             retSql += " case when " + _isNotEmpty(fields[i + 1]) + " then " + _trimIfAutoTrimEnabled(fields[i]) + separatorSql + " else " + _trimIfAutoTrimEnabled(fields[i]) + " end "; 
         else
             retSql += _trimIfAutoTrimEnabled(fields[i]);
-        retSql += " else '' end ";
+        //this blank is used just as in the old concat function which means this concat function has the same (wrong) behaviour
+        //TODO: find way to fix the case when separator is not a whitepsace (e.g. space)
+        //this concat-function does not work properly if you concat [<<value>>, <<null>>, <<value>>] by comma
+        retSql += " else ' ' end ";
     }
     return retSql;
 }
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index b27d5d9c3c802b1d8449e4b6e2f3e15f6520cdd9..3b5cc6b09496cf7cfb89ccafdaafcf635dc62bc4 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -14,6 +14,31 @@ import("system.datetime");
 import("Offer_lib");
 import("Date_lib");
 
+/**
+ * Class containing static utility functions for string-actions
+ * Do not create an instance of this
+ * 
+ * @class
+ */
+function StringUtils(){}
+
+/**
+ * concats severel elements by a separator; the separator is only applied if a element is not null and not an empty string "";
+ *
+ * @param {String} pSeparator specifies how the not empty elements shall be concatenated
+ * @param {String[]} pElements elements that shall be joined by the separator 
+ *
+ * @return {String} concatenated string; if all elements are empty an emtpy string is returned
+ * 
+ */
+StringUtils.concat = function(pSeparator, pElements)
+{
+   var res = pElements.filter(function(e){
+       return e != null && e != "";
+   }).join(pSeparator);
+   return res;
+};
+
 /**
  * Class containing static utility functions for use with arrays
  * Do not create an instance of this!
@@ -348,6 +373,33 @@ JSONUtils.customStringify = function(obj) {
     return stringify(obj);
 }
 
+/**
+ * Class containing functions for Javascript-Objects
+ * Do not create an instance of this
+ * 
+ * @class
+ */
+function ObjectUtils(){}
+
+/**
+ * checks if a value exists in the object
+ * mostly usefull for primitve datatypes
+ * 
+ * @param pObject {Object} the object where the value is searched
+ * @param pValue  {Boolean|Number|String} the value that is searched
+ * 
+ * @return {Boolean} true if the value was found, false if not
+ */
+ObjectUtils.existsValue = function(pObject, pValue)
+{
+    for (var key in pObject)
+    {
+        if (pObject[key] === pValue)
+            return true;
+    }
+    return false;
+};
+
 /**
  * Class containing functions for sequential numbers
  * Do not create an instance of this!