diff --git a/.mps/migration.xml b/.mps/migration.xml
index 333ddb4a..d88115b1 100644
--- a/.mps/migration.xml
+++ b/.mps/migration.xml
@@ -8,6 +8,8 @@
     <entry key="jetbrains.mps.fixMig_33_331" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v33.UpdateModuleUsedLang" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v34.EngagedLanguagesImports" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v35.EditorGeneratorRefactoring" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v35.RemoveHistoryFiles" value="executed" />
     <entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
     <entry key="jetbrains.mps.mps33.resaveModules" value="executed" />
     <entry key="jetbrains.mps.name2id_gen" value="executed" />
diff --git a/build.xml b/build.xml
index 13acbedd..42aa4a87 100644
--- a/build.xml
+++ b/build.xml
@@ -54,13 +54,14 @@
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="23949432-aaff-4c03-b7da-26e4e956ccea(jetbrains.mps.baseLanguage.regexp.runtime)" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
           <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.logic-src.jar" descriptor="jetbrains.mps.logic.mpl" />
       </module>
     </echoxml>
@@ -70,8 +71,31 @@
       <fileset dir="${basedir}/logic/languages/jetbrains.mps.logic/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.logic.jar" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.logic-generator.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.logic-generator.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.logic-generator.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.logic#6626732309150416985" type="generator" uuid="85f64970-3326-4ea7-966e-1ac904686424">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.logic-src.jar" descriptor="jetbrains.mps.logic.mpl" />
+      </module>
+    </echoxml>
     <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.logic-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.logic-generator.jar" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/logic-languages-jetbrains.mps.logic-generator-template">
       <fileset dir="${basedir}/logic/languages/jetbrains.mps.logic/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
@@ -109,6 +133,9 @@
         <library jar="../lib/kotlin-stdlib-1.0.5.jar" />
         <library jar="../lib/kotlin-runtime-1.0.5.jar" />
         <library jar="../lib/collection-0.6.jar" />
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
@@ -147,6 +174,9 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.logic.runtime-src.jar" descriptor="jetbrains.mps.logic.runtime.msd" />
       </module>
     </echoxml>
@@ -193,6 +223,9 @@
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2-src.jar" descriptor="jetbrains.mps.lang.typesystem2.mpl" />
       </module>
     </echoxml>
@@ -202,8 +235,32 @@
       <fileset dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.jar" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2-generator.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2-generator.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2-generator.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.typesystem2#4578927328670739933" type="generator" uuid="21d5540d-cd6b-44dd-b6ab-6835bf032803">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.typesystem2-src.jar" descriptor="jetbrains.mps.lang.typesystem2.mpl" />
+      </module>
+    </echoxml>
     <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2-generator.jar" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typesystem2-languages-jetbrains.mps.lang.typesystem2-generator-template">
       <fileset dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
@@ -245,6 +302,9 @@
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.runtime-src.jar" descriptor="jetbrains.mps.lang.typesystem2.runtime.msd" />
       </module>
     </echoxml>
@@ -283,6 +343,9 @@
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.template-src.jar" descriptor="jetbrains.mps.lang.typesystem2.template.msd" />
       </module>
     </echoxml>
@@ -311,19 +374,16 @@
       <module namespace="jetbrains.mps.lang.typesystem2.helper" type="solution" uuid="274c9cfa-1024-4444-904c-f2f1383a35da">
         <dependencies>
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
           <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.helper-src.jar" descriptor="jetbrains.mps.lang.typesystem2.helper.msd" />
       </module>
     </echoxml>
@@ -366,6 +426,9 @@
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
       </module>
     </echoxml>
@@ -375,8 +438,31 @@
       <fileset dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.smodel.types/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.smodel.types#7345257067587611144" type="generator" uuid="ceb57370-a04c-41e9-91e3-f36110b5e4aa">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
+      </module>
+    </echoxml>
     <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.smodel.types-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types#7345257067587611144" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typesystem2-languages-jetbrains.mps.lang.smodel.types-generator-template">
       <fileset dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.smodel.types/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
@@ -408,22 +494,21 @@
         <dependencies>
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
           <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
-          <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
-          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.sampleplugin-src.jar" descriptor="jetbrains.mps.lang.typesystem2.sampleplugin.msd" />
       </module>
     </echoxml>
@@ -464,6 +549,9 @@
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.samplechecker.handler.util-src.jar" descriptor="jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd" />
       </module>
     </echoxml>
@@ -534,23 +622,16 @@
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jetbrains.mps.baseLanguage.unitTest.libs.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
-      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.bootstrap-languages.devkit" />
-      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.devkit" />
-      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.devkit" />
-      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.templates.devkit" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect-generator.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior-generator.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.analyzers.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor-generator.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.extension.jar" />
@@ -572,13 +653,13 @@
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.script.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.slanguage.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel-generator.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
       <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.facet.jar" />
       <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.reduced.jar" />
@@ -650,9 +731,9 @@
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
@@ -665,13 +746,9 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
@@ -702,9 +779,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
@@ -719,13 +796,9 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -766,10 +839,7 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
       </classpath>
     </javac>
   </target>
@@ -801,13 +871,10 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
       </classpath>
     </javac>
   </target>
@@ -832,9 +899,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
@@ -853,27 +920,25 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       </classpath>
     </javac>
   </target>
@@ -898,9 +963,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" />
@@ -920,22 +985,19 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect-generator.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor-generator.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
@@ -954,8 +1016,6 @@
         <path location="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
@@ -963,11 +1023,13 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
@@ -982,13 +1044,9 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -1012,8 +1070,6 @@
         <path location="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
@@ -1021,11 +1077,13 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
@@ -1044,13 +1102,9 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -1081,9 +1135,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
@@ -1096,16 +1150,12 @@
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
         <fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
@@ -1126,8 +1176,6 @@
         <path location="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
@@ -1135,11 +1183,13 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
@@ -1148,10 +1198,7 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
       </classpath>
@@ -1178,9 +1225,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
@@ -1196,13 +1243,9 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -1235,9 +1278,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
@@ -1254,13 +1297,9 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
@@ -1283,8 +1322,6 @@
         <path location="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
@@ -1292,11 +1329,13 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
@@ -1315,10 +1354,7 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -1360,12 +1396,8 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
diff --git a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 2fa2ec63..6ca12dc8 100644
--- a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -6,8 +6,8 @@
     <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -222,8 +222,8 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
@@ -1299,7 +1299,6 @@
                             <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
                           </node>
                           <node concept="1PxgMI" id="7HUwyZaNQVa" role="33vP2m">
-                            <ref role="1m5ApE" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
                             <node concept="2OqwBi" id="7HUwyZaNQVb" role="1m5AlR">
                               <node concept="1iwH7S" id="7HUwyZaNQVc" role="2Oq$k0" />
                               <node concept="12$id9" id="7HUwyZaNQVd" role="2OqNvi">
@@ -1311,6 +1310,9 @@
                                 </node>
                               </node>
                             </node>
+                            <node concept="chp4Y" id="6fXjIfxgneo" role="3oSUPX">
+                              <ref role="cht4Q" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -1410,7 +1412,6 @@
                           <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
                         </node>
                         <node concept="1PxgMI" id="3sttX4FrOBO" role="33vP2m">
-                          <ref role="1m5ApE" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
                           <node concept="2OqwBi" id="3sttX4FrOBP" role="1m5AlR">
                             <node concept="1iwH7S" id="3sttX4FrOBQ" role="2Oq$k0" />
                             <node concept="12$id9" id="3sttX4FrOBR" role="2OqNvi">
@@ -1422,6 +1423,9 @@
                               </node>
                             </node>
                           </node>
+                          <node concept="chp4Y" id="6fXjIfxgnep" role="3oSUPX">
+                            <ref role="cht4Q" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+                          </node>
                         </node>
                       </node>
                     </node>
diff --git a/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 2d300610..8833ff2f 100644
--- a/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -18,12 +18,8 @@
         <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
         <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
       </dependencies>
-      <usedDevKits>
-        <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-      </usedDevKits>
       <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-        <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -33,7 +29,7 @@
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
         <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
@@ -44,8 +40,8 @@
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-        <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+        <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
@@ -87,13 +83,8 @@
     <dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
   </dependencies>
-  <usedDevKits>
-    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-    <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
-  </usedDevKits>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
@@ -102,17 +93,17 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="3" />
-    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="4" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="7" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
@@ -126,7 +117,6 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/actions.mps b/logic/languages/jetbrains.mps.logic/languageModels/actions.mps
index 867bf6a0..dc6a0dfb 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/actions.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/actions.mps
@@ -2,621 +2,14 @@
 <model ref="r:3e4db8f0-e5cf-49f3-9145-bc3c865d93ee(jetbrains.mps.logic.actions)">
   <persistence version="9" />
   <languages>
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="3" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="qgy9" ref="r:5195f849-566d-46a3-bb0a-7ae9911e2652(jetbrains.mps.logic.editor)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-        <child id="1068499141038" name="actualArgument" index="37wK5m" />
-      </concept>
-    </language>
-    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
-      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
-        <child id="1199569906740" name="parameter" index="1bW2Oz" />
-        <child id="1199569916463" name="body" index="1bW5cS" />
-      </concept>
-    </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
-        <reference id="5455284157994012188" name="link" index="2pIpSl" />
-      </concept>
-      <concept id="5455284157993911077" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitProperty" flags="ng" index="2pJxcG">
-        <reference id="5455284157993911078" name="property" index="2pJxcJ" />
-      </concept>
-      <concept id="5455284157993911097" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitPart" flags="ng" index="2pJxcK">
-        <child id="5455284157993911094" name="expression" index="2pJxcZ" />
-      </concept>
-      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
-        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
-      </concept>
-      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
-        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
-        <child id="5455284157993911099" name="values" index="2pJxcM" />
-      </concept>
-      <concept id="8182547171709738802" name="jetbrains.mps.lang.quotation.structure.NodeBuilderList" flags="nn" index="36be1Y">
-        <child id="8182547171709738803" name="nodes" index="36be1Z" />
-      </concept>
-    </language>
-    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
-      <concept id="1196433923911" name="jetbrains.mps.lang.actions.structure.SideTransform_SimpleString" flags="nn" index="2h1dTh">
-        <property id="1196433942569" name="text" index="2h1i$Z" />
-      </concept>
-      <concept id="1177323996388" name="jetbrains.mps.lang.actions.structure.AddMenuPart" flags="ng" index="tYCnQ" />
-      <concept id="1177327570013" name="jetbrains.mps.lang.actions.structure.QueryFunction_Substitute_Handler" flags="in" index="ucgPf" />
-      <concept id="1177327666243" name="jetbrains.mps.lang.actions.structure.SimpleItemSubstitutePart" flags="ng" index="ucClh">
-        <child id="1177327709106" name="handler" index="ucMEw" />
-        <child id="1177336013307" name="matchingText" index="uGu3D" />
-      </concept>
-      <concept id="1177333529597" name="jetbrains.mps.lang.actions.structure.ConceptPart" flags="ng" index="uyZFJ">
-        <reference id="1177333551023" name="concept" index="uz4UX" />
-        <child id="1177333559040" name="part" index="uz6Si" />
-      </concept>
-      <concept id="1177335944525" name="jetbrains.mps.lang.actions.structure.QueryFunction_SubstituteString" flags="in" index="uGdhv" />
-      <concept id="562388756457499018" name="jetbrains.mps.lang.actions.structure.MigratedToAnnotation" flags="ng" index="xBawi">
-        <reference id="562388756457499129" name="migratedTo" index="xBaxx" />
-      </concept>
-      <concept id="1177497140107" name="jetbrains.mps.lang.actions.structure.ConceptFunctionParameter_sourceNode" flags="nn" index="Cj7Ep" />
-      <concept id="1177498013932" name="jetbrains.mps.lang.actions.structure.SimpleSideTransformMenuPart" flags="ng" index="Cmt7Y">
-        <child id="1177498166690" name="matchingText" index="Cn2iK" />
-        <child id="1177498182537" name="descriptionText" index="Cn6ar" />
-        <child id="1177498207384" name="handler" index="Cncma" />
-      </concept>
-      <concept id="1177498227294" name="jetbrains.mps.lang.actions.structure.QueryFunction_SideTransform_Handler" flags="in" index="Cnhdc" />
-      <concept id="767145758118872833" name="jetbrains.mps.lang.actions.structure.NF_LinkList_AddNewChildOperation" flags="nn" index="2DeJg1" />
-      <concept id="767145758118872830" name="jetbrains.mps.lang.actions.structure.NF_Link_SetNewChildOperation" flags="nn" index="2DeJnY" />
-      <concept id="1180111159572" name="jetbrains.mps.lang.actions.structure.IncludeRightTransformForNodePart" flags="ng" index="346O06">
-        <child id="1180111489972" name="nodeBlock" index="3484EA" />
-      </concept>
-      <concept id="1154622616118" name="jetbrains.mps.lang.actions.structure.SideTransformHintSubstitutePreconditionFunction" flags="in" index="3kRJcU" />
-      <concept id="1178537049112" name="jetbrains.mps.lang.actions.structure.QueryFunction_SideTransform_NodeQuery" flags="in" index="1Ai3Oa" />
-      <concept id="1112056943463" name="jetbrains.mps.lang.actions.structure.NodeSubstituteActions" flags="ng" index="3FK_9_" />
-      <concept id="1112058030570" name="jetbrains.mps.lang.actions.structure.NodeSubstituteActionsBuilder" flags="ig" index="3FOIzC">
-        <reference id="1112058088712" name="applicableConcept" index="3FOWKa" />
-        <child id="1177324142645" name="part" index="tZc4B" />
-      </concept>
-      <concept id="1138079221458" name="jetbrains.mps.lang.actions.structure.SideTransformHintSubstituteActionsBuilder" flags="ig" index="3UNGvq">
-        <reference id="1138079221462" name="applicableConcept" index="3UNGvu" />
-        <child id="1177442283389" name="part" index="_1QTJ" />
-        <child id="1154622757656" name="precondition" index="3kShCk" />
-      </concept>
-      <concept id="1138079416598" name="jetbrains.mps.lang.actions.structure.SideTransformHintSubstituteActions" flags="ng" index="3UOs0u" />
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
-        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
-      </concept>
-      <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
-        <reference id="1139877738879" name="concept" index="1A0vxQ" />
-      </concept>
-      <concept id="6973815483243445083" name="jetbrains.mps.lang.smodel.structure.EnumMemberValueRefExpression" flags="nn" index="3f7Wdw">
-        <reference id="6973815483243565416" name="member" index="3f7u_j" />
-        <reference id="6973815483243564601" name="enum" index="3f7vo2" />
-      </concept>
-      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
-      <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <property id="1238684351431" name="asCast" index="1BlNFB" />
-      </concept>
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
-        <reference id="1138405853777" name="concept" index="ehGHo" />
-      </concept>
-      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
-        <reference id="1138056395725" name="property" index="3TsBF5" />
-      </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="linkRole" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
-        <child id="1204796294226" name="closure" index="23t8la" />
-      </concept>
-      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
-        <child id="540871147943773366" name="argument" index="25WWJ7" />
-      </concept>
-      <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
-    </language>
-  </registry>
-  <node concept="3FK_9_" id="5A$IBX$g$KA">
-    <property role="TrG5h" value="StandardNode" />
-    <node concept="1X3_iC" id="4hPXq9Jm7DA" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1112056943463/1112058057696" />
-      <node concept="3FOIzC" id="5A$IBX$g$KB" role="8Wnug">
-        <ref role="3FOWKa" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-        <node concept="tYCnQ" id="5A$IBX$gCvk" role="tZc4B">
-          <ref role="uz4UX" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-          <node concept="ucClh" id="5A$IBX$gCF$" role="uz6Si">
-            <node concept="ucgPf" id="5A$IBX$gCFA" role="ucMEw">
-              <node concept="3clFbS" id="5A$IBX$gCFC" role="2VODD2">
-                <node concept="3clFbF" id="5A$IBX$gM$I" role="3cqZAp">
-                  <node concept="2pJPEk" id="5A$IBX$gM$E" role="3clFbG">
-                    <node concept="2pJPED" id="5A$IBX$gNtn" role="2pJPEn">
-                      <ref role="2pJxaS" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-                      <node concept="2pIpSj" id="5A$IBX$gNtq" role="2pJxcM">
-                        <ref role="2pIpSl" to="5j4j:6$jH9oLnyAp" resolve="role" />
-                        <node concept="36be1Y" id="5A$IBX$gNtr" role="2pJxcZ">
-                          <node concept="2pJPED" id="5A$IBX$gNts" role="36be1Z">
-                            <ref role="2pJxaS" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
-                            <node concept="2pJxcG" id="5A$IBX$gNtt" role="2pJxcM">
-                              <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
-                              <node concept="3f7Wdw" id="5A$IBX$gNtu" role="2pJxcZ">
-                                <ref role="3f7u_j" to="5j4j:6dP_abdUiHP" />
-                                <ref role="3f7vo2" to="5j4j:6dP_abdUiHO" resolve="StandardRole" />
-                              </node>
-                            </node>
-                            <node concept="2pIpSj" id="5A$IBX$gNtv" role="2pJxcM">
-                              <ref role="2pIpSl" to="5j4j:6$jH9oLmYL8" resolve="contents" />
-                              <node concept="2pJPED" id="5A$IBX$gNtw" role="2pJxcZ">
-                                <ref role="2pJxaS" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
-                                <node concept="2pJxcG" id="5A$IBX$gNtx" role="2pJxcM">
-                                  <ref role="2pJxcJ" to="5j4j:6$jH9oLmYKA" resolve="value" />
-                                  <node concept="3f7Wdw" id="5A$IBX$gNty" role="2pJxcZ">
-                                    <ref role="3f7u_j" to="5j4j:5A$IBX$fPej" />
-                                    <ref role="3f7vo2" to="5j4j:5A$IBX$fPei" resolve="StandardValue" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="2pJPED" id="38jpnomYp6d" role="36be1Z">
-                            <ref role="2pJxaS" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
-                            <node concept="2pJxcG" id="38jpnomYpcU" role="2pJxcM">
-                              <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
-                              <node concept="3f7Wdw" id="38jpnomYpgj" role="2pJxcZ">
-                                <ref role="3f7vo2" to="5j4j:6dP_abdUiHO" resolve="StandardRole" />
-                                <ref role="3f7u_j" to="5j4j:25SygBrhNIm" />
-                              </node>
-                            </node>
-                            <node concept="2pIpSj" id="38jpnomYpqA" role="2pJxcM">
-                              <ref role="2pIpSl" to="5j4j:6$jH9oLmYL8" resolve="contents" />
-                              <node concept="2pJPED" id="38jpnomYpu3" role="2pJxcZ">
-                                <ref role="2pJxaS" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="uGdhv" id="38jpnomYo4r" role="uGu3D">
-              <node concept="3clFbS" id="38jpnomYo4s" role="2VODD2">
-                <node concept="3clFbF" id="38jpnomYogI" role="3cqZAp">
-                  <node concept="3f7Wdw" id="38jpnomYogH" role="3clFbG">
-                    <ref role="3f7vo2" to="5j4j:5A$IBX$fPei" resolve="StandardValue" />
-                    <ref role="3f7u_j" to="5j4j:5A$IBX$fPej" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="xBawi" id="4hPXq9Jm7D_" role="lGtFl">
-              <ref role="xBaxx" to="qgy9:4hPXq9Jm7Co" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jm7Cn" role="lGtFl">
-          <ref role="xBaxx" to="qgy9:4hPXq9Jm7Cm" resolve="Compound_SubstituteMenu" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3UOs0u" id="3qvzBqWDkum">
-    <property role="TrG5h" value="Node_add_parameter" />
-    <node concept="1X3_iC" id="4hPXq9Jm6ca" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
-      <node concept="3UNGvq" id="3qvzBqWDkva" role="8Wnug">
-        <ref role="3UNGvu" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-        <node concept="3kRJcU" id="3qvzBqWDkvc" role="3kShCk">
-          <node concept="3clFbS" id="3qvzBqWDkvd" role="2VODD2">
-            <node concept="3clFbF" id="3qvzBqWDl3f" role="3cqZAp">
-              <node concept="3fqX7Q" id="3qvzBqWDqCT" role="3clFbG">
-                <node concept="2OqwBi" id="3qvzBqWDqCU" role="3fr31v">
-                  <node concept="2OqwBi" id="3qvzBqWDqCV" role="2Oq$k0">
-                    <node concept="Cj7Ep" id="3qvzBqWDqCW" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="3qvzBqWDqCX" role="2OqNvi">
-                      <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
-                    </node>
-                  </node>
-                  <node concept="2HwmR7" id="3qvzBqWDqCY" role="2OqNvi">
-                    <node concept="1bVj0M" id="3qvzBqWDqCZ" role="23t8la">
-                      <node concept="3clFbS" id="3qvzBqWDqD0" role="1bW5cS">
-                        <node concept="3clFbF" id="3qvzBqWDqD1" role="3cqZAp">
-                          <node concept="2OqwBi" id="3qvzBqWDqD2" role="3clFbG">
-                            <node concept="3f7Wdw" id="3qvzBqWDqD3" role="2Oq$k0">
-                              <ref role="3f7u_j" to="5j4j:6MozwwzUqt8" />
-                              <ref role="3f7vo2" to="5j4j:6dP_abdUiHO" resolve="StandardRole" />
-                            </node>
-                            <node concept="liA8E" id="3qvzBqWDqD4" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
-                              <node concept="2OqwBi" id="3qvzBqWDqD5" role="37wK5m">
-                                <node concept="1PxgMI" id="3qvzBqWDqD6" role="2Oq$k0">
-                                  <property role="1BlNFB" value="true" />
-                                  <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                                  <node concept="37vLTw" id="3qvzBqWDqD7" role="1m5AlR">
-                                    <ref role="3cqZAo" node="3qvzBqWDqD9" resolve="it" />
-                                  </node>
-                                </node>
-                                <node concept="3TrcHB" id="3qvzBqWDqD8" role="2OqNvi">
-                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="3qvzBqWDqD9" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="3qvzBqWDqDa" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="tYCnQ" id="3qvzBqWDrzM" role="_1QTJ">
-          <ref role="uz4UX" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
-          <node concept="Cmt7Y" id="3qvzBqWDrQA" role="uz6Si">
-            <node concept="Cnhdc" id="3qvzBqWDrQB" role="Cncma">
-              <node concept="3clFbS" id="3qvzBqWDrQC" role="2VODD2">
-                <node concept="3cpWs8" id="3t7_2Fgv9e9" role="3cqZAp">
-                  <node concept="3cpWsn" id="3t7_2Fgv9ea" role="3cpWs9">
-                    <property role="TrG5h" value="cr" />
-                    <node concept="3Tqbb2" id="3t7_2Fgv9e7" role="1tU5fm">
-                      <ref role="ehGHo" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                    </node>
-                    <node concept="2pJPEk" id="3t7_2Fgv9eb" role="33vP2m">
-                      <node concept="2pJPED" id="3t7_2Fgv9ec" role="2pJPEn">
-                        <ref role="2pJxaS" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
-                        <node concept="2pJxcG" id="3t7_2Fgv9ed" role="2pJxcM">
-                          <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
-                          <node concept="3f7Wdw" id="3t7_2Fgv9ee" role="2pJxcZ">
-                            <ref role="3f7vo2" to="5j4j:6dP_abdUiHO" resolve="StandardRole" />
-                            <ref role="3f7u_j" to="5j4j:6MozwwzUqt8" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="3qvzBqWDrTt" role="3cqZAp">
-                  <node concept="2OqwBi" id="3qvzBqWDtar" role="3clFbG">
-                    <node concept="2OqwBi" id="3qvzBqWDrWC" role="2Oq$k0">
-                      <node concept="Cj7Ep" id="3qvzBqWDrTs" role="2Oq$k0" />
-                      <node concept="3Tsc0h" id="3qvzBqWDscA" role="2OqNvi">
-                        <ref role="3TtcxE" to="5j4j:6$jH9oLnyAp" resolve="role" />
-                      </node>
-                    </node>
-                    <node concept="TSZUe" id="3qvzBqWDv9h" role="2OqNvi">
-                      <node concept="37vLTw" id="3t7_2Fgv9ef" role="25WWJ7">
-                        <ref role="3cqZAo" node="3t7_2Fgv9ea" resolve="cr" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="3t7_2Fgv9Iy" role="3cqZAp">
-                  <node concept="2OqwBi" id="3t7_2FgvaOu" role="3clFbG">
-                    <node concept="2OqwBi" id="3t7_2Fgv9S3" role="2Oq$k0">
-                      <node concept="37vLTw" id="3t7_2Fgv9Iw" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3t7_2Fgv9ea" resolve="cr" />
-                      </node>
-                      <node concept="3Tsc0h" id="3t7_2Fgvac7" role="2OqNvi">
-                        <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
-                      </node>
-                    </node>
-                    <node concept="2DeJg1" id="3t7_2Fgvd32" role="2OqNvi">
-                      <ref role="1A0vxQ" to="5j4j:1OShD0HAY6y" resolve="List" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2h1dTh" id="3qvzBqWDrRW" role="Cn2iK">
-              <property role="2h1i$Z" value="&lt;" />
-            </node>
-            <node concept="2h1dTh" id="3qvzBqWDrSQ" role="Cn6ar">
-              <property role="2h1i$Z" value="add parameter" />
-            </node>
-            <node concept="xBawi" id="4hPXq9Jm6c9" role="lGtFl">
-              <ref role="xBaxx" to="qgy9:4hPXq9Jm6by" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jm6ba" role="lGtFl">
-          <ref role="xBaxx" to="qgy9:4hPXq9Jm6bb" />
-        </node>
-      </node>
-    </node>
-    <node concept="1X3_iC" id="4hPXq9Jm6aG" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
-      <node concept="3UNGvq" id="3qvzBqWDGSD" role="8Wnug">
-        <ref role="3UNGvu" to="5j4j:6$jH9oLmYJ_" resolve="Value" />
-        <node concept="346O06" id="3qvzBqWDH3q" role="_1QTJ">
-          <node concept="1Ai3Oa" id="3qvzBqWDH3r" role="3484EA">
-            <node concept="3clFbS" id="3qvzBqWDH3s" role="2VODD2">
-              <node concept="3clFbF" id="3qvzBqWDH4J" role="3cqZAp">
-                <node concept="2OqwBi" id="3qvzBqWDH78" role="3clFbG">
-                  <node concept="Cj7Ep" id="3qvzBqWDH4I" role="2Oq$k0" />
-                  <node concept="1mfA1w" id="3qvzBqWDHn7" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="xBawi" id="4hPXq9Jm6aF" role="lGtFl">
-            <ref role="xBaxx" to="qgy9:4hPXq9Jm6az" />
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jm6ay" role="lGtFl">
-          <ref role="xBaxx" to="qgy9:4hPXq9Jm6ap" resolve="Value_TransformationMenu" />
-        </node>
-      </node>
-    </node>
-    <node concept="1X3_iC" id="4hPXq9Jm6b0" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
-      <node concept="3UNGvq" id="3qvzBqWDJLk" role="8Wnug">
-        <ref role="3UNGvu" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
-        <node concept="346O06" id="3qvzBqWDJW2" role="_1QTJ">
-          <node concept="1Ai3Oa" id="3qvzBqWDJW3" role="3484EA">
-            <node concept="3clFbS" id="3qvzBqWDJW4" role="2VODD2">
-              <node concept="3clFbF" id="3qvzBqWDJXn" role="3cqZAp">
-                <node concept="2OqwBi" id="3qvzBqWDK1a" role="3clFbG">
-                  <node concept="Cj7Ep" id="3qvzBqWDJXm" role="2Oq$k0" />
-                  <node concept="1mfA1w" id="3qvzBqWDKdd" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="xBawi" id="4hPXq9Jm6aZ" role="lGtFl">
-            <ref role="xBaxx" to="qgy9:4hPXq9Jm6aR" />
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jm6aQ" role="lGtFl">
-          <ref role="xBaxx" to="qgy9:4hPXq9Jm6aH" resolve="ValueRole_TransformationMenu" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3UOs0u" id="7E86$tKsKAH">
-    <property role="3GE5qa" value="logical" />
-    <property role="TrG5h" value="LogicalVariable_addIndex" />
-    <node concept="1X3_iC" id="4hPXq9Jm6ao" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
-      <node concept="3UNGvq" id="7E86$tKsKAI" role="8Wnug">
-        <ref role="3UNGvu" to="5j4j:7E86$tKsHeX" resolve="AbstractLogicalVariable" />
-        <node concept="3kRJcU" id="7E86$tKsLe$" role="3kShCk">
-          <node concept="3clFbS" id="7E86$tKsLe_" role="2VODD2">
-            <node concept="3clFbF" id="6p0DfM0n_Ot" role="3cqZAp">
-              <node concept="2OqwBi" id="6p0DfM0nAQ2" role="3clFbG">
-                <node concept="2OqwBi" id="6p0DfM0n_WA" role="2Oq$k0">
-                  <node concept="Cj7Ep" id="6p0DfM0n_Os" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="7E86$tKsY3y" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:7E86$tKsJfa" resolve="index" />
-                  </node>
-                </node>
-                <node concept="3w_OXm" id="6p0DfM0nB4j" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="tYCnQ" id="7E86$tKsYzY" role="_1QTJ">
-          <ref role="uz4UX" to="5j4j:7E86$tKsHeX" resolve="AbstractLogicalVariable" />
-          <node concept="Cmt7Y" id="7E86$tKsZ1o" role="uz6Si">
-            <node concept="Cnhdc" id="7E86$tKsZ1p" role="Cncma">
-              <node concept="3clFbS" id="7E86$tKsZ1q" role="2VODD2">
-                <node concept="3clFbF" id="7E86$tKsZmQ" role="3cqZAp">
-                  <node concept="2OqwBi" id="7E86$tKt04j" role="3clFbG">
-                    <node concept="2OqwBi" id="7E86$tKsZpS" role="2Oq$k0">
-                      <node concept="Cj7Ep" id="7E86$tKsZmP" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="7E86$tKsZS4" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:7E86$tKsJfa" resolve="index" />
-                      </node>
-                    </node>
-                    <node concept="2DeJnY" id="7E86$tKt0pZ" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="3clFbF" id="7E86$tKt0zS" role="3cqZAp">
-                  <node concept="Cj7Ep" id="7E86$tKt0zQ" role="3clFbG" />
-                </node>
-              </node>
-            </node>
-            <node concept="2h1dTh" id="7E86$tKsZ4o" role="Cn2iK">
-              <property role="2h1i$Z" value="[" />
-            </node>
-            <node concept="xBawi" id="4hPXq9Jm6an" role="lGtFl">
-              <ref role="xBaxx" to="qgy9:4hPXq9Jm6a0" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jm69P" role="lGtFl">
-          <ref role="xBaxx" to="qgy9:4hPXq9Jm69Q" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3UOs0u" id="7E86$tKtoxK">
-    <property role="3GE5qa" value="logical" />
-    <property role="TrG5h" value="LogicalVariableDeclaration_addCardinality" />
-    <node concept="1X3_iC" id="4hPXq9Jm6d$" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
-      <node concept="3UNGvq" id="7E86$tKtoxL" role="8Wnug">
-        <ref role="3UNGvu" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
-        <node concept="tYCnQ" id="7E86$tKtsvh" role="_1QTJ">
-          <ref role="uz4UX" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
-          <node concept="Cmt7Y" id="7E86$tKtsXI" role="uz6Si">
-            <node concept="Cnhdc" id="7E86$tKtsXJ" role="Cncma">
-              <node concept="3clFbS" id="7E86$tKtsXK" role="2VODD2">
-                <node concept="3clFbF" id="7E86$tKtt3R" role="3cqZAp">
-                  <node concept="2OqwBi" id="7E86$tKttC$" role="3clFbG">
-                    <node concept="2OqwBi" id="7E86$tKtt6T" role="2Oq$k0">
-                      <node concept="Cj7Ep" id="7E86$tKtt3Q" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="7E86$tKttqF" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:7E86$tKtioV" resolve="cardinality" />
-                      </node>
-                    </node>
-                    <node concept="2DeJnY" id="7E86$tKtu8E" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="3clFbF" id="7E86$tKtuhH" role="3cqZAp">
-                  <node concept="Cj7Ep" id="7E86$tKtuhF" role="3clFbG" />
-                </node>
-              </node>
-            </node>
-            <node concept="2h1dTh" id="7E86$tKtt1$" role="Cn2iK">
-              <property role="2h1i$Z" value="[" />
-            </node>
-            <node concept="xBawi" id="4hPXq9Jm6dz" role="lGtFl">
-              <ref role="xBaxx" to="qgy9:4hPXq9Jm6dc" />
-            </node>
-          </node>
-        </node>
-        <node concept="3kRJcU" id="7E86$tKtqyF" role="3kShCk">
-          <node concept="3clFbS" id="7E86$tKtqyG" role="2VODD2">
-            <node concept="3clFbF" id="7E86$tKtqHO" role="3cqZAp">
-              <node concept="2OqwBi" id="7E86$tKtrE3" role="3clFbG">
-                <node concept="2OqwBi" id="7E86$tKtqVy" role="2Oq$k0">
-                  <node concept="Cj7Ep" id="7E86$tKtqHN" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="7E86$tKtriY" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:7E86$tKtioV" resolve="cardinality" />
-                  </node>
-                </node>
-                <node concept="3w_OXm" id="7E86$tKts2l" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jm6d1" role="lGtFl">
-          <ref role="xBaxx" to="qgy9:4hPXq9Jm6d2" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="3UOs0u" id="5zfvpQ71PCs">
-    <property role="3GE5qa" value="logical" />
-    <property role="TrG5h" value="LogicalType_specify_dataType" />
-    <node concept="1X3_iC" id="4hPXq9Jm6cR" role="lGtFl">
-      <property role="3V$3am" value="actionsBuilder" />
-      <property role="3V$3ak" value="aee9cad2-acd4-4608-aef2-0004f6a1cdbd/1138079416598/1138079416599" />
-      <node concept="3UNGvq" id="5zfvpQ71PCt" role="8Wnug">
-        <ref role="3UNGvu" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
-        <node concept="3kRJcU" id="5zfvpQ71PCN" role="3kShCk">
-          <node concept="3clFbS" id="5zfvpQ71PCO" role="2VODD2">
-            <node concept="3clFbF" id="5zfvpQ71PHJ" role="3cqZAp">
-              <node concept="2OqwBi" id="5zfvpQ71Qv3" role="3clFbG">
-                <node concept="2OqwBi" id="5zfvpQ71PN0" role="2Oq$k0">
-                  <node concept="Cj7Ep" id="5zfvpQ71PHI" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="5zfvpQ71QcK" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
-                  </node>
-                </node>
-                <node concept="3w_OXm" id="5zfvpQ71QNP" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="tYCnQ" id="5zfvpQ71QU8" role="_1QTJ">
-          <ref role="uz4UX" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
-          <node concept="Cmt7Y" id="5zfvpQ71R6x" role="uz6Si">
-            <node concept="Cnhdc" id="5zfvpQ71R6y" role="Cncma">
-              <node concept="3clFbS" id="5zfvpQ71R6z" role="2VODD2">
-                <node concept="3clFbF" id="5zfvpQ71R7y" role="3cqZAp">
-                  <node concept="2OqwBi" id="5zfvpQ71Rzs" role="3clFbG">
-                    <node concept="2OqwBi" id="5zfvpQ71Ram" role="2Oq$k0">
-                      <node concept="Cj7Ep" id="5zfvpQ71R7x" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="5zfvpQ71Rlz" role="2OqNvi">
-                        <ref role="3Tt5mk" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
-                      </node>
-                    </node>
-                    <node concept="2DeJnY" id="5zfvpQ71RR3" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="3clFbF" id="5zfvpQ71RVc" role="3cqZAp">
-                  <node concept="Cj7Ep" id="5zfvpQ71RVa" role="3clFbG" />
-                </node>
-              </node>
-            </node>
-            <node concept="2h1dTh" id="5zfvpQ71R7c" role="Cn2iK">
-              <property role="2h1i$Z" value="&lt;" />
-            </node>
-            <node concept="xBawi" id="4hPXq9Jm6cQ" role="lGtFl">
-              <ref role="xBaxx" to="qgy9:4hPXq9Jm6cv" />
-            </node>
-          </node>
-        </node>
-        <node concept="xBawi" id="4hPXq9Jm6ck" role="lGtFl">
-          <ref role="xBaxx" to="qgy9:4hPXq9Jm6cl" />
-        </node>
-      </node>
-    </node>
-  </node>
+  <registry />
 </model>
 
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps b/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
index 86d22a2c..4ec86500 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -2,7 +2,7 @@
 <model ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)">
   <persistence version="9" />
   <languages>
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="0" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -74,10 +74,13 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
         <reference id="1154546997487" name="concept" index="3gnhBz" />
