diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml
index e6c8a5f..e897839 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/003-Relationships.yaml
@@ -322,8 +322,6 @@
   - IDR_Derived_Element_Content__update_with__Executable_returning_Work_Data: "{4151911a-485c-4488-8e19-1560f489d411}"
   - IDR_Executable_returning_Work_Data__used_by__Derived_Element_Content: "{75fdacf8-163c-45ac-86eb-80677ff738ad}"
 
-  - IDR_Work_Data__in__Namespace: '{c06e6d4d-c0e3-4e87-b2b5-76fedb979318}'
-
   - IDR_Parameter_Assignment__assigns_from__Executable_returning_Work_Data: '{6f3687ed-7d88-4ece-914e-c47c57c1146d}'
   - IDR_Executable_returning_Work_Data__assigned_from__Parameter_Assignment: '{40540642-69b3-4713-ac55-6946060bd385}'
   - IDR_Parameter_Assignment__assigns_to__Work_Data: '{51c37636-35d2-4528-99ca-50cf09fa1427}'
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00006-Element.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00006-Element.yaml
index e4b3c8a..be670fe 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00006-Element.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00006-Element.yaml
@@ -1,4 +1,8 @@
 ---
+- entityDefinitions:
+  - IDR_Element__has_target__Namespace: '{7924469a-8853-403b-95b4-c1cbfa7df792}'
+  - IDR_Namespace__is_target_for__Element: '{6cde0a64-9e8b-4efd-a94c-f82365cd0a73}'
+    
 - library: '&IDL_MochaBaseSystem;'
   instances:
   - class:      '&IDC_Element;'
@@ -92,3 +96,19 @@
     destinationClassId: '&IDC_Element;'
     siblingRelationshipId: '&IDR_Element__has_default__Display_Option;'
     singular: no
+
+  - relationship: '&IDR_Element__has_target__Namespace;'
+    index: 869
+    sourceClassId: '&IDC_Element;'
+    type: 'has target'
+    destinationClassId: '&IDC_Namespace;'
+    siblingRelationshipId: '&IDR_Namespace__is_target_for__Element;'
+    singular: yes
+
+  - relationship: '&IDR_Namespace__is_target_for__Element;'
+    index: 870
+    sourceClassId: '&IDC_Namespace;'
+    type: 'is target for'
+    destinationClassId: '&IDC_Element;'
+    siblingRelationshipId: '&IDR_Element__has_target__Namespace;'
+    singular: no
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00042-WorkData.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00042-WorkData.yaml
index e6e92a4..5284feb 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00042-WorkData.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00042-WorkData.yaml
@@ -1,7 +1,29 @@
 ---
+- entityDefinitions:
+  - IDR_Work_Data__in__Namespace: '{c06e6d4d-c0e3-4e87-b2b5-76fedb979318}'
+  - IDR_Namespace__has__Work_Data: '{b7b66a6f-7a0e-42ee-b08e-e1464f6993d8}'
+    
+  # {28da848f-898f-4cf3-badc-a8ec979a3dcd}
+    
 - library: '&IDL_MochaBaseSystem;'
   instances:
   - class:      '&IDC_WorkData;'
     name:      Work Data
     index:     42
-    abstract:  yes
\ No newline at end of file
+    abstract:  yes
+
+  - relationship: '&IDR_Work_Data__in__Namespace;'
+    index: 765
+    sourceClassId: '&IDC_WorkData;'
+    type: 'in'
+    destinationClassId: '&IDC_Namespace;'
+    siblingRelationshipId: '&IDR_Namespace__has__Work_Data;'
+    singular: yes
+
+  - relationship: '&IDR_Namespace__has__Work_Data;'
+    index: 766
+    sourceClassId: '&IDC_Namespace;'
+    type: 'has'
+    destinationClassId: '&IDC_WorkData;'
+    siblingRelationshipId: '&IDR_Work_Data__in__Namespace;'
+    singular: no
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00333-Namespace.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00333-Namespace.yaml
new file mode 100644
index 0000000..fd93923
--- /dev/null
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00333-Namespace.yaml
@@ -0,0 +1,8 @@
+- entityDefinitions:
+  - IDC_Namespace: '{e1839f6f-f648-4879-bc1d-bb14559a6be3}'
+    
+- library: '&IDL_MochaBaseSystem;'
+  instances:
+  - class: '&IDC_Namespace;'
+    name: Namespace
+    index: 333