diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index a51593d0adf8aca483b9c27871b06b7787cd6b85..d3149a72f1cae2660c3668da6d0fc66651eaa760 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -2016,19 +2016,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>ESTIMATIONVALUE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="4" />
-                <size v="10" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>INFO</name>
                 <dbName></dbName>
@@ -2042,19 +2029,6 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>ESTIMATION</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="12" />
-                <size v="50" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>ENDDATE</name>
                 <dbName></dbName>
@@ -3027,6 +3001,34 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>PARENT_CONTEXT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PARENT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
@@ -3567,8 +3569,8 @@
                 <columnType v="4" />
                 <size v="10" />
                 <scale v="0" />
-                <notNull v="true" />
-                <isUnique v="true" />
+                <notNull v="false" />
+                <isUnique v="false" />
                 <index v="true" />
                 <documentation></documentation>
                 <title></title>
@@ -3672,6 +3674,34 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>PARENT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>PARENT_CONTEXT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="64" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index c87bb1efc1619306e28b8fa5b550a04239efdafa..d3c741ac844494f461972cab8c0b16c468abdc50 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -279,6 +279,60 @@
       <searchable v="false" />
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/creator/valueProcess.js</valueProcess>
     </entityField>
+    <entityConsumer>
+      <name>ModuleTrees</name>
+      <title>Baum</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ModuleTree_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ContextName</name>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/contextname/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>ID</name>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/moduletrees/children/id/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityActionField>
+      <name>newActivity_action</name>
+      <fieldType>ACTION</fieldType>
+      <title>Neue Aktivität</title>
+      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity_action/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:PLUS</iconId>
+    </entityActionField>
+    <entityActionField>
+      <name>newTask_action</name>
+      <fieldType>ACTION</fieldType>
+      <title>Neue Aufgabe</title>
+      <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newtask_action/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:PLUS</iconId>
+    </entityActionField>
+    <entityParameter>
+      <name>ParentId_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Activity_entity/entityfields/parentid_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ParentContext_param</name>
+      <expose v="true" />
+      <documentation>%aditoprj%/entity/Activity_entity/entityfields/parentcontext_param/documentation.adoc</documentation>
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>PARENT_ID</name>
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/parent_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PARENT_CONTEXT</name>
+      <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/parent_context/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -330,6 +384,14 @@
           <name>CREATOR.value</name>
           <recordfield>ACTIVITY.CREATOR</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENT_CONTEXT.value</name>