@@ -174,11 +177,13 @@
             </node>
             <node concept="1PxgMI" id="7MlQDeOyTuD" role="33vP2m">
               <property role="1BlNFB" value="true" />
-              <ref role="1m5ApE" to="5j4j:5lJXKARS0" resolve="TreeForm" />
               <node concept="2OqwBi" id="7MlQDeOyTii" role="1m5AlR">
                 <node concept="13iPFW" id="7MlQDeOyTij" role="2Oq$k0" />
                 <node concept="1mfA1w" id="7MlQDeOyTik" role="2OqNvi" />
               </node>
+              <node concept="chp4Y" id="6fXjIfxgne2" role="3oSUPX">
+                <ref role="cht4Q" to="5j4j:5lJXKARS0" resolve="TreeForm" />
+              </node>
             </node>
           </node>
         </node>
@@ -238,11 +243,13 @@
         <node concept="3clFbF" id="75vUFrSLzVQ" role="3cqZAp">
           <node concept="1PxgMI" id="75vUFrSL$eI" role="3clFbG">
             <property role="1BlNFB" value="true" />
-            <ref role="1m5ApE" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
             <node concept="2OqwBi" id="75vUFrSLzXF" role="1m5AlR">
               <node concept="13iPFW" id="75vUFrSLzVP" role="2Oq$k0" />
               <node concept="1mfA1w" id="75vUFrSL$5c" role="2OqNvi" />
             </node>
+            <node concept="chp4Y" id="6fXjIfxgndM" role="3oSUPX">
+              <ref role="cht4Q" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
+            </node>
           </node>
         </node>
       </node>
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/constraints.mps b/logic/languages/jetbrains.mps.logic/languageModels/constraints.mps
index bf6a966c..3899bc7e 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:939fd27c-b8ee-4168-a9aa-0b5e37366f76(jetbrains.mps.logic.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="0" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="2" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -125,7 +125,7 @@
       </concept>
     </language>
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
-      <concept id="1202989531578" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="nKS2y" />
+      <concept id="6702802731807351367" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="9S07l" />
       <concept id="1202989658459" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_parentNode" flags="nn" index="nLn13" />
       <concept id="8966504967485224688" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_contextNode" flags="nn" index="2rP1CM" />
       <concept id="1147467115080" name="jetbrains.mps.lang.constraints.structure.NodePropertyConstraint" flags="ng" index="EnEH3">
@@ -134,12 +134,12 @@
       </concept>
       <concept id="1147468365020" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_node" flags="nn" index="EsrRn" />
       <concept id="1212096972063" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyValidator" flags="in" index="QB0g5" />
-      <concept id="5676632058862809931" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="in" index="13QW63" />
+      <concept id="5564765827938091039" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="ig" index="3dgokm" />
       <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
         <reference id="1213093996982" name="concept" index="1M2myG" />
+        <child id="6702802731807737306" name="canBeChild" index="9Vyp8" />
         <child id="1213098023997" name="property" index="1MhHOB" />
         <child id="1213100494875" name="referent" index="1Mr941" />
-        <child id="1213106463729" name="canBeChild" index="1MLUbF" />
       </concept>
       <concept id="1148687176410" name="jetbrains.mps.lang.constraints.structure.NodeReferentConstraint" flags="ng" index="1N5Pfh">
         <reference id="1148687202698" name="applicableLink" index="1N5Vy1" />
@@ -172,8 +172,8 @@
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1180031783296" name="jetbrains.mps.lang.smodel.structure.Concept_IsSubConceptOfOperation" flags="nn" index="2Zo12i">
@@ -439,16 +439,16 @@
         </node>
       </node>
     </node>
-    <node concept="nKS2y" id="75vUFrSCHCs" role="1MLUbF">
-      <node concept="3clFbS" id="75vUFrSCHCt" role="2VODD2">
-        <node concept="3clFbF" id="75vUFrSCHHo" role="3cqZAp">
-          <node concept="2OqwBi" id="75vUFrSCIqq" role="3clFbG">
-            <node concept="2OqwBi" id="75vUFrSCHNr" role="2Oq$k0">
-              <node concept="nLn13" id="75vUFrSCHHn" role="2Oq$k0" />
-              <node concept="2yIwOk" id="75vUFrSCI0V" role="2OqNvi" />
+    <node concept="9S07l" id="6fXjIfxgfNX" role="9Vyp8">
+      <node concept="3clFbS" id="6fXjIfxgfNY" role="2VODD2">
+        <node concept="3clFbF" id="6fXjIfxgfNZ" role="3cqZAp">
+          <node concept="2OqwBi" id="6fXjIfxgfO0" role="3clFbG">
+            <node concept="2OqwBi" id="6fXjIfxgfO1" role="2Oq$k0">
+              <node concept="nLn13" id="6fXjIfxgfO2" role="2Oq$k0" />
+              <node concept="2yIwOk" id="6fXjIfxgfO3" role="2OqNvi" />
             </node>
-            <node concept="2Zo12i" id="75vUFrSCIBe" role="2OqNvi">
-              <node concept="chp4Y" id="75vUFrSCIJ9" role="2Zo12j">
+            <node concept="2Zo12i" id="6fXjIfxgfO4" role="2OqNvi">
+              <node concept="chp4Y" id="6fXjIfxgfO5" role="2Zo12j">
                 <ref role="cht4Q" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
               </node>
             </node>
@@ -462,116 +462,118 @@
     <ref role="1M2myG" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariableReference" />
     <node concept="1N5Pfh" id="7E86$tK_SGg" role="1Mr941">
       <ref role="1N5Vy1" to="5j4j:7E86$tK_PaH" resolve="declaration" />
-      <node concept="13QW63" id="7E86$tK_SKn" role="1N6uqs">
-        <node concept="3clFbS" id="7E86$tK_SKp" role="2VODD2">
-          <node concept="3clFbH" id="7E86$tKA3v8" role="3cqZAp" />
-          <node concept="3cpWs8" id="6Ng87FPZcv5" role="3cqZAp">
-            <node concept="3cpWsn" id="6Ng87FPZcv6" role="3cpWs9">
+      <node concept="3dgokm" id="6fXjIfxgfOn" role="1N6uqs">
+        <node concept="3clFbS" id="6fXjIfxgfOo" role="2VODD2">
+          <node concept="3clFbH" id="6fXjIfxgfOp" role="3cqZAp" />
+          <node concept="3cpWs8" id="6fXjIfxgfOq" role="3cqZAp">
+            <node concept="3cpWsn" id="6fXjIfxgfOr" role="3cpWs9">
               <property role="TrG5h" value="parentScope" />
-              <node concept="9cv3F" id="3LzT4PMaM2V" role="1tU5fm">
-                <node concept="3Tqbb2" id="3LzT4PMaM2W" role="1ajw0F" />
-                <node concept="3uibUv" id="3LzT4PMaM2X" role="1ajl9A">
+              <node concept="9cv3F" id="6fXjIfxgfOs" role="1tU5fm">
+                <node concept="3Tqbb2" id="6fXjIfxgfOt" role="1ajw0F" />
+                <node concept="3uibUv" id="6fXjIfxgfOu" role="1ajl9A">
                   <ref role="3uigEE" to="o8zo:3fifI_xCtN$" resolve="Scope" />
                 </node>
               </node>
-              <node concept="10Nm6u" id="6Ng87FPZcva" role="33vP2m" />
+              <node concept="10Nm6u" id="6fXjIfxgfOv" role="33vP2m" />
             </node>
           </node>
-          <node concept="3clFbF" id="6Ng87FPZcvb" role="3cqZAp">
-            <node concept="37vLTI" id="6Ng87FPZcvc" role="3clFbG">
-              <node concept="1bVj0M" id="6Ng87FPZcvd" role="37vLTx">
-                <node concept="37vLTG" id="6Ng87FPZcve" role="1bW2Oz">
+          <node concept="3clFbF" id="6fXjIfxgfOw" role="3cqZAp">
+            <node concept="37vLTI" id="6fXjIfxgfOx" role="3clFbG">
+              <node concept="1bVj0M" id="6fXjIfxgfOy" role="37vLTx">
+                <node concept="37vLTG" id="6fXjIfxgfOz" role="1bW2Oz">
                   <property role="TrG5h" value="container" />
-                  <node concept="3Tqbb2" id="6Ng87FPZcvf" role="1tU5fm" />
+                  <node concept="3Tqbb2" id="6fXjIfxgfO$" role="1tU5fm" />
                 </node>
-                <node concept="3clFbS" id="6Ng87FPZcvg" role="1bW5cS">
-                  <node concept="3clFbJ" id="6Ng87FPZcvh" role="3cqZAp">
-                    <node concept="3clFbS" id="6Ng87FPZcvi" role="3clFbx">
-                      <node concept="3clFbH" id="6Ng87FPZcvj" role="3cqZAp" />
-                      <node concept="3cpWs8" id="6Ng87FPZcvk" role="3cqZAp">
-                        <node concept="3cpWsn" id="6Ng87FPZcvl" role="3cpWs9">
+                <node concept="3clFbS" id="6fXjIfxgfO_" role="1bW5cS">
+                  <node concept="3clFbJ" id="6fXjIfxgfOA" role="3cqZAp">
+                    <node concept="3clFbS" id="6fXjIfxgfOB" role="3clFbx">
+                      <node concept="3clFbH" id="6fXjIfxgfOC" role="3cqZAp" />
+                      <node concept="3cpWs8" id="6fXjIfxgfOD" role="3cqZAp">
+                        <node concept="3cpWsn" id="6fXjIfxgfOE" role="3cpWs9">
                           <property role="TrG5h" value="childrenScope" />
-                          <node concept="3uibUv" id="6Ng87FPZcvm" role="1tU5fm">
+                          <node concept="3uibUv" id="6fXjIfxgfOF" role="1tU5fm">
                             <ref role="3uigEE" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                           </node>
-                          <node concept="2ShNRf" id="6Ng87FPZcvn" role="33vP2m">
-                            <node concept="YeOm9" id="6Ng87FPZcvo" role="2ShVmc">
-                              <node concept="1Y3b0j" id="6Ng87FPZcvp" role="YeSDq">
+                          <node concept="2ShNRf" id="6fXjIfxgfOG" role="33vP2m">
+                            <node concept="YeOm9" id="6fXjIfxgfOH" role="2ShVmc">
+                              <node concept="1Y3b0j" id="6fXjIfxgfOI" role="YeSDq">
                                 <property role="2bfB8j" value="true" />
                                 <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
                                 <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
-                                <node concept="2tJIrI" id="7E86$tKAluT" role="jymVt" />
-                                <node concept="2OqwBi" id="6Ng87FPZcvr" role="37wK5m">
-                                  <node concept="2OqwBi" id="5JTOzCQZUpe" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="6Ng87FPZcvs" role="2Oq$k0">
-                                      <node concept="37vLTw" id="6Ng87FPZcvt" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="6Ng87FPZcve" resolve="container" />
+                                <node concept="2tJIrI" id="6fXjIfxgfOJ" role="jymVt" />
+                                <node concept="2OqwBi" id="6fXjIfxgfOK" role="37wK5m">
+                                  <node concept="2OqwBi" id="6fXjIfxgfOL" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="6fXjIfxgfOM" role="2Oq$k0">
+                                      <node concept="37vLTw" id="6fXjIfxgfON" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
                                       </node>
-                                      <node concept="32TBzR" id="6Ng87FPZcvu" role="2OqNvi" />
+                                      <node concept="32TBzR" id="6fXjIfxgfOO" role="2OqNvi" />
                                     </node>
-                                    <node concept="3goQfb" id="5JTOzCQZWWn" role="2OqNvi">
-                                      <node concept="1bVj0M" id="5JTOzCQZWWp" role="23t8la">
-                                        <node concept="3clFbS" id="5JTOzCQZWWq" role="1bW5cS">
-                                          <node concept="3clFbF" id="5JTOzCQZXtz" role="3cqZAp">
-                                            <node concept="2OqwBi" id="5JTOzCQZXEz" role="3clFbG">
-                                              <node concept="37vLTw" id="5JTOzCQZXty" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="5JTOzCQZWWr" resolve="it" />
+                                    <node concept="3goQfb" id="6fXjIfxgfOP" role="2OqNvi">
+                                      <node concept="1bVj0M" id="6fXjIfxgfOQ" role="23t8la">
+                                        <node concept="3clFbS" id="6fXjIfxgfOR" role="1bW5cS">
+                                          <node concept="3clFbF" id="6fXjIfxgfOS" role="3cqZAp">
+                                            <node concept="2OqwBi" id="6fXjIfxgfOT" role="3clFbG">
+                                              <node concept="37vLTw" id="6fXjIfxgfOU" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="6fXjIfxgfOW" resolve="it" />
                                               </node>
-                                              <node concept="32TBzR" id="5JTOzCQZYvh" role="2OqNvi" />
+                                              <node concept="32TBzR" id="6fXjIfxgfOV" role="2OqNvi" />
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="Rh6nW" id="5JTOzCQZWWr" role="1bW2Oz">
+                                        <node concept="Rh6nW" id="6fXjIfxgfOW" role="1bW2Oz">
                                           <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="5JTOzCQZWWs" role="1tU5fm" />
+                                          <node concept="2jxLKc" id="6fXjIfxgfOX" role="1tU5fm" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3zZkjj" id="6Ng87FPZcvv" role="2OqNvi">
-                                    <node concept="1bVj0M" id="6Ng87FPZcvw" role="23t8la">
-                                      <node concept="3clFbS" id="6Ng87FPZcvx" role="1bW5cS">
-                                        <node concept="3clFbF" id="6Ng87FPZcvy" role="3cqZAp">
-                                          <node concept="2OqwBi" id="6Ng87FPZcvz" role="3clFbG">
-                                            <node concept="37vLTw" id="6Ng87FPZcv$" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="6Ng87FPZcvB" resolve="chd" />
+                                  <node concept="3zZkjj" id="6fXjIfxgfOY" role="2OqNvi">
+                                    <node concept="1bVj0M" id="6fXjIfxgfOZ" role="23t8la">
+                                      <node concept="3clFbS" id="6fXjIfxgfP0" role="1bW5cS">
+                                        <node concept="3clFbF" id="6fXjIfxgfP1" role="3cqZAp">
+                                          <node concept="2OqwBi" id="6fXjIfxgfP2" role="3clFbG">
+                                            <node concept="37vLTw" id="6fXjIfxgfP3" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="6fXjIfxgfP6" resolve="chd" />
                                             </node>
-                                            <node concept="1mIQ4w" id="6Ng87FPZcv_" role="2OqNvi">
-                                              <node concept="chp4Y" id="7E86$tKA4OJ" role="cj9EA">
+                                            <node concept="1mIQ4w" id="6fXjIfxgfP4" role="2OqNvi">
+                                              <node concept="chp4Y" id="6fXjIfxgfP5" role="cj9EA">
                                                 <ref role="cht4Q" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="6Ng87FPZcvB" role="1bW2Oz">
+                                      <node concept="Rh6nW" id="6fXjIfxgfP6" role="1bW2Oz">
                                         <property role="TrG5h" value="chd" />
-                                        <node concept="2jxLKc" id="6Ng87FPZcvC" role="1tU5fm" />
+                                        <node concept="2jxLKc" id="6fXjIfxgfP7" role="1tU5fm" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="3Tm1VV" id="6Ng87FPZcvN" role="1B3o_S" />
-                                <node concept="3clFb_" id="6Ng87FPZcvO" role="jymVt">
+                                <node concept="3Tm1VV" id="6fXjIfxgfP8" role="1B3o_S" />
+                                <node concept="3clFb_" id="6fXjIfxgfP9" role="jymVt">
                                   <property role="1EzhhJ" value="false" />
                                   <property role="TrG5h" value="getName" />
-                                  <node concept="17QB3L" id="6Ng87FPZcvP" role="3clF45" />
-                                  <node concept="3Tm1VV" id="6Ng87FPZcvQ" role="1B3o_S" />
-                                  <node concept="37vLTG" id="6Ng87FPZcvR" role="3clF46">
+                                  <node concept="17QB3L" id="6fXjIfxgfPa" role="3clF45" />
+                                  <node concept="3Tm1VV" id="6fXjIfxgfPb" role="1B3o_S" />
+                                  <node concept="37vLTG" id="6fXjIfxgfPc" role="3clF46">
                                     <property role="TrG5h" value="child" />
-                                    <node concept="3Tqbb2" id="6Ng87FPZcvS" role="1tU5fm" />
+                                    <node concept="3Tqbb2" id="6fXjIfxgfPd" role="1tU5fm" />
                                   </node>
-                                  <node concept="3clFbS" id="6Ng87FPZcvT" role="3clF47">
-                                    <node concept="3clFbF" id="6Ng87FPZcvU" role="3cqZAp">
-                                      <node concept="2OqwBi" id="6Ng87FPZcvV" role="3clFbG">
-                                        <node concept="1PxgMI" id="6Ng87FPZcvW" role="2Oq$k0">
+                                  <node concept="3clFbS" id="6fXjIfxgfPe" role="3clF47">
+                                    <node concept="3clFbF" id="6fXjIfxgfPf" role="3cqZAp">
+                                      <node concept="2OqwBi" id="6fXjIfxgfPg" role="3clFbG">
+                                        <node concept="1PxgMI" id="6fXjIfxgfPh" role="2Oq$k0">
                                           <property role="1BlNFB" value="true" />
-                                          <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                          <node concept="37vLTw" id="6Ng87FPZcvX" role="1m5AlR">
-                                            <ref role="3cqZAo" node="6Ng87FPZcvR" resolve="child" />
+                                          <node concept="37vLTw" id="6fXjIfxgfPi" role="1m5AlR">
+                                            <ref role="3cqZAo" node="6fXjIfxgfPc" resolve="child" />
+                                          </node>
+                                          <node concept="chp4Y" id="6fXjIfxgndR" role="3oSUPX">
+                                            <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                                           </node>
                                         </node>
-                                        <node concept="3TrcHB" id="6Ng87FPZcvY" role="2OqNvi">
+                                        <node concept="3TrcHB" id="6fXjIfxgfPj" role="2OqNvi">
                                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                                         </node>
                                       </node>
@@ -583,34 +585,34 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbH" id="7E86$tKAmrW" role="3cqZAp" />
-                      <node concept="3cpWs6" id="6Ng87FPZcw9" role="3cqZAp">
-                        <node concept="2YIFZM" id="6Ng87FPZcwa" role="3cqZAk">
+                      <node concept="3clFbH" id="6fXjIfxgfPk" role="3cqZAp" />
+                      <node concept="3cpWs6" id="6fXjIfxgfPl" role="3cqZAp">
+                        <node concept="2YIFZM" id="6fXjIfxgfPm" role="3cqZAk">
                           <ref role="1Pybhc" to="fnmy:3A2qfoxVUBF" resolve="Scopes" />
                           <ref role="37wK5l" to="fnmy:6Kqn2fZyoZp" resolve="defaultWithNameHiding" />
-                          <node concept="35c_gC" id="3PWU9gizU1o" role="37wK5m">
+                          <node concept="35c_gC" id="6fXjIfxgfPn" role="37wK5m">
                             <ref role="35c_gD" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
                           </node>
-                          <node concept="37vLTw" id="6Ng87FPZcwc" role="37wK5m">
-                            <ref role="3cqZAo" node="6Ng87FPZcvl" resolve="childrenScope" />
+                          <node concept="37vLTw" id="6fXjIfxgfPo" role="37wK5m">
+                            <ref role="3cqZAo" node="6fXjIfxgfOE" resolve="childrenScope" />
                           </node>
-                          <node concept="2Sg_IR" id="6Ng87FPZcwd" role="37wK5m">
-                            <node concept="37vLTw" id="6Ng87FPZcwe" role="2SgG2M">
-                              <ref role="3cqZAo" node="6Ng87FPZcv6" resolve="parentScope" />
+                          <node concept="2Sg_IR" id="6fXjIfxgfPp" role="37wK5m">
+                            <node concept="37vLTw" id="6fXjIfxgfPq" role="2SgG2M">
+                              <ref role="3cqZAo" node="6fXjIfxgfOr" resolve="parentScope" />
                             </node>
-                            <node concept="2OqwBi" id="7E86$tKAntd" role="2SgHGx">
-                              <node concept="37vLTw" id="7E86$tKAnte" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6Ng87FPZcve" resolve="container" />
+                            <node concept="2OqwBi" id="6fXjIfxgfPr" role="2SgHGx">
+                              <node concept="37vLTw" id="6fXjIfxgfPs" role="2Oq$k0">
+                                <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
                               </node>
-                              <node concept="2Xjw5R" id="7E86$tKAntf" role="2OqNvi">
-                                <node concept="3gmYPX" id="7E86$tKAntg" role="1xVPHs">
-                                  <node concept="3gn64h" id="7E86$tKAnth" role="3gmYPZ">
+                              <node concept="2Xjw5R" id="6fXjIfxgfPt" role="2OqNvi">
+                                <node concept="3gmYPX" id="6fXjIfxgfPu" role="1xVPHs">
+                                  <node concept="3gn64h" id="6fXjIfxgfPv" role="3gmYPZ">
                                     <ref role="3gnhBz" to="tpee:fzclF80" resolve="StatementList" />
                                   </node>
-                                  <node concept="3gn64h" id="7E86$tKAnti" role="3gmYPZ">
+                                  <node concept="3gn64h" id="6fXjIfxgfPw" role="3gmYPZ">
                                     <ref role="3gnhBz" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
                                   </node>
-                                  <node concept="3gn64h" id="7E86$tKAntj" role="3gmYPZ">
+                                  <node concept="3gn64h" id="6fXjIfxgfPx" role="3gmYPZ">
                                     <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                   </node>
                                 </node>
@@ -619,68 +621,72 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbH" id="6Ng87FPZcwg" role="3cqZAp" />
+                      <node concept="3clFbH" id="6fXjIfxgfPy" role="3cqZAp" />
                     </node>
-                    <node concept="2OqwBi" id="6Ng87FPZcwh" role="3clFbw">
-                      <node concept="37vLTw" id="6Ng87FPZcwi" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6Ng87FPZcve" resolve="container" />
+                    <node concept="2OqwBi" id="6fXjIfxgfPz" role="3clFbw">
+                      <node concept="37vLTw" id="6fXjIfxgfP$" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
                       </node>
-                      <node concept="1mIQ4w" id="6Ng87FPZcwj" role="2OqNvi">
-                        <node concept="chp4Y" id="6Ng87FPZcwk" role="cj9EA">
+                      <node concept="1mIQ4w" id="6fXjIfxgfP_" role="2OqNvi">
+                        <node concept="chp4Y" id="6fXjIfxgfPA" role="cj9EA">
                           <ref role="cht4Q" to="tpee:fzclF80" resolve="StatementList" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3eNFk2" id="6Ng87FPZcwl" role="3eNLev">
-                      <node concept="3clFbS" id="6Ng87FPZcwm" role="3eOfB_">
-                        <node concept="3clFbH" id="6Ng87FPZcwn" role="3cqZAp" />
-                        <node concept="3cpWs8" id="3PWU9gi_g4$" role="3cqZAp">
-                          <node concept="3cpWsn" id="3PWU9gi_g4_" role="3cpWs9">
+                    <node concept="3eNFk2" id="6fXjIfxgfPB" role="3eNLev">
+                      <node concept="3clFbS" id="6fXjIfxgfPC" role="3eOfB_">
+                        <node concept="3clFbH" id="6fXjIfxgfPD" role="3cqZAp" />
+                        <node concept="3cpWs8" id="6fXjIfxgfPE" role="3cqZAp">
+                          <node concept="3cpWsn" id="6fXjIfxgfPF" role="3cpWs9">
                             <property role="TrG5h" value="childrenScope" />
-                            <node concept="3uibUv" id="3PWU9gi_g4z" role="1tU5fm">
+                            <node concept="3uibUv" id="6fXjIfxgfPG" role="1tU5fm">
                               <ref role="3uigEE" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                             </node>
-                            <node concept="2ShNRf" id="3PWU9gi_g4A" role="33vP2m">
-                              <node concept="YeOm9" id="3PWU9gi_g4B" role="2ShVmc">
-                                <node concept="1Y3b0j" id="3PWU9gi_g4C" role="YeSDq">
+                            <node concept="2ShNRf" id="6fXjIfxgfPH" role="33vP2m">
+                              <node concept="YeOm9" id="6fXjIfxgfPI" role="2ShVmc">
+                                <node concept="1Y3b0j" id="6fXjIfxgfPJ" role="YeSDq">
                                   <property role="2bfB8j" value="true" />
                                   <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                                   <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                                  <node concept="2OqwBi" id="3PWU9gi_g4D" role="37wK5m">
-                                    <node concept="2OqwBi" id="3PWU9gi_g4E" role="2Oq$k0">
-                                      <node concept="1PxgMI" id="3PWU9gi_g4F" role="2Oq$k0">
-                                        <ref role="1m5ApE" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
-                                        <node concept="37vLTw" id="3PWU9gi_g4G" role="1m5AlR">
-                                          <ref role="3cqZAo" node="6Ng87FPZcve" resolve="container" />
+                                  <node concept="2OqwBi" id="6fXjIfxgfPK" role="37wK5m">
+                                    <node concept="2OqwBi" id="6fXjIfxgfPL" role="2Oq$k0">
+                                      <node concept="1PxgMI" id="6fXjIfxgfPM" role="2Oq$k0">
+                                        <node concept="37vLTw" id="6fXjIfxgfPN" role="1m5AlR">
+                                          <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
+                                        </node>
+                                        <node concept="chp4Y" id="6fXjIfxgndS" role="3oSUPX">
+                                          <ref role="cht4Q" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
                                         </node>
                                       </node>
-                                      <node concept="2qgKlT" id="6YKq674hz7i" role="2OqNvi">
+                                      <node concept="2qgKlT" id="6fXjIfxgfPO" role="2OqNvi">
                                         <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                       </node>
                                     </node>
-                                    <node concept="ANE8D" id="3PWU9gi_g4I" role="2OqNvi" />
+                                    <node concept="ANE8D" id="6fXjIfxgfPP" role="2OqNvi" />
                                   </node>
-                                  <node concept="3Tm1VV" id="3PWU9gi_g4J" role="1B3o_S" />
-                                  <node concept="3clFb_" id="3PWU9gi_g4K" role="jymVt">
+                                  <node concept="3Tm1VV" id="6fXjIfxgfPQ" role="1B3o_S" />
+                                  <node concept="3clFb_" id="6fXjIfxgfPR" role="jymVt">
                                     <property role="1EzhhJ" value="false" />
                                     <property role="TrG5h" value="getName" />
-                                    <node concept="17QB3L" id="3PWU9gi_g4L" role="3clF45" />
-                                    <node concept="3Tm1VV" id="3PWU9gi_g4M" role="1B3o_S" />
-                                    <node concept="37vLTG" id="3PWU9gi_g4N" role="3clF46">
+                                    <node concept="17QB3L" id="6fXjIfxgfPS" role="3clF45" />
+                                    <node concept="3Tm1VV" id="6fXjIfxgfPT" role="1B3o_S" />
+                                    <node concept="37vLTG" id="6fXjIfxgfPU" role="3clF46">
                                       <property role="TrG5h" value="child" />
-                                      <node concept="3Tqbb2" id="3PWU9gi_g4O" role="1tU5fm" />
+                                      <node concept="3Tqbb2" id="6fXjIfxgfPV" role="1tU5fm" />
                                     </node>
-                                    <node concept="3clFbS" id="3PWU9gi_g4P" role="3clF47">
-                                      <node concept="3clFbF" id="3PWU9gi_g4Q" role="3cqZAp">
-                                        <node concept="2OqwBi" id="3PWU9gi_g4R" role="3clFbG">
-                                          <node concept="1PxgMI" id="3PWU9gi_g4S" role="2Oq$k0">
+                                    <node concept="3clFbS" id="6fXjIfxgfPW" role="3clF47">
+                                      <node concept="3clFbF" id="6fXjIfxgfPX" role="3cqZAp">
+                                        <node concept="2OqwBi" id="6fXjIfxgfPY" role="3clFbG">
+                                          <node concept="1PxgMI" id="6fXjIfxgfPZ" role="2Oq$k0">
                                             <property role="1BlNFB" value="true" />
-                                            <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                            <node concept="37vLTw" id="3PWU9gi_g4T" role="1m5AlR">
-                                              <ref role="3cqZAo" node="3PWU9gi_g4N" resolve="child" />
+                                            <node concept="37vLTw" id="6fXjIfxgfQ0" role="1m5AlR">
+                                              <ref role="3cqZAo" node="6fXjIfxgfPU" resolve="child" />
+                                            </node>
+                                            <node concept="chp4Y" id="6fXjIfxgndK" role="3oSUPX">
+                                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                                             </node>
                                           </node>
-                                          <node concept="3TrcHB" id="3PWU9gi_g4U" role="2OqNvi">
+                                          <node concept="3TrcHB" id="6fXjIfxgfQ1" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                                           </node>
                                         </node>
@@ -692,34 +698,34 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbH" id="3PWU9gi_idr" role="3cqZAp" />
-                        <node concept="3cpWs6" id="3PWU9gi_iqn" role="3cqZAp">
-                          <node concept="2YIFZM" id="3PWU9gi_iqo" role="3cqZAk">
+                        <node concept="3clFbH" id="6fXjIfxgfQ2" role="3cqZAp" />
+                        <node concept="3cpWs6" id="6fXjIfxgfQ3" role="3cqZAp">
+                          <node concept="2YIFZM" id="6fXjIfxgfQ4" role="3cqZAk">
                             <ref role="37wK5l" to="fnmy:6Kqn2fZyoZp" resolve="defaultWithNameHiding" />
                             <ref role="1Pybhc" to="fnmy:3A2qfoxVUBF" resolve="Scopes" />
-                            <node concept="35c_gC" id="3PWU9gi_iqp" role="37wK5m">
+                            <node concept="35c_gC" id="6fXjIfxgfQ5" role="37wK5m">
                               <ref role="35c_gD" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
                             </node>
-                            <node concept="37vLTw" id="3PWU9gi_jaj" role="37wK5m">
-                              <ref role="3cqZAo" node="3PWU9gi_g4_" resolve="childrenScope" />
+                            <node concept="37vLTw" id="6fXjIfxgfQ6" role="37wK5m">
+                              <ref role="3cqZAo" node="6fXjIfxgfPF" resolve="childrenScope" />
                             </node>
-                            <node concept="2Sg_IR" id="3PWU9gi_iqr" role="37wK5m">
-                              <node concept="37vLTw" id="3PWU9gi_iqs" role="2SgG2M">
-                                <ref role="3cqZAo" node="6Ng87FPZcv6" resolve="parentScope" />
+                            <node concept="2Sg_IR" id="6fXjIfxgfQ7" role="37wK5m">
+                              <node concept="37vLTw" id="6fXjIfxgfQ8" role="2SgG2M">
+                                <ref role="3cqZAo" node="6fXjIfxgfOr" resolve="parentScope" />
                               </node>
-                              <node concept="2OqwBi" id="3PWU9gi_iqt" role="2SgHGx">
-                                <node concept="37vLTw" id="3PWU9gi_iqu" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6Ng87FPZcve" resolve="container" />
+                              <node concept="2OqwBi" id="6fXjIfxgfQ9" role="2SgHGx">
+                                <node concept="37vLTw" id="6fXjIfxgfQa" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
                                 </node>
-                                <node concept="2Xjw5R" id="3PWU9gi_iqv" role="2OqNvi">
-                                  <node concept="3gmYPX" id="3PWU9gi_iqw" role="1xVPHs">
-                                    <node concept="3gn64h" id="3PWU9gi_iqx" role="3gmYPZ">
+                                <node concept="2Xjw5R" id="6fXjIfxgfQb" role="2OqNvi">
+                                  <node concept="3gmYPX" id="6fXjIfxgfQc" role="1xVPHs">
+                                    <node concept="3gn64h" id="6fXjIfxgfQd" role="3gmYPZ">
                                       <ref role="3gnhBz" to="tpee:fzclF80" resolve="StatementList" />
                                     </node>
-                                    <node concept="3gn64h" id="3PWU9gi_iqy" role="3gmYPZ">
+                                    <node concept="3gn64h" id="6fXjIfxgfQe" role="3gmYPZ">
                                       <ref role="3gnhBz" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
                                     </node>
-                                    <node concept="3gn64h" id="3PWU9gi_iqz" role="3gmYPZ">
+                                    <node concept="3gn64h" id="6fXjIfxgfQf" role="3gmYPZ">
                                       <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                     </node>
                                   </node>
@@ -729,50 +735,50 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="2OqwBi" id="6Ng87FPZcyw" role="3eO9$A">
-                        <node concept="37vLTw" id="6Ng87FPZcyx" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6Ng87FPZcve" resolve="container" />
+                      <node concept="2OqwBi" id="6fXjIfxgfQg" role="3eO9$A">
+                        <node concept="37vLTw" id="6fXjIfxgfQh" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
                         </node>
-                        <node concept="1mIQ4w" id="6Ng87FPZcyy" role="2OqNvi">
-                          <node concept="chp4Y" id="7E86$tKAvH5" role="cj9EA">
+                        <node concept="1mIQ4w" id="6fXjIfxgfQi" role="2OqNvi">
+                          <node concept="chp4Y" id="6fXjIfxgfQj" role="cj9EA">
                             <ref role="cht4Q" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbH" id="6Ng87FPZcy$" role="3cqZAp" />
-                  <node concept="3clFbF" id="6Ng87FPZcy_" role="3cqZAp">
-                    <node concept="10Nm6u" id="6Ng87FPZcyA" role="3clFbG" />
+                  <node concept="3clFbH" id="6fXjIfxgfQk" role="3cqZAp" />
+                  <node concept="3clFbF" id="6fXjIfxgfQl" role="3cqZAp">
+                    <node concept="10Nm6u" id="6fXjIfxgfQm" role="3clFbG" />
                   </node>
                 </node>
               </node>
-              <node concept="37vLTw" id="6Ng87FPZcyB" role="37vLTJ">
-                <ref role="3cqZAo" node="6Ng87FPZcv6" resolve="parentScope" />
+              <node concept="37vLTw" id="6fXjIfxgfQn" role="37vLTJ">
+                <ref role="3cqZAo" node="6fXjIfxgfOr" resolve="parentScope" />
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="6Ng87FPZcyC" role="3cqZAp" />
-          <node concept="3clFbF" id="6Ng87FPZcyD" role="3cqZAp">
-            <node concept="2Sg_IR" id="6Ng87FPZcyE" role="3clFbG">
-              <node concept="37vLTw" id="6Ng87FPZcyF" role="2SgG2M">
-                <ref role="3cqZAo" node="6Ng87FPZcv6" resolve="parentScope" />
+          <node concept="3clFbH" id="6fXjIfxgfQo" role="3cqZAp" />
+          <node concept="3clFbF" id="6fXjIfxgfQp" role="3cqZAp">
+            <node concept="2Sg_IR" id="6fXjIfxgfQq" role="3clFbG">
+              <node concept="37vLTw" id="6fXjIfxgfQr" role="2SgG2M">
+                <ref role="3cqZAo" node="6fXjIfxgfOr" resolve="parentScope" />
               </node>
-              <node concept="2OqwBi" id="6Ng87FPZcyG" role="2SgHGx">
-                <node concept="2rP1CM" id="6Ng87FPZcyH" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="6Ng87FPZcyI" role="2OqNvi">
-                  <node concept="3gmYPX" id="euG2bFd70E" role="1xVPHs">
-                    <node concept="3gn64h" id="euG2bFd70F" role="3gmYPZ">
+              <node concept="2OqwBi" id="6fXjIfxgfQs" role="2SgHGx">
+                <node concept="2rP1CM" id="6fXjIfxgfQt" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="6fXjIfxgfQu" role="2OqNvi">
+                  <node concept="3gmYPX" id="6fXjIfxgfQv" role="1xVPHs">
+                    <node concept="3gn64h" id="6fXjIfxgfQw" role="3gmYPZ">
                       <ref role="3gnhBz" to="tpee:fzclF80" resolve="StatementList" />
                     </node>
-                    <node concept="3gn64h" id="euG2bFd83W" role="3gmYPZ">
+                    <node concept="3gn64h" id="6fXjIfxgfQx" role="3gmYPZ">
                       <ref role="3gnhBz" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
                     </node>
-                    <node concept="3gn64h" id="euG2bFd9vf" role="3gmYPZ">
+                    <node concept="3gn64h" id="6fXjIfxgfQy" role="3gmYPZ">
                       <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                     </node>
                   </node>
-                  <node concept="1xIGOp" id="6Ng87FPZcyL" role="1xVPHs" />
+                  <node concept="1xIGOp" id="6fXjIfxgfQz" role="1xVPHs" />
                 </node>
               </node>
             </node>
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
index cdae3a19..56c525f9 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -2,8 +2,8 @@
 <model ref="r:5195f849-566d-46a3-bb0a-7ae9911e2652(jetbrains.mps.logic.editor)">
   <persistence version="9" />
   <languages>
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="3" />
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="4" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="7" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -386,8 +386,8 @@
       </concept>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="7835263205327057228" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenAndChildAttributesOperation" flags="ng" index="Bykcj" />
       <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
@@ -411,7 +411,6 @@
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
-      <concept id="1140133623887" name="jetbrains.mps.lang.smodel.structure.Node_DeleteOperation" flags="nn" index="1PgB_6" />
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
       </concept>
@@ -427,6 +426,7 @@
       <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
         <reference id="1138056546658" name="link" index="3TtcxE" />
       </concept>
+      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -1032,8 +1032,10 @@
                   <node concept="2OqwBi" id="6dP_abdUo8U" role="37wK5m">
                     <node concept="1PxgMI" id="6dP_abdUo8V" role="2Oq$k0">
                       <property role="1BlNFB" value="true" />
-                      <ref role="1m5ApE" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
                       <node concept="12_Ws6" id="6dP_abdUo8W" role="1m5AlR" />
+                      <node concept="chp4Y" id="6fXjIfxgndQ" role="3oSUPX">
+                        <ref role="cht4Q" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+                      </node>
                     </node>
                     <node concept="3TrcHB" id="6dP_abdUo8X" role="2OqNvi">
                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1080,8 +1082,10 @@
                       <node concept="2OqwBi" id="38jpnomXF7_" role="37wK5m">
                         <node concept="1PxgMI" id="38jpnomXF7A" role="2Oq$k0">
                           <property role="1BlNFB" value="true" />
-                          <ref role="1m5ApE" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
                           <node concept="12_Ws6" id="38jpnomXF7B" role="1m5AlR" />
+                          <node concept="chp4Y" id="6fXjIfxgndU" role="3oSUPX">
+                            <ref role="cht4Q" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+                          </node>
                         </node>
                         <node concept="3TrcHB" id="38jpnomXF7C" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1296,8 +1300,10 @@
                   <node concept="2OqwBi" id="25SygBrhI1Z" role="37wK5m">
                     <node concept="1PxgMI" id="25SygBrhI20" role="2Oq$k0">
                       <property role="1BlNFB" value="true" />
-                      <ref role="1m5ApE" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
                       <node concept="12_Ws6" id="25SygBrhI21" role="1m5AlR" />
+                      <node concept="chp4Y" id="6fXjIfxgndW" role="3oSUPX">
+                        <ref role="cht4Q" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+                      </node>
                     </node>
                     <node concept="3TrcHB" id="25SygBrhI22" role="2OqNvi">
                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1347,8 +1353,10 @@
                     <node concept="2OqwBi" id="6MozwwzUpNi" role="37wK5m">
                       <node concept="1PxgMI" id="6MozwwzUpNj" role="2Oq$k0">
                         <property role="1BlNFB" value="true" />
-                        <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
                         <node concept="12_Ws6" id="6MozwwzUpNk" role="1m5AlR" />
+                        <node concept="chp4Y" id="6fXjIfxgndX" role="3oSUPX">
+                          <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                        </node>
                       </node>
                       <node concept="3TrcHB" id="6MozwwzUpNl" role="2OqNvi">
                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1403,10 +1411,12 @@
                             <node concept="2OqwBi" id="3qvzBqWD4Vq" role="37wK5m">
                               <node concept="1PxgMI" id="3qvzBqWD4Vr" role="2Oq$k0">
                                 <property role="1BlNFB" value="true" />
-                                <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
                                 <node concept="37vLTw" id="3qvzBqWD5Du" role="1m5AlR">
                                   <ref role="3cqZAo" node="3qvzBqWD4CY" resolve="it" />
                                 </node>
+                                <node concept="chp4Y" id="6fXjIfxgndL" role="3oSUPX">
+                                  <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                                </node>
                               </node>
                               <node concept="3TrcHB" id="3qvzBqWD6t4" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1785,10 +1795,12 @@
                             <node concept="2OqwBi" id="38jpnomX3jL" role="37wK5m">
                               <node concept="1PxgMI" id="38jpnomX3jM" role="2Oq$k0">
                                 <property role="1BlNFB" value="true" />
-                                <ref role="1m5ApE" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
                                 <node concept="37vLTw" id="38jpnomX3jN" role="1m5AlR">
                                   <ref role="3cqZAo" node="38jpnomX3jP" resolve="it" />
                                 </node>
+                                <node concept="chp4Y" id="6fXjIfxgndY" role="3oSUPX">
+                                  <ref role="cht4Q" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+                                </node>
                               </node>
                               <node concept="3TrcHB" id="38jpnomX3jO" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1888,10 +1900,12 @@
                             <node concept="2OqwBi" id="3qvzBqW$FvN" role="37wK5m">
                               <node concept="1PxgMI" id="3qvzBqW$FvO" role="2Oq$k0">
                                 <property role="1BlNFB" value="true" />
-                                <ref role="1m5ApE" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
                                 <node concept="37vLTw" id="3qvzBqW$FvP" role="1m5AlR">
                                   <ref role="3cqZAo" node="3qvzBqW$FvR" resolve="it" />
                                 </node>
+                                <node concept="chp4Y" id="6fXjIfxgndZ" role="3oSUPX">
+                                  <ref role="cht4Q" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+                                </node>
                               </node>
                               <node concept="3TrcHB" id="3qvzBqW$FvQ" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2009,10 +2023,12 @@
                             <node concept="2OqwBi" id="3qvzBqW_MPI" role="37wK5m">
                               <node concept="1PxgMI" id="3qvzBqW_MPJ" role="2Oq$k0">
                                 <property role="1BlNFB" value="true" />
-                                <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
                                 <node concept="37vLTw" id="3qvzBqW_MPK" role="1m5AlR">
                                   <ref role="3cqZAo" node="3qvzBqW_MPM" resolve="it" />
                                 </node>
+                                <node concept="chp4Y" id="6fXjIfxgne0" role="3oSUPX">
+                                  <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                                </node>
                               </node>
                               <node concept="3TrcHB" id="3qvzBqW_MPL" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2061,7 +2077,6 @@
                 <node concept="2OqwBi" id="35Lj3Tim$h8" role="3clFbG">
                   <node concept="1PxgMI" id="35Lj3Tim$b7" role="2Oq$k0">
                     <property role="1BlNFB" value="true" />
-                    <ref role="1m5ApE" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
                     <node concept="2OqwBi" id="35Lj3TimzW2" role="1m5AlR">
                       <node concept="2OqwBi" id="35Lj3TimzEI" role="2Oq$k0">
                         <node concept="0IXxy" id="35Lj3TimzD_" role="2Oq$k0" />
@@ -2069,8 +2084,11 @@
                       </node>
                       <node concept="1mfA1w" id="35Lj3Tim$37" role="2OqNvi" />
                     </node>
+                    <node concept="chp4Y" id="6fXjIfxgndO" role="3oSUPX">
+                      <ref role="cht4Q" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                    </node>
                   </node>
-                  <node concept="1PgB_6" id="35Lj3Tim$ss" role="2OqNvi" />
+                  <node concept="3YRAZt" id="35Lj3Tim$ss" role="2OqNvi" />
                 </node>
               </node>
             </node>
@@ -2084,11 +2102,13 @@
                 <node concept="2OqwBi" id="35Lj3Timzy_" role="37wK5m">
                   <node concept="1PxgMI" id="35Lj3TimzyA" role="2Oq$k0">
                     <property role="1BlNFB" value="true" />
-                    <ref role="1m5ApE" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
                     <node concept="2OqwBi" id="35Lj3TimzyB" role="1m5AlR">
                       <node concept="0IXxy" id="35Lj3TimzyC" role="2Oq$k0" />
                       <node concept="1mfA1w" id="35Lj3TimzyD" role="2OqNvi" />
                     </node>
+                    <node concept="chp4Y" id="6fXjIfxgndV" role="3oSUPX">
+                      <ref role="cht4Q" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+                    </node>
                   </node>
                   <node concept="3TrcHB" id="35Lj3TimzyE" role="2OqNvi">
                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2110,7 +2130,6 @@
                 <node concept="2OqwBi" id="35Lj3TimM__" role="3clFbG">
                   <node concept="1PxgMI" id="35Lj3TimM_A" role="2Oq$k0">
                     <property role="1BlNFB" value="true" />
-                    <ref role="1m5ApE" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
                     <node concept="2OqwBi" id="35Lj3TimM_B" role="1m5AlR">
                       <node concept="2OqwBi" id="35Lj3TimM_C" role="2Oq$k0">
                         <node concept="0IXxy" id="35Lj3TimM_D" role="2Oq$k0" />
@@ -2118,8 +2137,11 @@
                       </node>
                       <node concept="1mfA1w" id="35Lj3TimM_F" role="2OqNvi" />
                     </node>
+                    <node concept="chp4Y" id="6fXjIfxgne1" role="3oSUPX">
+                      <ref role="cht4Q" to="5j4j:6$jH9oLmYC_" resolve="Compound" />
+                    </node>
                   </node>
-                  <node concept="1PgB_6" id="35Lj3TimM_G" role="2OqNvi" />
+                  <node concept="3YRAZt" id="35Lj3TimM_G" role="2OqNvi" />
                 </node>
               </node>
             </node>
@@ -2133,11 +2155,13 @@
                 <node concept="2OqwBi" id="35Lj3TimM_K" role="37wK5m">
                   <node concept="1PxgMI" id="35Lj3TimM_L" role="2Oq$k0">
                     <property role="1BlNFB" value="true" />
-                    <ref role="1m5ApE" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
                     <node concept="2OqwBi" id="35Lj3TimM_M" role="1m5AlR">
                       <node concept="0IXxy" id="35Lj3TimM_N" role="2Oq$k0" />
                       <node concept="1mfA1w" id="35Lj3TimM_O" role="2OqNvi" />
                     </node>
+                    <node concept="chp4Y" id="6fXjIfxgndP" role="3oSUPX">
+                      <ref role="cht4Q" to="5j4j:6$jH9oLmYI0" resolve="ValueRole" />
+                    </node>
                   </node>
                   <node concept="3TrcHB" id="35Lj3TimM_P" role="2OqNvi">
                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2498,7 +2522,7 @@
           <node concept="3clFbF" id="dfChU1_gf2" role="3cqZAp">
             <node concept="2OqwBi" id="dfChU1_ggR" role="3clFbG">
               <node concept="0IXxy" id="dfChU1_gf1" role="2Oq$k0" />
-              <node concept="1PgB_6" id="dfChU1_gta" role="2OqNvi" />
+              <node concept="3YRAZt" id="dfChU1_gta" role="2OqNvi" />
             </node>
           </node>
         </node>
@@ -3008,6 +3032,7 @@
     </node>
   </node>
   <node concept="IW6AY" id="4hPXq9Jm69G">
+    <property role="3GE5qa" value="logical" />
     <ref role="aqKnT" to="5j4j:7E86$tKsHeX" resolve="AbstractLogicalVariable" />
     <node concept="1Qtc8_" id="4hPXq9Jm69H" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm69I" role="1Qtc8$">
@@ -3196,10 +3221,12 @@
                               <node concept="2OqwBi" id="4hPXq9Jm6br" role="37wK5m">
                                 <node concept="1PxgMI" id="4hPXq9Jm6bs" role="2Oq$k0">
                                   <property role="1BlNFB" value="true" />
-                                  <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
                                   <node concept="37vLTw" id="4hPXq9Jm6bt" role="1m5AlR">
                                     <ref role="3cqZAo" node="4hPXq9Jm6bv" resolve="it" />
                                   </node>
+                                  <node concept="chp4Y" id="6fXjIfxgne3" role="3oSUPX">
+                                    <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                                  </node>
                                 </node>
                                 <node concept="3TrcHB" id="4hPXq9Jm6bu" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3311,6 +3338,7 @@
     </node>
   </node>
   <node concept="IW6AY" id="4hPXq9Jm6cb">
+    <property role="3GE5qa" value="logical" />
     <ref role="aqKnT" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
     <node concept="1Qtc8_" id="4hPXq9Jm6cc" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm6cd" role="1Qtc8$">
@@ -3389,6 +3417,7 @@
     </node>
   </node>
   <node concept="IW6AY" id="4hPXq9Jm6cS">
+    <property role="3GE5qa" value="logical" />
     <ref role="aqKnT" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
     <node concept="1Qtc8_" id="4hPXq9Jm6cT" role="IW6Ez">
       <node concept="3cWJ9i" id="4hPXq9Jm6cU" role="1Qtc8$">
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/intentions.mps b/logic/languages/jetbrains.mps.logic/languageModels/intentions.mps
index 67f9437e..763820b3 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/intentions.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/intentions.mps
@@ -3,8 +3,8 @@
   <persistence version="9" />
   <languages>
     <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="3" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -146,11 +146,11 @@
         <child id="1240930317927" name="operation" index="3Hdvt7" />
       </concept>
       <concept id="1240930444980" name="jetbrains.mps.lang.smodel.structure.SEnum_MembersOperation" flags="ng" index="3HdYuk" />
-      <concept id="1140133623887" name="jetbrains.mps.lang.smodel.structure.Node_DeleteOperation" flags="nn" index="1PgB_6" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
+      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -383,7 +383,7 @@
       <node concept="3clFbS" id="1_iD3HA2fYx" role="2VODD2">
         <node concept="3clFbF" id="1_iD3HA2gIc" role="3cqZAp">
           <node concept="2OqwBi" id="1_iD3HA2gQz" role="3clFbG">
-            <node concept="1PgB_6" id="1_iD3HA2gXm" role="2OqNvi" />
+            <node concept="3YRAZt" id="1_iD3HA2gXm" role="2OqNvi" />
             <node concept="2OqwBi" id="1_iD3HA2oDd" role="2Oq$k0">
               <node concept="2Sf5sV" id="1_iD3HA2oDe" role="2Oq$k0" />
               <node concept="2Xjw5R" id="1_iD3HA2oDf" role="2OqNvi">
diff --git a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index e7457640..7f3fb0ee 100644
--- a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -154,8 +154,8 @@
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
@@ -643,13 +643,15 @@
                       <node concept="2OqwBi" id="65DJywF0URT" role="36biLW">
                         <node concept="1PxgMI" id="65DJywF0URU" role="2Oq$k0">
                           <property role="1BlNFB" value="true" />
-                          <ref role="1m5ApE" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
                           <node concept="2OqwBi" id="65DJywF0URV" role="1m5AlR">
                             <node concept="1YBJjd" id="65DJywF0URW" role="2Oq$k0">
                               <ref role="1YBMHb" node="2c3nq4GQKig" resolve="lvd" />
                             </node>
                             <node concept="1mfA1w" id="65DJywF0URX" role="2OqNvi" />
                           </node>
+                          <node concept="chp4Y" id="6fXjIfxgndN" role="3oSUPX">
+                            <ref role="cht4Q" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
+                          </node>
                         </node>
                         <node concept="3TrEf2" id="65DJywF0URY" role="2OqNvi">
                           <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
@@ -693,13 +695,15 @@
                         <node concept="2OqwBi" id="65DJywF0VuP" role="36biLW">
                           <node concept="1PxgMI" id="65DJywF0VuQ" role="2Oq$k0">
                             <property role="1BlNFB" value="true" />
-                            <ref role="1m5ApE" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
                             <node concept="2OqwBi" id="65DJywF0VuR" role="1m5AlR">
                               <node concept="1YBJjd" id="65DJywF0VuS" role="2Oq$k0">
                                 <ref role="1YBMHb" node="2c3nq4GQKig" resolve="lvd" />
                               </node>
                               <node concept="1mfA1w" id="65DJywF0VuT" role="2OqNvi" />
                             </node>
+                            <node concept="chp4Y" id="6fXjIfxgndT" role="3oSUPX">
+                              <ref role="cht4Q" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
+                            </node>
                           </node>
                           <node concept="3TrEf2" id="65DJywF0VuU" role="2OqNvi">
                             <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
diff --git a/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd b/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
index 2154d8d4..333af1f4 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
+++ b/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
@@ -10,12 +10,8 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
   </dependencies>
-  <usedDevKits>
-    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-  </usedDevKits>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -23,7 +19,7 @@
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
index 038920cf..3045bced 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
index cc8b26ec..a5316097 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
@@ -2,7 +2,7 @@
 <model ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
index 320f92fe..01156d32 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
@@ -2,7 +2,7 @@
 <model ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.builtin.program)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
