diff --git a/.mps/modules.xml b/.mps/modules.xml
index 12f5cf91..5755756c 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -45,6 +45,7 @@
+
diff --git a/samples/mpscore/.mps/modules.xml b/samples/mpscore/.mps/modules.xml
index 40e46fda..fb008177 100644
--- a/samples/mpscore/.mps/modules.xml
+++ b/samples/mpscore/.mps/modules.xml
@@ -12,6 +12,7 @@
+
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index cc84929a..46b50ec2 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -1563,6 +1563,144 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1662,6 +1800,7 @@
+
@@ -1794,7 +1933,7 @@
-
+
@@ -1956,6 +2095,7 @@
+
@@ -1984,6 +2124,351 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3349,220 +3834,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3839,9 +4110,6 @@
-
-
-
@@ -3914,6 +4182,8 @@
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/generator/templates/main@generator.mps
new file mode 100644
index 00000000..9a0296ac
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/generator/templates/main@generator.mps
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl
new file mode 100644
index 00000000..27004116
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl
@@ -0,0 +1,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)
+ 7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)
+ 0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.behavior.mps
new file mode 100644
index 00000000..542b79c6
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.behavior.mps
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.constraints.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.constraints.mps
new file mode 100644
index 00000000..30cf5d02
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.constraints.mps
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.editor.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.editor.mps
new file mode 100644
index 00000000..f3aa8cc0
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.editor.mps
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.structure.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.structure.mps
new file mode 100644
index 00000000..9b2abcc6
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.structure.mps
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
new file mode 100644
index 00000000..9309a25e
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+