+          <recordfield>ACTIVITY.PARENT_CONTEXT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENT_ID.value</name>
+          <recordfield>ACTIVITY.PARENT_ID</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Activity_entity/entityfields/moduletrees/children/contextname/code.js b/entity/Activity_entity/entityfields/moduletrees/children/contextname/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..109d9bf5c8ea2825f9da796529721deab9a96d9f
--- /dev/null
+++ b/entity/Activity_entity/entityfields/moduletrees/children/contextname/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Activity");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/moduletrees/children/id/code.js b/entity/Activity_entity/entityfields/moduletrees/children/id/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..06fe7d36324315ad85bfd6d0099c5aa6b2da98d4
--- /dev/null
+++ b/entity/Activity_entity/entityfields/moduletrees/children/id/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/newactivity_action/onActionProcess.js b/entity/Activity_entity/entityfields/newactivity_action/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..39352aaa738090de2afb9e23b20d769ab3da2c9e
--- /dev/null
+++ b/entity/Activity_entity/entityfields/newactivity_action/onActionProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+
+var params = {
+  "ParentId_param": vars.get("$field.ACTIVITYID"),
+  "ParentContext_param": "Activity"
+};
+
+neon.openContext("Activity", "ActivityEdit_view", null, neon.OPERATINGSTATE_NEW, params)
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/newtask_action/onActionProcess.js b/entity/Activity_entity/entityfields/newtask_action/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9417c7e293f407d60d36e775d581f8887d582633
--- /dev/null
+++ b/entity/Activity_entity/entityfields/newtask_action/onActionProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+
+var params = {
+  "ParentId_param": vars.get("$field.ACTIVITYID"),
+  "ParentContext_param": "Activity"
+};
+
+neon.openContext("Task", "TaskEdit_view", null, neon.OPERATINGSTATE_NEW, params)
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/parent_context/valueProcess.js b/entity/Activity_entity/entityfields/parent_context/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..348cc486cbe308a212dab0374b6e3fad11cba07d
--- /dev/null
+++ b/entity/Activity_entity/entityfields/parent_context/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.ParentContext_param"));
diff --git a/entity/Activity_entity/entityfields/parent_id/valueProcess.js b/entity/Activity_entity/entityfields/parent_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4ee2e311077e9a265cb4dcc8429ed2beee9f3fc4
--- /dev/null
+++ b/entity/Activity_entity/entityfields/parent_id/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.ParentId_param"));
diff --git a/entity/Activity_entity/entityfields/parentcontext_param/documentation.adoc b/entity/Activity_entity/entityfields/parentcontext_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d2438f42033bbf4ef941406a062b8e671852c462
--- /dev/null
+++ b/entity/Activity_entity/entityfields/parentcontext_param/documentation.adoc
@@ -0,0 +1,3 @@
+Describes the name of the parent element's context name. 
+This parameter is used to link a new activity to an existing.
+(Also see `ParentId_param`)
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/parentid_param/documentation.adoc b/entity/Activity_entity/entityfields/parentid_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..06e595d64fc0592edf8102f6fde9cc7c913a542c
--- /dev/null
+++ b/entity/Activity_entity/entityfields/parentid_param/documentation.adoc
@@ -0,0 +1,3 @@
+Describes the ID of the parent element's context name. 
+This parameter is used to link a new activity to an existing.
+(Also see `ParentContextName_param`)
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js b/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js
index 4a159dc81d7a388e26c6fe81aeb554be0707f34b..eccc2a26904d34b493843fe84d3d562a7df71d9d 100644
--- a/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js
@@ -1,5 +1,5 @@
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-        
-result.object(AttributeUtil.getPossibleAttributes(vars.get("$param.objectType_param"), true));
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+        
+result.object(AttributeUtil.getPossibleAttributes(vars.get("$param.objectType_param"), true));
diff --git a/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js b/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js
index 1c37c30f461e97c9b5efb040f290f762fefc2166..1977334cca875a56fdbf51b64cd088a46a788ba4 100644
--- a/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js
@@ -1,16 +1,16 @@
-import("system.db");
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("Sql_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    if (vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
-    {
-        var level = db.cell(SqlCondition.begin()
-            .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", vars.get("$field.ATTRIBUTE_PARENT_ID"))
-            .buildSql("select ATTRIBUTE_LEVEL from AB_ATTRIBUTE"));
-        result.string(parseInt(level) + 1);
-    }
-    else
-        result.string("0");
+import("system.db");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    if (vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
+    {
+        var level = db.cell(SqlCondition.begin()
+            .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", vars.get("$field.ATTRIBUTE_PARENT_ID"))
+            .buildSql("select ATTRIBUTE_LEVEL from AB_ATTRIBUTE"));
+        result.string(parseInt(level) + 1);
+    }
+    else
+        result.string("0");
diff --git a/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js b/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js
index 876969048dfe73156cafbe8c083b7df89e968694..11f1cb994026398ca6df3cfcffd3157ed05f78f7 100644
--- a/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js
@@ -1,11 +1,11 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-var fieldState;
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    fieldState = neon.COMPONENTSTATE_AUTO;
-else
-    fieldState = neon.COMPONENTSTATE_READONLY;
-
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+var fieldState;
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    fieldState = neon.COMPONENTSTATE_AUTO;
+else
+    fieldState = neon.COMPONENTSTATE_READONLY;
+
 result.string(fieldState);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js b/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js
index 149d8d0591e67a669d9fc78572350775da9c1850..8c60a83409d16ed0c06f474820e356a9c71b4fbb 100644
--- a/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js
@@ -1,12 +1,12 @@
-import("system.db");
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("Attribute_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
-{
-    var type = AttributeHandler.begin(vars.get("$field.ATTRIBUTE_PARENT_ID")).getAttributeType();
-    if (type == $AttributeTypes.COMBO)
-        result.string($AttributeTypes.COMBOVALUE);
+import("system.db");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
+{
+    var type = AttributeHandler.begin(vars.get("$field.ATTRIBUTE_PARENT_ID")).getAttributeType();
+    if (type == $AttributeTypes.COMBO)
+        result.string($AttributeTypes.COMBOVALUE);
 }
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/db/onDBInsert.js b/entity/Attribute_entity/recordcontainers/db/onDBInsert.js
index 4d04bd35a23a9b71da2fe8d62ae17fbd32cb6bb8..9abf4505f0765bd027b54de2c259db0da57b5704 100644
--- a/entity/Attribute_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Attribute_entity/recordcontainers/db/onDBInsert.js
@@ -1,31 +1,31 @@
-import("system.db");
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("system.util");
-import("Sql_lib");
-
-if (vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
-{
-    var parentId = vars.get("$param.attrParentId_param");
-    var attributeId = vars.get("$field.AB_ATTRIBUTEID");
-    var cols = [
-        "AB_ATTRIBUTEUSAGEID", 
-        "OBJECT_TYPE",
-        "AB_ATTRIBUTE_ID"
-    ];
-    var usageSql = SqlCondition.begin()
-        .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", parentId)
-        .buildSql("select " + cols.join(", ") + " from AB_ATTRIBUTEUSAGE", "1=0");
-    var usages = db.table(usageSql);
-
-    var table = "AB_ATTRIBUTEUSAGE";
-    var types = db.getColumnTypes(table, cols);
-    
-    var toInsert = usages.map(function (row) 
-    {
-        return [table, cols, types, [util.getNewUUID(), row[1], attributeId]];
-    });
-    
-    db.inserts(toInsert);
+import("system.db");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("system.util");
+import("Sql_lib");
+
+if (vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
+{
+    var parentId = vars.get("$param.attrParentId_param");
+    var attributeId = vars.get("$field.AB_ATTRIBUTEID");
+    var cols = [
+        "AB_ATTRIBUTEUSAGEID", 
+        "OBJECT_TYPE",
+        "AB_ATTRIBUTE_ID"
+    ];
+    var usageSql = SqlCondition.begin()
+        .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", parentId)
+        .buildSql("select " + cols.join(", ") + " from AB_ATTRIBUTEUSAGE", "1=0");
+    var usages = db.table(usageSql);
+
+    var table = "AB_ATTRIBUTEUSAGE";
+    var types = db.getColumnTypes(table, cols);
+    
+    var toInsert = usages.map(function (row) 
+    {
+        return [table, cols, types, [util.getNewUUID(), row[1], attributeId]];
+    });
+    
+    db.inserts(toInsert);
 }
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/db/orderClauseProcess.js b/entity/Attribute_entity/recordcontainers/db/orderClauseProcess.js
index 7d38fd890e1751c5be85767520d81e8e362bbab3..4b14378884f0ed11d22218c0e63a66614d3d1d90 100644
--- a/entity/Attribute_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/Attribute_entity/recordcontainers/db/orderClauseProcess.js
@@ -1,3 +1,3 @@
-import("system.db");
-import("system.result");
+import("system.db");
+import("system.result");
 result.object({"AB_ATTRIBUTE.ATTRIBUTE_LEVEL" : db.ASCENDING});
\ No newline at end of file
diff --git a/entity/Attribute_entity/titleProcess.js b/entity/Attribute_entity/titleProcess.js
index 09b4ecb2cceec0f6d09f3b1bd72c2fe60aba970d..bbb15f2a7f35c157449854b9c7fbeecd7550756d 100644
--- a/entity/Attribute_entity/titleProcess.js
+++ b/entity/Attribute_entity/titleProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
 result.string(vars.get("$field.ATTRIBUTE_NAME"));
\ No newline at end of file
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c23de7614329146b8b129bfad95aa7d62c621064
--- /dev/null
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -0,0 +1,82 @@
+<?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>ModuleTree_entity</name>
+  <title>Tree Entity</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+      <recordContainer>jdito</recordContainer>
+    </entityProvider>
+    <entityField>
+      <name>TITLE</name>
+    </entityField>
+    <entityField>
+      <name>DESCRIPTION</name>
+    </entityField>
+    <entityField>
+      <name>ICON</name>
+    </entityField>
+    <entityProvider>
+      <name>TreeProvider</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <targetContextField>TYPE</targetContextField>
+      <targetIdField>UID</targetIdField>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>7da88ffb-4292-4fe2-88e2-dda2dc4aa625</name>
+          <entityName>Task_entity</entityName>
+          <fieldName>ModuleTrees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>70e2ea81-1e08-47a6-ac89-3164bdbd9e02</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>ModuleTrees</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
+    <entityField>
+      <name>PARENT_ID</name>
+    </entityField>
+    <entityField>
+      <name>UID</name>
+    </entityField>
+    <entityField>
+      <name>PARENT_CONTEXT</name>
+    </entityField>
+    <entityField>
+      <name>TYPE</name>
+    </entityField>
+    <entityParameter>
+      <name>ContextName</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ID</name>
+      <expose v="true" />
+      <mandatory v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+  </entityFields>
+  <recordContainers>
+    <jDitoRecordContainer>
+      <name>jdito</name>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+      <contentProcess>%aditoprj%/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+      <recordFields>
+        <element>UID.value</element>
+        <element>TYPE.value</element>
+        <element>PARENT_ID.value</element>
+        <element>PARENT_CONTEXT.value</element>
+        <element>TITLE.value</element>
+        <element>DESCRIPTION.value</element>
+        <element>ICON.value</element>
+      </recordFields>
+    </jDitoRecordContainer>
+  </recordContainers>
+</entity>
diff --git a/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0710ff8b81a8f85eb8b3f0e9bfa4974574fb74dc
--- /dev/null
+++ b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,133 @@
+import("system.vars");
+import("Sql_lib")
+import("system.result");
+import("system.db");
+
+var fixedContextName = vars.get("$param.ContextName");
+var fixedID = vars.get("$param.ID");
+
+let resArray = [];
+
+// Query root element
+var root = queryRootElement(fixedContextName, fixedID);
+if (root !== null) {
+    // Push root element
+    resArray.push(root);
+
+    // Query children of root
+    var children = queryChildrenElements(fixedContextName, fixedID);
+    
+    if (children !== null) {
+     
+       // Push each children
+       for(let i = 0; i < children.length; i++) {
+           resArray.push(children[i]);
+       }
+
+       result.object(resArray);
+    }
+}
+
+/**
+ * Queries the children of the given parent element.
+ * This function will recursively go through each level of children.
+ * 
+ * @param pContextName Context name of the parent element.
+ * @param pID ID of the parent element.
+ */
+function queryChildrenElements (pContextName, pID) {
+    var taskResult = db.table("select TASKID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION from TASK where PARENT_ID = '" + pID +"' and PARENT_CONTEXT = '" + pContextName + "'");
+    var activityResult = db.table("select ACTIVITYID, PARENT_ID, PARENT_CONTEXT, SUBJECT, INFO from ACTIVITY where PARENT_ID = '" + pID +"' and PARENT_CONTEXT = '" + pContextName + "'");
+  
+    var res = []
+  
+    for (let i = 0; i < taskResult.length; i++) {
+        // Augment data
+        taskResult[i] = augmentData(taskResult[i], "Task");
+        res.push(taskResult[i]);
+        
+        // Query children
+        let children = queryChildrenElements("Task", taskResult[i][0]);
+        for (let i = 0; i < children.length; i++) {
+            res.push(children[i]);
+        }
+    }
+    
+    for (let i = 0; i < activityResult.length; i++) {
+        // Augment data
+        activityResult[i] = augmentData(activityResult[i], "Activity");
+        res.push(activityResult[i]);
+        
+        // Query children
+        let children = queryChildrenElements("Activity", activityResult[i][0]);
+        for (let i = 0; i < children.length; i++) {
+            res.push(children[i]);
+        }
+    }
+      
+    return res;
+}
+
+/**
+ * Queries the root element.
+ * 
+ * @param pContextName Context name of the root element.
+ * @param pID ID of the root element.
+ */
+function queryRootElement (pContextName, pID) {
+    var resultArray;
+    if (pContextName === "Task") {
+        resultArray = db.table("select TASKID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION from TASK where TASKID = '" + pID + "'");
+        if (resultArray.length === 0) {
+            return null;
+        }
+        
+        return augmentData(resultArray[0], "Task");
+    } else if (pContextName === "Activity") {
+        resultArray = db.table("select ACTIVITYID, PARENT_ID, PARENT_CONTEXT, SUBJECT, INFO from ACTIVITY where ACTIVITYID = '" + pID +"'");
+        if (resultArray.length === 0) {
+            return null;
+        }
+        
+        return augmentData(resultArray[0], "Activity");
+    } else {
+        return null;
+    }
+}
+
+/**
+ * Augments the given row to match the required result signature.
+ * 
+ * @param pDataRow Requires the following format:
+ *                 UID, PARENT_ID, PARENT_CONTEXT, TITLE, DESCRIPTION
+ * @param pType The type of the row which needs adjustment.
+ * @return Returns the following format:
+ *         UID, TYPE, PARENT_ID, PARENT_CONTEX, TITL, DESCRIPTION, ICON
+ * 
+ */
+function augmentData (pDataRow, pType) {
+    if (pDataRow === null || pDataRow === undefined)
+        return null;
+    
+    if (pDataRow.length === 0)
+        return null;
+    
+    if (pType !== "Task" && pType !== "Activity")
+        return null;
+    
+    // PARENT_ID check
+    if (pDataRow[2] === "")
+        pDataRow[2] = null;
+    
+    // PARENT_CONTEXT check
+    if (pDataRow[3] === "")
+        pDataRow[3] = null;
+    
+    // Insert type
+    pDataRow.splice(1, 0, pType);
+    
+    // Insert icon
+    pDataRow.splice(6, 0, pType === "Task" ? "VAADIN:TASKS" : pType === "Activity" ? "NEON:HISTORY": null);
+    
+    return pDataRow;
+}
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index e04596e9cf5502542592216b3d7b0e0c727175ab..e127be7bea92f4bea3f62516f96f09267db2084a 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -196,6 +196,11 @@
           <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
 Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
         </entityParameter>
+        <entityParameter>
+          <name>CommCategory_param</name>
+          <code>%aditoprj%/entity/Person_entity/entityfields/communications/children/commcategory_param/code.js</code>
+          <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityConsumer>
diff --git a/entity/Person_entity/entityfields/communications/children/commcategory_param/code.js b/entity/Person_entity/entityfields/communications/children/commcategory_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Person_entity/entityfields/offers/children/contactid_param/code.js b/entity/Person_entity/entityfields/offers/children/contactid_param/code.js
index ed4a4f567aa9d494002b914426589ea37bc56682..7b6137b4d105e9ba592cf8ef6e796fb838a32b09 100644
--- a/entity/Person_entity/entityfields/offers/children/contactid_param/code.js
+++ b/entity/Person_entity/entityfields/offers/children/contactid_param/code.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
 result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/entityfields/salesprojectforecastdatestart/code.js b/entity/SalesprojectForecast_entity/entityfields/salesprojectforecastdatestart/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..66ce3a4676a6c0a9b212a2ac2126c03f3c3a912b
--- /dev/null
+++ b/entity/SalesprojectForecast_entity/entityfields/salesprojectforecastdatestart/code.js
@@ -0,0 +1,2 @@
+import("system.result")
+result.string("DATE_START");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 33747b351b2cd6381beb1bb75c19b69da28b32ca..7bcd55845a690a27069d3f692ba3141545d364dc 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -31,16 +31,6 @@
       <resolution>DAY</resolution>
       <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/enddate/valueProcess.js</valueProcess>
     </entityField>
-    <entityField>
-      <name>ESTIMATION</name>
-      <title>Estimation</title>
-      <possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js</possibleItemsProcess>
-      <selectionMode>MULTI</selectionMode>
-    </entityField>
-    <entityField>
-      <name>ESTIMATIONVALUE</name>
-      <searchable v="false" />
-    </entityField>
     <entityField>
       <name>INFO</name>
       <title>Information</title>
@@ -451,10 +441,6 @@
           <name>ENDDATE.value</name>
           <recordfield>SALESPROJECT.ENDDATE</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ESTIMATION.value</name>
-          <recordfield>SALESPROJECT.ESTIMATION</recordfield>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>INFO.value</name>
           <recordfield>SALESPROJECT.INFO</recordfield>
@@ -491,10 +477,6 @@
           <name>VOLUME.value</name>
           <recordfield>SALESPROJECT.VOLUME</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ESTIMATIONVALUE.value</name>
-          <recordfield>SALESPROJECT.ESTIMATIONVALUE</recordfield>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ID.value</name>
           <recordfield>SALESPROJECT.CONTACT_ID</recordfield>
diff --git a/entity/Salesproject_entity/entityfields/days_notactive/valueProcess.js b/entity/Salesproject_entity/entityfields/days_notactive/valueProcess.js
index cddfb6d43c94f74e66d49f9444cbaf03415b07d2..d0e97fc19f6fb3ab1b69daa387909eb7f98d32ba 100644
--- a/entity/Salesproject_entity/entityfields/days_notactive/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/days_notactive/valueProcess.js
@@ -1,11 +1,11 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("Activity_lib");
-import("Date_lib");
-
-var entryDate = ActivityUtils.getLastActivityDate(vars.get("$field.SALESPROJECTID"));
-var daysPassed = DateUtils.getDayDifference(entryDate);
-
-if (daysPassed != null)
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Activity_lib");
+import("Date_lib");
+
+var entryDate = ActivityUtils.getLastActivityDate(vars.get("$field.SALESPROJECTID"));
+var daysPassed = DateUtils.getDayDifference(entryDate);
+
+if (daysPassed != null)
     result.string(daysPassed);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js b/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js
deleted file mode 100644
index f527f159dc20b1e2bf4dc0bb00bd2a028195169e..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = LegacyKeywordUtils.getStandardArray("SALESPROJECT.ESTIMATION");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 108b7a7020149215a7d5ecf470c656bcf23519d5..f44e1b225807c52a2803e631d35ab5e81856d732 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -171,6 +171,59 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityConsumer>
+      <name>ModuleTrees</name>
+      <title>Baum</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ModuleTree_entity</entityName>
+        <fieldName>TreeProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>ID</name>
+          <code>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/id/code.js</code>
+          <description>PARAMETER</description>
+        </entityParameter>
+        <entityParameter>
+          <name>ContextName</name>
+          <code>%aditoprj%/entity/Task_entity/entityfields/moduletrees/children/contextname/code.js</code>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityField>
+      <name>PARENT_CONTEXT</name>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/parent_context/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>PARENT_ID</name>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/parent_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ParentId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityParameter>
+      <name>ParentContext_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityActionField>
+      <name>newActivity_action</name>
+      <fieldType>ACTION</fieldType>
+      <title>Neue Aktivität</title>
+      <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newactivity_action/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:PLUS</iconId>
+    </entityActionField>
+    <entityActionField>
+      <name>newTask_action</name>
+      <fieldType>ACTION</fieldType>
+      <title>Neue Aufgabe</title>
+      <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newtask_action/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:PLUS</iconId>
+    </entityActionField>
     <entityParameter>
       <name>RowId_param</name>
       <expose v="true" />
@@ -262,6 +315,14 @@
           <name>STATUS.displayValue</name>
           <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENT_CONTEXT.value</name>
+          <recordfield>TASK.PARENT_CONTEXT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PARENT_ID.value</name>
+          <recordfield>TASK.PARENT_ID</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Task_entity/entityfields/contacteditors/children/contactid_param/code.js b/entity/Task_entity/entityfields/contacteditors/children/contactid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Task_entity/entityfields/contactrequestors/children/contactid_param/code.js b/entity/Task_entity/entityfields/contactrequestors/children/contactid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Task_entity/entityfields/moduletrees/children/contextname/code.js b/entity/Task_entity/entityfields/moduletrees/children/contextname/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..86bf9bdfc95f2757f6ee947b7549edad4ce0b154
--- /dev/null
+++ b/entity/Task_entity/entityfields/moduletrees/children/contextname/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Task");
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/moduletrees/children/contextname/documentation.adoc b/entity/Task_entity/entityfields/moduletrees/children/contextname/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Task_entity/entityfields/moduletrees/children/id/code.js b/entity/Task_entity/entityfields/moduletrees/children/id/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..890f0a3405749e82541e057057f75d24166006d7
--- /dev/null
+++ b/entity/Task_entity/entityfields/moduletrees/children/id/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.TASKID"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/newactivity_action/onActionProcess.js b/entity/Task_entity/entityfields/newactivity_action/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f3c7bcbb72428414e2f789b2d17b1ba40a916b18
--- /dev/null
+++ b/entity/Task_entity/entityfields/newactivity_action/onActionProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+
+var params = {
+  "ParentId_param": vars.get("$field.TASKID"),
+  "ParentContext_param": "Task"
+};
+
+neon.openContext("Activity", "ActivityEdit_view", null, neon.OPERATINGSTATE_NEW, params)
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/newtask_action/onActionProcess.js b/entity/Task_entity/entityfields/newtask_action/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b4e2fd874a328729465b5f1d47f86a2352af528c
--- /dev/null
+++ b/entity/Task_entity/entityfields/newtask_action/onActionProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.vars");
+
+var params = {
+  "ParentId_param": vars.get("$field.TASKID"),
+  "ParentContext_param": "Task"
+};
+
+neon.openContext("Task", "TaskEdit_view", null, neon.OPERATINGSTATE_NEW, params)
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/parent_context/valueProcess.js b/entity/Task_entity/entityfields/parent_context/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..348cc486cbe308a212dab0374b6e3fad11cba07d
--- /dev/null
+++ b/entity/Task_entity/entityfields/parent_context/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.ParentContext_param"));
diff --git a/entity/Task_entity/entityfields/parent_id/valueProcess.js b/entity/Task_entity/entityfields/parent_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d628d7b12408acee8e94da575abee2e3e846882f
--- /dev/null
+++ b/entity/Task_entity/entityfields/parent_id/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("system.logging");
+
+result.string(vars.get("$param.ParentId_param"));
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index ae516de8b29040697890f44b499916e7ca0ed646..c296a6d5b7327fc7b1164cd4ed027063141a5314 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -585,10 +585,6 @@
       <key>Rollout</key>
       <value>Roll Out</value>
     </entry>
-    <entry>
-      <key>Estimation</key>
-      <value>Einschätzung</value>
-    </entry>
     <entry>
       <key>Phase</key>
       <value>Phase</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 4c101a4c2c0ac238cf76b884496c4bd3ab3c1274..647509f8eefbab504f14212ed4ae93b23ffc269e 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -352,9 +352,6 @@
     <entry>
       <key>Rollout</key>
     </entry>
-    <entry>
-      <key>Estimation</key>
-    </entry>
     <entry>
       <key>Phase</key>
     </entry>
diff --git a/neonContext/ModuleTree/ModuleTree.aod b/neonContext/ModuleTree/ModuleTree.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4b0216f17ab31b75eb2e81c1ca33ad3433c153b5
--- /dev/null
+++ b/neonContext/ModuleTree/ModuleTree.aod
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
+  <name>ModuleTree</name>
+  <title>Tree</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <entity>ModuleTree_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>90d2e21e-1231-418e-8729-d29f2453dfdd</name>
+      <view>ModuleTree_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index 0d925d49efa8aeaf7421bd5b6fee7b5673f5d789..1409d56b581523d9bb7071a9293c438988e80a16 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -25,5 +25,9 @@
       <name>c35cc718-94a8-43cf-afe4-f02d251d4e9f</name>
       <view>SalesprojectEdit_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>d7fb7e2b-c932-4b96-be2c-ae5ec3d36beb</name>
+      <view>SalesprojectCycle_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index 79170c513dfcab35377e2ace6a3e8b6ae2284dfc..5937e2ba7b21546420d60c63fc05da01b31e76f8 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -29,5 +29,10 @@
       <entityField>Links</entityField>
       <view>ActivityLinkFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>f6c6888a-f3d6-410a-b97b-30c34a9dd6a2</name>
+      <entityField>ModuleTrees</entityField>
+      <view>ModuleTree_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/AttributeFilter_view/AttributeFilter_view.aod b/neonView/AttributeFilter_view/AttributeFilter_view.aod
index f832fe72dc58882788636fa74e9e1bf3e4aaa412..397239aacb52f57f539768356b12078993b2e19a 100644
--- a/neonView/AttributeFilter_view/AttributeFilter_view.aod
+++ b/neonView/AttributeFilter_view/AttributeFilter_view.aod
@@ -1,21 +1,21 @@
-<?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>AttributeFilter_view</name>
-  <title>Attributes</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
-  <layout>
-    <groupLayout>
-      <name>layout</name>
-    </groupLayout>
-  </layout>
-  <children>
-    <treetableViewTemplate>
-      <name>Treetable</name>
-      <parentField>ATTRIBUTE_PARENT_ID</parentField>
-      <titleField>ATTRIBUTE_NAME</titleField>
-      <descriptionField>ATTRIBUTE_TYPE</descriptionField>
-      <entityField>#ENTITY</entityField>
-    </treetableViewTemplate>
-  </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>AttributeFilter_view</name>
+  <title>Attributes</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <treetableViewTemplate>
+      <name>Treetable</name>
+      <parentField>ATTRIBUTE_PARENT_ID</parentField>
+      <titleField>ATTRIBUTE_NAME</titleField>
+      <descriptionField>ATTRIBUTE_TYPE</descriptionField>
+      <entityField>#ENTITY</entityField>
+    </treetableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
index fbcf895c91a45e539a0b4aa4cb9d56875a007d49..8943bfa0c50cbef9a0e813a1d52d58e43dc4088b 100644
--- a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
+++ b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
@@ -1,36 +1,36 @@
-<?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>AttributeRelationFilter_view</name>
-  <title>Attributes</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
-  <layout>
-    <groupLayout>
-      <name>layout</name>
-    </groupLayout>
-  </layout>
-  <children>
-    <tableViewTemplate>
-      <name>Table</name>
-      <autoNewRow v="true" />
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>b37d207a-6119-454a-8fc6-073e9d54b1d3</name>
-          <entityField>AB_ATTRIBUTE_ID</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>83a10d52-9eaf-4901-935e-2a7410831861</name>
-          <entityField>ATTRIBUTERELATION_VALUE</entityField>
-        </neonTableColumn>
-      </columns>
-    </tableViewTemplate>
-    <treetableViewTemplate>
-      <name>Tree</name>
-      <parentField>ATTRIBUTE_PARENT_ID</parentField>
-      <titleField>AB_ATTRIBUTE_ID</titleField>
-      <descriptionField>ATTRIBUTERELATION_VALUE</descriptionField>
-      <entityField>#ENTITY</entityField>
-    </treetableViewTemplate>
-  </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>AttributeRelationFilter_view</name>
+  <title>Attributes</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <layout>
+    <groupLayout>
+      <name>layout</name>
+    </groupLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <autoNewRow v="true" />
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>b37d207a-6119-454a-8fc6-073e9d54b1d3</name>
+          <entityField>AB_ATTRIBUTE_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>83a10d52-9eaf-4901-935e-2a7410831861</name>
+          <entityField>ATTRIBUTERELATION_VALUE</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+    <treetableViewTemplate>
+      <name>Tree</name>
+      <parentField>ATTRIBUTE_PARENT_ID</parentField>
+      <titleField>AB_ATTRIBUTE_ID</titleField>
+      <descriptionField>ATTRIBUTERELATION_VALUE</descriptionField>
+      <entityField>#ENTITY</entityField>
+    </treetableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod b/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod
index eeb1eed20e2d6eb13d75e245cbeb7e8b79bb76b1..15c3fd3b9577143daee960012808a8e9b8937e4f 100644
--- a/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod
+++ b/neonView/AttributeUsageFilter_view/AttributeUsageFilter_view.aod
@@ -1,24 +1,24 @@
-<?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>AttributeUsageFilter_view</name>
-  <description>View for listing all contexts where a attribute can be used in the attribute entity</description>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <tableViewTemplate>
-      <name>UsageTable_template</name>
-      <autoNewRow v="true" />
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>ba8d5468-4e59-4ab8-8174-afcca1ae0d9e</name>
-          <entityField>OBJECT_TYPE</entityField>
-        </neonTableColumn>
-      </columns>
-    </tableViewTemplate>
-  </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>AttributeUsageFilter_view</name>
+  <description>View for listing all contexts where a attribute can be used in the attribute entity</description>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>UsageTable_template</name>
+      <autoNewRow v="true" />
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>ba8d5468-4e59-4ab8-8174-afcca1ae0d9e</name>
+          <entityField>OBJECT_TYPE</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod b/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod
index 231d9cf048557708638e4a93eeb3a471d91cda3a..37108cc1078ff2bcbad081a3022b48f8b2f857d0 100644
--- a/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod
+++ b/neonView/AttributeUsageMultiEdit_view/AttributeUsageMultiEdit_view.aod
@@ -1,23 +1,23 @@
-<?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>AttributeUsageMultiEdit_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <genericMultipleViewTemplate>
-      <name>UsageEdit_template</name>
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>a2efb4ca-4e8d-4e90-9870-2cebf338d95f</name>
-          <entityField>OBJECT_TYPE</entityField>
-          <width v="75" />
-        </neonTableColumn>
-      </columns>
-    </genericMultipleViewTemplate>
-  </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+  <name>AttributeUsageMultiEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericMultipleViewTemplate>
+      <name>UsageEdit_template</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>a2efb4ca-4e8d-4e90-9870-2cebf338d95f</name>
+          <entityField>OBJECT_TYPE</entityField>
+          <width v="75" />
+        </neonTableColumn>
+      </columns>
+    </genericMultipleViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/ModuleTree_view/ModuleTree_view.aod b/neonView/ModuleTree_view/ModuleTree_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..255c830a3d576467c148efbcc80f6f90635319d9
--- /dev/null
+++ b/neonView/ModuleTree_view/ModuleTree_view.aod
@@ -0,0 +1,23 @@
+<?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>ModuleTree_view</name>
+  <title>Tree</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <treetableViewTemplate>
+      <name>Treetable</name>
+      <parentField>PARENT_ID</parentField>
+      <favoriteActionGroup3></favoriteActionGroup3>
+      <titleField>TITLE</titleField>
+      <descriptionField>DESCRIPTION</descriptionField>
+      <iconField>ICON</iconField>
+      <entityField>#ENTITY</entityField>
+      <title></title>
+    </treetableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectCycle_view/SalesprojectCycle_view.aod b/neonView/SalesprojectCycle_view/SalesprojectCycle_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0af20f499b83bd5f76825ed8e150a9ad7e1aefe4
--- /dev/null
+++ b/neonView/SalesprojectCycle_view/SalesprojectCycle_view.aod
@@ -0,0 +1,23 @@
+<?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>SalesprojectCycle_view</name>
+  <title>Milestones</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>c68c50b8-6ff9-4be4-ab1e-c8bd9b93f650</name>
+      <entityField>SalesprojectCycles</entityField>
+      <view>SalesprojectCycleFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>b172fd14-209d-412f-9250-aeb0f37091b5</name>
+      <entityField>SalesprojectForecasts</entityField>
+      <view>SalesprojectForecastFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>
diff --git a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
index f6210915219b67e0f623747a3f521d65eb717fba..5e0a05ce09a55d27e751210dc2426f0d84c30ade 100644
--- a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
+++ b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
@@ -52,10 +52,6 @@
           <name>5b3c3dc2-4ca5-45c5-96e5-7196a99dcdce</name>
           <entityField>VOLUME</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>f9332d9d-184b-4044-afaf-5d377fe59072</name>
-          <entityField>ESTIMATION</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>3836ef6b-64c4-4e0e-8cd6-88f784275b2f</name>
           <entityField>PROBABILITY</entityField>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 22e91e6848557fd2869630e628c09ae3c7e45bc8..c7d28d906bcbd9991378592dda9dfbebf03539a2 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -20,9 +20,9 @@
       <view>ActivityFilter_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>138f1ee7-f23b-4de9-a4c7-b4db870b57e9</name>
-      <entityField>SalesprojectCycles</entityField>
-      <view>SalesprojectCycleFilter_view</view>
+      <name>b0302dd4-fd72-4d34-8c22-70d3a721347f</name>
+      <entityField>#ENTITY</entityField>
+      <view>SalesprojectCycle_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>5d7248e8-3f3e-4262-8f13-6d5eff7165c1</name>
@@ -49,11 +49,6 @@
       <entityField>SalesprojectClassifications</entityField>
       <view>SalesprojectClassificationFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>0acc61f5-f61a-4c93-a4fb-e5ae44a71dae</name>
-      <entityField>SalesprojectForecasts</entityField>
-      <view>SalesprojectForecastFilter_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>c0027b4d-c014-4053-a595-daad9a73ad5c</name>
       <entityField>Timetrackings</entityField>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 1fa433506d584d17b0388c1aa38fa138cf2e308a..ca19051792ee7cf6d39757603d4df7b3dfc5d4a3 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -49,10 +49,6 @@
           <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
           <entityField>VOLUME</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>774ab565-a5e0-4b31-a77a-39143534f9a8</name>
-          <entityField>ESTIMATION</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
           <entityField>TIMETRACKINGSUM</entityField>
diff --git a/neonView/TaskMain_view/TaskMain_view.aod b/neonView/TaskMain_view/TaskMain_view.aod
index 149f56dedc1aaca285dbe649edac6095b515cd92..4be843f93960bac853acd429f72aacbba0c61fae 100644
--- a/neonView/TaskMain_view/TaskMain_view.aod
+++ b/neonView/TaskMain_view/TaskMain_view.aod
@@ -35,5 +35,10 @@
       <entityField>MainDocuments</entityField>
       <view>DocumentFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>4211b2cf-3a1f-4447-ad1c-f521d2d3f258</name>
+      <entityField>ModuleTrees</entityField>
+      <view>ModuleTree_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/others/db_changes/data_alias/basic/2019.2/ChangeNotes.txt b/others/db_changes/data_alias/basic/2019.2/ChangeNotes.txt
index 0759040edd7a2fef03c9b13007b43fb70f7f4786..a567af3fbd00e9aa95d7858f28965087221b66a3 100644
--- a/others/db_changes/data_alias/basic/2019.2/ChangeNotes.txt
+++ b/others/db_changes/data_alias/basic/2019.2/ChangeNotes.txt
@@ -1,2 +1,4 @@
 * all TaskTypes are deleted, new Type "Task" is created
  - you may have to update all Tasks to use type "Tak" (keyid: 4dee8727-8299-422e-ae41-6cdf9de2dfd799)
+* Column CODE is reset to NULL on all tasks (it is curently  not needed by basic)
+* ESTIMATION and ESTIMATIONVALUE from salesproject are droped
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/activity_add_parent.xml b/others/db_changes/data_alias/basic/2019.2/activity_add_parent.xml
new file mode 100644
index 0000000000000000000000000000000000000000..11ec89d2691a2c07cd5a3ac448affaf4b7855992
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/activity_add_parent.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="a.loreth" id="31d7b6f2-c376-4bfa-ba42-9aab6f07737c">
+        <addColumn tableName="ACTIVITY">
+            <column name="PARENT_CONTEXT" type="VARCHAR(64)"/>
+            <column name="PARENT_ID" type="CHAR(36)"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
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 5961affe7d1ed6c83733cd787642b13b06654653..3919bd758ff92a4de901038ea4c369c995edb72d 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -32,12 +32,23 @@
     <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1000.xml" context="example"/>
     <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1001.xml" context="example"/>
     <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1002.xml" context="example"/>
-    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1004.xml" context="example"/>  
     <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1003.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1004.xml" context="example"/>  
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1005.xml" context="example"/>  
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1006.xml" context="example"/>  
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1007.xml" context="example"/>  
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1008.xml" context="example"/>
+    <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1009.xml" context="example"/>
     <include relativeToChangelogFile="true" file="data/example_task/base.xml" context="example"/>
 	
     <include relativeToChangelogFile="true" file="update_TaskType_Task.xml"/>
+    
     <include relativeToChangelogFile="true" file="removeTaskCode.xml"/>
     
+    <include relativeToChangelogFile="true" file="activity_add_parent.xml"/>
+    <include relativeToChangelogFile="true" file="task_add_parent.xml"/>
+
     <include relativeToChangelogFile="true" file="create_salutation.xml"/>
-</databaseChangeLog>
+    
+    <include relativeToChangelogFile="true" file="drop_estimation_salesproject.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
index 90898dfe0d1a58966782e65a7601f3435b8c949a..9629672f13eaf9aeddfcd3df20f57cde4419cbd9 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
@@ -9,8 +9,8 @@
             <column name="SALESORDERCODE" valueNumeric="1004"/>
             <column name="VERSNR" valueNumeric="1"/>
             <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
-            <column name="NET" valueNumeric="840.00"/>
-            <column name="VAT" valueNumeric="159.60"/>
+            <column name="NET" valueNumeric="420.00"/>
+            <column name="VAT" valueNumeric="79.80"/>
             <column name="CURRENCY" value="EUR"/>
             <column name="LANGUAGE" value="deu"/>
         </insert>
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8473f6476873890bd07b7acf404ed49cc4243cbb
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml
@@ -0,0 +1,118 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermann" id="f834fa51-7c20-4ea8-be57-0780008c49d3">
+        <insert tableName="SALESORDER">
+            <column name="SALESORDERID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+            <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+            <column name="SALESORDERDATE" valueDate="2017-11-21T00:00:00"/>
+            <column name="SALESORDERCODE" valueNumeric="1005"/>
+            <column name="VERSNR" valueNumeric="1"/>
+            <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+            <column name="NET" valueNumeric="210.00"/>
+            <column name="VAT" valueNumeric="39.90"/>
+            <column name="CURRENCY" value="EUR"/>
+            <column name="LANGUAGE" value="deu"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="92ebcce0-8970-42dc-b32f-b892fe7dbb52"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="1"/>
+            <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+            <column name="PRICE" valueNumeric="210.00"/>
+            <column name="ITEMSORT" valueNumeric="1"/>
+            <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
+            <column name="VAT" valueNumeric="19.00"/>
+            <column name="ITEMNAME" value="AX45"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="2bf1eb1f-501c-4006-83cb-fb9783272e35"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="1"/>
+            <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+            <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
+            <column name="ITEMSORT" valueNumeric="2"/>
+            <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
+            <column name="ITEMNAME" value="AX47"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1.1"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="dcb02f78-8305-462f-bbeb-f7b5cb102461"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="3"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
+            <column name="ITEMSORT" valueNumeric="3"/>
+            <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
+            <column name="ITEMNAME" value="Produktname4.1"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1.1.1"/>
+        </insert>
+
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="a63b3fed-f7a4-4173-ba3e-a893f7186ed6"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="3"/>
+            <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
+            <column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
+            <column name="ITEMSORT" valueNumeric="4"/>
+            <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
+            <column name="ITEMNAME" value="Sonderrabatt"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1.1.1.1"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="6d59b91d-bfac-46ac-be79-35fdeb793d0d"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="3"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
+            <column name="ITEMSORT" valueNumeric="5"/>
+            <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
+            <column name="ITEMNAME" value="Produktname4.2a"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1.1.2"/>
+        </insert>
+
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="b68656aa-84e1-4682-9c2e-2d9ec0810ecb"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="2"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
+            <column name="ITEMSORT" valueNumeric="6"/>
+            <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
+            <column name="ITEMNAME" value="Produktname1.1"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1.2"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="fafb2b07-012e-4d20-b263-2b794e5370a7"/>
+            <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="3"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
+            <column name="ITEMSORT" valueNumeric="7"/>
+            <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
+            <column name="ITEMNAME" value="Produktname1.2"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1.3"/>
+        </insert>
+
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml
new file mode 100644
index 0000000000000000000000000000000000000000..62e06a3e45ed1e6a039442dfcc3a9bed0d0da321
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml
@@ -0,0 +1,35 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermann" id="2a4e1c95-1827-4716-8875-8086b323caed">
+        <insert tableName="SALESORDER">
+            <column name="SALESORDERID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
+            <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+            <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+            <column name="SALESORDERDATE" valueDate="2018-08-12T00:00:00"/>
+            <column name="SALESORDERCODE" valueNumeric="1006"/>
+            <column name="VERSNR" valueNumeric="1"/>
+            <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+            <column name="NET" valueNumeric="420.00"/>
+            <column name="VAT" valueNumeric="79.80"/>
+            <column name="CURRENCY" value="EUR"/>
+            <column name="LANGUAGE" value="deu"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="45c38cca-86b7-46f1-aee8-635c8f0603bc"/>
+            <column name="SALESORDER_ID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="2"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="PRICE" valueNumeric="210.00"/>
+            <column name="ITEMSORT" valueNumeric="1"/>
+            <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
+            <column name="VAT" valueNumeric="19.00"/>
+            <column name="ITEMNAME" value="AX45"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1"/>
+        </insert>
+   
+
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f93270dbd8127527a9af09eb52da8e8507509812
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml
@@ -0,0 +1,35 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermann" id="7f2fe3fb-52a6-4056-9968-f576be04ab2b">
+        <insert tableName="SALESORDER">
+            <column name="SALESORDERID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
+            <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+            <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+            <column name="SALESORDERDATE" valueDate="2016-06-14T00:00:00"/>
+            <column name="SALESORDERCODE" valueNumeric="1007"/>
+            <column name="VERSNR" valueNumeric="1"/>
+            <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+            <column name="NET" valueNumeric="630.00"/>
+            <column name="VAT" valueNumeric="119.70"/>
+            <column name="CURRENCY" value="EUR"/>
+            <column name="LANGUAGE" value="deu"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="c64dc823-98cd-4159-a27d-7167f510fc57"/>
+            <column name="SALESORDER_ID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="3"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="PRICE" valueNumeric="210.00"/>
+            <column name="ITEMSORT" valueNumeric="1"/>
+            <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
+            <column name="VAT" valueNumeric="19.00"/>
+            <column name="ITEMNAME" value="AX45"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1"/>
+        </insert>
+   
+
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml
new file mode 100644
index 0000000000000000000000000000000000000000..20e6443c67aa7b2444d7a0d2c45b2839b9a81895
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml
@@ -0,0 +1,35 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermann" id="bbc9e3d3-8a1d-4411-ba4c-900404d8a010">
+        <insert tableName="SALESORDER">
+            <column name="SALESORDERID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
+            <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+            <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+            <column name="SALESORDERDATE" valueDate="2018-08-23T00:00:00"/>
+            <column name="SALESORDERCODE" valueNumeric="1008"/>
+            <column name="VERSNR" valueNumeric="1"/>
+            <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+            <column name="NET" valueNumeric="420.00"/>
+            <column name="VAT" valueNumeric="79.80"/>
+            <column name="CURRENCY" value="EUR"/>
+            <column name="LANGUAGE" value="deu"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="5396e85b-3144-400f-8f5d-c01e875679f7"/>
+            <column name="SALESORDER_ID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
+            <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+            <column name="QUANTITY" valueNumeric="2"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="PRICE" valueNumeric="210.00"/>
+            <column name="ITEMSORT" valueNumeric="1"/>
+            <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
+            <column name="VAT" valueNumeric="19.00"/>
+            <column name="ITEMNAME" value="AX45"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1"/>
+        </insert>
+   
+
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml
new file mode 100644
index 0000000000000000000000000000000000000000..52f6e8ced36739ecee4d47f55811e9416c0ce551
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml
@@ -0,0 +1,35 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermann" id="0a93418f-9c50-4b76-9fb5-f7156f209271">
+        <insert tableName="SALESORDER">
+            <column name="SALESORDERID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
+            <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+            <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+            <column name="SALESORDERDATE" valueDate="2017-05-09T00:00:00"/>
+            <column name="SALESORDERCODE" valueNumeric="1009"/>
+            <column name="VERSNR" valueNumeric="1"/>
+            <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+            <column name="NET" valueNumeric="420.00"/>
+            <column name="VAT" valueNumeric="79.80"/>
+            <column name="CURRENCY" value="EUR"/>
+            <column name="LANGUAGE" value="deu"/>
+        </insert>
+        
+        <insert tableName="SALESORDERITEM">
+            <column name="SALESORDERITEMID" value="709e37c9-0397-4b82-965c-e11416e6f090"/>
+            <column name="SALESORDER_ID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
+            <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+            <column name="QUANTITY" valueNumeric="2"/>
+            <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+            <column name="PRICE" valueNumeric="210.00"/>
+            <column name="ITEMSORT" valueNumeric="1"/>
+            <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
+            <column name="VAT" valueNumeric="19.00"/>
+            <column name="ITEMNAME" value="AX45"/>
+            <column name="OPTIONAL" valueNumeric="0"/>
+            <column name="ITEMPOSITION" value="1"/>
+        </insert>
+   
+
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
index 78e3fb27480d753b524aa5aa9b5ed5f370c4d41d..2ee7119a4945df11439960372182ca4c38f192c4 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
@@ -93,6 +93,58 @@
         <column name="VOLUME" valueNumeric="1.3"/>
     </insert>
 
+    <insert tableName="SALESPROJECT_FORECAST">
+        <column name="SALESPROJECT_FORECASTID" value="92c4db4d-ed8d-4651-8a2c-797f4ac6237b"/>
+        <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+        <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+
+        <column name="TYPE" value="PLAN"/>
+        <column name="GROUPCODE" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
+
+        <column name="DATE_START" valueDate="2018-06-13T09:03:43"/>
+        <column name="VOLUME" valueNumeric="0.5"/>
+    </insert>
+
+    <insert tableName="SALESPROJECT_FORECAST">
+        <column name="SALESPROJECT_FORECASTID" value="7c2d866b-abc9-4fa7-8499-ccc82d4097bb"/>
+        <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+        <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+
+        <column name="TYPE" value="PLAN"/>
+        <column name="GROUPCODE" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
+
+        <column name="DATE_START" valueDate="2016-06-13T09:03:43"/>
+        <column name="VOLUME" valueNumeric="1.2"/>
+    </insert>
+
+    <insert tableName="SALESPROJECT_FORECAST">
+        <column name="SALESPROJECT_FORECASTID" value="11c4125c-5c56-499e-acc9-d879fa09ddf7"/>
+        <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+        <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+
+        <column name="TYPE" value="PLAN"/>
+        <column name="GROUPCODE" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
+
+        <column name="DATE_START" valueDate="2017-06-13T09:03:43"/>
+        <column name="VOLUME" valueNumeric="1.4"/>
+    </insert>
+    
+    <insert tableName="SALESPROJECT_FORECAST">
+        <column name="SALESPROJECT_FORECASTID" value="e60e5cd9-bbf7-41eb-ae9f-443083052eef"/>
+        <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
+        <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+
+        <column name="TYPE" value="PLAN"/>
+        <column name="GROUPCODE" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+        <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
+
+        <column name="DATE_START" valueDate="2017-05-13T09:03:43"/>
+        <column name="VOLUME" valueNumeric="1.2"/>
+    </insert>
+
     <insert tableName="SALESPROJECT_COMPETITION">
         <column name="SALESPROJECT_COMPETITIONID" value="a3ae9702-a3da-4d5f-a3ab-e386c8a0ac40"/>
         <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
diff --git a/others/db_changes/data_alias/basic/2019.2/drop_estimation_salesproject.xml b/others/db_changes/data_alias/basic/2019.2/drop_estimation_salesproject.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ab045eecb61425666f5f5a69642cb138dc77cbb5
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/drop_estimation_salesproject.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="j.hoermann" id="0601eb26-fc5e-4b57-ad18-2b6a064f383f">
+        <dropColumn tableName="SALESPROJECT" columnName="ESTIMATION"/>
+        <dropColumn tableName="SALESPROJECT" columnName="ESTIMATIONVALUE"/>
+        
+        <rollback>
+            <addColumn tableName="SALESPROJECT">
+                <column name="ESTIMATION" type="NVARCHAR(50)"/>
+                <column name="ESTIMATIONVALUE" type="INTEGER"/>
+            </addColumn>
+        </rollback>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/task_add_parent.xml b/others/db_changes/data_alias/basic/2019.2/task_add_parent.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0bf722803a32e15b3c0661159914fcbc48fa120e
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/task_add_parent.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="a.loreth" id="a1890934-4f52-4623-a587-9d690505bbaf">
+        <addColumn tableName="TASK">
+            <column name="PARENT_CONTEXT" type="VARCHAR(64)"/>
+            <column name="PARENT_ID" type="CHAR(36)"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 4827e4fa1a0045c62aea4b40cd915402337df88e..d727fa79f4bee63c63a9deb2058a268e9c0149d4 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -321,22 +321,7 @@ function LegacyKeywordUtils(){}
                      _createKeywordEntry("1", translate.text("Weakness 1", locale))
                     ,_createKeywordEntry("2", translate.text("Weakness 2", locale))
                     ,_createKeywordEntry("3", translate.text("Weakness 3", locale))
-                ]);                
-                break;
-            case "SALESPROJECT.ESTIMATION":
-                valueContainer = _createKeywordEntriesContainer([
-                     _createKeywordEntry("1", translate.text("Project_volume sufficient", locale))
-                    ,_createKeywordEntry("2", translate.text("Project_budget available", locale))
-                    ,_createKeywordEntry("3", translate.text("Project_specifications available", locale))
-                    ,_createKeywordEntry("4", translate.text("Project_timeframe critical", locale))
-                    ,_createKeywordEntry("5", translate.text("Project_payment default/penalty critical", locale))
-                    ,_createKeywordEntry("6", translate.text("Project_references available", locale))
-                    ,_createKeywordEntry("7", translate.text("Product_requirements suitable", locale))
-                    ,_createKeywordEntry("8", translate.text("Product_philosophy fitting", locale))
-                    ,_createKeywordEntry("9", translate.text("Product_industry template available", locale))
-                    ,_createKeywordEntry("10", translate.text("Other_sympathy available", locale))
-                    ,_createKeywordEntry("11", translate.text("Other_advocate available", locale))
-                ]);                
+                ]);
                 break;
             case "SALESPROJECT.STATE":
                 valueContainer = _createKeywordEntriesContainer([
diff --git a/process/Salesproject_lib/process.js b/process/Salesproject_lib/process.js
index 479848b10d7f01270ceddc1a6456d9a040897b96..cadd2a4a1b46dffb081cc55939a6a5769624c2dd 100644
--- a/process/Salesproject_lib/process.js
+++ b/process/Salesproject_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
 import("system.neon");
 import("system.vars");
 import("system.util");
@@ -5,10 +6,9 @@ import("system.translate");
 import("system.db");
 import("system.eMath");
 import("system.question");
-import("system.logging");
 import("Util_lib");
 import("Keyword_lib");
-
+import("system.neonTools");
 /**
  * Methods used by the Salesproject.
  * Do not create an instance of this!
@@ -67,8 +67,8 @@ Salesproject.insertMilestone = function(salesprojectId, type, value, notifyForec
  * Notify the user to update the forecast
  */
 Salesproject.notifyToUpdateForecast = function() {
-    // TODO: logging.show durch sinnvolle Meldung ersetzen oder ähnlich...
-    logging.show(translate.text("Please update the forecast."));
+   // TODO: logging.show durch sinnvolle Meldung ersetzen oder ähnlich...
+   // logging.show(translate.text("Please update the forecast."));
 }
 
 /**