index 1ac6ef99..de42c11e 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
@@ -2,7 +2,7 @@
 <model ref="r:4e44cb56-a834-45de-a0c4-c49a5c86e78e(jetbrains.mps.logic.builtin.solver)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
   </languages>
   <imports>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/treeform.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/treeform.mps
index ad6bcde7..68a0e389 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/treeform.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/treeform.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
   </languages>
   <imports>
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd b/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
index 0052c135..bbaac64c 100644
--- a/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
+++ b/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
@@ -25,8 +25,7 @@
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd b/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
index b82dc5b3..5c7eb29b 100644
--- a/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
+++ b/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
@@ -19,12 +19,8 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
   </dependencies>
-  <usedDevKits>
-    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-  </usedDevKits>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:5dc5fc0d-37ef-4782-8192-8b5ce1f69f80:jetbrains.mps.baseLanguage.extensionMethods" version="0" />
@@ -34,7 +30,7 @@
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="0" />
   </languageVersions>
@@ -44,8 +40,8 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
index c0054106..47ab1da6 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
@@ -5,7 +5,7 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
index 907afe0b..ca43a100 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="5dc5fc0d-37ef-4782-8192-8b5ce1f69f80" name="jetbrains.mps.baseLanguage.extensionMethods" version="0" />
   </languages>
   <imports>
diff --git a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
index 1b5e1adf..242a2624 100644
--- a/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
+++ b/logic/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="5dc5fc0d-37ef-4782-8192-8b5ce1f69f80" name="jetbrains.mps.baseLanguage.extensionMethods" version="0" />
   </languages>
   <imports>
@@ -161,7 +161,7 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertInNotNull" flags="nn" index="2Hmddi">
+      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
         <child id="7080278351417106681" name="expression" index="2Hmdds" />
       </concept>
       <concept id="1171931690126" name="jetbrains.mps.baseLanguage.unitTest.structure.TestMethod" flags="ig" index="3s$Bmu">
diff --git a/test.xml b/test.xml
index 27a8a59c..3d5f828a 100644
--- a/test.xml
+++ b/test.xml
@@ -40,13 +40,14 @@
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="23949432-aaff-4c03-b7da-26e4e956ccea(jetbrains.mps.baseLanguage.regexp.runtime)" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
           <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.logic-src.jar" descriptor="jetbrains.mps.logic.mpl" />
       </module>
     </echoxml>
@@ -56,8 +57,31 @@
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.logic.jar" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.logic-generator.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.logic-generator.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.logic-generator.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.logic#6626732309150416985" type="generator" uuid="85f64970-3326-4ea7-966e-1ac904686424">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.logic-src.jar" descriptor="jetbrains.mps.logic.mpl" />
+      </module>
+    </echoxml>
     <jar destfile="${build.layout}/tests/jetbrains.mps.logic-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.logic-generator.jar" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/logic-languages-jetbrains.mps.logic-generator-template">
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
@@ -106,6 +130,9 @@
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2-src.jar" descriptor="jetbrains.mps.lang.typesystem2.mpl" />
       </module>
     </echoxml>
@@ -115,8 +142,32 @@
       <fileset dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.jar" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2-generator.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2-generator.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2-generator.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.typesystem2#4578927328670739933" type="generator" uuid="21d5540d-cd6b-44dd-b6ab-6835bf032803">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.typesystem2-src.jar" descriptor="jetbrains.mps.lang.typesystem2.mpl" />
+      </module>
+    </echoxml>
     <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2-generator.jar" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typesystem2-languages-jetbrains.mps.lang.typesystem2-generator-template">
       <fileset dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
@@ -148,22 +199,21 @@
         <dependencies>
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
           <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
-          <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
-          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.sampleplugin-src.jar" descriptor="jetbrains.mps.lang.typesystem2.sampleplugin.msd" />
       </module>
     </echoxml>
@@ -203,6 +253,9 @@
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.runtime-src.jar" descriptor="jetbrains.mps.lang.typesystem2.runtime.msd" />
       </module>
     </echoxml>
@@ -241,6 +294,9 @@
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.template-src.jar" descriptor="jetbrains.mps.lang.typesystem2.template.msd" />
       </module>
     </echoxml>
@@ -269,19 +325,16 @@
       <module namespace="jetbrains.mps.lang.typesystem2.helper" type="solution" uuid="274c9cfa-1024-4444-904c-f2f1383a35da">
         <dependencies>
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
           <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.helper-src.jar" descriptor="jetbrains.mps.lang.typesystem2.helper.msd" />
       </module>
     </echoxml>
@@ -322,6 +375,9 @@
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.samplechecker.handler.util-src.jar" descriptor="jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd" />
       </module>
     </echoxml>
@@ -360,6 +416,9 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.logic.runtime-src.jar" descriptor="jetbrains.mps.logic.runtime.msd" />
       </module>
     </echoxml>
@@ -402,6 +461,9 @@
         </dependencies>
         <library jar="lib/mockito-core-2.0.3-beta.jar" />
         <library jar="lib/objenesis-2.1.jar" />
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.logic.test-src.jar" descriptor="jetbrains.mps.logic.test.msd" />
       </module>
     </echoxml>
@@ -431,22 +493,21 @@
         <dependencies>
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
-          <module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
           <module ref="83f155ff-422c-4b5a-a2f2-b459302dd215(jetbrains.mps.baseLanguage.unitTest.libs)" />
-          <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
-          <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" />
           <module ref="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" />
-          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.samplechecker.test-src.jar" descriptor="jetbrains.mps.lang.typesystem2.samplechecker.test.msd" />
       </module>
     </echoxml>
@@ -482,16 +543,16 @@
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
-          <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" />
           <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
-          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.sampleLang-src.jar" descriptor="jetbrains.mps.lang.typesystem2.sampleLang.mpl" />
       </module>
     </echoxml>
@@ -501,8 +562,31 @@
       <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sampleLang.jar" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sampleLang-generator.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sampleLang-generator.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sampleLang-generator.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.lang.typesystem2.sampleLang#8436953480441303409" type="generator" uuid="3128d3e3-76dc-4d6d-b958-99599e4307fa">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.lang.typesystem2.sampleLang-src.jar" descriptor="jetbrains.mps.lang.typesystem2.sampleLang.mpl" />
+      </module>
+    </echoxml>
     <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sampleLang-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleLang#8436953480441303409" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.sampleLang-generator.jar" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.typesystem2.sampleLang-generator-template">
       <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
@@ -545,6 +629,9 @@
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.sampleLang.test-src.jar" descriptor="jetbrains.mps.lang.typesystem2.sampleLang.test.msd" />
       </module>
     </echoxml>
@@ -574,6 +661,9 @@
         <dependencies>
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.sample-src.jar" descriptor="jetbrains.mps.lang.typesystem2.sample.msd" />
       </module>
     </echoxml>
@@ -606,8 +696,6 @@
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
-          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
           <module ref="83f155ff-422c-4b5a-a2f2-b459302dd215(jetbrains.mps.baseLanguage.unitTest.libs)" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
@@ -617,6 +705,9 @@
           <module ref="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.lang.typesystem2.sample.test-src.jar" descriptor="jetbrains.mps.lang.typesystem2.sample.test.msd" />
       </module>
     </echoxml>
@@ -652,6 +743,9 @@
         <library jar="lib/kotlin-stdlib-1.0.5.jar" />
         <library jar="lib/kotlin-runtime-1.0.5.jar" />
         <library jar="lib/collection-0.6.jar" />
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
@@ -688,13 +782,14 @@
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
           <module ref="23949432-aaff-4c03-b7da-26e4e956ccea(jetbrains.mps.baseLanguage.regexp.runtime)" />
           <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="2af156ab-65c1-4a62-bd0d-ea734f71eab6(jetbrains.mps.dataFlow.runtime)" />
           <module ref="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
         <sources jar="jetbrains.mps.typechecking.annotation-src.jar" descriptor="jetbrains.mps.typechecking.annotation.mpl" />
       </module>
     </echoxml>
@@ -704,8 +799,31 @@
       <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.typechecking.annotation/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.annotation.jar" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.annotation-generator.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.annotation-generator.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.annotation-generator.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.typechecking.annotation#8686569986502648408" type="generator" uuid="a3a7e08f-128a-4c99-9838-c4b2a4582540">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.typechecking.annotation-src.jar" descriptor="jetbrains.mps.typechecking.annotation.mpl" />
