diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Instance/Instance__get__Global_Identifier.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Instance/Instance__get__Global_Identifier.yaml
index 738be76..6c33622 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Instance/Instance__get__Global_Identifier.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/004-Methods/Instance/Instance__get__Global_Identifier.yaml
@@ -1,7 +1,8 @@
 - entityDefinitions:
   - IDM_Instance__get__Global_Identifier: '{4c63e13a-29c3-434a-a7e0-5fbe4a3c27b1}'
   - IDMB_Instance__get__Global_Identifier: '{41635a5a-a1eb-4918-919a-84cae7dd2fef}'
-
+  - IDMB_Instance__get__Global_Identifier_for_Related_Task_Instance: '{46e77d8c-dcc3-440d-a680-a07b8e537588}'
+    
 - library: '&IDL_MochaBaseSystem;'
   instances:
   - getAttributeBySystemRoutineMethod: '&IDM_Instance__get__Global_Identifier;'
@@ -13,3 +14,11 @@
     returnsAttributeId: '&IDA_GlobalIdentifier;'
   - returnAttributeMethodBinding: '&IDMB_Instance__get__Global_Identifier;'
     executesMethod: '&IDM_Instance__get__Global_Identifier;'
+
+  - returnAttributeMethodBinding: '&IDMB_Instance__get__Global_Identifier_for_Related_Task_Instance;'
+    executesMethod: '&IDM_Instance__get__Global_Identifier;'
+    parameterAssignments:
+    - globalIdentifier: '{132f20c1-1797-4ff2-ab02-a946a35be564}'
+      assignsToParameter: '&IDC_Instance;'
+      assignsFromWorkData: '&IDI_WorkSet_TaskRelatedInstance;'
+      evaluateWorkSet: yes
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/ElementContent/Common.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/ElementContent/Common.yaml
index 38d0398..5db6fc3 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/ElementContent/Common.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/ElementContent/Common.yaml
@@ -21,7 +21,7 @@
     moduleId: '&IDI_Module_MochaBaseSystem;'
     elementContents:
     - globalIdentifier: '{cffdab26-d808-41ce-b7b2-1686ef76cb40}'
-      defaultDataType: '&IDMB_Instance__get__Global_Identifier;'
+      defaultDataType: '&IDMB_Instance__get__Global_Identifier_for_Related_Task_Instance;'
       label: 'Global Identifier'
       order: a
       displayOptions:
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/ElementContent/ViewElementContent.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/ElementContent/ViewElementContent.yaml
index aa22351..26fa736 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/ElementContent/ViewElementContent.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/ElementContent/ViewElementContent.yaml
@@ -21,6 +21,11 @@
     - globalIdentifier: '{4004bfb2-0f81-4e52-a88b-646ba564be3b}'
       defaultDataType: '&IDE_ElementContent_Definition;'
       order: a
+      layout:
+      - type: '&IDC_GroupLayout;'
+        globalIdentifier: '{5b324642-f539-49e8-8098-8fcd118c73c4}'
+        options:
+        - instance: '&IDI_GroupLayoutOption_FieldSet;'
       displayOptions:
       - instance: '&IDI_DisplayOption_Singular;'
       - instance: '&IDI_DisplayOption_ShowSubelementsVertically;'