diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/004-Instances.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/004-Instances.yaml
index ef4bff2..95e5050 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/004-Instances.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/000-EntityDefinitions/004-Instances.yaml
@@ -1,5 +1,5 @@
 - entityDefinitions:
-  - IDI_Element_AddMetadataInstance: '{a-000d-4910-ac24-e13f46cf5d99}'
+  - IDI_Element_AddMetadataInstance: '{e3ec65c0-bcff-4fe8-9d75-0da77368868e}'
 
   - IDI_DisplayOption_DisplayAsPageTitle: '{369335cf-4a3d-4349-9300-62bd72dafeb6}'
   - IDI_DisplayOption_NotEnterable: '{831e921b-5132-4b37-9303-da0994a0f828}'
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00041-Application.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00041-Application.yaml
new file mode 100644
index 0000000..11d3659
--- /dev/null
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00041-Application.yaml
@@ -0,0 +1,8 @@
+- entityDefinitions:
+  - IDC_Application: '{06b6e9bc-812d-49fa-aab2-33654069f815}'
+
+- library: '&IDL_MochaBaseSystem;'
+  instances:
+  - class: '&IDC_Application;'
+    name: Application
+    index: 41
diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00041-Layout.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01078-Layout.yaml
similarity index 87%
rename from mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00041-Layout.yaml
rename to mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01078-Layout.yaml
index 4df8c13..6baf9da 100644
--- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/00041-Layout.yaml
+++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01078-Layout.yaml
@@ -2,5 +2,5 @@
   instances:
   - class: '&IDC_Layout;'
     name: Layout
-    index: 41
+    index: 1078
     abstract: yes