+      </module>
+    </echoxml>
     <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.annotation-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.annotation#8686569986502648408" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.annotation-generator.jar" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.typechecking.annotation-generator-template">
       <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.typechecking.annotation/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
@@ -781,10 +899,6 @@
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jetbrains.mps.baseLanguage.unitTest.libs.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
-      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.bootstrap-languages.devkit" />
-      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.devkit" />
-      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.devkit" />
-      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.templates.devkit" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
@@ -800,7 +914,6 @@
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.extension.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationParameters.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.jar" />
@@ -822,6 +935,7 @@
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
       <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.facet.jar" />
       <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.reduced.jar" />
@@ -910,9 +1024,9 @@
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
@@ -925,13 +1039,9 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
@@ -962,9 +1072,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
@@ -979,13 +1089,9 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -1026,10 +1132,7 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
       </classpath>
     </javac>
   </target>
@@ -1061,13 +1164,10 @@
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
       </classpath>
     </javac>
   </target>
@@ -1093,9 +1193,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
@@ -1109,6 +1209,18 @@
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/jdom.jar" />
+        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
@@ -1117,22 +1229,6 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
-        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       </classpath>
     </javac>
   </target>
@@ -1157,9 +1253,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
@@ -1178,27 +1274,25 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       </classpath>
     </javac>
   </target>
@@ -1223,9 +1317,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" />
@@ -1245,22 +1339,19 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect-generator.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor-generator.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
@@ -1279,8 +1370,6 @@
         <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
@@ -1288,11 +1377,13 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
@@ -1307,13 +1398,9 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -1337,8 +1424,6 @@
         <path location="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
@@ -1346,11 +1431,13 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
@@ -1369,13 +1456,9 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -1406,9 +1489,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
@@ -1421,16 +1504,12 @@
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
@@ -1451,8 +1530,6 @@
         <path location="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
@@ -1460,11 +1537,13 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
@@ -1473,10 +1552,7 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
       </classpath>
@@ -1492,8 +1568,6 @@
         <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
       </src>
       <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
@@ -1501,11 +1575,13 @@
         <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
@@ -1524,10 +1600,7 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -1569,12 +1642,8 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
@@ -1605,22 +1674,18 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
@@ -1658,9 +1723,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.annotation" />
@@ -1668,10 +1733,7 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -1700,9 +1762,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
@@ -1720,13 +1782,9 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -1756,9 +1814,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleLang" />
@@ -1766,13 +1824,9 @@
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -1815,9 +1869,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleLang" />
@@ -1834,26 +1888,14 @@
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3-sources.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2-sources.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
         <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
@@ -1868,6 +1910,14 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
       </classpath>
     </javac>
   </target>
@@ -1893,9 +1943,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
@@ -1914,26 +1964,14 @@
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3-sources.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2-sources.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
         <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
@@ -1947,6 +1985,14 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
       </classpath>
     </javac>
   </target>
@@ -1972,9 +2018,9 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
@@ -1994,26 +2040,14 @@
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.5.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.5.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.6.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3-sources.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2-sources.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
         <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
-        <fileset file="${artifacts.mps}/lib/asm-all.jar" />
-        <fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
@@ -2028,6 +2062,14 @@
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
       </classpath>
     </javac>
   </target>
@@ -2050,9 +2092,6 @@
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jetbrains.mps.baseLanguage.unitTest.libs.jar" />
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
-      <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.bootstrap-languages.devkit" />
-      <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.devkit" />
-      <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.devkit" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
diff --git a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl
index aef983ca..2ebab711 100644
--- a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl
+++ b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/jetbrains.mps.lang.typesystem2.sampleLang.mpl
@@ -14,12 +14,8 @@
         </modelRoot>
       </models>
       <external-templates />
-      <usedDevKits>
-        <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-      </usedDevKits>
       <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-        <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -29,7 +25,7 @@
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.lang.typesystem2.sampleLang" version="-1" />
       </languageVersions>
@@ -39,8 +35,8 @@
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-        <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+        <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
@@ -59,29 +55,23 @@
     <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
-  <usedDevKits>
-    <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
-    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-  </usedDevKits>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="3" />
-    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="4" />
-    <language slang="l:86ef8290-12bb-4ca7-947f-093788f263a9:jetbrains.mps.lang.project" version="0" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="7" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
@@ -94,8 +84,8 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
diff --git a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/behavior.mps b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/behavior.mps
index 7588fdf6..fe6fe107 100644
--- a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/behavior.mps
+++ b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/behavior.mps
@@ -2,7 +2,7 @@
 <model ref="r:93d77cb0-24e4-4236-bb8f-ec74a28cf85d(jetbrains.mps.lang.typesystem2.sampleLang.behavior)">
   <persistence version="9" />
   <languages>
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="0" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/constraints.mps b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/constraints.mps
index 70b154ac..ffb12fd2 100644
--- a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/constraints.mps
+++ b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:8cb9b106-f20c-45e1-b93a-1ad22077cd8d(jetbrains.mps.lang.typesystem2.sampleLang.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="0" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/editor.mps b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/editor.mps
index b27dc957..252c8ce2 100644
--- a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/editor.mps
+++ b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:e5022488-eabe-41a9-8cb7-295cff00cbac(jetbrains.mps.lang.typesystem2.sampleLang.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="4" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="7" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
index 00a8da24..0cb8b22a 100644
--- a/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
+++ b/typechecking/languages/jetbrains.mps.lang.typesystem2.sampleLang/models/types.mps
@@ -10,8 +10,8 @@
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
@@ -387,8 +387,8 @@
       </concept>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
@@ -1496,7 +1496,6 @@
         <node concept="3clFbS" id="6f8YfqtSmu" role="16YjZG">
           <node concept="3clFbF" id="6f8YfqtSsY" role="3cqZAp">
             <node concept="1PxgMI" id="6f8YfqtSt0" role="3clFbG">
-              <ref role="1m5ApE" to="tpee:g7pOWCK" resolve="Classifier" />
               <node concept="2OqwBi" id="6f8YfqtSt1" role="1m5AlR">
                 <node concept="2OqwBi" id="6f8YfqtSt2" role="2Oq$k0">
                   <node concept="3A2sRY" id="6f8YfqtSt3" role="2Oq$k0">
@@ -1508,6 +1507,9 @@
                 </node>
                 <node concept="1mfA1w" id="6f8YfqtSt5" role="2OqNvi" />
               </node>
+              <node concept="chp4Y" id="6fXjIfxgnet" role="3oSUPX">
+                <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+              </node>
             </node>
           </node>
         </node>
@@ -2234,10 +2236,12 @@
                               <node concept="3clFbF" id="2q0gzCFJpnY" role="3cqZAp">
                                 <node concept="2OqwBi" id="2q0gzCFJpGj" role="3clFbG">
                                   <node concept="1PxgMI" id="2q0gzCFJpuz" role="2Oq$k0">
-                                    <ref role="1m5ApE" to="tpee:g7uibYu" resolve="ClassifierType" />
                                     <node concept="37vLTw" id="2q0gzCFJpnX" role="1m5AlR">
                                       <ref role="3cqZAo" node="2q0gzCFJodI" resolve="it" />
                                     </node>
+                                    <node concept="chp4Y" id="6fXjIfxgnew" role="3oSUPX">
+                                      <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                    </node>
                                   </node>
                                   <node concept="3TrEf2" id="2q0gzCFJB0B" role="2OqNvi">
                                     <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
@@ -2658,10 +2662,12 @@
                               <node concept="3clFbF" id="2jjvHNv9JRL" role="3cqZAp">
                                 <node concept="2OqwBi" id="2jjvHNv9JRM" role="3clFbG">
                                   <node concept="1PxgMI" id="2jjvHNv9JRN" role="2Oq$k0">
-                                    <ref role="1m5ApE" to="tpee:g7uibYu" resolve="ClassifierType" />
                                     <node concept="37vLTw" id="2jjvHNv9JRO" role="1m5AlR">
                                       <ref role="3cqZAo" node="2jjvHNv9JRQ" resolve="it" />
                                     </node>
+                                    <node concept="chp4Y" id="6fXjIfxgney" role="3oSUPX">
+                                      <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                    </node>
                                   </node>
                                   <node concept="3TrEf2" id="2jjvHNv9JRP" role="2OqNvi">
                                     <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
@@ -3386,7 +3392,6 @@
                     <node concept="3clFbS" id="3jXBvmTlQcc" role="1bW5cS">
                       <node concept="3clFbF" id="3jXBvmTlQcd" role="3cqZAp">
                         <node concept="1PxgMI" id="3jXBvmTlQce" role="3clFbG">
-                          <ref role="1m5ApE" to="tpee:g7pOWCK" resolve="Classifier" />
                           <node concept="2OqwBi" id="3jXBvmTlQcf" role="1m5AlR">
                             <node concept="2OqwBi" id="3jXBvmTlQcg" role="2Oq$k0">
                               <node concept="37vLTw" id="3jXBvmTlQch" role="2Oq$k0">
@@ -3398,6 +3403,9 @@
                             </node>
                             <node concept="1mfA1w" id="3jXBvmTlQcj" role="2OqNvi" />
                           </node>
+                          <node concept="chp4Y" id="6fXjIfxgneu" role="3oSUPX">
+                            <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -3716,7 +3724,6 @@
         <node concept="3clFbS" id="6f8YfqtHrz" role="16YjZG">
           <node concept="3clFbF" id="6f8YfqtHVl" role="3cqZAp">
             <node concept="1PxgMI" id="6f8YfqtHVn" role="3clFbG">
-              <ref role="1m5ApE" to="tpee:g7pOWCK" resolve="Classifier" />
               <node concept="2OqwBi" id="6f8YfqtHVo" role="1m5AlR">
                 <node concept="2OqwBi" id="6f8YfqtHVp" role="2Oq$k0">
                   <node concept="3A2sRY" id="6f8YfqtHVq" role="2Oq$k0">
@@ -3728,6 +3735,9 @@
                 </node>
                 <node concept="1mfA1w" id="6f8YfqtHVs" role="2OqNvi" />
               </node>
+              <node concept="chp4Y" id="6fXjIfxgnes" role="3oSUPX">
+                <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+              </node>
             </node>
           </node>
         </node>
@@ -4113,7 +4123,6 @@
                       <node concept="3clFbS" id="2yOynGeSIrO" role="1bW5cS">
                         <node concept="3clFbF" id="2yOynGeSIrP" role="3cqZAp">
                           <node concept="1PxgMI" id="2yOynGeSIrQ" role="3clFbG">
-                            <ref role="1m5ApE" to="tpee:g7pOWCK" resolve="Classifier" />
                             <node concept="2OqwBi" id="2yOynGeSIrR" role="1m5AlR">
                               <node concept="2OqwBi" id="2yOynGeSIrS" role="2Oq$k0">
                                 <node concept="37vLTw" id="2yOynGeSIrT" role="2Oq$k0">
@@ -4125,6 +4134,9 @@
                               </node>
                               <node concept="1mfA1w" id="2yOynGeSIrV" role="2OqNvi" />
                             </node>
+                            <node concept="chp4Y" id="6fXjIfxgnex" role="3oSUPX">
+                              <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -4271,7 +4283,6 @@
                       </node>
                       <node concept="2OqwBi" id="1AC$mzro3dY" role="33vP2m">
                         <node concept="1PxgMI" id="1AC$mzro3dZ" role="2Oq$k0">
-                          <ref role="1m5ApE" to="tpee:fz12cDA" resolve="ClassConcept" />
                           <node concept="2OqwBi" id="1AC$mzro3e0" role="1m5AlR">
                             <node concept="2OqwBi" id="1AC$mzro3e1" role="2Oq$k0">
                               <node concept="3A2sRY" id="1AC$mzro3e2" role="2Oq$k0">
@@ -4283,6 +4294,9 @@
                             </node>
                             <node concept="1mfA1w" id="1AC$mzro3e4" role="2OqNvi" />
                           </node>
+                          <node concept="chp4Y" id="6fXjIfxgnez" role="3oSUPX">
+                            <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
+                          </node>
                         </node>
                         <node concept="3Tsc0h" id="1AC$mzro3e5" role="2OqNvi">
                           <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
@@ -6491,10 +6505,12 @@
                         <node concept="2HTt$P" id="7t5VLKGU885" role="2ShVmc">
                           <node concept="2OqwBi" id="7t5VLKGU8RG" role="2HTEbv">
                             <node concept="1PxgMI" id="7t5VLKGU8JV" role="2Oq$k0">
-                              <ref role="1m5ApE" to="tpee:fzclF8j" resolve="ExpressionStatement" />
                               <node concept="37vLTw" id="7t5VLKGU8cI" role="1m5AlR">
                                 <ref role="3cqZAo" node="7t5VLKGU5RD" resolve="lastStmt" />
                               </node>
+                              <node concept="chp4Y" id="6fXjIfxgnev" role="3oSUPX">
+                                <ref role="cht4Q" to="tpee:fzclF8j" resolve="ExpressionStatement" />
+                              </node>
                             </node>
                             <node concept="3TrEf2" id="7t5VLKGU9v2" role="2OqNvi">
                               <ref role="3Tt5mk" to="tpee:fzclF8k" resolve="expression" />
diff --git a/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl b/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
index 3616c84c..95f1d462 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
+++ b/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
@@ -14,12 +14,8 @@
         </modelRoot>
       </models>
       <external-templates />
-      <usedDevKits>
-        <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-      </usedDevKits>
       <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-        <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -29,7 +25,7 @@
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
         <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
       </languageVersions>
@@ -52,13 +48,8 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)</dependency>
   </dependencies>
-  <usedDevKits>
-    <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
-    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-  </usedDevKits>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
@@ -67,17 +58,17 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="3" />
-    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="4" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="7" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
@@ -88,11 +79,11 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="aee9cad2-acd4-4608-aef2-0004f6a1cdbd(jetbrains.mps.lang.actions)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)" version="0" />
diff --git a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps
index 8546073b..d9641a8a 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps
+++ b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps
@@ -2,7 +2,7 @@
 <model ref="r:cef1dda6-3b0f-43e4-8ec9-7f1ff412f529(jetbrains.mps.typechecking.annotation.behavior)">
   <persistence version="9" />
   <languages>
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="0" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/constraints.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/constraints.mps
index 0faa0df2..80059984 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/constraints.mps
+++ b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:b3f597cd-d05e-4396-8bd7-d967f5186f88(jetbrains.mps.typechecking.annotation.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="0" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps
index 829adeae..49ed17bf 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps
+++ b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:26262999-7049-47d1-a8fc-8e4617b9cd2d(jetbrains.mps.typechecking.annotation.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="4" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="7" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -86,7 +86,7 @@
       <concept id="6407023681583031218" name="jetbrains.mps.lang.smodel.structure.AttributeAccess" flags="nn" index="3CFZ6_">
         <child id="6407023681583036852" name="qualifier" index="3CFYIz" />
       </concept>
-      <concept id="1140133623887" name="jetbrains.mps.lang.smodel.structure.Node_DeleteOperation" flags="nn" index="1PgB_6" />
+      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
@@ -148,7 +148,7 @@
                   </node>
                 </node>
               </node>
-              <node concept="1PgB_6" id="7KcYPxpV_29" role="2OqNvi" />
+              <node concept="3YRAZt" id="7KcYPxpV_29" role="2OqNvi" />
             </node>
           </node>
         </node>
diff --git a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
index f63fedcd..4a859dac 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
+++ b/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
@@ -86,13 +86,13 @@
       <concept id="6407023681583031218" name="jetbrains.mps.lang.smodel.structure.AttributeAccess" flags="nn" index="3CFZ6_">
         <child id="6407023681583036852" name="qualifier" index="3CFYIz" />
       </concept>
-      <concept id="1140133623887" name="jetbrains.mps.lang.smodel.structure.Node_DeleteOperation" flags="nn" index="1PgB_6" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
+      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
@@ -276,7 +276,7 @@
                 </node>
               </node>
             </node>
-            <node concept="1PgB_6" id="7KcYPxpVigA" role="2OqNvi" />
+            <node concept="3YRAZt" id="7KcYPxpVigA" role="2OqNvi" />
           </node>
         </node>
       </node>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
index 79e1c6b9..ef0c1d28 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
@@ -16,19 +16,16 @@
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
@@ -42,9 +39,9 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad@tests.mps
index b290124b..207ad83c 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad@tests.mps
@@ -3,8 +3,8 @@
   <persistence version="9" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
   </languages>
   <imports>
@@ -60,7 +60,7 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertInNotNull" flags="nn" index="2Hmddi">
+      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
         <child id="7080278351417106681" name="expression" index="2Hmdds" />
       </concept>
       <concept id="1172073500303" name="jetbrains.mps.baseLanguage.unitTest.structure.Message" flags="ng" index="3_1$Yv">
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds@tests.mps
index 68f98753..7f4fd518 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/bounds@tests.mps
@@ -4,8 +4,8 @@
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="2" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/codeAnal@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/codeAnal@tests.mps
index a95034a1..2a747b03 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/codeAnal@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/codeAnal@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
   </languages>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/helloWorld@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/helloWorld@tests.mps
index f71926b6..52df2d15 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/helloWorld@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/helloWorld@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
   </languages>
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics@tests.mps
index 79e854c6..dd2a0863 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
   </languages>
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/slice@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/slice@tests.mps
index d970dbb5..5725929b 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/slice@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/slice@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
   </languages>
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample@tests.mps
index 41119243..0294c6bc 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample@tests.mps
@@ -3,8 +3,8 @@
   <persistence version="9" />
   <languages>
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
   </languages>
   <imports>
     <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd
index d97dab33..315a7f8d 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd
@@ -10,8 +10,7 @@
     <dependency reexport="true">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
index 645c6021..447e6418 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
@@ -2,7 +2,7 @@
 <model ref="r:9993217f-5bfa-4281-bc47-527677747cb2(jetbrains.mps.lang.typesystem2.sample.bounds)" doNotGenerate="true">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
   </languages>
   <imports>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad.mps
index a572a076..7b274945 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad.mps
@@ -2,7 +2,7 @@
 <model ref="r:b1bec7fa-733c-4182-bbd4-b266e3d7e6db(jetbrains.mps.lang.typesystem2.sample.bounds.bad)" doNotGenerate="true">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
   </languages>
   <imports />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/codeAnal.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/codeAnal.mps
index 2d2303a0..1913c45d 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/codeAnal.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/codeAnal.mps
@@ -2,7 +2,7 @@
 <model ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(jetbrains.mps.lang.typesystem2.sample.codeAnal)" doNotGenerate="true">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
   </languages>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
index d1dfdf3c..d7f195bf 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
   </languages>
   <imports>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
index 7b95eec3..29a4a9b0 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
@@ -2,7 +2,7 @@
 <model ref="r:5669dd77-177e-474f-8fb2-c015a8eb4306(jetbrains.mps.lang.typesystem2.sample.simpleGenerics)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
   </languages>
   <imports>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
index e1c4e131..d4f6fd16 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
@@ -2,7 +2,7 @@
 <model ref="r:a8ff5933-0f6e-4d4a-af4a-5da865d78faf(jetbrains.mps.lang.typesystem2.sample.slice)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
   </languages>
   <imports>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleLang.test/jetbrains.mps.lang.typesystem2.sampleLang.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleLang.test/jetbrains.mps.lang.typesystem2.sampleLang.test.msd
index 20fc8d38..5f0e2296 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleLang.test/jetbrains.mps.lang.typesystem2.sampleLang.test.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleLang.test/jetbrains.mps.lang.typesystem2.sampleLang.test.msd
@@ -16,15 +16,14 @@
     <dependency reexport="false">b189d6c6-9397-4d64-88af-1ac73760a4f5(jetbrains.mps.logic.test)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="0" />
@@ -35,9 +34,9 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleLang.test/models/jetbrains/mps/lang/typesystem2/sampleLang/test/types@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleLang.test/models/jetbrains/mps/lang/typesystem2/sampleLang/test/types@tests.mps
index 039f6cb6..8ccc8d81 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleLang.test/models/jetbrains/mps/lang/typesystem2/sampleLang/test/types@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleLang.test/models/jetbrains/mps/lang/typesystem2/sampleLang/test/types@tests.mps
@@ -5,9 +5,9 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
@@ -265,9 +265,12 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
       <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
@@ -596,10 +599,12 @@
                       <node concept="3clFbF" id="7t5VLKGThbf" role="3cqZAp">
                         <node concept="2OqwBi" id="7t5VLKGThbg" role="3clFbG">
                           <node concept="1PxgMI" id="7t5VLKGThbh" role="2Oq$k0">
-                            <ref role="1m5ApE" to="tp68:h5nCRdH" resolve="InternalNewExpression" />
                             <node concept="37vLTw" id="7t5VLKGThbi" role="1m5AlR">
                               <ref role="3cqZAo" node="7t5VLKGThbk" resolve="it" />
                             </node>
+                            <node concept="chp4Y" id="6fXjIfxgngw" role="3oSUPX">
+                              <ref role="cht4Q" to="tp68:h5nCRdH" resolve="InternalNewExpression" />
+                            </node>
                           </node>
                           <node concept="3Tsc0h" id="7t5VLKGThbj" role="2OqNvi">
                             <ref role="3TtcxE" to="tp68:i3HumyW" resolve="parameter" />
@@ -681,10 +686,12 @@
                       <node concept="3clFbF" id="7t5VLKGTHeo" role="3cqZAp">
                         <node concept="2OqwBi" id="7t5VLKGTHep" role="3clFbG">
                           <node concept="1PxgMI" id="7t5VLKGTHeq" role="2Oq$k0">
-                            <ref role="1m5ApE" to="tp68:h5nCRdH" resolve="InternalNewExpression" />
                             <node concept="37vLTw" id="7t5VLKGTHer" role="1m5AlR">
                               <ref role="3cqZAo" node="7t5VLKGTHet" resolve="it" />
                             </node>
+                            <node concept="chp4Y" id="6fXjIfxgngx" role="3oSUPX">
+                              <ref role="cht4Q" to="tp68:h5nCRdH" resolve="InternalNewExpression" />
+                            </node>
                           </node>
                           <node concept="3Tsc0h" id="7t5VLKGTHes" role="2OqNvi">
                             <ref role="3TtcxE" to="tp68:i3HumyW" resolve="parameter" />
@@ -766,10 +773,12 @@
                       <node concept="3clFbF" id="4JRKVCv9wT$" role="3cqZAp">
                         <node concept="2OqwBi" id="4JRKVCv9wT_" role="3clFbG">
                           <node concept="1PxgMI" id="4JRKVCv9wTA" role="2Oq$k0">
-                            <ref role="1m5ApE" to="tp68:h5nCRdH" resolve="InternalNewExpression" />
                             <node concept="37vLTw" id="4JRKVCv9wTB" role="1m5AlR">
                               <ref role="3cqZAo" node="4JRKVCv9wTD" resolve="it" />
                             </node>
+                            <node concept="chp4Y" id="6fXjIfxgngy" role="3oSUPX">
+                              <ref role="cht4Q" to="tp68:h5nCRdH" resolve="InternalNewExpression" />
+                            </node>
                           </node>
                           <node concept="3Tsc0h" id="4JRKVCv9wTC" role="2OqNvi">
                             <ref role="3TtcxE" to="tp68:i3HumyW" resolve="parameter" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/jetbrains.mps.lang.typesystem2.samplechecker.build.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/jetbrains.mps.lang.typesystem2.samplechecker.build.msd
index 19338593..2e0887cc 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/jetbrains.mps.lang.typesystem2.samplechecker.build.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/jetbrains.mps.lang.typesystem2.samplechecker.build.msd
@@ -11,13 +11,12 @@
   </dependencies>
   <languageVersions>
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
-    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="2" />
+    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="3" />
     <language slang="l:427a473d-5177-432c-9905-bcbceb71b996:jetbrains.mps.build.mps.runner" version="0" />
     <language slang="l:9f846aef-4e4a-4a84-828e-7e83fe2697f2:jetbrains.mps.build.mps.testManifest" version="0" />
     <language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="0" />
     <language slang="l:d5033cee-f632-44b6-b308-89d4fbde34ff:jetbrains.mps.build.startup" version="0" />
     <language slang="l:698a8d22-a104-47a0-ba8d-10e3ec237f13:jetbrains.mps.build.workflow" version="0" />
-    <language slang="l:58f98fef-90ad-4b72-a390-fad66ec7005a:jetbrains.mps.core.properties" version="0" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
index 72a19906..c43fbfee 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="427a473d-5177-432c-9905-bcbceb71b996" name="jetbrains.mps.build.mps.runner" version="0" />
     <use id="698a8d22-a104-47a0-ba8d-10e3ec237f13" name="jetbrains.mps.build.workflow" version="0" />
-    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="2" />
+    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="3" />
     <use id="d5033cee-f632-44b6-b308-89d4fbde34ff" name="jetbrains.mps.build.startup" version="0" />
     <use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
     <use id="9f846aef-4e4a-4a84-828e-7e83fe2697f2" name="jetbrains.mps.build.mps.testManifest" version="0" />
@@ -664,12 +664,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7BVjoXzUxWJ" role="3bR37C">
-          <node concept="3bR9La" id="7BVjoXzUxWK" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6L2F" resolve="jetbrains.mps.baseLanguage.tuples" />
-          </node>
-        </node>
         <node concept="1E0d5M" id="7BVjoXzUxWL" role="1E1XAP">
           <ref role="1E0d5P" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.typesystem2.runtime" />
         </node>
@@ -765,6 +759,16 @@
               <ref role="3bR37D" node="7Ant4Wk$48A" resolve="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
             </node>
           </node>
+          <node concept="1SiIV0" id="6fXjIfxguhs" role="3bR37C">
+            <node concept="3bR9La" id="6fXjIfxguhr" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:7YI57w6K0jH" resolve="jetbrains.mps.lang.descriptor#9020561928507175817" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="6fXjIfxguhu" role="3bR37C">
+            <node concept="3bR9La" id="6fXjIfxguht" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:6zkSwmUIjUj" resolve="jetbrains.mps.lang.aspect#3274906159125927726" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUxee" role="2G$12L">
@@ -1940,12 +1944,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLqg" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLqh" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6L2F" resolve="jetbrains.mps.baseLanguage.tuples" />
-          </node>
-        </node>
         <node concept="1E0d5M" id="7Ant4WkHLqi" role="1E1XAP">
           <ref role="1E0d5P" node="7Ant4WkHLr9" resolve="jetbrains.mps.lang.typesystem2.runtime" />
         </node>
@@ -2041,6 +2039,16 @@
               <ref role="3bR37D" node="7Ant4WkHLsm" resolve="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
             </node>
           </node>
+          <node concept="1SiIV0" id="6fXjIfxgus0" role="3bR37C">
+            <node concept="3bR9La" id="6fXjIfxgurZ" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:7YI57w6K0jH" resolve="jetbrains.mps.lang.descriptor#9020561928507175817" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="6fXjIfxgus2" role="3bR37C">
+            <node concept="3bR9La" id="6fXjIfxgus1" role="1SiIV1">
+              <ref role="3bR37D" to="ffeo:6zkSwmUIjUj" resolve="jetbrains.mps.lang.aspect#3274906159125927726" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="1E1JtA" id="7Ant4WkHLr9" role="2G$12L">
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
index f64962ac..088a15bf 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
@@ -12,12 +12,8 @@
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
   </dependencies>
-  <usedDevKits>
-    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-  </usedDevKits>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -26,7 +22,7 @@
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="0" />
   </languageVersions>
@@ -36,8 +32,8 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
index 0b8f54e7..fa334b6f 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
@@ -4,9 +4,9 @@
   <languages>
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -170,8 +170,8 @@
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
@@ -734,10 +734,12 @@
                 <node concept="2OqwBi" id="6infEALx4sG" role="33vP2m">
                   <node concept="2OqwBi" id="6infEALx4sH" role="2Oq$k0">
                     <node concept="1PxgMI" id="6infEALx4sI" role="2Oq$k0">
-                      <ref role="1m5ApE" to="tpee:g7uibYu" resolve="ClassifierType" />
                       <node concept="37vLTw" id="6infEALx4sJ" role="1m5AlR">
                         <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
                       </node>
+                      <node concept="chp4Y" id="6fXjIfxgngA" role="3oSUPX">
+                        <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+                      </node>
                     </node>
                     <node concept="3TrEf2" id="6infEALx4sK" role="2OqNvi">
                       <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
@@ -758,10 +760,12 @@
                     <node concept="2JrnkZ" id="6infEALxfD2" role="2Oq$k0">
                       <node concept="2OqwBi" id="4JRKVCvdyFf" role="2JrQYb">
                         <node concept="1PxgMI" id="6infEALxfD3" role="2Oq$k0">
-                          <ref role="1m5ApE" to="tpee:g7uibYu" resolve="ClassifierType" />
                           <node concept="37vLTw" id="6infEALxfD4" role="1m5AlR">
                             <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
                           </node>
+                          <node concept="chp4Y" id="6fXjIfxgngD" role="3oSUPX">
+                            <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+                          </node>
                         </node>
                         <node concept="3TrEf2" id="4JRKVCvd_0q" role="2OqNvi">
                           <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
@@ -787,10 +791,12 @@
                 <node concept="2OqwBi" id="5_6ImQZjqKV" role="33vP2m">
                   <node concept="1PxgMI" id="5_6ImQZjqKW" role="2Oq$k0">
                     <property role="1BlNFB" value="true" />
-                    <ref role="1m5ApE" to="tpee:g7uibYu" resolve="ClassifierType" />
                     <node concept="37vLTw" id="5_6ImQZjqKX" role="1m5AlR">
                       <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
                     </node>
+                    <node concept="chp4Y" id="6fXjIfxgngB" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+                    </node>
                   </node>
                   <node concept="3Tsc0h" id="5_6ImQZjqKY" role="2OqNvi">
                     <ref role="3TtcxE" to="tpee:g91_B6F" resolve="parameter" />
@@ -939,10 +945,12 @@
                 <node concept="17QB3L" id="4OKkcnfu_ye" role="1tU5fm" />
                 <node concept="2OqwBi" id="4OKkcnfu_yf" role="33vP2m">
                   <node concept="1PxgMI" id="4OKkcnfu_yg" role="2Oq$k0">
-                    <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
                     <node concept="37vLTw" id="4OKkcnfu_yh" role="1m5AlR">
                       <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
                     </node>
+                    <node concept="chp4Y" id="6fXjIfxgngC" role="3oSUPX">
+                      <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                    </node>
                   </node>
                   <node concept="3TrcHB" id="4OKkcnfu_yi" role="2OqNvi">
                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
index 1212e450..c9cccf97 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
@@ -19,13 +19,8 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
   </dependencies>
-  <usedDevKits>
-    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-    <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
-  </usedDevKits>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
@@ -36,7 +31,7 @@
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
@@ -50,10 +45,10 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type@tests.mps
index b767e4f6..3d3420c3 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type@tests.mps
@@ -6,8 +6,8 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="-1" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="-1" />
@@ -164,7 +164,7 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertInNotNull" flags="nn" index="2Hmddi">
+      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
         <child id="7080278351417106681" name="expression" index="2Hmdds" />
       </concept>
       <concept id="8427750732757990717" name="jetbrains.mps.baseLanguage.unitTest.structure.BinaryAssert" flags="nn" index="3tpDYu">
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
index a5cd7453..042b7661 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
@@ -24,13 +24,8 @@
     <dependency reexport="true">bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)</dependency>
     <dependency reexport="false">274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)</dependency>
   </dependencies>
-  <usedDevKits>
-    <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
-    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-  </usedDevKits>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
@@ -43,7 +38,7 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
index bda6ddea..8ff48ff9 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
@@ -9,8 +9,8 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
@@ -95,7 +95,6 @@
     <import index="g3l6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.model(MPS.Core/)" />
     <import index="umch" ref="r:4caa22a9-5195-4617-8800-5f9f74cc4480(jetbrains.mps.lang.typesystem2.helper.plugin)" />
     <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" implicit="true" />
   </imports>
   <registry>
@@ -579,9 +578,12 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
@@ -4947,10 +4949,12 @@
                         <node concept="2OqwBi" id="1pPth$l_Zf7" role="33vP2m">
                           <node concept="1PxgMI" id="1pPth$l_Zf8" role="2Oq$k0">
                             <property role="1BlNFB" value="true" />
-                            <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
                             <node concept="37vLTw" id="7y50OW6U33L" role="1m5AlR">
                               <ref role="3cqZAo" node="4n$QnzZUsy4" resolve="node" />
                             </node>
+                            <node concept="chp4Y" id="6fXjIfxgngI" role="3oSUPX">
+                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                            </node>
                           </node>
                           <node concept="3TrcHB" id="1pPth$l_Zfa" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl b/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl
index 26553401..d5520fd8 100644
--- a/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl
+++ b/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl
@@ -18,13 +18,8 @@
         <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
         <dependency reexport="false">2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696)</dependency>
       </dependencies>
