diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00010-Method.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00010-Method.yaml
index 0ae95b3..41b829e 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00010-Method.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00010-Method.yaml
@@ -26,6 +26,8 @@
       customTagName: 'moduleId'
     - instance: '&IDR_Method__implements__Method;'
       customTagName: 'implementsMethodId'
+    superclasses:
+    - instance: '&IDC_MetadataWithAccessModifier;'
 
   - relationship: '&IDR_Class__has__Method;'
     index: 15
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00015-WorkSet.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00015-WorkSet.yaml
index f88224b..1e8109d 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00015-WorkSet.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00015-WorkSet.yaml
@@ -5,6 +5,8 @@
     name:      Work Set
     index:     15
     customTagName: workSet
+    superclasses:
+    - instance: '&IDC_ExecutableReturningInstanceSet;'
     defaultTask: '&IDI_Task_ViewWorkSet;'
     relatedTasks:
     # - instance: '&IDI_Task_ViewWorkData;'
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00062-BuildUIResponseMethod.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00062-BuildUIResponseMethod.yaml
index 79247e6..119765e 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00062-BuildUIResponseMethod.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00062-BuildUIResponseMethod.yaml
@@ -14,6 +14,8 @@
     instancesLabeledByRAMB: '&IDMB_Method__get__Fully_Qualified_Name_BUIR;'
     customTagName: 'buildUIResponseMethod'
     registerForTemplate: yes
+    superclasses:
+    - instance: '&IDC_Method;'
     translations:
     - relationship: '&IDR_Class__has_title__Translation;'
       values:
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00073-AssignAttributeMethod.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00073-AssignAttributeMethod.yaml
index 58dabac..915e9c7 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00073-AssignAttributeMethod.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00073-AssignAttributeMethod.yaml
@@ -3,6 +3,8 @@
   instances:
   - class:      '&IDC_AssignAttributeMethod;'
     inherits:  '&IDC_Method;'
+    superclasses:
+    - instance: '&IDC_Method;' 
     name:      AA - Assign Attribute Method
     index:     73
     customTagName: assignAttributeMethod
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00148-RelationalOperator.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00148-RelationalOperator.yaml
index 002286e..091d10d 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00148-RelationalOperator.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00148-RelationalOperator.yaml
@@ -24,6 +24,8 @@
     name: 'Relational Operator'
     index: 148
     inherits: '&IDC_BooleanOperator;'
+    superclasses:
+    - instance: '&IDC_BooleanOperator;'
     description: operator that is the target of an EBE - Evaluate Boolean Expression Method
     customTagName: 'relationalOperator'
     attributes:
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00149-LogicalOperator.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00149-LogicalOperator.yaml
index 6143373..571b56a 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00149-LogicalOperator.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00149-LogicalOperator.yaml
@@ -13,7 +13,8 @@
   - class: '&IDC_LogicalOperator;'
     index: 149
     name: 'Logical Operator'
-    inherits: '&IDC_BooleanOperator;'
+    superclasses:
+    - instance: '&IDC_BooleanOperator;'
     description: operator that is the target of an EBE - Evaluate Boolean Expression Method
     customTagName: 'logicalOperator'
     attributes: