diff --git a/.mps/modules.xml b/.mps/modules.xml
index a1603750..70ab6cf0 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -46,6 +46,7 @@
+
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index f82a76fc..2e3397c3 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -2614,7 +2614,7 @@
-
+
@@ -2773,6 +2773,7 @@
+
@@ -3018,6 +3019,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5613,6 +5731,8 @@
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/generator/templates/jetbrains.mps.behaviorExt.generator.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/generator/templates/jetbrains.mps.behaviorExt.generator.templates@generator.mps
new file mode 100644
index 00000000..a62110bb
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/generator/templates/jetbrains.mps.behaviorExt.generator.templates@generator.mps
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.behaviorExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.behaviorExt.mpl
new file mode 100644
index 00000000..0f0709e8
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.behaviorExt.mpl
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)
+ 65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior)
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.behavior.mps
new file mode 100644
index 00000000..08f75b0e
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.behavior.mps
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.constraints.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.constraints.mps
new file mode 100644
index 00000000..033ffb0e
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.constraints.mps
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.editor.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.editor.mps
new file mode 100644
index 00000000..f9c06414
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.editor.mps
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.structure.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.structure.mps
new file mode 100644
index 00000000..08c20d64
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.structure.mps
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.types.mps
new file mode 100644
index 00000000..9fdea52f
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.behaviorExt.types.mps
@@ -0,0 +1,524 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+