-      <usedDevKits>
-        <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-        <usedDevKit>a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)</usedDevKit>
-      </usedDevKits>
       <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-        <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -36,7 +31,7 @@
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
         <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="-1" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
@@ -46,11 +41,10 @@
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-        <module reference="985c8c6a-64b4-486d-a91e-7d4112742556(jetbrains.mps.baseLanguage#1129914002933)" version="0" />
-        <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
         <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
         <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+        <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
         <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
@@ -82,12 +76,8 @@
     </generator>
   </generators>
   <sourcePath />
-  <usedDevKits>
-    <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
-  </usedDevKits>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
@@ -96,13 +86,13 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
-    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="3" />
-    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="4" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="7" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
     <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
@@ -113,7 +103,7 @@
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@@ -125,10 +115,10 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.smodel.types/models/behavior.mps b/typesystem2/languages/jetbrains.mps.lang.smodel.types/models/behavior.mps
index afed81da..b400b19f 100644
--- a/typesystem2/languages/jetbrains.mps.lang.smodel.types/models/behavior.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.smodel.types/models/behavior.mps
@@ -2,7 +2,7 @@
 <model ref="r:56bea503-26a7-435b-9a37-5d637e54991c(jetbrains.mps.lang.smodel.types.behavior)">
   <persistence version="9" />
   <languages>
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="0" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
diff --git a/typesystem2/languages/jetbrains.mps.lang.smodel.types/models/constraints.mps b/typesystem2/languages/jetbrains.mps.lang.smodel.types/models/constraints.mps
index 6feff073..861d74ca 100644
--- a/typesystem2/languages/jetbrains.mps.lang.smodel.types/models/constraints.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.smodel.types/models/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:6b253d8b-9c9f-42db-bd3f-8b7dd724b1c7(jetbrains.mps.lang.smodel.types.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="0" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports />
diff --git a/typesystem2/languages/jetbrains.mps.lang.smodel.types/models/editor.mps b/typesystem2/languages/jetbrains.mps.lang.smodel.types/models/editor.mps
index bc401196..faf74c7a 100644
--- a/typesystem2/languages/jetbrains.mps.lang.smodel.types/models/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.smodel.types/models/editor.mps
@@ -2,7 +2,7 @@
 <model ref="r:29e6d197-c9e1-483d-a801-8724d71606b3(jetbrains.mps.lang.smodel.types.editor)">
   <persistence version="9" />
   <languages>
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="4" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="7" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 3482d3e6..2fb56416 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -8,7 +8,7 @@
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="-1" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="-1" />
     <use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="-1" />
@@ -559,8 +559,8 @@
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
@@ -1704,8 +1704,10 @@
                                 <node concept="2OqwBi" id="2JQZWxFcfP8" role="1iwH7V">
                                   <node concept="2OqwBi" id="2JQZWxFcf3e" role="2Oq$k0">
                                     <node concept="1PxgMI" id="2JQZWxFceNy" role="2Oq$k0">
-                                      <ref role="1m5ApE" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
                                       <node concept="30H73N" id="2JQZWxFcez7" role="1m5AlR" />
+                                      <node concept="chp4Y" id="6fXjIfxgnfM" role="3oSUPX">
+                                        <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
+                                      </node>
                                     </node>
                                     <node concept="3TrEf2" id="2JQZWxFcfxO" role="2OqNvi">
                                       <ref role="3Tt5mk" to="wq2x:6wQEDbCLoaZ" resolve="includeClause" />
@@ -1739,8 +1741,10 @@
                       <node concept="2OqwBi" id="2JQZWxFcbM$" role="2Oq$k0">
                         <node concept="1PxgMI" id="2JQZWxFcboe" role="2Oq$k0">
                           <property role="1BlNFB" value="true" />
-                          <ref role="1m5ApE" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
                           <node concept="30H73N" id="2JQZWxFcap9" role="1m5AlR" />
+                          <node concept="chp4Y" id="6fXjIfxgnfQ" role="3oSUPX">
+                            <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
+                          </node>
                         </node>
                         <node concept="3TrEf2" id="2JQZWxFccjc" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:6wQEDbCLoaZ" resolve="includeClause" />
@@ -2174,8 +2178,10 @@
                       <node concept="2OqwBi" id="PpXnWs3b_M" role="2Oq$k0">
                         <node concept="1PxgMI" id="PpXnWs3b4e" role="2Oq$k0">
                           <property role="1BlNFB" value="true" />
-                          <ref role="1m5ApE" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
                           <node concept="30H73N" id="PpXnWs3a_X" role="1m5AlR" />
+                          <node concept="chp4Y" id="6fXjIfxgnfN" role="3oSUPX">
+                            <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
+                          </node>
                         </node>
                         <node concept="3TrEf2" id="PpXnWs3c8Q" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:6wQEDbCLoaZ" resolve="includeClause" />
@@ -2469,8 +2475,10 @@
                       <node concept="2OqwBi" id="2JQZWxFfwIb" role="2Oq$k0">
                         <node concept="1PxgMI" id="2JQZWxFfwjn" role="2Oq$k0">
                           <property role="1BlNFB" value="true" />
-                          <ref role="1m5ApE" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
                           <node concept="30H73N" id="2JQZWxFfw0o" role="1m5AlR" />
+                          <node concept="chp4Y" id="6fXjIfxgnfT" role="3oSUPX">
+                            <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
+                          </node>
                         </node>
                         <node concept="3TrEf2" id="2JQZWxFfxeX" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:6wQEDbCLoaZ" resolve="includeClause" />
@@ -2814,11 +2822,13 @@
               <node concept="3cpWs3" id="4vbeH84Cbdf" role="3uHU7B">
                 <node concept="2OqwBi" id="tIwzd2qLwH" role="3uHU7B">
                   <node concept="1PxgMI" id="tIwzd2qMMo" role="2Oq$k0">
-                    <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
                     <node concept="2OqwBi" id="tIwzd2qKcg" role="1m5AlR">
                       <node concept="30H73N" id="tIwzd2qK4p" role="2Oq$k0" />
                       <node concept="1mfA1w" id="tIwzd2qLfF" role="2OqNvi" />
                     </node>
+                    <node concept="chp4Y" id="6fXjIfxgng4" role="3oSUPX">
+                      <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                    </node>
                   </node>
                   <node concept="3TrcHB" id="tIwzd2qN6y" role="2OqNvi">
                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -3088,10 +3098,12 @@
                                             <node concept="2OqwBi" id="4sSe4$p5z8w" role="3K4E3e">
                                               <node concept="1PxgMI" id="4sSe4$p5z8x" role="2Oq$k0">
                                                 <property role="1BlNFB" value="true" />
-                                                <ref role="1m5ApE" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
                                                 <node concept="37vLTw" id="4sSe4$p5z8y" role="1m5AlR">
                                                   <ref role="3cqZAo" node="4sSe4$p5z8D" resolve="it" />
                                                 </node>
+                                                <node concept="chp4Y" id="6fXjIfxgng2" role="3oSUPX">
+                                                  <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+                                                </node>
                                               </node>
                                               <node concept="3TrEf2" id="4sSe4$p8ymx" role="2OqNvi">
                                                 <ref role="3Tt5mk" to="5j4j:4sSe4$p4oOP" resolve="value" />
@@ -3149,10 +3161,12 @@
                                           <node concept="2OqwBi" id="4sSe4$p5umw" role="3K4E3e">
                                             <node concept="1PxgMI" id="4sSe4$p5sOA" role="2Oq$k0">
                                               <property role="1BlNFB" value="true" />
-                                              <ref role="1m5ApE" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
                                               <node concept="37vLTw" id="4sSe4$p5s25" role="1m5AlR">
                                                 <ref role="3cqZAo" node="4sSe4$p5lcB" resolve="it" />
                                               </node>
+                                              <node concept="chp4Y" id="6fXjIfxgnfO" role="3oSUPX">
+                                                <ref role="cht4Q" to="5j4j:4sSe4$p4oOM" resolve="AssignedLogicalVariable" />
+                                              </node>
                                             </node>
                                             <node concept="3TrEf2" id="4sSe4$p8$9K" role="2OqNvi">
                                               <ref role="3Tt5mk" to="5j4j:4sSe4$p4oON" resolve="variable" />
@@ -3827,10 +3841,12 @@
                     <node concept="2OqwBi" id="4vbeH84Nusz" role="33vP2m">
                       <node concept="2OqwBi" id="4vbeH84Nus$" role="2Oq$k0">
                         <node concept="1PxgMI" id="4vbeH84Nus_" role="2Oq$k0">
-                          <ref role="1m5ApE" to="tpee:fzcpWvK" resolve="LocalVariableDeclarationStatement" />
                           <node concept="37vLTw" id="4vbeH84NusA" role="1m5AlR">
                             <ref role="3cqZAo" node="4vbeH84NqoT" resolve="lvd" />
                           </node>
+                          <node concept="chp4Y" id="6fXjIfxgng5" role="3oSUPX">
+                            <ref role="cht4Q" to="tpee:fzcpWvK" resolve="LocalVariableDeclarationStatement" />
+                          </node>
                         </node>
                         <node concept="3TrEf2" id="4vbeH84NusB" role="2OqNvi">
                           <ref role="3Tt5mk" to="tpee:fzcpWvL" resolve="localVariableDeclaration" />
@@ -3861,10 +3877,12 @@
                     <node concept="2OqwBi" id="4vbeH84NvMg" role="37vLTJ">
                       <node concept="2OqwBi" id="4vbeH84NvMh" role="2Oq$k0">
                         <node concept="1PxgMI" id="4vbeH84NvMi" role="2Oq$k0">
-                          <ref role="1m5ApE" to="tpee:fzcpWvK" resolve="LocalVariableDeclarationStatement" />
                           <node concept="37vLTw" id="4vbeH84NvMj" role="1m5AlR">
                             <ref role="3cqZAo" node="4vbeH84NqoT" resolve="lvd" />
                           </node>
+                          <node concept="chp4Y" id="6fXjIfxgnfI" role="3oSUPX">
+                            <ref role="cht4Q" to="tpee:fzcpWvK" resolve="LocalVariableDeclarationStatement" />
+                          </node>
                         </node>
                         <node concept="3TrEf2" id="4vbeH84NvMk" role="2OqNvi">
                           <ref role="3Tt5mk" to="tpee:fzcpWvL" resolve="localVariableDeclaration" />
@@ -5188,8 +5206,10 @@
                       <node concept="2OqwBi" id="452KZTbwcjm" role="2Oq$k0">
                         <node concept="1PxgMI" id="452KZTbwcjn" role="2Oq$k0">
                           <property role="1BlNFB" value="true" />
-                          <ref role="1m5ApE" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
                           <node concept="30H73N" id="452KZTbwcjo" role="1m5AlR" />
+                          <node concept="chp4Y" id="6fXjIfxgnfY" role="3oSUPX">
+                            <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
+                          </node>
                         </node>
                         <node concept="3TrEf2" id="452KZTbwcjp" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:6wQEDbCLoaZ" resolve="includeClause" />
@@ -5646,8 +5666,10 @@
                       <node concept="2OqwBi" id="452KZTbwX1F" role="2Oq$k0">
                         <node concept="1PxgMI" id="452KZTbwX1G" role="2Oq$k0">
                           <property role="1BlNFB" value="true" />
-                          <ref role="1m5ApE" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
                           <node concept="30H73N" id="452KZTbwX1H" role="1m5AlR" />
+                          <node concept="chp4Y" id="6fXjIfxgnfV" role="3oSUPX">
+                            <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
+                          </node>
                         </node>
                         <node concept="3TrEf2" id="452KZTbwX1I" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:6wQEDbCLoaZ" resolve="includeClause" />
@@ -5912,11 +5934,13 @@
               <node concept="3cpWs3" id="5MHpiylJzd1" role="3uHU7B">
                 <node concept="2OqwBi" id="tIwzd2qPSc" role="3uHU7B">
                   <node concept="1PxgMI" id="tIwzd2qPSd" role="2Oq$k0">
-                    <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
                     <node concept="2OqwBi" id="tIwzd2qPSe" role="1m5AlR">
                       <node concept="30H73N" id="tIwzd2qPSf" role="2Oq$k0" />
                       <node concept="1mfA1w" id="tIwzd2qPSg" role="2OqNvi" />
                     </node>
+                    <node concept="chp4Y" id="6fXjIfxgnfK" role="3oSUPX">
+                      <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                    </node>
                   </node>
                   <node concept="3TrcHB" id="tIwzd2qPSh" role="2OqNvi">
                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -6262,13 +6286,15 @@
                       <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
                       <node concept="2OqwBi" id="3yhgKRI$QPN" role="37wK5m">
                         <node concept="1PxgMI" id="3yhgKRI$Ss$" role="2Oq$k0">
-                          <ref role="1m5ApE" to="tpee:hwliAcM" resolve="InstanceMethodCallOperation" />
                           <node concept="2OqwBi" id="3yhgKRI$Rfg" role="1m5AlR">
                             <node concept="30H73N" id="3yhgKRI$QPO" role="2Oq$k0" />
                             <node concept="3TrEf2" id="3yhgKRI$RNA" role="2OqNvi">
                               <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
                             </node>
                           </node>
+                          <node concept="chp4Y" id="6fXjIfxgnfZ" role="3oSUPX">
+                            <ref role="cht4Q" to="tpee:hwliAcM" resolve="InstanceMethodCallOperation" />
+                          </node>
                         </node>
                         <node concept="3TrEf2" id="3yhgKRI$TkD" role="2OqNvi">
                           <ref role="3Tt5mk" to="tpee:hwllgre" resolve="instanceMethodDeclaration" />
@@ -6796,7 +6822,6 @@
                       <node concept="3clFbS" id="6FQzrygVX$O" role="2VODD2">
                         <node concept="3clFbF" id="6FQzrygVX$P" role="3cqZAp">
                           <node concept="1PxgMI" id="6FQzrygVX$Q" role="3clFbG">
-                            <ref role="1m5ApE" to="tpee:fz12cDA" resolve="ClassConcept" />
                             <node concept="2OqwBi" id="6FQzrygVX$R" role="1m5AlR">
                               <node concept="2OqwBi" id="6FQzrygVX$S" role="2Oq$k0">
                                 <node concept="3TrEf2" id="6FQzrygVX$T" role="2OqNvi">
@@ -6806,6 +6831,9 @@
                               </node>
                               <node concept="1mfA1w" id="6FQzrygVX$V" role="2OqNvi" />
                             </node>
+                            <node concept="chp4Y" id="6fXjIfxgng1" role="3oSUPX">
+                              <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -6948,8 +6976,10 @@
                               <ref role="3Tt5mk" to="tpee:fIYIWN3" resolve="staticMethodDeclaration" />
                             </node>
                             <node concept="1PxgMI" id="2QE4RCGf9r5" role="2Oq$k0">
-                              <ref role="1m5ApE" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
                               <node concept="30H73N" id="2QE4RCGdVoY" role="1m5AlR" />
+                              <node concept="chp4Y" id="6fXjIfxgng0" role="3oSUPX">
+                                <ref role="cht4Q" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -6963,19 +6993,23 @@
                       <node concept="3clFbS" id="2QE4RCGdVp1" role="2VODD2">
                         <node concept="3clFbF" id="2QE4RCGdVp2" role="3cqZAp">
                           <node concept="1PxgMI" id="2QE4RCGdVp3" role="3clFbG">
-                            <ref role="1m5ApE" to="tpee:fz12cDA" resolve="ClassConcept" />
                             <node concept="2OqwBi" id="2QE4RCGdVp4" role="1m5AlR">
                               <node concept="2OqwBi" id="2QE4RCGdVp5" role="2Oq$k0">
                                 <node concept="3TrEf2" id="2QE4RCGdVp6" role="2OqNvi">
                                   <ref role="3Tt5mk" to="tpee:fIYIWN3" resolve="staticMethodDeclaration" />
                                 </node>
                                 <node concept="1PxgMI" id="2QE4RCGf7mk" role="2Oq$k0">
-                                  <ref role="1m5ApE" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
                                   <node concept="30H73N" id="2QE4RCGdVp7" role="1m5AlR" />
+                                  <node concept="chp4Y" id="6fXjIfxgng3" role="3oSUPX">
+                                    <ref role="cht4Q" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
+                                  </node>
                                 </node>
                               </node>
                               <node concept="1mfA1w" id="2QE4RCGdVp8" role="2OqNvi" />
                             </node>
+                            <node concept="chp4Y" id="6fXjIfxgng6" role="3oSUPX">
+                              <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -7379,13 +7413,15 @@
                     <node concept="3clFbF" id="5JTOzCReRa6" role="3cqZAp">
                       <node concept="2OqwBi" id="5JTOzCReRwx" role="3clFbG">
                         <node concept="1PxgMI" id="5JTOzCReRow" role="2Oq$k0">
-                          <ref role="1m5ApE" to="5j4j:7E86$tKskWj" resolve="LogicalValue" />
                           <node concept="2OqwBi" id="5JTOzCReRa1" role="1m5AlR">
                             <node concept="3TrEf2" id="5JTOzCReRa4" role="2OqNvi">
                               <ref role="3Tt5mk" to="wq2x:6p0DfM0pQge" resolve="content" />
                             </node>
                             <node concept="30H73N" id="5JTOzCReRa5" role="2Oq$k0" />
                           </node>
+                          <node concept="chp4Y" id="6fXjIfxgnfL" role="3oSUPX">
+                            <ref role="cht4Q" to="5j4j:7E86$tKskWj" resolve="LogicalValue" />
+                          </node>
                         </node>
                         <node concept="3TrEf2" id="5JTOzCReS3T" role="2OqNvi">
                           <ref role="3Tt5mk" to="5j4j:7E86$tKsqnr" resolve="code" />
@@ -8472,7 +8508,6 @@
                             <node concept="2OqwBi" id="7IysFeB9Nvb" role="3clFbG">
                               <node concept="1PxgMI" id="7IysFeB9MVU" role="2Oq$k0">
                                 <property role="1BlNFB" value="true" />
-                                <ref role="1m5ApE" to="tpee:fzclF8j" resolve="ExpressionStatement" />
                                 <node concept="2OqwBi" id="7IysFeB9KvQ" role="1m5AlR">
                                   <node concept="2OqwBi" id="7IysFeB9J_H" role="2Oq$k0">
                                     <node concept="30H73N" id="7IysFeB9Jse" role="2Oq$k0" />
@@ -8484,6 +8519,9 @@
                                     <ref role="37wK5l" to="tpek:4GU1DgEHJ2u" resolve="getFirstStatement" />
                                   </node>
                                 </node>
+                                <node concept="chp4Y" id="6fXjIfxgnfS" role="3oSUPX">
+                                  <ref role="cht4Q" to="tpee:fzclF8j" resolve="ExpressionStatement" />
+                                </node>
                               </node>
                               <node concept="3TrEf2" id="7IysFeB9NSM" role="2OqNvi">
                                 <ref role="3Tt5mk" to="tpee:fzclF8k" resolve="expression" />
@@ -8589,7 +8627,6 @@
                             <node concept="2OqwBi" id="7IysFeB9OpJ" role="3clFbG">
                               <node concept="1PxgMI" id="7IysFeB9OpK" role="2Oq$k0">
                                 <property role="1BlNFB" value="true" />
-                                <ref role="1m5ApE" to="tpee:fzclF8j" resolve="ExpressionStatement" />
                                 <node concept="2OqwBi" id="7IysFeB9OpL" role="1m5AlR">
                                   <node concept="2OqwBi" id="7IysFeB9OpM" role="2Oq$k0">
                                     <node concept="30H73N" id="7IysFeB9OpN" role="2Oq$k0" />
@@ -8601,6 +8638,9 @@
                                     <ref role="37wK5l" to="tpek:4GU1DgEHJ2u" resolve="getFirstStatement" />
                                   </node>
                                 </node>
+                                <node concept="chp4Y" id="6fXjIfxgnfR" role="3oSUPX">
+                                  <ref role="cht4Q" to="tpee:fzclF8j" resolve="ExpressionStatement" />
+                                </node>
                               </node>
                               <node concept="3TrEf2" id="7IysFeB9OpQ" role="2OqNvi">
                                 <ref role="3Tt5mk" to="tpee:fzclF8k" resolve="expression" />
@@ -8730,13 +8770,15 @@
                     <node concept="3clFbF" id="18kNIl0G$or" role="3cqZAp">
                       <node concept="2OqwBi" id="18kNIl0GA2j" role="3clFbG">
                         <node concept="1PxgMI" id="18kNIl0G_HR" role="2Oq$k0">
-                          <ref role="1m5ApE" to="wq2x:18kNIl0F1t4" resolve="LogicalSubstitutionCreator" />
                           <node concept="2OqwBi" id="18kNIl0G$om" role="1m5AlR">
                             <node concept="3TrEf2" id="18kNIl0G$op" role="2OqNvi">
                               <ref role="3Tt5mk" to="tpee:gEShVi6" resolve="creator" />
                             </node>
                             <node concept="30H73N" id="18kNIl0G$oq" role="2Oq$k0" />
                           </node>
+                          <node concept="chp4Y" id="6fXjIfxgnfW" role="3oSUPX">
+                            <ref role="cht4Q" to="wq2x:18kNIl0F1t4" resolve="LogicalSubstitutionCreator" />
+                          </node>
                         </node>
                         <node concept="3TrEf2" id="18kNIl0GAgh" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:18kNIl0F1xB" resolve="anchor" />
@@ -15995,13 +16037,15 @@
                                   <ref role="3TtcxE" to="tpee:fz7wK6I" resolve="actualArgument" />
                                 </node>
                                 <node concept="1PxgMI" id="3yhgKRI_01u" role="2Oq$k0">
-                                  <ref role="1m5ApE" to="tpee:hwliAcM" resolve="InstanceMethodCallOperation" />
                                   <node concept="2OqwBi" id="3yhgKRI$Zb5" role="1m5AlR">
                                     <node concept="30H73N" id="3yhgKRI$JTp" role="2Oq$k0" />
                                     <node concept="3TrEf2" id="3yhgKRI$ZzV" role="2OqNvi">
                                       <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
                                     </node>
                                   </node>
+                                  <node concept="chp4Y" id="6fXjIfxgnfX" role="3oSUPX">
+                                    <ref role="cht4Q" to="tpee:hwliAcM" resolve="InstanceMethodCallOperation" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
@@ -16020,13 +16064,15 @@
                                 <ref role="3Tt5mk" to="tpee:hwllgre" resolve="instanceMethodDeclaration" />
                               </node>
                               <node concept="1PxgMI" id="3yhgKRI_2cK" role="2Oq$k0">
-                                <ref role="1m5ApE" to="tpee:hwliAcM" resolve="InstanceMethodCallOperation" />
                                 <node concept="2OqwBi" id="3yhgKRI_1dv" role="1m5AlR">
                                   <node concept="30H73N" id="3yhgKRI$Jkp" role="2Oq$k0" />
                                   <node concept="3TrEf2" id="3yhgKRI_1Dk" role="2OqNvi">
                                     <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
                                   </node>
                                 </node>
+                                <node concept="chp4Y" id="6fXjIfxgnfJ" role="3oSUPX">
+                                  <ref role="cht4Q" to="tpee:hwliAcM" resolve="InstanceMethodCallOperation" />
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -17190,8 +17236,10 @@
                         <node concept="3clFbF" id="1yw2nYyfLIy" role="3cqZAp">
                           <node concept="2OqwBi" id="1yw2nYyfLIz" role="3clFbG">
                             <node concept="1PxgMI" id="1yw2nYyfLI$" role="2Oq$k0">
-                              <ref role="1m5ApE" to="tpee:6LFqxSRBTg4" resolve="LocalMethodCall" />
                               <node concept="30H73N" id="1yw2nYyfLI_" role="1m5AlR" />
+                              <node concept="chp4Y" id="6fXjIfxgnfP" role="3oSUPX">
+                                <ref role="cht4Q" to="tpee:6LFqxSRBTg4" resolve="LocalMethodCall" />
+                              </node>
                             </node>
                             <node concept="3TrEf2" id="1yw2nYyfLIA" role="2OqNvi">
                               <ref role="3Tt5mk" to="tpee:6LFqxSRBTg7" resolve="method" />
@@ -18671,11 +18719,13 @@
                                     <node concept="2OqwBi" id="4MEOIDGCJ5U" role="2Oq$k0">
                                       <node concept="2OqwBi" id="4MEOIDGCJ5V" role="2Oq$k0">
                                         <node concept="1PxgMI" id="4MEOIDGCJ5W" role="2Oq$k0">
-                                          <ref role="1m5ApE" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
                                           <node concept="2OqwBi" id="4MEOIDGCJ5X" role="1m5AlR">
                                             <node concept="30H73N" id="4MEOIDGCJ5Y" role="2Oq$k0" />
                                             <node concept="1mfA1w" id="4MEOIDGCJ5Z" role="2OqNvi" />
                                           </node>
+                                          <node concept="chp4Y" id="6fXjIfxgnfU" role="3oSUPX">
+                                            <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
+                                          </node>
                                         </node>
                                         <node concept="3TrEf2" id="4MEOIDGCJ60" role="2OqNvi">
                                           <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index 4b46f583..5bca08fc 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -29,13 +29,8 @@
         <dependency reexport="false">96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)</dependency>
         <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
       </dependencies>
-      <usedDevKits>
-        <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-        <usedDevKit>a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)</usedDevKit>
-      </usedDevKits>
       <languageVersions>
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-        <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -51,10 +46,11 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
         <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
+        <language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util" version="0" />
         <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="0" />
       </languageVersions>
       <dependencyVersions>
@@ -63,18 +59,17 @@
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-        <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
         <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
         <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
         <module reference="96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples)" version="0" />
         <module reference="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" version="0" />
+        <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
         <module reference="e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
         <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
         <module reference="3ac18869-0828-4401-abad-822a47bf83f1(jetbrains.mps.lang.descriptor#9020561928507175817)" version="0" />
-        <module reference="86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)" version="0" />
         <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
         <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
@@ -84,6 +79,7 @@
         <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
         <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
         <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
+        <module reference="b19b2d23-1869-41e0-9ee6-8eaad9ffcd84(jetbrains.mps.lang.util.order#174635545557533742)" version="0" />
         <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
         <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
         <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
@@ -108,12 +104,8 @@
     <dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
     <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
   </dependencies>
-  <usedDevKits>
-    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-    <usedDevKit>2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)</usedDevKit>
-  </usedDevKits>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
     <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
@@ -126,14 +118,14 @@
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
-    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="3" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="1" />
-    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="0" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="0" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="4" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="7" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
     <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
@@ -145,11 +137,12 @@
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="3" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="0" />
+    <language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="0" />
     <language slang="l:696c1165-4a59-463b-bc5d-902caab85dd0:jetbrains.mps.make.facet" version="0" />
     <language slang="l:95f8a3e6-f994-4ca0-a65e-763c9bae2d3b:jetbrains.mps.make.script" version="0" />
@@ -163,7 +156,6 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)" version="0" />
@@ -172,7 +164,6 @@
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
-    <module reference="86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
index cff884a3..6655124b 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -2,7 +2,7 @@
 <model ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.typesystem2.behavior)">
   <persistence version="9" />
   <languages>
-    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="0" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -20,7 +20,6 @@
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
-    <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
@@ -168,8 +167,8 @@
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
@@ -403,13 +402,15 @@
                   </node>
                   <node concept="2OqwBi" id="4EfgX2E$QyW" role="33vP2m">
                     <node concept="1PxgMI" id="4EfgX2E$Qpz" role="2Oq$k0">
-                      <ref role="1m5ApE" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
                       <node concept="2OqwBi" id="4EfgX2E$Qp$" role="1m5AlR">
                         <node concept="13iPFW" id="4EfgX2E$Qp_" role="2Oq$k0" />
                         <node concept="3TrEf2" id="4EfgX2E$QpA" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:4EfgX2EvGcc" resolve="expression" />
                         </node>
                       </node>
+                      <node concept="chp4Y" id="6fXjIfxgneJ" role="3oSUPX">
+                        <ref role="cht4Q" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
+                      </node>
                     </node>
                     <node concept="3TrEf2" id="4EfgX2E$R7t" role="2OqNvi">
                       <ref role="3Tt5mk" to="tpee:fIYIWN3" resolve="staticMethodDeclaration" />
@@ -427,13 +428,15 @@
                       <node concept="3cpWs3" id="4EfgX2EE6Te" role="3uHU7B">
                         <node concept="2OqwBi" id="4EfgX2EEb$j" role="3uHU7w">
                           <node concept="1PxgMI" id="4EfgX2EEbam" role="2Oq$k0">
-                            <ref role="1m5ApE" to="tpee:g7pOWCK" resolve="Classifier" />
                             <node concept="2OqwBi" id="4EfgX2EE7im" role="1m5AlR">
                               <node concept="37vLTw" id="4EfgX2EE73f" role="2Oq$k0">
                                 <ref role="3cqZAo" node="4EfgX2E$Qpy" resolve="smd" />
                               </node>
                               <node concept="1mfA1w" id="4EfgX2EE920" role="2OqNvi" />
                             </node>
+                            <node concept="chp4Y" id="6fXjIfxgnf9" role="3oSUPX">
+                              <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                            </node>
                           </node>
                           <node concept="3TrcHB" id="4EfgX2EEcd0" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -487,13 +490,15 @@
                   <ref role="37wK5l" to="wyt6:~String.valueOf(boolean):java.lang.String" resolve="valueOf" />
                   <node concept="2OqwBi" id="3x8pcoFej2u" role="37wK5m">
                     <node concept="1PxgMI" id="3x8pcoFejIl" role="2Oq$k0">
-                      <ref role="1m5ApE" to="tpee:fzclF81" resolve="BooleanConstant" />
                       <node concept="2OqwBi" id="3x8pcoFeipH" role="1m5AlR">
                         <node concept="13iPFW" id="3x8pcoFehXU" role="2Oq$k0" />
                         <node concept="3TrEf2" id="3x8pcoFeiM5" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:4EfgX2EvGcc" resolve="expression" />
                         </node>
                       </node>
+                      <node concept="chp4Y" id="6fXjIfxgneO" role="3oSUPX">
+                        <ref role="cht4Q" to="tpee:fzclF81" resolve="BooleanConstant" />
+                      </node>
                     </node>
                     <node concept="3TrcHB" id="3x8pcoFekiC" role="2OqNvi">
                       <ref role="3TsBF5" to="tpee:fzclF82" resolve="value" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
index 272b9691..ad3240f5 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
@@ -2,7 +2,7 @@
 <model ref="r:81151157-4aa6-41ac-acda-128bb1020041(jetbrains.mps.lang.typesystem2.constraints)">
   <persistence version="9" />
   <languages>
-    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="0" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="2" />
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="1" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
@@ -22,9 +22,6 @@
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.typesystem2.behavior)" implicit="true" />
   </imports>
   <registry>
-    <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
-      <concept id="1161622665029" name="jetbrains.mps.lang.sharedConcepts.structure.ConceptFunctionParameter_model" flags="nn" index="1Q6Npb" />
-    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -116,7 +113,7 @@
       </concept>
       <concept id="1147467790433" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyGetter" flags="in" index="Eqf_E" />
       <concept id="1147468365020" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_node" flags="nn" index="EsrRn" />
-      <concept id="5676632058862809931" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="in" index="13QW63" />
+      <concept id="5564765827938091039" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="ig" index="3dgokm" />
       <concept id="1159285995602" name="jetbrains.mps.lang.constraints.structure.NodeDefaultSearchScope" flags="ng" index="3EP7_v">
         <child id="1159286114227" name="searchScopeFactory" index="3EP$qY" />
       </concept>
@@ -141,9 +138,10 @@
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
+      <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
@@ -202,72 +200,74 @@
     <property role="3GE5qa" value="rule.input" />
     <ref role="1M2myG" to="wq2x:6p0DfM0ia8T" resolve="RuleInputDeclaration" />
     <node concept="3EP7_v" id="6ntBQ9KM5jK" role="1MtirG">
-      <node concept="13QW63" id="6ntBQ9KM6eb" role="3EP$qY">
-        <node concept="3clFbS" id="6ntBQ9KM6ed" role="2VODD2">
-          <node concept="3cpWs8" id="6ntBQ9KM$Fo" role="3cqZAp">
-            <node concept="3cpWsn" id="6ntBQ9KM$Fp" role="3cpWs9">
+      <node concept="3dgokm" id="6fXjIfxgfU_" role="3EP$qY">
+        <node concept="3clFbS" id="6fXjIfxgfUA" role="2VODD2">
+          <node concept="3cpWs8" id="6fXjIfxgfUB" role="3cqZAp">
+            <node concept="3cpWsn" id="6fXjIfxgfUC" role="3cpWs9">
               <property role="TrG5h" value="rule" />
