diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/02993-Task.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/02993-Task.yaml
index 433fdcc..95a214b 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/02993-Task.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/02993-Task.yaml
@@ -1,3 +1,7 @@
+- entityDefinitions:
+  - IDR_Task__has_related__Work_Set: '{2eb391b4-7da2-4eca-8460-dcda7757c47a}'
+  - IDR_Work_Set__related_for__Task: '{0109d3aa-9de5-43fd-98e3-f91db65aef64}'
+
 - library: '&IDL_MochaBaseSystem;'
   instances:
   - class: '&IDC_Task;'
@@ -5,15 +9,17 @@
     index: 2993
     abstract: yes
     relationships:
-    - instance: '&IDR_Task__related_action_for__Instance;'
-      customTagName: relatedActionForInstanceId
+    # - instance: '&IDR_Task__related_action_for__Instance;'
+    #   customTagName: relatedActionForInstanceId
+    - instance: '&IDR_Task__has_related__Work_Set;'
+      customTagName: relatedWorkSetId
 
 # BUIR - Build UI Response Method.uses Executable returning Element
 # the BUIR is referenced via a Build Response Method Binding [BRMB] on the CT
 # the CT is in turn referenced by the Task
 
   - relationship: '&IDR_Task__has_initiating__Element;'
-    index: 89
+    index: 865
     sourceClassId: '&IDC_Task;'
     type: 'has initiating'
     destinationClassId: '&IDC_Element;'
@@ -21,9 +27,25 @@
     singular: yes
 
   - relationship: '&IDR_Element__initiates_for__Task;'
-    index: 90
+    index: 866 
     sourceClassId: '&IDC_Element;'
     type: 'initiates for'
     destinationClassId: '&IDC_Task;'
     siblingRelationshipId: '&IDR_Task__has_initiating__Element;'
     singular: no
+
+  - relationship: '&IDR_Task__has_related__Work_Set;'
+    index: 867
+    sourceClassId: '&IDC_Task;'
+    type: 'has related'
+    destinationClassId: '&IDC_WorkSet;'
+    siblingRelationshipId: '&IDR_Work_Set__related_for__Task;'
+    singular: yes
+
+  - relationship: '&IDR_Work_Set__related_for__Task;'
+    index: 868
+    sourceClassId: '&IDC_WorkSet;'
+    type: 'related for'
+    destinationClassId: '&IDC_Task;'
+    siblingRelationshipId: '&IDR_Task__has_related__Work_Set;'
+    singular: no
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/02997-SequenceTask.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/02997-SequenceTask.yaml
index 47fb0e6..e0efe6b 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/02997-SequenceTask.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/02997-SequenceTask.yaml
@@ -22,5 +22,7 @@
     - instance: '&IDR_Task__has_initiating__Element;'
       customTagName: initiatingElement
       customTagNameCreatesInstanceOf: '&IDC_Element;'
+    - instance: '&IDR_Task__has_related__Work_Set;'
+      customTagName: relatedWorkSetId
     - instance: '&IDR_Task__has__Task_Category;'
       customTagName: taskCategory
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/Class/ViewClass.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/Class/ViewClass.yaml
index d4957b1..66651dc 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/Class/ViewClass.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/Class/ViewClass.yaml
@@ -20,11 +20,13 @@
     name: 'View Class'
     initiatingElement: '&IDE_ClassSelect;'
     taskCategory: '&IDI_TaskCategory_Class;'
+    relatedWorkSetId: '&IDC_Class;'
     
   - sequenceTask: '&IDI_Task_EditClass;'
     name: 'Edit Class'
     initiatingElement: '&IDE_ClassStart;'
     taskCategory: '&IDI_TaskCategory_Class;'
+    relatedWorkSetId: '&IDC_Class;'
     
     # name: 'View Class'
     # taskCategory: '&IDI_TaskCategory_Class;'
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/ReturnAttributeMethodBinding/View.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/ReturnAttributeMethodBinding/View.yaml
index d5a39b3..5786de3 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/ReturnAttributeMethodBinding/View.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Tasks/ReturnAttributeMethodBinding/View.yaml
@@ -14,6 +14,7 @@
     name: 'View Return Attribute Method Binding'
     initiatingElement: '&IDE_ReturnAttributeMethodBinding_View_Start;'
     taskCategory: '&IDI_TaskCategory_ReturnAttributeMethodBinding;'
+    relatedWorkSetId: '&IDC_ReturnAttributeMethodBinding;'
 
   - controlTransactionMethod: '&IDM_ReturnAttributeMethodBinding_View_Start;'
     forClassId: '&IDC_ReturnAttributeMethodBinding;'