diff --git a/.mps/modules.xml b/.mps/modules.xml
index 5755756c..b36f702f 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -43,6 +43,7 @@
+
diff --git a/samples/mpscore/.mps/modules.xml b/samples/mpscore/.mps/modules.xml
index fb008177..85754745 100644
--- a/samples/mpscore/.mps/modules.xml
+++ b/samples/mpscore/.mps/modules.xml
@@ -10,6 +10,7 @@
+
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index 9fcf422f..3dc7201c 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -266,6 +266,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1935,7 +2076,7 @@
-
+
@@ -2096,6 +2237,7 @@
+
@@ -2547,6 +2689,112 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4112,6 +4360,8 @@
+
+
@@ -4182,6 +4432,8 @@
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/generator/templates/main@generator.mps
new file mode 100644
index 00000000..c0bfb8df
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/generator/templates/main@generator.mps
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
new file mode 100644
index 00000000..8b009dda
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)
+ df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.behavior.mps
new file mode 100644
index 00000000..81ebf851
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.behavior.mps
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.constraints.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.constraints.mps
new file mode 100644
index 00000000..2dd88021
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.constraints.mps
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.editor.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.editor.mps
new file mode 100644
index 00000000..22c98089
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.editor.mps
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.structure.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.structure.mps
new file mode 100644
index 00000000..3df8e4f3
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.structure.mps
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps
new file mode 100644
index 00000000..feed0617
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps
@@ -0,0 +1,1314 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+