-              <node concept="3Tqbb2" id="6ntBQ9KM$Fk" role="1tU5fm">
+              <node concept="3Tqbb2" id="6fXjIfxgfUD" role="1tU5fm">
                 <ref role="ehGHo" to="wq2x:4EfgX2ET3GH" resolve="AbstractRule" />
               </node>
-              <node concept="2OqwBi" id="6ntBQ9KM$Fq" role="33vP2m">
-                <node concept="2rP1CM" id="6ntBQ9KM$Fr" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="6ntBQ9KM$Fs" role="2OqNvi">
-                  <node concept="1xMEDy" id="6ntBQ9KM$Ft" role="1xVPHs">
-                    <node concept="chp4Y" id="3KXGt7X4HHo" role="ri$Ld">
+              <node concept="2OqwBi" id="6fXjIfxgfUE" role="33vP2m">
+                <node concept="2rP1CM" id="6fXjIfxgfUF" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="6fXjIfxgfUG" role="2OqNvi">
+                  <node concept="1xMEDy" id="6fXjIfxgfUH" role="1xVPHs">
+                    <node concept="chp4Y" id="6fXjIfxgfUI" role="ri$Ld">
                       <ref role="cht4Q" to="wq2x:4EfgX2ET3GH" resolve="AbstractRule" />
                     </node>
                   </node>
-                  <node concept="1xIGOp" id="6ntBQ9KM$Fv" role="1xVPHs" />
+                  <node concept="1xIGOp" id="6fXjIfxgfUJ" role="1xVPHs" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="6ntBQ9KM82u" role="3cqZAp">
-            <node concept="2ShNRf" id="6ntBQ9KM82q" role="3clFbG">
-              <node concept="YeOm9" id="6ntBQ9KM8cc" role="2ShVmc">
-                <node concept="1Y3b0j" id="6ntBQ9KM8cf" role="YeSDq">
+          <node concept="3clFbF" id="6fXjIfxgfUK" role="3cqZAp">
+            <node concept="2ShNRf" id="6fXjIfxgfUL" role="3clFbG">
+              <node concept="YeOm9" id="6fXjIfxgfUM" role="2ShVmc">
+                <node concept="1Y3b0j" id="6fXjIfxgfUN" role="YeSDq">
                   <property role="2bfB8j" value="true" />
                   <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                   <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <node concept="2YIFZM" id="6ntBQ9KM$lM" role="37wK5m">
+                  <node concept="2YIFZM" id="6fXjIfxgfUO" role="37wK5m">
                     <ref role="37wK5l" to="33ny:~Collections.singletonList(java.lang.Object):java.util.List" resolve="singletonList" />
                     <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                    <node concept="2OqwBi" id="6ntBQ9KM_jA" role="37wK5m">
-                      <node concept="2OqwBi" id="5NuEpF1jBOR" role="2Oq$k0">
-                        <node concept="37vLTw" id="6ntBQ9KM_a3" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6ntBQ9KM$Fp" resolve="rule" />
+                    <node concept="2OqwBi" id="6fXjIfxgfUP" role="37wK5m">
+                      <node concept="2OqwBi" id="6fXjIfxgfUQ" role="2Oq$k0">
+                        <node concept="37vLTw" id="6fXjIfxgfUR" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6fXjIfxgfUC" resolve="rule" />
                         </node>
-                        <node concept="3TrEf2" id="6wQEDbCDRK7" role="2OqNvi">
+                        <node concept="3TrEf2" id="6fXjIfxgfUS" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:6wQEDbCCPyR" resolve="input" />
                         </node>
                       </node>
-                      <node concept="3TrEf2" id="5NuEpF1jCoN" role="2OqNvi">
+                      <node concept="3TrEf2" id="6fXjIfxgfUT" role="2OqNvi">
                         <ref role="3Tt5mk" to="wq2x:5NuEpF1ihrB" resolve="input" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3Tm1VV" id="6ntBQ9KM8cg" role="1B3o_S" />
-                  <node concept="3clFb_" id="6ntBQ9KM8cr" role="jymVt">
+                  <node concept="3Tm1VV" id="6fXjIfxgfUU" role="1B3o_S" />
+                  <node concept="3clFb_" id="6fXjIfxgfUV" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="6ntBQ9KM8cs" role="3clF45" />
-                    <node concept="3Tm1VV" id="6ntBQ9KM8ct" role="1B3o_S" />
-                    <node concept="37vLTG" id="6ntBQ9KM8cv" role="3clF46">
+                    <node concept="17QB3L" id="6fXjIfxgfUW" role="3clF45" />
+                    <node concept="3Tm1VV" id="6fXjIfxgfUX" role="1B3o_S" />
+                    <node concept="37vLTG" id="6fXjIfxgfUY" role="3clF46">
                       <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="6ntBQ9KM8cw" role="1tU5fm" />
+                      <node concept="3Tqbb2" id="6fXjIfxgfUZ" role="1tU5fm" />
                     </node>
-                    <node concept="3clFbS" id="6ntBQ9KM8cx" role="3clF47">
-                      <node concept="3clFbF" id="6ntBQ9KM8n0" role="3cqZAp">
-                        <node concept="2OqwBi" id="6ntBQ9KM8_$" role="3clFbG">
-                          <node concept="1PxgMI" id="6ntBQ9KM8uP" role="2Oq$k0">
+                    <node concept="3clFbS" id="6fXjIfxgfV0" role="3clF47">
+                      <node concept="3clFbF" id="6fXjIfxgfV1" role="3cqZAp">
+                        <node concept="2OqwBi" id="6fXjIfxgfV2" role="3clFbG">
+                          <node concept="1PxgMI" id="6fXjIfxgfV3" role="2Oq$k0">
                             <property role="1BlNFB" value="true" />
-                            <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            <node concept="37vLTw" id="6ntBQ9KM8mZ" role="1m5AlR">
-                              <ref role="3cqZAo" node="6ntBQ9KM8cv" resolve="child" />
+                            <node concept="37vLTw" id="6fXjIfxgfV4" role="1m5AlR">
+                              <ref role="3cqZAo" node="6fXjIfxgfUY" resolve="child" />
+                            </node>
+                            <node concept="chp4Y" id="6fXjIfxgneH" role="3oSUPX">
+                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                             </node>
                           </node>
-                          <node concept="3TrcHB" id="6ntBQ9KM8Im" role="2OqNvi">
+                          <node concept="3TrcHB" id="6fXjIfxgfV5" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                           </node>
                         </node>
@@ -286,74 +286,76 @@
     <property role="3GE5qa" value="rule.code.parameter" />
     <ref role="1M2myG" to="wq2x:5MHpiylEsuT" resolve="RuleParameterDeclaration" />
     <node concept="3EP7_v" id="5MHpiylEttA" role="1MtirG">
-      <node concept="13QW63" id="5MHpiylEu44" role="3EP$qY">
-        <node concept="3clFbS" id="5MHpiylEu45" role="2VODD2">
-          <node concept="3cpWs8" id="5MHpiylEu46" role="3cqZAp">
-            <node concept="3cpWsn" id="5MHpiylEu47" role="3cpWs9">
+      <node concept="3dgokm" id="6fXjIfxgfSL" role="3EP$qY">
+        <node concept="3clFbS" id="6fXjIfxgfSM" role="2VODD2">
+          <node concept="3cpWs8" id="6fXjIfxgfSN" role="3cqZAp">
+            <node concept="3cpWsn" id="6fXjIfxgfSO" role="3cpWs9">
               <property role="TrG5h" value="rule" />
-              <node concept="3Tqbb2" id="5MHpiylEu48" role="1tU5fm">
+              <node concept="3Tqbb2" id="6fXjIfxgfSP" role="1tU5fm">
                 <ref role="ehGHo" to="wq2x:4EfgX2ET3GH" resolve="AbstractRule" />
               </node>
-              <node concept="2OqwBi" id="5MHpiylEu49" role="33vP2m">
-                <node concept="2rP1CM" id="5MHpiylEu4a" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="5MHpiylEu4b" role="2OqNvi">
-                  <node concept="1xMEDy" id="5MHpiylEu4c" role="1xVPHs">
-                    <node concept="chp4Y" id="30XHGaOOk7n" role="ri$Ld">
+              <node concept="2OqwBi" id="6fXjIfxgfSQ" role="33vP2m">
+                <node concept="2rP1CM" id="6fXjIfxgfSR" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="6fXjIfxgfSS" role="2OqNvi">
+                  <node concept="1xMEDy" id="6fXjIfxgfST" role="1xVPHs">
+                    <node concept="chp4Y" id="6fXjIfxgfSU" role="ri$Ld">
                       <ref role="cht4Q" to="wq2x:4EfgX2ET3GH" resolve="AbstractRule" />
                     </node>
                   </node>
-                  <node concept="1xIGOp" id="5MHpiylEu4e" role="1xVPHs" />
+                  <node concept="1xIGOp" id="6fXjIfxgfSV" role="1xVPHs" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="2JQZWxF8s89" role="3cqZAp">
-            <node concept="3cpWsn" id="2JQZWxF8s8a" role="3cpWs9">
+          <node concept="3cpWs8" id="6fXjIfxgfSW" role="3cqZAp">
+            <node concept="3cpWsn" id="6fXjIfxgfSX" role="3cpWs9">
               <property role="TrG5h" value="ruleParams" />
-              <node concept="_YKpA" id="2JQZWxF8s7X" role="1tU5fm">
-                <node concept="3Tqbb2" id="2JQZWxF8s80" role="_ZDj9" />
+              <node concept="_YKpA" id="6fXjIfxgfSY" role="1tU5fm">
+                <node concept="3Tqbb2" id="6fXjIfxgfSZ" role="_ZDj9" />
               </node>
-              <node concept="2ShNRf" id="2JQZWxF8s8b" role="33vP2m">
-                <node concept="Tc6Ow" id="2JQZWxF8s8c" role="2ShVmc">
-                  <node concept="2OqwBi" id="2JQZWxF8s8i" role="HW$Y0">
-                    <node concept="2OqwBi" id="2JQZWxF8s8j" role="2Oq$k0">
-                      <node concept="37vLTw" id="2JQZWxF8s8k" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5MHpiylEu47" resolve="rule" />
+              <node concept="2ShNRf" id="6fXjIfxgfT0" role="33vP2m">
+                <node concept="Tc6Ow" id="6fXjIfxgfT1" role="2ShVmc">
+                  <node concept="2OqwBi" id="6fXjIfxgfT2" role="HW$Y0">
+                    <node concept="2OqwBi" id="6fXjIfxgfT3" role="2Oq$k0">
+                      <node concept="37vLTw" id="6fXjIfxgfT4" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6fXjIfxgfSO" resolve="rule" />
                       </node>
-                      <node concept="3TrEf2" id="2JQZWxF8s8l" role="2OqNvi">
+                      <node concept="3TrEf2" id="6fXjIfxgfT5" role="2OqNvi">
                         <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" resolve="letBlock" />
                       </node>
                     </node>
-                    <node concept="3TrEf2" id="2JQZWxF8s8m" role="2OqNvi">
+                    <node concept="3TrEf2" id="6fXjIfxgfT6" role="2OqNvi">
                       <ref role="3Tt5mk" to="wq2x:5MHpiylFI5Z" resolve="parameter" />
                     </node>
                   </node>
-                  <node concept="3Tqbb2" id="2JQZWxF8s8n" role="HW$YZ" />
+                  <node concept="3Tqbb2" id="6fXjIfxgfT7" role="HW$YZ" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbJ" id="30XHGaOP6z0" role="3cqZAp">
-            <node concept="3clFbS" id="30XHGaOP6z2" role="3clFbx">
-              <node concept="3clFbF" id="30XHGaOP723" role="3cqZAp">
-                <node concept="2OqwBi" id="30XHGaOP7gW" role="3clFbG">
-                  <node concept="37vLTw" id="30XHGaOP721" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2JQZWxF8s8a" resolve="ruleParams" />
+          <node concept="3clFbJ" id="6fXjIfxgfT8" role="3cqZAp">
+            <node concept="3clFbS" id="6fXjIfxgfT9" role="3clFbx">
+              <node concept="3clFbF" id="6fXjIfxgfTa" role="3cqZAp">
+                <node concept="2OqwBi" id="6fXjIfxgfTb" role="3clFbG">
+                  <node concept="37vLTw" id="6fXjIfxgfTc" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6fXjIfxgfSX" resolve="ruleParams" />
                   </node>
-                  <node concept="TSZUe" id="30XHGaOP8jN" role="2OqNvi">
-                    <node concept="2OqwBi" id="30XHGaOP8nE" role="25WWJ7">
-                      <node concept="2OqwBi" id="30XHGaOP8nF" role="2Oq$k0">
-                        <node concept="1PxgMI" id="30XHGaOP8ys" role="2Oq$k0">
-                          <ref role="1m5ApE" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
-                          <node concept="37vLTw" id="30XHGaOP8nG" role="1m5AlR">
-                            <ref role="3cqZAo" node="5MHpiylEu47" resolve="rule" />
+                  <node concept="TSZUe" id="6fXjIfxgfTd" role="2OqNvi">
+                    <node concept="2OqwBi" id="6fXjIfxgfTe" role="25WWJ7">
+                      <node concept="2OqwBi" id="6fXjIfxgfTf" role="2Oq$k0">
+                        <node concept="1PxgMI" id="6fXjIfxgfTg" role="2Oq$k0">
+                          <node concept="37vLTw" id="6fXjIfxgfTh" role="1m5AlR">
+                            <ref role="3cqZAo" node="6fXjIfxgfSO" resolve="rule" />
+                          </node>
+                          <node concept="chp4Y" id="6fXjIfxgnfb" role="3oSUPX">
+                            <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
                           </node>
                         </node>
-                        <node concept="3TrEf2" id="30XHGaOP8nH" role="2OqNvi">
+                        <node concept="3TrEf2" id="6fXjIfxgfTi" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:5MHpiylGjt8" resolve="iterateParameterBlock" />
                         </node>
                       </node>
-                      <node concept="3TrEf2" id="30XHGaOP8nI" role="2OqNvi">
+                      <node concept="3TrEf2" id="6fXjIfxgfTj" role="2OqNvi">
                         <ref role="3Tt5mk" to="wq2x:5MHpiylFI5Z" resolve="parameter" />
                       </node>
                     </node>
@@ -361,49 +363,51 @@
                 </node>
               </node>
             </node>
-            <node concept="2OqwBi" id="30XHGaOP6Hp" role="3clFbw">
-              <node concept="37vLTw" id="30XHGaOP6B5" role="2Oq$k0">
-                <ref role="3cqZAo" node="5MHpiylEu47" resolve="rule" />
+            <node concept="2OqwBi" id="6fXjIfxgfTk" role="3clFbw">
+              <node concept="37vLTw" id="6fXjIfxgfTl" role="2Oq$k0">
+                <ref role="3cqZAo" node="6fXjIfxgfSO" resolve="rule" />
               </node>
-              <node concept="1mIQ4w" id="30XHGaOP6Tp" role="2OqNvi">
-                <node concept="chp4Y" id="30XHGaOP6Xh" role="cj9EA">
+              <node concept="1mIQ4w" id="6fXjIfxgfTm" role="2OqNvi">
+                <node concept="chp4Y" id="6fXjIfxgfTn" role="cj9EA">
                   <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbJ" id="2JQZWxF8sqw" role="3cqZAp">
-            <node concept="3clFbS" id="2JQZWxF8sqy" role="3clFbx">
-              <node concept="3clFbF" id="2JQZWxF8v46" role="3cqZAp">
-                <node concept="2OqwBi" id="2JQZWxF8vse" role="3clFbG">
-                  <node concept="37vLTw" id="2JQZWxF8v44" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2JQZWxF8s8a" resolve="ruleParams" />
+          <node concept="3clFbJ" id="6fXjIfxgfTo" role="3cqZAp">
+            <node concept="3clFbS" id="6fXjIfxgfTp" role="3clFbx">
+              <node concept="3clFbF" id="6fXjIfxgfTq" role="3cqZAp">
+                <node concept="2OqwBi" id="6fXjIfxgfTr" role="3clFbG">
+                  <node concept="37vLTw" id="6fXjIfxgfTs" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6fXjIfxgfSX" resolve="ruleParams" />
                   </node>
-                  <node concept="TSZUe" id="2JQZWxF8wYb" role="2OqNvi">
-                    <node concept="2OqwBi" id="2JQZWxF8xVo" role="25WWJ7">
-                      <node concept="2OqwBi" id="2JQZWxF8xja" role="2Oq$k0">
-                        <node concept="2OqwBi" id="2JQZWxF8x4l" role="2Oq$k0">
-                          <node concept="2OqwBi" id="2JQZWxF8x4m" role="2Oq$k0">
-                            <node concept="1PxgMI" id="2JQZWxF8x4n" role="2Oq$k0">
+                  <node concept="TSZUe" id="6fXjIfxgfTt" role="2OqNvi">
+                    <node concept="2OqwBi" id="6fXjIfxgfTu" role="25WWJ7">
+                      <node concept="2OqwBi" id="6fXjIfxgfTv" role="2Oq$k0">
+                        <node concept="2OqwBi" id="6fXjIfxgfTw" role="2Oq$k0">
+                          <node concept="2OqwBi" id="6fXjIfxgfTx" role="2Oq$k0">
+                            <node concept="1PxgMI" id="6fXjIfxgfTy" role="2Oq$k0">
                               <property role="1BlNFB" value="true" />
-                              <ref role="1m5ApE" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
-                              <node concept="37vLTw" id="2JQZWxF8x4o" role="1m5AlR">
-                                <ref role="3cqZAo" node="5MHpiylEu47" resolve="rule" />
+                              <node concept="37vLTw" id="6fXjIfxgfTz" role="1m5AlR">
+                                <ref role="3cqZAo" node="6fXjIfxgfSO" resolve="rule" />
+                              </node>
+                              <node concept="chp4Y" id="6fXjIfxgnf3" role="3oSUPX">
+                                <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
                               </node>
                             </node>
-                            <node concept="3TrEf2" id="2JQZWxF8x4p" role="2OqNvi">
+                            <node concept="3TrEf2" id="6fXjIfxgfT$" role="2OqNvi">
                               <ref role="3Tt5mk" to="wq2x:6wQEDbCLoaZ" resolve="includeClause" />
                             </node>
                           </node>
-                          <node concept="3TrEf2" id="2JQZWxF8x4q" role="2OqNvi">
+                          <node concept="3TrEf2" id="6fXjIfxgfT_" role="2OqNvi">
                             <ref role="3Tt5mk" to="wq2x:6wQEDbCL4Fj" resolve="fragment" />
                           </node>
                         </node>
-                        <node concept="3TrEf2" id="2JQZWxF8xAc" role="2OqNvi">
+                        <node concept="3TrEf2" id="6fXjIfxgfTA" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:6wQEDbCHGnY" resolve="letBlock" />
                         </node>
                       </node>
-                      <node concept="3TrEf2" id="2JQZWxF8yv2" role="2OqNvi">
+                      <node concept="3TrEf2" id="6fXjIfxgfTB" role="2OqNvi">
                         <ref role="3Tt5mk" to="wq2x:5MHpiylFI5Z" resolve="parameter" />
                       </node>
                     </node>
@@ -411,58 +415,62 @@
                 </node>
               </node>
             </node>
-            <node concept="2OqwBi" id="2JQZWxF8uyT" role="3clFbw">
-              <node concept="2OqwBi" id="2JQZWxF8udr" role="2Oq$k0">
-                <node concept="2OqwBi" id="2JQZWxF8tsz" role="2Oq$k0">
-                  <node concept="1PxgMI" id="2JQZWxF8tfD" role="2Oq$k0">
+            <node concept="2OqwBi" id="6fXjIfxgfTC" role="3clFbw">
+              <node concept="2OqwBi" id="6fXjIfxgfTD" role="2Oq$k0">
+                <node concept="2OqwBi" id="6fXjIfxgfTE" role="2Oq$k0">
+                  <node concept="1PxgMI" id="6fXjIfxgfTF" role="2Oq$k0">
                     <property role="1BlNFB" value="true" />
-                    <ref role="1m5ApE" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
-                    <node concept="37vLTw" id="2JQZWxF8stM" role="1m5AlR">
-                      <ref role="3cqZAo" node="5MHpiylEu47" resolve="rule" />
+                    <node concept="37vLTw" id="6fXjIfxgfTG" role="1m5AlR">
+                      <ref role="3cqZAo" node="6fXjIfxgfSO" resolve="rule" />
+                    </node>
+                    <node concept="chp4Y" id="6fXjIfxgneW" role="3oSUPX">
+                      <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
                     </node>
                   </node>
-                  <node concept="3TrEf2" id="2JQZWxF8tUH" role="2OqNvi">
+                  <node concept="3TrEf2" id="6fXjIfxgfTH" role="2OqNvi">
                     <ref role="3Tt5mk" to="wq2x:6wQEDbCLoaZ" resolve="includeClause" />
                   </node>
                 </node>
-                <node concept="3TrEf2" id="2JQZWxF8unF" role="2OqNvi">
+                <node concept="3TrEf2" id="6fXjIfxgfTI" role="2OqNvi">
                   <ref role="3Tt5mk" to="wq2x:6wQEDbCL4Fj" resolve="fragment" />
                 </node>
               </node>
-              <node concept="3x8VRR" id="2JQZWxF8uYQ" role="2OqNvi" />
+              <node concept="3x8VRR" id="6fXjIfxgfTJ" role="2OqNvi" />
             </node>
           </node>
-          <node concept="3clFbF" id="5MHpiylEu4f" role="3cqZAp">
-            <node concept="2ShNRf" id="5MHpiylEu4g" role="3clFbG">
-              <node concept="YeOm9" id="5MHpiylEu4h" role="2ShVmc">
-                <node concept="1Y3b0j" id="5MHpiylEu4i" role="YeSDq">
+          <node concept="3clFbF" id="6fXjIfxgfTK" role="3cqZAp">
+            <node concept="2ShNRf" id="6fXjIfxgfTL" role="3clFbG">
+              <node concept="YeOm9" id="6fXjIfxgfTM" role="2ShVmc">
+                <node concept="1Y3b0j" id="6fXjIfxgfTN" role="YeSDq">
                   <property role="2bfB8j" value="true" />
                   <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                   <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <node concept="37vLTw" id="2JQZWxF8s8o" role="37wK5m">
-                    <ref role="3cqZAo" node="2JQZWxF8s8a" resolve="ruleParams" />
+                  <node concept="37vLTw" id="6fXjIfxgfTO" role="37wK5m">
+                    <ref role="3cqZAo" node="6fXjIfxgfSX" resolve="ruleParams" />
                   </node>
-                  <node concept="3Tm1VV" id="5MHpiylEu4n" role="1B3o_S" />
-                  <node concept="3clFb_" id="5MHpiylEu4o" role="jymVt">
+                  <node concept="3Tm1VV" id="6fXjIfxgfTP" role="1B3o_S" />
+                  <node concept="3clFb_" id="6fXjIfxgfTQ" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="5MHpiylEu4p" role="3clF45" />
-                    <node concept="3Tm1VV" id="5MHpiylEu4q" role="1B3o_S" />
-                    <node concept="37vLTG" id="5MHpiylEu4r" role="3clF46">
+                    <node concept="17QB3L" id="6fXjIfxgfTR" role="3clF45" />
+                    <node concept="3Tm1VV" id="6fXjIfxgfTS" role="1B3o_S" />
+                    <node concept="37vLTG" id="6fXjIfxgfTT" role="3clF46">
                       <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="5MHpiylEu4s" role="1tU5fm" />
+                      <node concept="3Tqbb2" id="6fXjIfxgfTU" role="1tU5fm" />
                     </node>
-                    <node concept="3clFbS" id="5MHpiylEu4t" role="3clF47">
-                      <node concept="3clFbF" id="5MHpiylEu4u" role="3cqZAp">
-                        <node concept="2OqwBi" id="5MHpiylEu4v" role="3clFbG">
-                          <node concept="1PxgMI" id="5MHpiylEu4w" role="2Oq$k0">
+                    <node concept="3clFbS" id="6fXjIfxgfTV" role="3clF47">
+                      <node concept="3clFbF" id="6fXjIfxgfTW" role="3cqZAp">
+                        <node concept="2OqwBi" id="6fXjIfxgfTX" role="3clFbG">
+                          <node concept="1PxgMI" id="6fXjIfxgfTY" role="2Oq$k0">
                             <property role="1BlNFB" value="true" />
-                            <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            <node concept="37vLTw" id="5MHpiylEu4x" role="1m5AlR">
-                              <ref role="3cqZAo" node="5MHpiylEu4r" resolve="child" />
+                            <node concept="37vLTw" id="6fXjIfxgfTZ" role="1m5AlR">
+                              <ref role="3cqZAo" node="6fXjIfxgfTT" resolve="child" />
+                            </node>
+                            <node concept="chp4Y" id="6fXjIfxgnf1" role="3oSUPX">
+                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                             </node>
                           </node>
-                          <node concept="3TrcHB" id="5MHpiylEu4y" role="2OqNvi">
+                          <node concept="3TrcHB" id="6fXjIfxgfU0" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                           </node>
                         </node>
@@ -482,19 +490,19 @@
     <ref role="1M2myG" to="wq2x:1hX44vMEjQr" resolve="TypeNodeExpression" />
     <node concept="1N5Pfh" id="1hX44vMIQ9L" role="1Mr941">
       <ref role="1N5Vy1" to="wq2x:1hX44vMIQ6F" resolve="declaration" />
-      <node concept="13QW63" id="1hX44vMIQ9P" role="1N6uqs">
-        <node concept="3clFbS" id="1hX44vMIQ9R" role="2VODD2">
-          <node concept="3cpWs8" id="7IysFeA8w5P" role="3cqZAp">
-            <node concept="3cpWsn" id="7IysFeA8w5Q" role="3cpWs9">
+      <node concept="3dgokm" id="6fXjIfxgfV6" role="1N6uqs">
+        <node concept="3clFbS" id="6fXjIfxgfV7" role="2VODD2">
+          <node concept="3cpWs8" id="6fXjIfxgfV8" role="3cqZAp">
+            <node concept="3cpWsn" id="6fXjIfxgfV9" role="3cpWs9">
               <property role="TrG5h" value="tpd" />
-              <node concept="3Tqbb2" id="7IysFeA8w5M" role="1tU5fm">
+              <node concept="3Tqbb2" id="6fXjIfxgfVa" role="1tU5fm">
                 <ref role="ehGHo" to="wq2x:7IysFeA0yb0" resolve="TypeDeclarationParameter" />
               </node>
-              <node concept="2OqwBi" id="7IysFeA8w5R" role="33vP2m">
-                <node concept="2rP1CM" id="7IysFeA8w5S" role="2Oq$k0" />
-                <node concept="2Xjw5R" id="7IysFeA8w5T" role="2OqNvi">
-                  <node concept="1xMEDy" id="7IysFeA8w5U" role="1xVPHs">
-                    <node concept="chp4Y" id="7IysFeA8w5V" role="ri$Ld">
+              <node concept="2OqwBi" id="6fXjIfxgfVb" role="33vP2m">
+                <node concept="2rP1CM" id="6fXjIfxgfVc" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="6fXjIfxgfVd" role="2OqNvi">
+                  <node concept="1xMEDy" id="6fXjIfxgfVe" role="1xVPHs">
+                    <node concept="chp4Y" id="6fXjIfxgfVf" role="ri$Ld">
                       <ref role="cht4Q" to="wq2x:7IysFeA0yb0" resolve="TypeDeclarationParameter" />
                     </node>
                   </node>
@@ -502,47 +510,49 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbJ" id="1hX44vMIS2R" role="3cqZAp">
-            <node concept="3clFbS" id="1hX44vMIS2T" role="3clFbx">
-              <node concept="3cpWs6" id="1hX44vMIXyO" role="3cqZAp">
-                <node concept="2ShNRf" id="1hX44vMITbU" role="3cqZAk">
-                  <node concept="YeOm9" id="1hX44vMITsf" role="2ShVmc">
-                    <node concept="1Y3b0j" id="1hX44vMITsi" role="YeSDq">
+          <node concept="3clFbJ" id="6fXjIfxgfVg" role="3cqZAp">
+            <node concept="3clFbS" id="6fXjIfxgfVh" role="3clFbx">
+              <node concept="3cpWs6" id="6fXjIfxgfVi" role="3cqZAp">
+                <node concept="2ShNRf" id="6fXjIfxgfVj" role="3cqZAk">
+                  <node concept="YeOm9" id="6fXjIfxgfVk" role="2ShVmc">
+                    <node concept="1Y3b0j" id="6fXjIfxgfVl" role="YeSDq">
                       <property role="2bfB8j" value="true" />
                       <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                       <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                      <node concept="3Tm1VV" id="1hX44vMITsj" role="1B3o_S" />
-                      <node concept="3clFb_" id="1hX44vMITsk" role="jymVt">
+                      <node concept="3Tm1VV" id="6fXjIfxgfVm" role="1B3o_S" />
+                      <node concept="3clFb_" id="6fXjIfxgfVn" role="jymVt">
                         <property role="1EzhhJ" value="false" />
                         <property role="TrG5h" value="getName" />
-                        <node concept="17QB3L" id="1hX44vMITsl" role="3clF45" />
-                        <node concept="3Tm1VV" id="1hX44vMITsm" role="1B3o_S" />
-                        <node concept="37vLTG" id="1hX44vMITso" role="3clF46">
+                        <node concept="17QB3L" id="6fXjIfxgfVo" role="3clF45" />
+                        <node concept="3Tm1VV" id="6fXjIfxgfVp" role="1B3o_S" />
+                        <node concept="37vLTG" id="6fXjIfxgfVq" role="3clF46">
                           <property role="TrG5h" value="child" />
-                          <node concept="3Tqbb2" id="1hX44vMITsp" role="1tU5fm" />
+                          <node concept="3Tqbb2" id="6fXjIfxgfVr" role="1tU5fm" />
                         </node>
-                        <node concept="3clFbS" id="1hX44vMITsq" role="3clF47">
-                          <node concept="3clFbF" id="1hX44vML04f" role="3cqZAp">
-                            <node concept="2OqwBi" id="1hX44vML0ns" role="3clFbG">
-                              <node concept="35c_gC" id="1hX44vML04e" role="2Oq$k0">
+                        <node concept="3clFbS" id="6fXjIfxgfVs" role="3clF47">
+                          <node concept="3clFbF" id="6fXjIfxgfVt" role="3cqZAp">
+                            <node concept="2OqwBi" id="6fXjIfxgfVu" role="3clFbG">
+                              <node concept="35c_gC" id="6fXjIfxgfVv" role="2Oq$k0">
                                 <ref role="35c_gD" to="wq2x:1hX44vMEjQr" resolve="TypeNodeExpression" />
                               </node>
-                              <node concept="3n3YKJ" id="1hX44vML0Pm" role="2OqNvi" />
+                              <node concept="3n3YKJ" id="6fXjIfxgfVw" role="2OqNvi" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="2ShNRf" id="1hX44vMITGC" role="37wK5m">
-                        <node concept="Tc6Ow" id="1hX44vMITZG" role="2ShVmc">
-                          <node concept="3Tqbb2" id="1hX44vMIUxJ" role="HW$YZ" />
-                          <node concept="1PxgMI" id="7IysFeA8ywX" role="HW$Y0">
+                      <node concept="2ShNRf" id="6fXjIfxgfVx" role="37wK5m">
+                        <node concept="Tc6Ow" id="6fXjIfxgfVy" role="2ShVmc">
+                          <node concept="3Tqbb2" id="6fXjIfxgfVz" role="HW$YZ" />
+                          <node concept="1PxgMI" id="6fXjIfxgfV$" role="HW$Y0">
                             <property role="1BlNFB" value="true" />
-                            <ref role="1m5ApE" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                            <node concept="2OqwBi" id="7IysFeA8xnn" role="1m5AlR">
-                              <node concept="37vLTw" id="7IysFeA8x8h" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7IysFeA8w5Q" resolve="tpd" />
+                            <node concept="2OqwBi" id="6fXjIfxgfV_" role="1m5AlR">
+                              <node concept="37vLTw" id="6fXjIfxgfVA" role="2Oq$k0">
+                                <ref role="3cqZAo" node="6fXjIfxgfV9" resolve="tpd" />
                               </node>
-                              <node concept="1mfA1w" id="7IysFeA8xGj" role="2OqNvi" />
+                              <node concept="1mfA1w" id="6fXjIfxgfVB" role="2OqNvi" />
+                            </node>
+                            <node concept="chp4Y" id="6fXjIfxgnf6" role="3oSUPX">
+                              <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
                             </node>
                           </node>
                         </node>
@@ -551,19 +561,19 @@
                   </node>
                 </node>
               </node>
-              <node concept="3clFbH" id="1hX44vMIXRx" role="3cqZAp" />
+              <node concept="3clFbH" id="6fXjIfxgfVC" role="3cqZAp" />
             </node>
-            <node concept="2OqwBi" id="1hX44vMISJ8" role="3clFbw">
-              <node concept="37vLTw" id="7IysFeA8wVa" role="2Oq$k0">
-                <ref role="3cqZAo" node="7IysFeA8w5Q" resolve="tpd" />
+            <node concept="2OqwBi" id="6fXjIfxgfVD" role="3clFbw">
+              <node concept="37vLTw" id="6fXjIfxgfVE" role="2Oq$k0">
+                <ref role="3cqZAo" node="6fXjIfxgfV9" resolve="tpd" />
               </node>
-              <node concept="3x8VRR" id="1hX44vMIT4L" role="2OqNvi" />
+              <node concept="3x8VRR" id="6fXjIfxgfVF" role="2OqNvi" />
             </node>
-            <node concept="9aQIb" id="1hX44vMIX8V" role="9aQIa">
-              <node concept="3clFbS" id="1hX44vMIX8W" role="9aQI4">
-                <node concept="3cpWs6" id="1hX44vMIY1J" role="3cqZAp">
-                  <node concept="2ShNRf" id="1hX44vMIYlE" role="3cqZAk">
-                    <node concept="1pGfFk" id="1hX44vMIY_s" role="2ShVmc">
+            <node concept="9aQIb" id="6fXjIfxgfVG" role="9aQIa">
+              <node concept="3clFbS" id="6fXjIfxgfVH" role="9aQI4">
+                <node concept="3cpWs6" id="6fXjIfxgfVI" role="3cqZAp">
+                  <node concept="2ShNRf" id="6fXjIfxgfVJ" role="3cqZAk">
+                    <node concept="1pGfFk" id="6fXjIfxgfVK" role="2ShVmc">
                       <ref role="37wK5l" to="o8zo:7ipADkTfAzT" resolve="EmptyScope" />
                     </node>
                   </node>
@@ -580,52 +590,54 @@
     <ref role="1M2myG" to="wq2x:7IysFeA1uPa" resolve="TypeDeclarationParameterReference" />
     <node concept="1N5Pfh" id="7IysFeA1vHe" role="1Mr941">
       <ref role="1N5Vy1" to="wq2x:7IysFeA1uTj" resolve="parameter" />
-      <node concept="13QW63" id="7IysFeA1vHj" role="1N6uqs">
-        <node concept="3clFbS" id="7IysFeA1vHm" role="2VODD2">
-          <node concept="3clFbF" id="7IysFeA1y_v" role="3cqZAp">
-            <node concept="2ShNRf" id="7IysFeA1y_t" role="3clFbG">
-              <node concept="YeOm9" id="7IysFeA1zMX" role="2ShVmc">
-                <node concept="1Y3b0j" id="7IysFeA1zN0" role="YeSDq">
+      <node concept="3dgokm" id="6fXjIfxgfVL" role="1N6uqs">
+        <node concept="3clFbS" id="6fXjIfxgfVM" role="2VODD2">
+          <node concept="3clFbF" id="6fXjIfxgfVN" role="3cqZAp">
+            <node concept="2ShNRf" id="6fXjIfxgfVO" role="3clFbG">
+              <node concept="YeOm9" id="6fXjIfxgfVP" role="2ShVmc">
+                <node concept="1Y3b0j" id="6fXjIfxgfVQ" role="YeSDq">
                   <property role="2bfB8j" value="true" />
                   <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                   <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <node concept="2OqwBi" id="7IysFeA1A0p" role="37wK5m">
-                    <node concept="2OqwBi" id="7IysFeA1A0q" role="2Oq$k0">
-                      <node concept="2rP1CM" id="7IysFeA1A0r" role="2Oq$k0" />
-                      <node concept="2Xjw5R" id="7IysFeA1A0s" role="2OqNvi">
-                        <node concept="1xMEDy" id="7IysFeA1A0t" role="1xVPHs">
-                          <node concept="chp4Y" id="7IysFeA1A0u" role="ri$Ld">
+                  <node concept="2OqwBi" id="6fXjIfxgfVR" role="37wK5m">
+                    <node concept="2OqwBi" id="6fXjIfxgfVS" role="2Oq$k0">
+                      <node concept="2rP1CM" id="6fXjIfxgfVT" role="2Oq$k0" />
+                      <node concept="2Xjw5R" id="6fXjIfxgfVU" role="2OqNvi">
+                        <node concept="1xMEDy" id="6fXjIfxgfVV" role="1xVPHs">
+                          <node concept="chp4Y" id="6fXjIfxgfVW" role="ri$Ld">
                             <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
                           </node>
                         </node>
-                        <node concept="1xIGOp" id="7IysFeA1A0v" role="1xVPHs" />
+                        <node concept="1xIGOp" id="6fXjIfxgfVX" role="1xVPHs" />
                       </node>
                     </node>
-                    <node concept="3Tsc0h" id="7IysFeA1A0w" role="2OqNvi">
+                    <node concept="3Tsc0h" id="6fXjIfxgfVY" role="2OqNvi">
                       <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
                     </node>
                   </node>
-                  <node concept="3Tm1VV" id="7IysFeA1zN1" role="1B3o_S" />
-                  <node concept="3clFb_" id="7IysFeA1zNg" role="jymVt">
+                  <node concept="3Tm1VV" id="6fXjIfxgfVZ" role="1B3o_S" />
+                  <node concept="3clFb_" id="6fXjIfxgfW0" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="7IysFeA1zNh" role="3clF45" />
-                    <node concept="3Tm1VV" id="7IysFeA1zNi" role="1B3o_S" />
-                    <node concept="37vLTG" id="7IysFeA1zNk" role="3clF46">
+                    <node concept="17QB3L" id="6fXjIfxgfW1" role="3clF45" />
+                    <node concept="3Tm1VV" id="6fXjIfxgfW2" role="1B3o_S" />
+                    <node concept="37vLTG" id="6fXjIfxgfW3" role="3clF46">
                       <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="7IysFeA1zNl" role="1tU5fm" />
+                      <node concept="3Tqbb2" id="6fXjIfxgfW4" role="1tU5fm" />
                     </node>
-                    <node concept="3clFbS" id="7IysFeA1zNm" role="3clF47">
-                      <node concept="3clFbF" id="7IysFeA1AeC" role="3cqZAp">
-                        <node concept="2OqwBi" id="7IysFeA1Bq9" role="3clFbG">
-                          <node concept="1PxgMI" id="7IysFeA1AMY" role="2Oq$k0">
+                    <node concept="3clFbS" id="6fXjIfxgfW5" role="3clF47">
+                      <node concept="3clFbF" id="6fXjIfxgfW6" role="3cqZAp">
+                        <node concept="2OqwBi" id="6fXjIfxgfW7" role="3clFbG">
+                          <node concept="1PxgMI" id="6fXjIfxgfW8" role="2Oq$k0">
                             <property role="1BlNFB" value="true" />
-                            <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            <node concept="37vLTw" id="7IysFeA1AeB" role="1m5AlR">
-                              <ref role="3cqZAo" node="7IysFeA1zNk" resolve="child" />
+                            <node concept="37vLTw" id="6fXjIfxgfW9" role="1m5AlR">
+                              <ref role="3cqZAo" node="6fXjIfxgfW3" resolve="child" />
+                            </node>
+                            <node concept="chp4Y" id="6fXjIfxgneK" role="3oSUPX">
+                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                             </node>
                           </node>
-                          <node concept="3TrcHB" id="7IysFeA1Bya" role="2OqNvi">
+                          <node concept="3TrcHB" id="6fXjIfxgfWa" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                           </node>
                         </node>
@@ -645,52 +657,54 @@
     <ref role="1M2myG" to="wq2x:3TnYLtqfh$J" resolve="ContextParameterReference" />
     <node concept="1N5Pfh" id="3TnYLtqfhNA" role="1Mr941">
       <ref role="1N5Vy1" to="wq2x:3TnYLtqfh$T" resolve="parameter" />
-      <node concept="13QW63" id="3TnYLtqfhNE" role="1N6uqs">
-        <node concept="3clFbS" id="3TnYLtqfhNH" role="2VODD2">
-          <node concept="3clFbF" id="3TnYLtqfhS5" role="3cqZAp">
-            <node concept="2ShNRf" id="3TnYLtqfhS3" role="3clFbG">
-              <node concept="YeOm9" id="3TnYLtqfj71" role="2ShVmc">
-                <node concept="1Y3b0j" id="3TnYLtqfj74" role="YeSDq">
+      <node concept="3dgokm" id="6fXjIfxgfWM" role="1N6uqs">
+        <node concept="3clFbS" id="6fXjIfxgfWN" role="2VODD2">
+          <node concept="3clFbF" id="6fXjIfxgfWO" role="3cqZAp">
+            <node concept="2ShNRf" id="6fXjIfxgfWP" role="3clFbG">
+              <node concept="YeOm9" id="6fXjIfxgfWQ" role="2ShVmc">
+                <node concept="1Y3b0j" id="6fXjIfxgfWR" role="YeSDq">
                   <property role="2bfB8j" value="true" />
                   <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                   <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <node concept="2OqwBi" id="3TnYLtqfkUT" role="37wK5m">
-                    <node concept="2OqwBi" id="3TnYLtqfjRJ" role="2Oq$k0">
-                      <node concept="2rP1CM" id="3TnYLtqfj$F" role="2Oq$k0" />
-                      <node concept="2Xjw5R" id="3TnYLtqfkbN" role="2OqNvi">
-                        <node concept="1xMEDy" id="3TnYLtqfkbP" role="1xVPHs">
-                          <node concept="chp4Y" id="3TnYLtqfkl$" role="ri$Ld">
+                  <node concept="2OqwBi" id="6fXjIfxgfWS" role="37wK5m">
+                    <node concept="2OqwBi" id="6fXjIfxgfWT" role="2Oq$k0">
+                      <node concept="2rP1CM" id="6fXjIfxgfWU" role="2Oq$k0" />
+                      <node concept="2Xjw5R" id="6fXjIfxgfWV" role="2OqNvi">
+                        <node concept="1xMEDy" id="6fXjIfxgfWW" role="1xVPHs">
+                          <node concept="chp4Y" id="6fXjIfxgfWX" role="ri$Ld">
                             <ref role="cht4Q" to="wq2x:1pPth$m5B4X" resolve="TypeTable" />
                           </node>
                         </node>
-                        <node concept="1xIGOp" id="3TnYLtqfkEe" role="1xVPHs" />
+                        <node concept="1xIGOp" id="6fXjIfxgfWY" role="1xVPHs" />
                       </node>
                     </node>
-                    <node concept="3Tsc0h" id="3TnYLtqfpsM" role="2OqNvi">
+                    <node concept="3Tsc0h" id="6fXjIfxgfWZ" role="2OqNvi">
                       <ref role="3TtcxE" to="wq2x:3TnYLtqfp9N" resolve="parameter" />
                     </node>
                   </node>
-                  <node concept="3Tm1VV" id="3TnYLtqfj75" role="1B3o_S" />
-                  <node concept="3clFb_" id="3TnYLtqfj7k" role="jymVt">
+                  <node concept="3Tm1VV" id="6fXjIfxgfX0" role="1B3o_S" />
+                  <node concept="3clFb_" id="6fXjIfxgfX1" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="3TnYLtqfj7l" role="3clF45" />
-                    <node concept="3Tm1VV" id="3TnYLtqfj7m" role="1B3o_S" />
-                    <node concept="37vLTG" id="3TnYLtqfj7o" role="3clF46">
+                    <node concept="17QB3L" id="6fXjIfxgfX2" role="3clF45" />
+                    <node concept="3Tm1VV" id="6fXjIfxgfX3" role="1B3o_S" />
+                    <node concept="37vLTG" id="6fXjIfxgfX4" role="3clF46">
                       <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="3TnYLtqfj7p" role="1tU5fm" />
+                      <node concept="3Tqbb2" id="6fXjIfxgfX5" role="1tU5fm" />
                     </node>
-                    <node concept="3clFbS" id="3TnYLtqfj7q" role="3clF47">
-                      <node concept="3clFbF" id="3TnYLtqfliu" role="3cqZAp">
-                        <node concept="2OqwBi" id="3TnYLtqflMj" role="3clFbG">
-                          <node concept="1PxgMI" id="3TnYLtqflAa" role="2Oq$k0">
+                    <node concept="3clFbS" id="6fXjIfxgfX6" role="3clF47">
+                      <node concept="3clFbF" id="6fXjIfxgfX7" role="3cqZAp">
+                        <node concept="2OqwBi" id="6fXjIfxgfX8" role="3clFbG">
+                          <node concept="1PxgMI" id="6fXjIfxgfX9" role="2Oq$k0">
                             <property role="1BlNFB" value="true" />
-                            <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            <node concept="37vLTw" id="3TnYLtqflit" role="1m5AlR">
-                              <ref role="3cqZAo" node="3TnYLtqfj7o" resolve="child" />
+                            <node concept="37vLTw" id="6fXjIfxgfXa" role="1m5AlR">
+                              <ref role="3cqZAo" node="6fXjIfxgfX4" resolve="child" />
+                            </node>
+                            <node concept="chp4Y" id="6fXjIfxgnf7" role="3oSUPX">
+                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                             </node>
                           </node>
-                          <node concept="3TrcHB" id="3TnYLtqflUC" role="2OqNvi">
+                          <node concept="3TrcHB" id="6fXjIfxgfXb" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                           </node>
                         </node>
@@ -710,15 +724,18 @@
     <ref role="1M2myG" to="wq2x:3TnYLtqgQYU" resolve="WithContextStatement" />
     <node concept="1N5Pfh" id="3TnYLtqgRGP" role="1Mr941">
       <ref role="1N5Vy1" to="wq2x:3TnYLtqgRY3" resolve="parameter" />
-      <node concept="13QW63" id="3TnYLtqgS00" role="1N6uqs">
-        <node concept="3clFbS" id="3TnYLtqgS03" role="2VODD2">
-          <node concept="3clFbF" id="3TnYLtqh7i9" role="3cqZAp">
-            <node concept="2ShNRf" id="3TnYLtqh7ib" role="3clFbG">
-              <node concept="1pGfFk" id="3TnYLtqh7ic" role="2ShVmc">
+      <node concept="3dgokm" id="6fXjIfxgfWb" role="1N6uqs">
+        <node concept="3clFbS" id="6fXjIfxgfWc" role="2VODD2">
+          <node concept="3clFbF" id="6fXjIfxgfWd" role="3cqZAp">
+            <node concept="2ShNRf" id="6fXjIfxgfWe" role="3clFbG">
+              <node concept="1pGfFk" id="6fXjIfxgfWf" role="2ShVmc">
                 <ref role="37wK5l" to="o8zo:4k9eBec$QVW" resolve="ModelPlusImportedScope" />
-                <node concept="1Q6Npb" id="3TnYLtqh7id" role="37wK5m" />
-                <node concept="3clFbT" id="3TnYLtqh7ie" role="37wK5m" />
-                <node concept="35c_gC" id="3TnYLtqh7if" role="37wK5m">
+                <node concept="2OqwBi" id="6fXjIfxgfWj" role="37wK5m">
+                  <node concept="2rP1CM" id="6fXjIfxgfWk" role="2Oq$k0" />
+                  <node concept="I4A8Y" id="6fXjIfxgfWl" role="2OqNvi" />
+                </node>
+                <node concept="3clFbT" id="6fXjIfxgfWh" role="37wK5m" />
+                <node concept="35c_gC" id="6fXjIfxgfWi" role="37wK5m">
                   <ref role="35c_gD" to="wq2x:3TnYLtqfhzx" resolve="ContextParameterDeclaration" />
                 </node>
               </node>
@@ -733,60 +750,62 @@
     <ref role="1M2myG" to="wq2x:1L74NXEmF9s" resolve="TypeParameterBinding" />
     <node concept="1N5Pfh" id="1L74NXEmG0W" role="1Mr941">
       <ref role="1N5Vy1" to="wq2x:1L74NXEmG0t" resolve="parameter" />
-      <node concept="13QW63" id="1L74NXEmGch" role="1N6uqs">
-        <node concept="3clFbS" id="1L74NXEmGci" role="2VODD2">
-          <node concept="3clFbF" id="1L74NXEmGr8" role="3cqZAp">
-            <node concept="2ShNRf" id="1L74NXEmGr9" role="3clFbG">
-              <node concept="YeOm9" id="1L74NXEmGra" role="2ShVmc">
-                <node concept="1Y3b0j" id="1L74NXEmGrb" role="YeSDq">
+      <node concept="3dgokm" id="6fXjIfxgfWm" role="1N6uqs">
+        <node concept="3clFbS" id="6fXjIfxgfWn" role="2VODD2">
+          <node concept="3clFbF" id="6fXjIfxgfWo" role="3cqZAp">
+            <node concept="2ShNRf" id="6fXjIfxgfWp" role="3clFbG">
+              <node concept="YeOm9" id="6fXjIfxgfWq" role="2ShVmc">
+                <node concept="1Y3b0j" id="6fXjIfxgfWr" role="YeSDq">
                   <property role="2bfB8j" value="true" />
                   <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
                   <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
-                  <node concept="3Tm1VV" id="1L74NXEmGrc" role="1B3o_S" />
-                  <node concept="3clFb_" id="1L74NXEmGrd" role="jymVt">
+                  <node concept="3Tm1VV" id="6fXjIfxgfWs" role="1B3o_S" />
+                  <node concept="3clFb_" id="6fXjIfxgfWt" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="1L74NXEmGre" role="3clF45" />
-                    <node concept="3Tm1VV" id="1L74NXEmGrf" role="1B3o_S" />
-                    <node concept="37vLTG" id="1L74NXEmGrg" role="3clF46">
+                    <node concept="17QB3L" id="6fXjIfxgfWu" role="3clF45" />
+                    <node concept="3Tm1VV" id="6fXjIfxgfWv" role="1B3o_S" />
+                    <node concept="37vLTG" id="6fXjIfxgfWw" role="3clF46">
                       <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="1L74NXEmGrh" role="1tU5fm" />
+                      <node concept="3Tqbb2" id="6fXjIfxgfWx" role="1tU5fm" />
                     </node>
-                    <node concept="3clFbS" id="1L74NXEmGri" role="3clF47">
-                      <node concept="3clFbF" id="1L74NXEmGrj" role="3cqZAp">
-                        <node concept="2OqwBi" id="1L74NXEmGrk" role="3clFbG">
-                          <node concept="1PxgMI" id="1L74NXEmGrl" role="2Oq$k0">
+                    <node concept="3clFbS" id="6fXjIfxgfWy" role="3clF47">
+                      <node concept="3clFbF" id="6fXjIfxgfWz" role="3cqZAp">
+                        <node concept="2OqwBi" id="6fXjIfxgfW$" role="3clFbG">
+                          <node concept="1PxgMI" id="6fXjIfxgfW_" role="2Oq$k0">
                             <property role="1BlNFB" value="true" />
-                            <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            <node concept="37vLTw" id="1L74NXEmGrm" role="1m5AlR">
-                              <ref role="3cqZAo" node="1L74NXEmGrg" resolve="child" />
+                            <node concept="37vLTw" id="6fXjIfxgfWA" role="1m5AlR">
+                              <ref role="3cqZAo" node="6fXjIfxgfWw" resolve="child" />
+                            </node>
+                            <node concept="chp4Y" id="6fXjIfxgnfc" role="3oSUPX">
+                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                             </node>
                           </node>
-                          <node concept="3TrcHB" id="1L74NXEmGrn" role="2OqNvi">
+                          <node concept="3TrcHB" id="6fXjIfxgfWB" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="1L74NXEmGro" role="37wK5m">
-                    <node concept="2OqwBi" id="1L74NXEmGrp" role="2Oq$k0">
-                      <node concept="2OqwBi" id="1L74NXEmGrq" role="2Oq$k0">
-                        <node concept="2rP1CM" id="1L74NXEmGrr" role="2Oq$k0" />
-                        <node concept="2Xjw5R" id="1L74NXEmGrs" role="2OqNvi">
-                          <node concept="1xMEDy" id="1L74NXEmGrt" role="1xVPHs">
-                            <node concept="chp4Y" id="1L74NXEmGQf" role="ri$Ld">
+                  <node concept="2OqwBi" id="6fXjIfxgfWC" role="37wK5m">
+                    <node concept="2OqwBi" id="6fXjIfxgfWD" role="2Oq$k0">
+                      <node concept="2OqwBi" id="6fXjIfxgfWE" role="2Oq$k0">
+                        <node concept="2rP1CM" id="6fXjIfxgfWF" role="2Oq$k0" />
+                        <node concept="2Xjw5R" id="6fXjIfxgfWG" role="2OqNvi">
+                          <node concept="1xMEDy" id="6fXjIfxgfWH" role="1xVPHs">
+                            <node concept="chp4Y" id="6fXjIfxgfWI" role="ri$Ld">
                               <ref role="cht4Q" to="wq2x:1L74NXEmF9t" resolve="TypeInvocation" />
                             </node>
                           </node>
-                          <node concept="1xIGOp" id="1L74NXEmGrv" role="1xVPHs" />
+                          <node concept="1xIGOp" id="6fXjIfxgfWJ" role="1xVPHs" />
                         </node>
                       </node>
-                      <node concept="2qgKlT" id="1L74NXEmH8N" role="2OqNvi">
+                      <node concept="2qgKlT" id="6fXjIfxgfWK" role="2OqNvi">
                         <ref role="37wK5l" to="x5bw:1L74NXEmFa8" resolve="getTypeDeclaration" />
                       </node>
                     </node>
-                    <node concept="3Tsc0h" id="1L74NXEmGrx" role="2OqNvi">
+                    <node concept="3Tsc0h" id="6fXjIfxgfWL" role="2OqNvi">
                       <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
                     </node>
                   </node>
@@ -803,78 +822,80 @@
     <ref role="1M2myG" to="wq2x:1L74NXFMz6j" resolve="TypeFeatureOverride" />
     <node concept="1N5Pfh" id="1L74NXFMz8i" role="1Mr941">
       <ref role="1N5Vy1" to="wq2x:1L74NXFMz74" resolve="feature" />
-      <node concept="13QW63" id="1L74NXFMz8m" role="1N6uqs">
-        <node concept="3clFbS" id="1L74NXFMz8o" role="2VODD2">
-          <node concept="3cpWs8" id="1L74NXFM$r3" role="3cqZAp">
-            <node concept="3cpWsn" id="1L74NXFM$r4" role="3cpWs9">
+      <node concept="3dgokm" id="6fXjIfxgfU1" role="1N6uqs">
+        <node concept="3clFbS" id="6fXjIfxgfU2" role="2VODD2">
+          <node concept="3cpWs8" id="6fXjIfxgfU3" role="3cqZAp">
+            <node concept="3cpWsn" id="6fXjIfxgfU4" role="3cpWs9">
               <property role="TrG5h" value="td" />
-              <node concept="3Tqbb2" id="1L74NXFM$r2" role="1tU5fm">
+              <node concept="3Tqbb2" id="6fXjIfxgfU5" role="1tU5fm">
                 <ref role="ehGHo" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
               </node>
-              <node concept="2OqwBi" id="1L74NXFM$r5" role="33vP2m">
-                <node concept="2OqwBi" id="1L74NXFM$r6" role="2Oq$k0">
-                  <node concept="2rP1CM" id="1L74NXFM$r7" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="1L74NXFM$r8" role="2OqNvi">
-                    <node concept="1xMEDy" id="1L74NXFM$r9" role="1xVPHs">
-                      <node concept="chp4Y" id="1L74NXFM$ra" role="ri$Ld">
+              <node concept="2OqwBi" id="6fXjIfxgfU6" role="33vP2m">
+                <node concept="2OqwBi" id="6fXjIfxgfU7" role="2Oq$k0">
+                  <node concept="2rP1CM" id="6fXjIfxgfU8" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="6fXjIfxgfU9" role="2OqNvi">
+                    <node concept="1xMEDy" id="6fXjIfxgfUa" role="1xVPHs">
+                      <node concept="chp4Y" id="6fXjIfxgfUb" role="ri$Ld">
                         <ref role="cht4Q" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
                       </node>
                     </node>
-                    <node concept="1xIGOp" id="1L74NXFM$rb" role="1xVPHs" />
+                    <node concept="1xIGOp" id="6fXjIfxgfUc" role="1xVPHs" />
                   </node>
                 </node>
-                <node concept="3TrEf2" id="1L74NXFM$rc" role="2OqNvi">
+                <node concept="3TrEf2" id="6fXjIfxgfUd" role="2OqNvi">
                   <ref role="3Tt5mk" to="wq2x:1L74NXElX1C" resolve="declaration" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="1L74NXFM$In" role="3cqZAp">
-            <node concept="2ShNRf" id="1L74NXFM$Ij" role="3clFbG">
-              <node concept="YeOm9" id="1L74NXFM$WN" role="2ShVmc">
-                <node concept="1Y3b0j" id="1L74NXFM$WQ" role="YeSDq">
+          <node concept="3clFbF" id="6fXjIfxgfUe" role="3cqZAp">
+            <node concept="2ShNRf" id="6fXjIfxgfUf" role="3clFbG">
+              <node concept="YeOm9" id="6fXjIfxgfUg" role="2ShVmc">
+                <node concept="1Y3b0j" id="6fXjIfxgfUh" role="YeSDq">
                   <property role="2bfB8j" value="true" />
                   <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                   <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <node concept="2OqwBi" id="1L74NXFMAdz" role="37wK5m">
-                    <node concept="2OqwBi" id="4MEOIDFRjcb" role="2Oq$k0">
-                      <node concept="2OqwBi" id="1L74NXFM_uv" role="2Oq$k0">
-                        <node concept="37vLTw" id="1L74NXFM_eO" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1L74NXFM$r4" resolve="td" />
+                  <node concept="2OqwBi" id="6fXjIfxgfUi" role="37wK5m">
+                    <node concept="2OqwBi" id="6fXjIfxgfUj" role="2Oq$k0">
+                      <node concept="2OqwBi" id="6fXjIfxgfUk" role="2Oq$k0">
+                        <node concept="37vLTw" id="6fXjIfxgfUl" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6fXjIfxgfU4" resolve="td" />
                         </node>
-                        <node concept="3TrEf2" id="4MEOIDFRiG4" role="2OqNvi">
+                        <node concept="3TrEf2" id="6fXjIfxgfUm" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
                         </node>
                       </node>
-                      <node concept="3TrEf2" id="4MEOIDFRjF4" role="2OqNvi">
+                      <node concept="3TrEf2" id="6fXjIfxgfUn" role="2OqNvi">
                         <ref role="3Tt5mk" to="wq2x:4MEOIDFttNk" resolve="template" />
                       </node>
                     </node>
-                    <node concept="3Tsc0h" id="4MEOIDFRjYI" role="2OqNvi">
+                    <node concept="3Tsc0h" id="6fXjIfxgfUo" role="2OqNvi">
                       <ref role="3TtcxE" to="wq2x:1pPth$m5oa9" resolve="feature" />
                     </node>
                   </node>
-                  <node concept="3Tm1VV" id="1L74NXFM$WR" role="1B3o_S" />
-                  <node concept="3clFb_" id="1L74NXFM$X6" role="jymVt">
+                  <node concept="3Tm1VV" id="6fXjIfxgfUp" role="1B3o_S" />
+                  <node concept="3clFb_" id="6fXjIfxgfUq" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="1L74NXFM$X7" role="3clF45" />
-                    <node concept="3Tm1VV" id="1L74NXFM$X8" role="1B3o_S" />
-                    <node concept="37vLTG" id="1L74NXFM$Xa" role="3clF46">
+                    <node concept="17QB3L" id="6fXjIfxgfUr" role="3clF45" />
+                    <node concept="3Tm1VV" id="6fXjIfxgfUs" role="1B3o_S" />
+                    <node concept="37vLTG" id="6fXjIfxgfUt" role="3clF46">
                       <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="1L74NXFM$Xb" role="1tU5fm" />
+                      <node concept="3Tqbb2" id="6fXjIfxgfUu" role="1tU5fm" />
                     </node>
-                    <node concept="3clFbS" id="1L74NXFM$Xc" role="3clF47">
-                      <node concept="3clFbF" id="1L74NXFMAQ0" role="3cqZAp">
-                        <node concept="2OqwBi" id="1L74NXFMBGQ" role="3clFbG">
-                          <node concept="1PxgMI" id="1L74NXFMBxl" role="2Oq$k0">
+                    <node concept="3clFbS" id="6fXjIfxgfUv" role="3clF47">
+                      <node concept="3clFbF" id="6fXjIfxgfUw" role="3cqZAp">
+                        <node concept="2OqwBi" id="6fXjIfxgfUx" role="3clFbG">
+                          <node concept="1PxgMI" id="6fXjIfxgfUy" role="2Oq$k0">
                             <property role="1BlNFB" value="true" />
-                            <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            <node concept="37vLTw" id="1L74NXFMAPZ" role="1m5AlR">
-                              <ref role="3cqZAo" node="1L74NXFM$Xa" resolve="child" />
+                            <node concept="37vLTw" id="6fXjIfxgfUz" role="1m5AlR">
+                              <ref role="3cqZAo" node="6fXjIfxgfUt" resolve="child" />
+                            </node>
+                            <node concept="chp4Y" id="6fXjIfxgnfa" role="3oSUPX">
+                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                             </node>
                           </node>
-                          <node concept="3TrcHB" id="1L74NXFMBOR" role="2OqNvi">
+                          <node concept="3TrcHB" id="6fXjIfxgfU$" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                           </node>
                         </node>
@@ -925,52 +946,54 @@
     <ref role="1M2myG" to="wq2x:4MEOIDFxxDM" resolve="TypeTermDeclarationParameterReference" />
     <node concept="1N5Pfh" id="4MEOIDFxyEg" role="1Mr941">
       <ref role="1N5Vy1" to="wq2x:4MEOIDFxxDY" resolve="parameter" />
-      <node concept="13QW63" id="4MEOIDFxyEi" role="1N6uqs">
-        <node concept="3clFbS" id="4MEOIDFxyEj" role="2VODD2">
-          <node concept="3clFbF" id="4MEOIDFxyEk" role="3cqZAp">
-            <node concept="2ShNRf" id="4MEOIDFxyEl" role="3clFbG">
-              <node concept="YeOm9" id="4MEOIDFxyEm" role="2ShVmc">
-                <node concept="1Y3b0j" id="4MEOIDFxyEn" role="YeSDq">
+      <node concept="3dgokm" id="6fXjIfxgfXc" role="1N6uqs">
+        <node concept="3clFbS" id="6fXjIfxgfXd" role="2VODD2">
+          <node concept="3clFbF" id="6fXjIfxgfXe" role="3cqZAp">
+            <node concept="2ShNRf" id="6fXjIfxgfXf" role="3clFbG">
+              <node concept="YeOm9" id="6fXjIfxgfXg" role="2ShVmc">
+                <node concept="1Y3b0j" id="6fXjIfxgfXh" role="YeSDq">
                   <property role="2bfB8j" value="true" />
                   <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                   <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <node concept="2OqwBi" id="4MEOIDFxyEo" role="37wK5m">
-                    <node concept="2OqwBi" id="4MEOIDFxyEp" role="2Oq$k0">
-                      <node concept="2rP1CM" id="4MEOIDFxyEq" role="2Oq$k0" />
-                      <node concept="2Xjw5R" id="4MEOIDFxyEr" role="2OqNvi">
-                        <node concept="1xMEDy" id="4MEOIDFxyEs" role="1xVPHs">
-                          <node concept="chp4Y" id="4MEOIDFxz12" role="ri$Ld">
+                  <node concept="2OqwBi" id="6fXjIfxgfXi" role="37wK5m">
+                    <node concept="2OqwBi" id="6fXjIfxgfXj" role="2Oq$k0">
+                      <node concept="2rP1CM" id="6fXjIfxgfXk" role="2Oq$k0" />
+                      <node concept="2Xjw5R" id="6fXjIfxgfXl" role="2OqNvi">
+                        <node concept="1xMEDy" id="6fXjIfxgfXm" role="1xVPHs">
+                          <node concept="chp4Y" id="6fXjIfxgfXn" role="ri$Ld">
                             <ref role="cht4Q" to="wq2x:4MEOIDFttoe" resolve="TypeTermDeclaration" />
                           </node>
                         </node>
-                        <node concept="1xIGOp" id="4MEOIDFxyEu" role="1xVPHs" />
+                        <node concept="1xIGOp" id="6fXjIfxgfXo" role="1xVPHs" />
                       </node>
                     </node>
-                    <node concept="3Tsc0h" id="4MEOIDFxzkz" role="2OqNvi">
+                    <node concept="3Tsc0h" id="6fXjIfxgfXp" role="2OqNvi">
                       <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
                     </node>
                   </node>
-                  <node concept="3Tm1VV" id="4MEOIDFxyEw" role="1B3o_S" />
-                  <node concept="3clFb_" id="4MEOIDFxyEx" role="jymVt">
+                  <node concept="3Tm1VV" id="6fXjIfxgfXq" role="1B3o_S" />
+                  <node concept="3clFb_" id="6fXjIfxgfXr" role="jymVt">
                     <property role="1EzhhJ" value="false" />
                     <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="4MEOIDFxyEy" role="3clF45" />
-                    <node concept="3Tm1VV" id="4MEOIDFxyEz" role="1B3o_S" />
-                    <node concept="37vLTG" id="4MEOIDFxyE$" role="3clF46">
+                    <node concept="17QB3L" id="6fXjIfxgfXs" role="3clF45" />
+                    <node concept="3Tm1VV" id="6fXjIfxgfXt" role="1B3o_S" />
+                    <node concept="37vLTG" id="6fXjIfxgfXu" role="3clF46">
                       <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="4MEOIDFxyE_" role="1tU5fm" />
+                      <node concept="3Tqbb2" id="6fXjIfxgfXv" role="1tU5fm" />
                     </node>
-                    <node concept="3clFbS" id="4MEOIDFxyEA" role="3clF47">
-                      <node concept="3clFbF" id="4MEOIDFxyEB" role="3cqZAp">
-                        <node concept="2OqwBi" id="4MEOIDFxyEC" role="3clFbG">
-                          <node concept="1PxgMI" id="4MEOIDFxyED" role="2Oq$k0">
+                    <node concept="3clFbS" id="6fXjIfxgfXw" role="3clF47">
+                      <node concept="3clFbF" id="6fXjIfxgfXx" role="3cqZAp">
+                        <node concept="2OqwBi" id="6fXjIfxgfXy" role="3clFbG">
+                          <node concept="1PxgMI" id="6fXjIfxgfXz" role="2Oq$k0">
                             <property role="1BlNFB" value="true" />
-                            <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            <node concept="37vLTw" id="4MEOIDFxyEE" role="1m5AlR">
-                              <ref role="3cqZAo" node="4MEOIDFxyE$" resolve="child" />
+                            <node concept="37vLTw" id="6fXjIfxgfX$" role="1m5AlR">
+                              <ref role="3cqZAo" node="6fXjIfxgfXu" resolve="child" />
+                            </node>
+                            <node concept="chp4Y" id="6fXjIfxgnf2" role="3oSUPX">
+                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                             </node>
                           </node>
-                          <node concept="3TrcHB" id="4MEOIDFxyEF" role="2OqNvi">
+                          <node concept="3TrcHB" id="6fXjIfxgfX_" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                           </node>
                         </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index f66161cf..4b42a806 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -3,8 +3,8 @@
   <persistence version="9" />
   <languages>
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="4" />
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="3" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="7" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -19,7 +19,6 @@
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" implicit="true" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
-    <import index="wr1s" ref="r:0f9ddbb6-f761-4bd7-8dde-1e5300bd28c2(jetbrains.mps.lang.project.editor)" implicit="true" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
   <registry>
@@ -76,9 +75,6 @@
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
-      <concept id="562388756457499018" name="jetbrains.mps.lang.editor.structure.MigratedToAnnotation" flags="ng" index="xBawi">
-        <reference id="562388756457499129" name="migratedTo" index="xBaxx" />
-      </concept>
       <concept id="562388756446465666" name="jetbrains.mps.lang.editor.structure.MigratedSideTransformMenuAttribute" flags="ng" index="yp4Wq">
         <property id="562388756446465811" name="transformTag" index="yp4Ub" />
       </concept>
@@ -117,9 +113,6 @@
       <concept id="1186402211651" name="jetbrains.mps.lang.editor.structure.StyleSheet" flags="ng" index="V5hpn">
         <child id="1186402402630" name="styleClass" index="V601i" />
       </concept>
-      <concept id="1214320119173" name="jetbrains.mps.lang.editor.structure.SideTransformAnchorTagStyleClassItem" flags="ln" index="2V7CMv">
-        <property id="1214320119174" name="tag" index="2V7CMs" />
-      </concept>
       <concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
         <property id="1186403713874" name="color" index="Vb096" />
         <child id="1186403803051" name="query" index="VblUZ" />
@@ -486,7 +479,6 @@
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
-      <concept id="1140133623887" name="jetbrains.mps.lang.smodel.structure.Node_DeleteOperation" flags="nn" index="1PgB_6" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -502,6 +494,7 @@
       <concept id="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
         <reference id="1172424100906" name="conceptDeclaration" index="3TV0OU" />
       </concept>
+      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -511,13 +504,6 @@
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="linkRole" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
@@ -2538,7 +2524,7 @@
           <node concept="3clFbF" id="5bC6UNlwTHG" role="3cqZAp">
             <node concept="2OqwBi" id="5bC6UNlwTJv" role="3clFbG">
               <node concept="0IXxy" id="5bC6UNlwTHF" role="2Oq$k0" />
-              <node concept="1PgB_6" id="5bC6UNlwTSX" role="2OqNvi" />
+              <node concept="3YRAZt" id="5bC6UNlwTSX" role="2OqNvi" />
             </node>
           </node>
         </node>
@@ -2921,7 +2907,7 @@
       </node>
       <node concept="PMmxH" id="2L20jGt8dZ2" role="3EZMnx">
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="wr1s:eY0iPzB7gM" resolve="KeyWord" />
+        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
       </node>
       <node concept="3F0ifn" id="2L20jGt8dZ3" role="3EZMnx">
         <property role="3F0ifm" value="=" />
@@ -3879,16 +3865,6 @@
         <node concept="11L4FC" id="1L74NXEnLsO" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
-        <node concept="1X3_iC" id="4hPXq9JmfbA" role="lGtFl">
-          <property role="3V$3am" value="styleItem" />
-          <property role="3V$3ak" value="18bc6592-03a6-4e29-a83a-7ff23bde13ba/1219418625346/1219418656006" />
-          <node concept="2V7CMv" id="1L74NXFO1Bk" role="8Wnug">
-            <property role="2V7CMs" value="ext_1_RTransform" />
-            <node concept="xBawi" id="4hPXq9Jmfb_" role="lGtFl">
-              <ref role="xBaxx" node="4hPXq9Jmel2" resolve="TypeTerm_addOverride" />
-            </node>
-          </node>
-        </node>
         <node concept="A1WHu" id="4hPXq9Jmfb$" role="3vIgyS">
           <ref role="A1WHt" node="4hPXq9Jmel2" resolve="TypeTerm_addOverride" />
         </node>
@@ -4471,6 +4447,7 @@
   </node>
   <node concept="3ICXOK" id="4hPXq9Jmel2">
     <property role="TrG5h" value="TypeTerm_addOverride" />
+    <property role="3GE5qa" value="type.term" />
     <ref role="aqKnT" to="wq2x:1L74NXElX0R" resolve="TypeTerm" />
     <node concept="yp4Wq" id="4hPXq9Jmel3" role="lGtFl">
       <property role="yp4Ub" value="ext_1_RTransform" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/findUsages.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/findUsages.mps
index e56d6605..435011c1 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/findUsages.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/findUsages.mps
@@ -87,8 +87,8 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
       <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
@@ -187,13 +187,15 @@
                   <node concept="2OqwBi" id="2TtA2rKdyC$" role="2Oq$k0">
                     <node concept="1PxgMI" id="2TtA2rKdyns" role="2Oq$k0">
                       <property role="1BlNFB" value="true" />
-                      <ref role="1m5ApE" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
                       <node concept="2OqwBi" id="2TtA2rKdxfp" role="1m5AlR">
                         <node concept="37vLTw" id="2TtA2rKdx7o" role="2Oq$k0">
                           <ref role="3cqZAo" node="2TtA2rK3FLs" resolve="u" />
                         </node>
                         <node concept="2Rxl7S" id="2TtA2rKdxwW" role="2OqNvi" />
                       </node>
+                      <node concept="chp4Y" id="6fXjIfxgneU" role="3oSUPX">
+                        <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                      </node>
                     </node>
                     <node concept="3Tsc0h" id="2TtA2rKdz12" role="2OqNvi">
                       <ref role="3TtcxE" to="wq2x:2vGNdoJLd0q" resolve="primary" />
@@ -207,10 +209,12 @@
                             <node concept="2OqwBi" id="2TtA2rKdOiB" role="3uHU7w">
                               <node concept="1PxgMI" id="2TtA2rKdNFA" role="2Oq$k0">
                                 <property role="1BlNFB" value="true" />
-                                <ref role="1m5ApE" to="wq2x:6p0DfM0ang5" resolve="UserConstraint" />
                                 <node concept="37vLTw" id="2TtA2rKdNvg" role="1m5AlR">
                                   <ref role="3cqZAo" node="2TtA2rK3FLs" resolve="u" />
                                 </node>
+                                <node concept="chp4Y" id="6fXjIfxgnf8" role="3oSUPX">
+                                  <ref role="cht4Q" to="wq2x:6p0DfM0ang5" resolve="UserConstraint" />
+                                </node>
                               </node>
                               <node concept="3TrEf2" id="2TtA2rKdOIl" role="2OqNvi">
                                 <ref role="3Tt5mk" to="wq2x:6p0DfM0aywA" resolve="template" />
@@ -395,13 +399,15 @@
                   <node concept="2OqwBi" id="2TtA2rKe8Up" role="2Oq$k0">
                     <node concept="1PxgMI" id="2TtA2rKe8Uq" role="2Oq$k0">
                       <property role="1BlNFB" value="true" />
-                      <ref role="1m5ApE" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
                       <node concept="2OqwBi" id="2TtA2rKe8Ur" role="1m5AlR">
                         <node concept="37vLTw" id="2TtA2rKe8Us" role="2Oq$k0">
                           <ref role="3cqZAo" node="2TtA2rKdV55" resolve="u" />
                         </node>
                         <node concept="2Rxl7S" id="2TtA2rKe8Ut" role="2OqNvi" />
                       </node>
+                      <node concept="chp4Y" id="6fXjIfxgneQ" role="3oSUPX">
+                        <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                      </node>
                     </node>
                     <node concept="3Tsc0h" id="2TtA2rKe8Uu" role="2OqNvi">
                       <ref role="3TtcxE" to="wq2x:2vGNdoJLd0q" resolve="primary" />
@@ -492,13 +498,15 @@
                     <node concept="2OqwBi" id="2TtA2rKerkx" role="2Oq$k0">
                       <node concept="1PxgMI" id="2TtA2rKerky" role="2Oq$k0">
                         <property role="1BlNFB" value="true" />
-                        <ref role="1m5ApE" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
                         <node concept="2OqwBi" id="2TtA2rKerkz" role="1m5AlR">
                           <node concept="37vLTw" id="2TtA2rKerk$" role="2Oq$k0">
                             <ref role="3cqZAo" node="2TtA2rKefbz" resolve="u" />
                           </node>
                           <node concept="2Rxl7S" id="2TtA2rKerk_" role="2OqNvi" />
                         </node>
+                        <node concept="chp4Y" id="6fXjIfxgnf5" role="3oSUPX">
+                          <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                        </node>
                       </node>
                       <node concept="3Tsc0h" id="2TtA2rKerkA" role="2OqNvi">
                         <ref role="3TtcxE" to="wq2x:2vGNdoJLd0q" resolve="primary" />
@@ -512,10 +520,12 @@
                               <node concept="2OqwBi" id="2TtA2rKerkG" role="3uHU7w">
                                 <node concept="1PxgMI" id="2TtA2rKerkH" role="2Oq$k0">
                                   <property role="1BlNFB" value="true" />
-                                  <ref role="1m5ApE" to="wq2x:6p0DfM0ang5" resolve="UserConstraint" />
                                   <node concept="37vLTw" id="2TtA2rKerkI" role="1m5AlR">
                                     <ref role="3cqZAo" node="2TtA2rKefbz" resolve="u" />
                                   </node>
+                                  <node concept="chp4Y" id="6fXjIfxgneN" role="3oSUPX">
+                                    <ref role="cht4Q" to="wq2x:6p0DfM0ang5" resolve="UserConstraint" />
+                                  </node>
                                 </node>
                                 <node concept="3TrEf2" id="2TtA2rKerkJ" role="2OqNvi">
                                   <ref role="3Tt5mk" to="wq2x:6p0DfM0aywA" resolve="template" />
@@ -560,13 +570,15 @@
                     <node concept="2OqwBi" id="2TtA2rKezo6" role="2Oq$k0">
                       <node concept="1PxgMI" id="2TtA2rKeyQy" role="2Oq$k0">
                         <property role="1BlNFB" value="true" />
-                        <ref role="1m5ApE" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
                         <node concept="2OqwBi" id="2TtA2rKexlk" role="1m5AlR">
                           <node concept="37vLTw" id="2TtA2rKexbr" role="2Oq$k0">
                             <ref role="3cqZAo" node="2TtA2rKefbz" resolve="u" />
                           </node>
                           <node concept="2Rxl7S" id="2TtA2rKexJ5" role="2OqNvi" />
                         </node>
+                        <node concept="chp4Y" id="6fXjIfxgnf4" role="3oSUPX">
+                          <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                        </node>
                       </node>
                       <node concept="3Tsc0h" id="2TtA2rKezSM" role="2OqNvi">
                         <ref role="3TtcxE" to="wq2x:2vGNdoJLd0q" resolve="primary" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
index 1ffac6ca..928a2383 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
@@ -6,10 +6,10 @@
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="3" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="3" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index 4d81bd10..5dcf584a 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)">
   <persistence version="9" />
   <languages>
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="3" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
index 62608de4..0f47c059 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
@@ -172,8 +172,8 @@
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
@@ -258,13 +258,15 @@
                 <node concept="2OqwBi" id="6p0DfM0iSj4" role="2c44t1">
                   <node concept="1PxgMI" id="6p0DfM0iSj5" role="2Oq$k0">
                     <property role="1BlNFB" value="true" />
-                    <ref role="1m5ApE" to="wq2x:5NuEpF1if3e" resolve="RuleInputSpecification" />
                     <node concept="2OqwBi" id="6p0DfM0iSj6" role="1m5AlR">
                       <node concept="1YBJjd" id="6p0DfM0iSj7" role="2Oq$k0">
                         <ref role="1YBMHb" node="6p0DfM0iLg$" resolve="rid" />
                       </node>
                       <node concept="1mfA1w" id="6p0DfM0iSj8" role="2OqNvi" />
                     </node>
+                    <node concept="chp4Y" id="6fXjIfxgneV" role="3oSUPX">
+                      <ref role="cht4Q" to="wq2x:5NuEpF1if3e" resolve="RuleInputSpecification" />
+                    </node>
                   </node>
                   <node concept="3TrEf2" id="5NuEpF1k2lS" role="2OqNvi">
                     <ref role="3Tt5mk" to="wq2x:5NuEpF1iiA0" resolve="applicableConcept" />
@@ -434,7 +436,6 @@
               </node>
               <node concept="2OqwBi" id="1zN1RIls0zy" role="33vP2m">
                 <node concept="1PxgMI" id="1zN1RIls0zz" role="2Oq$k0">
-                  <ref role="1m5ApE" to="tpee:fKRm8J8" resolve="EnumConstantReference" />
                   <node concept="2OqwBi" id="1zN1RIls0z$" role="1m5AlR">
                     <node concept="2OqwBi" id="1zN1RIls0z_" role="2Oq$k0">
                       <node concept="2OqwBi" id="1zN1RIls0zA" role="2Oq$k0">
@@ -477,6 +478,9 @@
                       <ref role="3Tt5mk" to="tpee:hiB70Z4" resolve="value" />
                     </node>
                   </node>
+                  <node concept="chp4Y" id="6fXjIfxgneM" role="3oSUPX">
+                    <ref role="cht4Q" to="tpee:fKRm8J8" resolve="EnumConstantReference" />
+                  </node>
                 </node>
                 <node concept="3TrEf2" id="1zN1RIls0zQ" role="2OqNvi">
                   <ref role="3Tt5mk" to="tpee:fKRm8Ja" resolve="enumConstantDeclaration" />
@@ -517,10 +521,12 @@
                   <node concept="2OqwBi" id="1zN1RIlsblO" role="33vP2m">
                     <node concept="2OqwBi" id="1zN1RIlsblP" role="2Oq$k0">
                       <node concept="1PxgMI" id="1zN1RIlsblQ" role="2Oq$k0">
-                        <ref role="1m5ApE" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                         <node concept="37vLTw" id="1zN1RIlsblR" role="1m5AlR">
                           <ref role="3cqZAo" node="1zN1RIls30Y" resolve="context" />
                         </node>
+                        <node concept="chp4Y" id="6fXjIfxgneI" role="3oSUPX">
+                          <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
+                        </node>
                       </node>
                       <node concept="3Tsc0h" id="1zN1RIlsblS" role="2OqNvi">
                         <ref role="3TtcxE" to="tpee:hiAJF2X" resolve="annotation" />
@@ -562,7 +568,6 @@
                   </node>
                   <node concept="2OqwBi" id="1zN1RIlsbIt" role="33vP2m">
                     <node concept="1PxgMI" id="1zN1RIlsbIu" role="2Oq$k0">
-                      <ref role="1m5ApE" to="tpee:fKRm8J8" resolve="EnumConstantReference" />
                       <node concept="2OqwBi" id="1zN1RIlsbIv" role="1m5AlR">
                         <node concept="2OqwBi" id="1zN1RIlsbIw" role="2Oq$k0">
                           <node concept="2OqwBi" id="1zN1RIlsbIx" role="2Oq$k0">
@@ -605,6 +610,9 @@
                           <ref role="3Tt5mk" to="tpee:hiB70Z4" resolve="value" />
                         </node>
                       </node>
+                      <node concept="chp4Y" id="6fXjIfxgnf0" role="3oSUPX">
+                        <ref role="cht4Q" to="tpee:fKRm8J8" resolve="EnumConstantReference" />
+                      </node>
                     </node>
                     <node concept="3TrEf2" id="1zN1RIlsbIL" role="2OqNvi">
                       <ref role="3Tt5mk" to="tpee:fKRm8Ja" resolve="enumConstantDeclaration" />
@@ -661,10 +669,12 @@
                         <node concept="1Wc70l" id="1zN1RIlsdDy" role="37vLTx">
                           <node concept="2OqwBi" id="1zN1RIlsdDz" role="3uHU7w">
                             <node concept="1PxgMI" id="1zN1RIlsdD$" role="2Oq$k0">
-                              <ref role="1m5ApE" to="wq2x:6p0DfM0a3gA" resolve="Head" />
                               <node concept="37vLTw" id="1zN1RIlsdD_" role="1m5AlR">
                                 <ref role="3cqZAo" node="1zN1RIls30Y" resolve="context" />
                               </node>
+                              <node concept="chp4Y" id="6fXjIfxgneT" role="3oSUPX">
+                                <ref role="cht4Q" to="wq2x:6p0DfM0a3gA" resolve="Head" />
+                              </node>
                             </node>
                             <node concept="3TrcHB" id="1zN1RIlsdDA" role="2OqNvi">
                               <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
@@ -718,10 +728,12 @@
                             <node concept="3fqX7Q" id="1zN1RIlse3$" role="3uHU7w">
                               <node concept="2OqwBi" id="1zN1RIlse3_" role="3fr31v">
                                 <node concept="1PxgMI" id="1zN1RIlse3A" role="2Oq$k0">
-                                  <ref role="1m5ApE" to="wq2x:6p0DfM0a3gA" resolve="Head" />
                                   <node concept="37vLTw" id="1zN1RIlse3B" role="1m5AlR">
                                     <ref role="3cqZAo" node="1zN1RIls30Y" resolve="context" />
                                   </node>
+                                  <node concept="chp4Y" id="6fXjIfxgneR" role="3oSUPX">
+                                    <ref role="cht4Q" to="wq2x:6p0DfM0a3gA" resolve="Head" />
+                                  </node>
                                 </node>
                                 <node concept="3TrcHB" id="1zN1RIlse3C" role="2OqNvi">
                                   <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
@@ -1016,10 +1028,12 @@
               <node concept="1Z2H0r" id="7feMCq_1rII" role="mwGJk">
                 <node concept="2OqwBi" id="7feMCq_2dkE" role="1Z2MuG">
                   <node concept="1PxgMI" id="7feMCq_2dfm" role="2Oq$k0">
-                    <ref role="1m5ApE" to="tpee:fzclF8j" resolve="ExpressionStatement" />
                     <node concept="37vLTw" id="7feMCq_2cHA" role="1m5AlR">
                       <ref role="3cqZAo" node="7feMCq_2cHy" resolve="lastStatement" />
                     </node>
+                    <node concept="chp4Y" id="6fXjIfxgneP" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:fzclF8j" resolve="ExpressionStatement" />
+                    </node>
                   </node>
                   <node concept="3TrEf2" id="7feMCq_2d$e" role="2OqNvi">
                     <ref role="3Tt5mk" to="tpee:fzclF8k" resolve="expression" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/util.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/util.mps
index 8db05d91..49d0546b 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/util.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/util.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="3" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
@@ -15,7 +15,7 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)" implicit="true" />
-    <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
+    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -144,6 +144,9 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
+    <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
+      <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
+    </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -176,8 +179,8 @@
       </concept>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <reference id="6733348108486823428" name="concept" index="1m5ApE" />
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
@@ -196,6 +199,7 @@
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
+      <concept id="6870613620390542976" name="jetbrains.mps.lang.smodel.structure.ConceptAliasOperation" flags="ng" index="3n3YKJ" />
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
@@ -213,7 +217,6 @@
       <concept id="1828409047608048457" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="nn" index="1N_AGu">
         <reference id="1828409047608048458" name="referentNode" index="1N_AGt" />
       </concept>
-      <concept id="1172323065820" name="jetbrains.mps.lang.smodel.structure.Node_GetConceptOperation" flags="nn" index="3NT_Vc" />
       <concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
         <child id="1140131861877" name="replacementNode" index="1P9ThW" />
       </concept>
@@ -695,10 +698,12 @@
                       <node concept="2OqwBi" id="67SsWaEehqX" role="2Oq$k0">
                         <node concept="2OqwBi" id="67SsWaEegdX" role="2Oq$k0">
                           <node concept="1PxgMI" id="67SsWaEefUS" role="2Oq$k0">
-                            <ref role="1m5ApE" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
                             <node concept="3M$PaV" id="67SsWaEefgD" role="1m5AlR">
                               <ref role="3M$S_o" node="67SsWaEe2GF" resolve="role" />
                             </node>
+                            <node concept="chp4Y" id="6fXjIfxgneS" role="3oSUPX">
+                              <ref role="cht4Q" to="5j4j:6$jH9oLmYEJ" resolve="ChildRole" />
+                            </node>
                           </node>
                           <node concept="3Tsc0h" id="67SsWaEegFL" role="2OqNvi">
                             <ref role="3TtcxE" to="5j4j:6$jH9oLmYFB" resolve="contents" />
@@ -749,27 +754,25 @@
                     <node concept="Xl_RD" id="67SsWaEeluJ" role="37wK5m">
                       <property role="Xl_RC" value="type mismatch: %s and %s" />
                     </node>
-                    <node concept="2OqwBi" id="67SsWaEem0u" role="37wK5m">
-                      <node concept="2OqwBi" id="67SsWaEeluK" role="2Oq$k0">
+                    <node concept="2EnYce" id="67SsWaEem0u" role="37wK5m">
+                      <node concept="2OqwBi" id="6fXjIfxggn5" role="2Oq$k0">
+                        <node concept="2yIwOk" id="6fXjIfxggn6" role="2OqNvi" />
                         <node concept="3M$PaV" id="67SsWaEeluL" role="2Oq$k0">
                           <ref role="3M$S_o" node="67SsWaEe2GF" resolve="role" />
                         </node>
-                        <node concept="3NT_Vc" id="67SsWaEen8$" role="2OqNvi" />
                       </node>
-                      <node concept="3TrcHB" id="67SsWaEfwZg" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      <node concept="liA8E" id="6fXjIfxggn7" role="2OqNvi">
+                        <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
                       </node>
                     </node>
                     <node concept="2OqwBi" id="67SsWaEeSBP" role="37wK5m">
-                      <node concept="2OqwBi" id="67SsWaEeluN" role="2Oq$k0">
+                      <node concept="2OqwBi" id="6fXjIfxgglU" role="2Oq$k0">
+                        <node concept="2yIwOk" id="6fXjIfxgglV" role="2OqNvi" />
                         <node concept="3M$PaV" id="67SsWaEeluO" role="2Oq$k0">
                           <ref role="3M$S_o" node="67SsWaEe2UH" resolve="feature" />
                         </node>
-                        <node concept="3NT_Vc" id="67SsWaEeScX" role="2OqNvi" />
-                      </node>
-                      <node concept="3TrcHB" id="67SsWaEeSVb" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpce:4qF2Hm2r7ja" resolve="conceptAlias" />
                       </node>
+                      <node concept="3n3YKJ" id="6fXjIfxgglW" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
@@ -1016,10 +1019,12 @@
                   <node concept="tyxLq" id="2N2MQGCLn3J" role="2OqNvi">
                     <node concept="2OqwBi" id="2N2MQGCLn4Z" role="tz02z">
                       <node concept="1PxgMI" id="2N2MQGCLn50" role="2Oq$k0">
-                        <ref role="1m5ApE" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
                         <node concept="37vLTw" id="2N2MQGCLn51" role="1m5AlR">
                           <ref role="3cqZAo" node="2N2MQGCJHIO" resolve="feature" />
                         </node>
+                        <node concept="chp4Y" id="6fXjIfxgneL" role="3oSUPX">
+                          <ref role="cht4Q" to="wq2x:1pPth$m5oae" resolve="StringTypeFeature" />
+                        </node>
                       </node>
                       <node concept="3TrcHB" id="2N2MQGCLn52" role="2OqNvi">
                         <ref role="3TsBF5" to="wq2x:2N2MQGCKV7J" resolve="value" />
@@ -1309,10 +1314,12 @@
             <node concept="2OqwBi" id="18kNIl1dMWF" role="33vP2m">
               <node concept="2OqwBi" id="18kNIl1dMWG" role="2Oq$k0">
                 <node concept="1PxgMI" id="18kNIl1dMWH" role="2Oq$k0">
-                  <ref role="1m5ApE" to="tpee:hiABswc" resolve="Annotation" />
                   <node concept="37vLTw" id="18kNIl1dMWI" role="1m5AlR">
                     <ref role="3cqZAo" node="18kNIl1d0Il" resolve="annDecl" />
                   </node>
+                  <node concept="chp4Y" id="6fXjIfxgneX" role="3oSUPX">
+                    <ref role="cht4Q" to="tpee:hiABswc" resolve="Annotation" />
+                  </node>
                 </node>
                 <node concept="3Tsc0h" id="18kNIl1dMWJ" role="2OqNvi">
                   <ref role="3TtcxE" to="tpee:hiACsvU" resolve="annotationMethod" />
@@ -1402,7 +1409,6 @@
                   <ref role="ehGHo" to="tpee:fKRm8J8" resolve="EnumConstantReference" />
                 </node>
                 <node concept="1PxgMI" id="746Sd4ukhhJ" role="33vP2m">
-                  <ref role="1m5ApE" to="tpee:fKRm8J8" resolve="EnumConstantReference" />
                   <node concept="2OqwBi" id="746Sd4ukhhK" role="1m5AlR">
                     <node concept="2OqwBi" id="746Sd4ukhhL" role="2Oq$k0">
                       <node concept="2OqwBi" id="746Sd4ukhhM" role="2Oq$k0">
@@ -1443,6 +1449,9 @@
                       <ref role="3Tt5mk" to="tpee:hiB70Z4" resolve="value" />
                     </node>
                   </node>
+                  <node concept="chp4Y" id="6fXjIfxgneZ" role="3oSUPX">
+                    <ref role="cht4Q" to="tpee:fKRm8J8" resolve="EnumConstantReference" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -1539,10 +1548,12 @@
             <node concept="2OqwBi" id="18kNIl1dUkz" role="33vP2m">
               <node concept="2OqwBi" id="18kNIl1dUk$" role="2Oq$k0">
                 <node concept="1PxgMI" id="18kNIl1dUk_" role="2Oq$k0">
-                  <ref role="1m5ApE" to="tpee:hiABswc" resolve="Annotation" />
                   <node concept="37vLTw" id="18kNIl1dUkA" role="1m5AlR">
                     <ref role="3cqZAo" node="18kNIl1dUks" resolve="annDecl" />
                   </node>
+                  <node concept="chp4Y" id="6fXjIfxgneG" role="3oSUPX">
+                    <ref role="cht4Q" to="tpee:hiABswc" resolve="Annotation" />
+                  </node>
                 </node>
                 <node concept="3Tsc0h" id="18kNIl1dUkB" role="2OqNvi">
                   <ref role="3TtcxE" to="tpee:hiACsvU" resolve="annotationMethod" />
@@ -1681,7 +1692,6 @@
                     <node concept="2OqwBi" id="18kNIl1h0L1" role="37wK5m">
                       <node concept="1PxgMI" id="18kNIl1gZvI" role="2Oq$k0">
                         <property role="1BlNFB" value="true" />
-                        <ref role="1m5ApE" to="tpee:fzclF81" resolve="BooleanConstant" />
                         <node concept="2OqwBi" id="18kNIl1ef8l" role="1m5AlR">
                           <node concept="37vLTw" id="18kNIl1eeeA" role="2Oq$k0">
                             <ref role="3cqZAo" node="18kNIl1e4pj" resolve="generated" />
@@ -1690,6 +1700,9 @@
                             <ref role="3Tt5mk" to="tpee:hiB70Z4" resolve="value" />
                           </node>
                         </node>
+                        <node concept="chp4Y" id="6fXjIfxgneY" role="3oSUPX">
+                          <ref role="cht4Q" to="tpee:fzclF81" resolve="BooleanConstant" />
+                        </node>
                       </node>
                       <node concept="3TrcHB" id="18kNIl1h1vy" role="2OqNvi">
                         <ref role="3TsBF5" to="tpee:fzclF82" resolve="value" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
index 25366979..b504b890 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
@@ -17,19 +17,15 @@
     <dependency reexport="true">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)</dependency>
   </dependencies>
-  <usedDevKits>
-    <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
-  </usedDevKits>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="0" />
   </languageVersions>
@@ -42,9 +38,9 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
index f94c281d..d6c0a104 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/program.mps
@@ -2,10 +2,10 @@
 <model ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps
index 8d32be4d..2cc1316c 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps
@@ -2,9 +2,9 @@
 <model ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.typechecking)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd
index 155f23bc..c183c1e3 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd
@@ -12,19 +12,16 @@
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models/jetbrains/mps/lang/typesystem2/helper/plugin.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models/jetbrains/mps/lang/typesystem2/helper/plugin.mps
index 98e4e1bc..6e4435be 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models/jetbrains/mps/lang/typesystem2/helper/plugin.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models/jetbrains/mps/lang/typesystem2/helper/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:4caa22a9-5195-4617-8800-5f9f74cc4480(jetbrains.mps.lang.typesystem2.helper.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
index 6db4e696..ceec7571 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
@@ -16,14 +16,13 @@
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="0" />
   </languageVersions>
@@ -33,8 +32,8 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/aspect.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/aspect.mps
index 3a3e8f9d..a271a683 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/aspect.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/aspect.mps
@@ -2,8 +2,8 @@
 <model ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.typesystem2.aspect)">
   <persistence version="9" />
   <languages>
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps
index 0f76f94f..ef69a912 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/template.mps
@@ -5,8 +5,8 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/type.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/type.mps
index 1df86ada..629e5f8d 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/type.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/type.mps
@@ -3,8 +3,8 @@
   <persistence version="9" />
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
   </languages>
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd
index da21c120..abcbd4d9 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd
@@ -18,15 +18,14 @@
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="4" />
-    <language slang="l:ed6d7656-532c-4bc2-81d1-af945aeb8280:jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="4" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@@ -38,8 +37,8 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="ed6d7656-532c-4bc2-81d1-af945aeb8280(jetbrains.mps.baseLanguage.blTypes)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/models/jetbrains/mps/lang/typesystem2/typechecking@tests.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/models/jetbrains/mps/lang/typesystem2/typechecking@tests.mps
index d15f7daf..b6999609 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/models/jetbrains/mps/lang/typesystem2/typechecking@tests.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/models/jetbrains/mps/lang/typesystem2/typechecking@tests.mps
@@ -4,9 +4,9 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
@@ -163,7 +163,7 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertInNotNull" flags="nn" index="2Hmddi">
+      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
         <child id="7080278351417106681" name="expression" index="2Hmdds" />
       </concept>
       <concept id="8427750732757990717" name="jetbrains.mps.baseLanguage.unitTest.structure.BinaryAssert" flags="nn" index="3tpDYu">