diff --git a/build.xml b/build.xml
index 39cfd45f..0330ce78 100644
--- a/build.xml
+++ b/build.xml
@@ -808,6 +808,120 @@
       <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking.ui-models" prefix="module/models" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.testlang.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.testlang.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.testlang.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.typechecking.testlang" type="language" uuid="3a1f0f04-b5e0-43be-884e-b856bfdeca21">
+        <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="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="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" />
+          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.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)" />
+          <module ref="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.typechecking.testlang-src.jar" descriptor="jetbrains.mps.typechecking.testlang.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.testlang.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" />
+      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.testlang.jar" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.testlang-generator.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.testlang-generator.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.testlang-generator.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.typechecking.testlang#3575255234175341581" type="generator" uuid="1f130d77-1d29-44cb-bef3-bde05978c2c7">
+        <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.testlang-src.jar" descriptor="jetbrains.mps.typechecking.testlang.mpl" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.testlang-generator.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang#3575255234175341581" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.testlang-generator.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.typechecking.testlang-generator-template">
+      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.typechecking.testlang-models">
+      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.testlang-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/generator/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <fileset dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.typechecking.testlang-generator-template" prefix="module/generator/template" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.typechecking.testlang-models" prefix="module/models" />
+    </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.testlang.sandbox.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.testlang.sandbox.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.testlang.sandbox.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.typechecking.testlang.sandbox" type="solution" uuid="f9bad4b1-59da-4f20-8feb-9f4cc4ad872e">
+        <dependencies />
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.typechecking.testlang.sandbox-src.jar" descriptor="jetbrains.mps.typechecking.testlang.sandbox.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.testlang.sandbox.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang.sandbox" />
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.testlang.sandbox.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking.testlang.sandbox-models">
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.testlang.sandbox-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/jetbrains.mps.typechecking.testlang.sandbox.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.typechecking.testlang.sandbox-models" prefix="module/models" />
+    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.test.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.test.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.test.jar/META-INF/module.xml">
@@ -837,7 +951,6 @@
     </echoxml>
     <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.test.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.test" />
-      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.typechecking.test" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.test.jar" />
     </jar>
@@ -1178,167 +1291,6 @@
       <zipfileset file="${basedir}/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.typechecking.annotation-languageModels" prefix="module/languageModels" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.baseLanguageExt" type="language" uuid="0fda14cc-a416-4c81-869a-2175d8b3325d">
-        <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="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.coderules.runtime)" />
-          <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" />
-          <module ref="ffcd9ef5-e931-4da9-a8d1-eb9bf80d19b4(jetbrains.mps.lang.controlflow.runtime)" />
-          <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-          <module ref="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" />
-        </dependencies>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.baseLanguageExt-src.jar" descriptor="jetbrains.mps.baseLanguageExt.mpl" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.baseLanguageExt.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/samples-mpscore-languages-jetbrains.mps.baseLanguageExt-models">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.baseLanguageExt-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/samples-mpscore-languages-jetbrains.mps.baseLanguageExt-models" prefix="module/models" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.baseLanguageExt.test" type="solution" uuid="e44e7802-2e40-482b-9b1c-6d42660a6a11">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" />
-          <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="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="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.baseLanguageExt.test-src.jar" descriptor="jetbrains.mps.baseLanguageExt.test.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.baseLanguageExt.test.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt.test" />
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/samples-mpscore-solutions-jetbrains.mps.baseLanguageExt.test-models">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.baseLanguageExt.test-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/samples-mpscore-solutions-jetbrains.mps.baseLanguageExt.test-models" prefix="module/models" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.typechecking.sample" type="solution" uuid="3ddddf69-9ff0-426b-9365-51ae7356fb82">
-        <dependencies />
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.typechecking.sample-src.jar" descriptor="jetbrains.mps.typechecking.sample.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.sample.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/samples-mpscore-solutions-jetbrains.mps.typechecking.sample-models">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.sample-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/samples-mpscore-solutions-jetbrains.mps.typechecking.sample-models" prefix="module/models" />
-    </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.typechecking.sample.test" type="solution" uuid="1b65dfe8-24ff-41c3-9a3e-70f102942455">
-        <dependencies>
-          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
-          <module ref="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" />
-          <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="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="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" />
-          <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.typechecking.sample.test-src.jar" descriptor="jetbrains.mps.typechecking.sample.test.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.sample.test.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" />
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.sample.test.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/samples-mpscore-solutions-jetbrains.mps.typechecking.sample.test-models">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.sample.test-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/samples-mpscore-solutions-jetbrains.mps.typechecking.sample.test-models" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.layout}/tests/lib" />
     <copy todir="${build.layout}/tests/lib">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib" />
@@ -2520,7 +2472,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.dataform#01, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.typechecking.test, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow#01, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.controlflow.ui, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.typechecking.sample.test" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.dataform#01, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking#01, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581, java.compile.jetbrains.mps.typechecking.testlang.sandbox, java.compile.jetbrains.mps.typechecking.test, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.lang.controlflow, java.compile.jetbrains.mps.lang.controlflow#01, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.controlflow.ui, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.typechecking.reporting" />
   
   <target name="processResources" />
   
@@ -2629,7 +2581,6 @@
         <module file="${basedir}/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd" />
-        <module file="${basedir}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" />
       </chunk>
       <chunk>
         <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd" />
@@ -2649,12 +2600,11 @@
         <module file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" />
       </chunk>
       <chunk>
-        <module file="${basedir}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" />
-        <module file="${basedir}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" />
+        <module file="${basedir}/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl" />
       </chunk>
       <chunk>
-        <module file="${basedir}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" />
         <module file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.typechecking.test.msd" />
+        <module file="${basedir}/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/jetbrains.mps.typechecking.testlang.sandbox.msd" />
       </chunk>
       <jvmargs>
         <arg value="-Xmx512m" />
@@ -3350,7 +3300,114 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.typechecking.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.typechecking.testlang" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+    <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/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" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <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-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-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.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/ecj-4.7.2.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
+      </classpath>
+    </javac>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.typechecking.testlang#3575255234175341581" depends="java.compile.jetbrains.mps.typechecking.testlang, fetchDependencies">
+    <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/generator/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang#3575255234175341581" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang#3575255234175341581" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/generator/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" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <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-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-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" />
+        <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/ecj-4.7.2.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+      </classpath>
+    </javac>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.typechecking.testlang.sandbox">
+    <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang.sandbox" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang.sandbox" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/source_gen" />
+      </src>
+      <classpath />
+    </javac>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.typechecking.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.typechecking.testlang, java.compile.jetbrains.mps.typechecking.testlang.sandbox, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -3385,6 +3442,8 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.testlang.sandbox" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
@@ -3672,7 +3731,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.coderules" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.coderules" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -3704,6 +3763,7 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
@@ -3748,7 +3808,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.coderules#4578927328670739933" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.coderules#4578927328670739933" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.coderules/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -3781,6 +3841,7 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
@@ -4043,212 +4104,9 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/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" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <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-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-platform.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.controlflow" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.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/ecj-4.7.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.logging.runtime.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.descriptor.aspects.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.baseLanguageExt.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt.test" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
-        <pathelement path="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/test_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" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <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-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-platform.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.test" />
-        <fileset file="${artifacts.mps}/lib/mps-test.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/mockito-core-2.0.3-beta.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/lib/objenesis-2.1.jar" />
-        <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
-        <fileset file="${artifacts.mps}/lib/junit-4.12.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/ecj-4.7.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.classifiers.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
-        <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" />
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.typechecking.sample">
-    <mkdir dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/source_gen" />
-      </src>
-      <classpath />
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
-        <pathelement path="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/test_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" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <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-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-platform.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
-        <fileset file="${artifacts.mps}/lib/mps-test.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
-        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
-        <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
-        <fileset file="${artifacts.mps}/lib/junit-4.12.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/ecj-4.7.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.classifiers.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.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}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
-        <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" />
-      </classpath>
-    </javac>
-  </target>
-  
   <target name="test.testconfig" depends="assemble">
     <path id="mps.libraries.path">
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-      <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.checkedDots.jar" />
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
@@ -4270,6 +4128,7 @@
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
       <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
+      <pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.templates.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
@@ -4284,6 +4143,7 @@
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
+      <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationParameters.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
       <pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.jar" />
@@ -4327,15 +4187,11 @@
       <pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
       <pathelement location="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.coderules.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.controlflow.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.dataform.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.coderules.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.coderules.runtime.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.coderules.template.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.controlflow.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.controlflow.runtime.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.smodel.types.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typechecking.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typechecking.runtime.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.reactor.jar" />
@@ -4350,12 +4206,11 @@
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.plugins.path.string" refid="mps.plugins.path" />
     <path id="mps.tests.path">
-      <pathelement location="${build.layout}/tests/jetbrains.mps.baseLanguageExt.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.baseLanguageExt.test.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.test.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.sample.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.sample.test.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.test.jar" />
+      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.testlang-generator.jar" />
+      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.testlang.jar" />
+      <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.testlang.sandbox.jar" />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.tests.path.string" refid="mps.tests.path" />
     <path id="long.class.path">
@@ -4416,7 +4271,6 @@
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.logic/runtime/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.annotation/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.reporting/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.controlflow/source_gen" />
@@ -4437,13 +4291,11 @@
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.ui/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
+    <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/source_gen" />
+    <delete dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.typechecking.testlang/generator/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.test/source_gen" />
+    <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.test/test_gen" />
-    <delete dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/test_gen" />
-    <delete dir="${mps.macro.coderules_home}/samples/mpscore/solutions/jetbrains.mps.typechecking.sample.test/test_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.typechecking.test/test_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/constraints.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/constraints.mps
index 7f11aca9..1eac715d 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/constraints.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/constraints.mps
@@ -3,9 +3,152 @@
   <persistence version="9" />
   <languages>
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
+    <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="qulx" ref="r:ec0979fb-ae37-4823-9eaa-8550d9f5c6fd(jetbrains.mps.typechecking.testlang.structure)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="tpfp" ref="r:00000000-0000-4000-0000-011c89590519(jetbrains.mps.baseLanguage.regexp.jetbrains.mps.regexp.accessory)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </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="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+    </language>
+    <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
+      <concept id="1147467115080" name="jetbrains.mps.lang.constraints.structure.NodePropertyConstraint" flags="ng" index="EnEH3">
+        <reference id="1147467295099" name="applicableProperty" index="EomxK" />
+        <child id="1212097481299" name="propertyValidator" index="QCWH9" />
+      </concept>
+      <concept id="1212096972063" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyValidator" flags="in" index="QB0g5" />
+      <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
+        <reference id="1213093996982" name="concept" index="1M2myG" />
+        <child id="1213098023997" name="property" index="1MhHOB" />
+      </concept>
+      <concept id="1153138554286" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_propertyValue" flags="nn" index="1Wqviy" />
+    </language>
+    <language id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp">
+      <concept id="1175161264766" name="jetbrains.mps.baseLanguage.regexp.structure.LineStartRegexp" flags="ng" index="2t4tHJ" />
+      <concept id="1175161300324" name="jetbrains.mps.baseLanguage.regexp.structure.LineEndRegexp" flags="ng" index="2t4AhP" />
+      <concept id="1175169009571" name="jetbrains.mps.baseLanguage.regexp.structure.FindMatchStatement" flags="nn" index="2ty0qM">
+        <child id="1175169023932" name="expr" index="2ty3UH" />
+        <child id="1175169154112" name="body" index="2tyzPh" />
+      </concept>
+      <concept id="1174482804200" name="jetbrains.mps.baseLanguage.regexp.structure.PlusRegexp" flags="ng" index="1OClNT" />
+      <concept id="1174484562151" name="jetbrains.mps.baseLanguage.regexp.structure.SeqRegexp" flags="ng" index="1OJ37Q" />
+      <concept id="1174485167097" name="jetbrains.mps.baseLanguage.regexp.structure.BinaryRegexp" flags="ng" index="1OLmFC">
+        <child id="1174485176897" name="left" index="1OLpdg" />
+        <child id="1174485181039" name="right" index="1OLqdY" />
+      </concept>
+      <concept id="1174485235885" name="jetbrains.mps.baseLanguage.regexp.structure.UnaryRegexp" flags="ng" index="1OLBAW">
+        <child id="1174485243418" name="regexp" index="1OLDsb" />
+      </concept>
+      <concept id="1174510540317" name="jetbrains.mps.baseLanguage.regexp.structure.InlineRegexpExpression" flags="nn" index="1Qi9sc">
+        <child id="1174510571016" name="regexp" index="1QigWp" />
+      </concept>
+      <concept id="1174554186090" name="jetbrains.mps.baseLanguage.regexp.structure.SymbolClassRegexp" flags="ng" index="1SSD1V">
+        <child id="1174557628217" name="part" index="1T5LoC" />
+      </concept>
+      <concept id="1174554211468" name="jetbrains.mps.baseLanguage.regexp.structure.PositiveSymbolClassRegexp" flags="ng" index="1SSJmt" />
+      <concept id="1174555732504" name="jetbrains.mps.baseLanguage.regexp.structure.PredefinedSymbolClassRegexp" flags="ng" index="1SYyG9">
+        <reference id="1174555843709" name="symbolClass" index="1SYXPG" />
+      </concept>
+      <concept id="1174558792178" name="jetbrains.mps.baseLanguage.regexp.structure.PredefinedSymbolClassSymbolClassPart" flags="ng" index="1Tadzz">
+        <reference id="1174558819022" name="declaration" index="1Takfv" />
+      </concept>
+      <concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ng" index="1YMW5F">
+        <child id="1174653387388" name="regexp" index="1YN4dH" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1M2fIO" id="7mB3viLbll5">
+    <ref role="1M2myG" to="qulx:7mB3viLbaW_" resolve="VarDecl" />
+    <node concept="EnEH3" id="7mB3viLbll6" role="1MhHOB">
+      <ref role="EomxK" to="tpck:h0TrG11" resolve="name" />
+      <node concept="QB0g5" id="7mB3viLbll8" role="QCWH9">
+        <node concept="3clFbS" id="7mB3viLbll9" role="2VODD2">
+          <node concept="2ty0qM" id="7mB3viLbllu" role="3cqZAp">
+            <node concept="1Qi9sc" id="7mB3viLbllv" role="1YN4dH">
+              <node concept="1OJ37Q" id="7mB3viLbopj" role="1QigWp">
+                <node concept="2t4tHJ" id="7mB3viLbohs" role="1OLpdg" />
+                <node concept="1OJ37Q" id="7mB3viLboKM" role="1OLqdY">
+                  <node concept="1OClNT" id="7mB3viLboCV" role="1OLpdg">
+                    <node concept="1SSJmt" id="7mB3viLbopi" role="1OLDsb">
+                      <node concept="1Tadzz" id="7mB3viLbox9" role="1T5LoC">
+                        <ref role="1Takfv" to="tpfp:h5SUJUw" resolve="\w" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2t4AhP" id="7mB3viLboKL" role="1OLqdY" />
+                </node>
+              </node>
+            </node>
+            <node concept="1Wqviy" id="7mB3viLbllP" role="2ty3UH" />
+            <node concept="3clFbS" id="7mB3viLblly" role="2tyzPh">
+              <node concept="3cpWs6" id="7mB3viLblml" role="3cqZAp">
+                <node concept="3clFbT" id="7mB3viLblmx" role="3cqZAk">
+                  <property role="3clFbU" value="true" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs6" id="7mB3viLblmO" role="3cqZAp">
+            <node concept="3clFbT" id="7mB3viLblna" role="3cqZAk">
+              <property role="3clFbU" value="false" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="1M2fIO" id="7mB3viLhgek">
+    <ref role="1M2myG" to="qulx:7mB3viLbCL0" resolve="Type" />
+    <node concept="EnEH3" id="7mB3viLhgel" role="1MhHOB">
+      <ref role="EomxK" to="qulx:7mB3viLbCL1" resolve="name" />
+      <node concept="QB0g5" id="7mB3viLhgen" role="QCWH9">
+        <node concept="3clFbS" id="7mB3viLhgeo" role="2VODD2">
+          <node concept="2ty0qM" id="7mB3viLhglE" role="3cqZAp">
+            <node concept="1Qi9sc" id="7mB3viLhglF" role="1YN4dH">
+              <node concept="1OJ37Q" id="7mB3viLhhoF" role="1QigWp">
+                <node concept="2t4tHJ" id="7mB3viLhh2c" role="1OLpdg" />
+                <node concept="1OJ37Q" id="7mB3viLhhBN" role="1OLqdY">
+                  <node concept="2t4AhP" id="7mB3viLhhBZ" role="1OLqdY" />
+                  <node concept="1OClNT" id="7mB3viLhhwh" role="1OLpdg">
+                    <node concept="1SYyG9" id="7mB3viLhhoI" role="1OLDsb">
+                      <ref role="1SYXPG" to="tpfp:h5SUJUw" resolve="\w" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1Wqviy" id="7mB3viLhgtc" role="2ty3UH" />
+            <node concept="3clFbS" id="7mB3viLhglI" role="2tyzPh">
+              <node concept="3cpWs6" id="7mB3viLhhYe" role="3cqZAp">
+                <node concept="3clFbT" id="7mB3viLhi5G" role="3cqZAk">
+                  <property role="3clFbU" value="true" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs6" id="7mB3viLhikY" role="3cqZAp">
+            <node concept="3clFbT" id="7mB3viLhiln" role="3cqZAk">
+              <property role="3clFbU" value="false" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps
index c71092e1..94b8409b 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps
@@ -3,9 +3,702 @@
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="11" />
+    <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="qulx" ref="r:ec0979fb-ae37-4823-9eaa-8550d9f5c6fd(jetbrains.mps.typechecking.testlang.structure)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="tpfp" ref="r:00000000-0000-4000-0000-011c89590519(jetbrains.mps.baseLanguage.regexp.jetbrains.mps.regexp.accessory)" implicit="true" />
+    <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+        <child id="414384289274416996" name="parts" index="3ft7WO" />
+      </concept>
+      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
+      <concept id="1597643335227097138" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_TransformationMenu_node" flags="ng" index="7Obwk" />
+      <concept id="6516520003787916624" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Condition" flags="ig" index="27VH4U" />
+      <concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
+        <property id="1140524450557" name="separatorText" index="2czwfO" />
+        <child id="1140524464360" name="cellLayout" index="2czzBx" />
+        <child id="1233141163694" name="separatorStyle" index="sWeuL" />
+      </concept>
+      <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
+      <concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
+      <concept id="1237308012275" name="jetbrains.mps.lang.editor.structure.IndentLayoutNewLineStyleClassItem" flags="ln" index="ljvvj" />
+      <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
+      <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
+      <concept id="1237385578942" name="jetbrains.mps.lang.editor.structure.IndentLayoutOnNewLineStyleClassItem" flags="ln" index="pVoyu" />
+      <concept id="1233148810477" name="jetbrains.mps.lang.editor.structure.InlineStyleDeclaration" flags="ng" index="tppnM" />
+      <concept id="1177327274449" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_pattern" flags="nn" index="ub8z3" />
+      <concept id="1177327570013" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Substitute" flags="in" index="ucgPf" />
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+        <child id="8478191136883534238" name="features" index="upBLP" />
+      </concept>
+      <concept id="1177335944525" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_SubstituteString" flags="in" index="uGdhv" />
+      <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
+        <child id="1080736633877" name="cellModel" index="2wV5jI" />
+      </concept>
+      <concept id="6718020819487620876" name="jetbrains.mps.lang.editor.structure.TransformationMenuReference_Default" flags="ng" index="A1WHr" />
+      <concept id="3473224453637651916" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform_PlaceInCellHolder" flags="ng" index="CtIbL">
+        <property id="3473224453637651917" name="placeInCell" index="CtIbK" />
+      </concept>
+      <concept id="1638911550608571617" name="jetbrains.mps.lang.editor.structure.TransformationMenu_Default" flags="ng" index="IW6AY" />
+      <concept id="1638911550608610798" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Execute" flags="ig" index="IWg2L" />
+      <concept id="1638911550608610278" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_Action" flags="ng" index="IWgqT">
+        <child id="6202297022026447496" name="canExecuteFunction" index="2jiSrf" />
+        <child id="1638911550608610281" name="executeFunction" index="IWgqQ" />
+        <child id="5692353713941573325" name="textFunction" index="1hCUd6" />
+      </concept>
+      <concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
+        <property id="1186414551515" name="flag" index="VOm3f" />
+      </concept>
+      <concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+        <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
+      </concept>
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+        <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
+      </concept>
+      <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
+      <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
+      <concept id="8998492695583125082" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_MatchingText" flags="ng" index="16NfWO">
+        <child id="8998492695583129244" name="query" index="16NeZM" />
+      </concept>
+      <concept id="2896773699153795590" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform" flags="ng" index="3cWJ9i">
+        <child id="3473224453637651919" name="placeInCell" index="CtIbM" />
+      </concept>
+      <concept id="7342352913006985483" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Action" flags="ng" index="3eGOop">
+        <child id="8612453216082699922" name="substituteHandler" index="3aKz83" />
+      </concept>
+      <concept id="5692353713941573329" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_ActionLabelText" flags="ig" index="1hCUdq" />
+      <concept id="3308396621974580100" name="jetbrains.mps.lang.editor.structure.SubstituteMenu_Default" flags="ng" index="3p36aQ" />
+      <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
+        <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
+      </concept>
+      <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
+        <child id="1142887637401" name="renderingCondition" index="pqm2j" />
+        <child id="4202667662392416064" name="transformationMenu" index="3vIgyS" />
+      </concept>
+      <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
+        <child id="1106270802874" name="cellLayout" index="2iSdaV" />
+        <child id="1073389446424" name="childCellModel" index="3EZMnx" />
+      </concept>
+      <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
+        <property id="1073389577007" name="text" index="3F0ifm" />
+      </concept>
+      <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+        <child id="1219418656006" name="styleItem" index="3F10Kt" />
+      </concept>
+      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
+      <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+        <child id="1638911550608572412" name="sections" index="IW6Ez" />
+      </concept>
+      <concept id="1161622981231" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_editorContext" flags="nn" index="1Q80Hx" />
+      <concept id="7980428675268276156" name="jetbrains.mps.lang.editor.structure.TransformationMenuSection" flags="ng" index="1Qtc8_">
+        <child id="7980428675268276157" name="locations" index="1Qtc8$" />
+        <child id="7980428675268276159" name="parts" index="1Qtc8A" />
+      </concept>
+      <concept id="2722384699544370949" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Placeholder" flags="ng" index="3VyMlK" />
+      <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
+        <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
+      </concept>
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <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="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <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="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
+      <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="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </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="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>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
+    </language>
+    <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
+      <concept id="767145758118872830" name="jetbrains.mps.lang.actions.structure.NF_Link_SetNewChildOperation" flags="nn" index="2DeJnY" />
+    </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="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
+        <child id="1138662048170" name="value" index="tz02z" />
+      </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <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="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">
+        <child id="1180636770616" name="createdType" index="3zrR0E" />
+      </concept>
+      <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>
+    </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">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp">
+      <concept id="1175161264766" name="jetbrains.mps.baseLanguage.regexp.structure.LineStartRegexp" flags="ng" index="2t4tHJ" />
+      <concept id="1175161300324" name="jetbrains.mps.baseLanguage.regexp.structure.LineEndRegexp" flags="ng" index="2t4AhP" />
+      <concept id="1175169009571" name="jetbrains.mps.baseLanguage.regexp.structure.FindMatchStatement" flags="nn" index="2ty0qM">
+        <child id="1175169023932" name="expr" index="2ty3UH" />
+        <child id="1175169154112" name="body" index="2tyzPh" />
+      </concept>
+      <concept id="1174482753837" name="jetbrains.mps.baseLanguage.regexp.structure.StringLiteralRegexp" flags="ng" index="1OC9wW">
+        <property id="1174482761807" name="text" index="1OCb_u" />
+      </concept>
+      <concept id="1174482804200" name="jetbrains.mps.baseLanguage.regexp.structure.PlusRegexp" flags="ng" index="1OClNT" />
+      <concept id="1174482808826" name="jetbrains.mps.baseLanguage.regexp.structure.StarRegexp" flags="ng" index="1OCmVF" />
+      <concept id="1174484562151" name="jetbrains.mps.baseLanguage.regexp.structure.SeqRegexp" flags="ng" index="1OJ37Q" />
+      <concept id="1174485167097" name="jetbrains.mps.baseLanguage.regexp.structure.BinaryRegexp" flags="ng" index="1OLmFC">
+        <child id="1174485176897" name="left" index="1OLpdg" />
+        <child id="1174485181039" name="right" index="1OLqdY" />
+      </concept>
+      <concept id="1174485235885" name="jetbrains.mps.baseLanguage.regexp.structure.UnaryRegexp" flags="ng" index="1OLBAW">
+        <child id="1174485243418" name="regexp" index="1OLDsb" />
+      </concept>
+      <concept id="1174491169200" name="jetbrains.mps.baseLanguage.regexp.structure.ParensRegexp" flags="ng" index="1P8g2x">
+        <child id="1174491174779" name="expr" index="1P8hpE" />
+      </concept>
+      <concept id="1174510540317" name="jetbrains.mps.baseLanguage.regexp.structure.InlineRegexpExpression" flags="nn" index="1Qi9sc">
+        <child id="1174510571016" name="regexp" index="1QigWp" />
+      </concept>
+      <concept id="1174512414484" name="jetbrains.mps.baseLanguage.regexp.structure.MatchRegexpStatement" flags="nn" index="1QpiS5">
+        <child id="1174512427594" name="body" index="1Qpmdr" />
+        <child id="1174512569438" name="expr" index="1QpSPf" />
+      </concept>
+      <concept id="1174554186090" name="jetbrains.mps.baseLanguage.regexp.structure.SymbolClassRegexp" flags="ng" index="1SSD1V">
+        <child id="1174557628217" name="part" index="1T5LoC" />
+      </concept>
+      <concept id="1174554211468" name="jetbrains.mps.baseLanguage.regexp.structure.PositiveSymbolClassRegexp" flags="ng" index="1SSJmt" />
+      <concept id="1174555732504" name="jetbrains.mps.baseLanguage.regexp.structure.PredefinedSymbolClassRegexp" flags="ng" index="1SYyG9">
+        <reference id="1174555843709" name="symbolClass" index="1SYXPG" />
+      </concept>
+      <concept id="1174558792178" name="jetbrains.mps.baseLanguage.regexp.structure.PredefinedSymbolClassSymbolClassPart" flags="ng" index="1Tadzz">
+        <reference id="1174558819022" name="declaration" index="1Takfv" />
+      </concept>
+      <concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ng" index="1YMW5F">
+        <child id="1174653387388" name="regexp" index="1YN4dH" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="24kQdi" id="7mB3viLaASZ">
+    <ref role="1XX52x" to="qulx:7lt0LtPHOlU" resolve="Root" />
+    <node concept="3EZMnI" id="7mB3viLaAT1" role="2wV5jI">
+      <node concept="3F0A7n" id="7mB3viLaATg" role="3EZMnx">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+      </node>
+      <node concept="3F0ifn" id="7mB3viLaATm" role="3EZMnx">
+        <property role="3F0ifm" value="{" />
+        <node concept="ljvvj" id="7mB3viLaAV6" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F2HdR" id="7mB3viLaATO" role="3EZMnx">
+        <property role="2czwfO" value=" " />
+        <ref role="1NtTu8" to="qulx:7lt0LtPHOme" resolve="stmt" />
+        <node concept="l2Vlx" id="7mB3viLaATQ" role="2czzBx" />
+        <node concept="tppnM" id="7mB3viLaATW" role="sWeuL">
+          <node concept="ljvvj" id="7mB3viLaAV4" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="lj46D" id="7mB3viLaAV8" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="7mB3viLaATu" role="3EZMnx">
+        <property role="3F0ifm" value="}" />
+        <node concept="pVoyu" id="7mB3viLb9NT" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="l2Vlx" id="7mB3viLaAT4" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="7mB3viLb8Fo">
+    <ref role="1XX52x" to="qulx:7lt0LtPHOm6" resolve="ExprStmt" />
+    <node concept="3EZMnI" id="7mB3viLb8Fq" role="2wV5jI">
+      <node concept="3F1sOY" id="7mB3viLb8Fx" role="3EZMnx">
+        <ref role="1NtTu8" to="qulx:7lt0LtPHOmo" resolve="expr" />
+      </node>
+      <node concept="l2Vlx" id="7mB3viLb8Ft" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="7mB3viLbaWC">
+    <ref role="1XX52x" to="qulx:7mB3viLbaW_" resolve="VarDecl" />
+    <node concept="3EZMnI" id="7mB3viLbaWE" role="2wV5jI">
+      <node concept="3F0A7n" id="7mB3viLbaWL" role="3EZMnx">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+      </node>
+      <node concept="l2Vlx" id="7mB3viLbaWH" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="7mB3viLbaWT">
+    <ref role="1XX52x" to="qulx:7mB3viLbaW$" resolve="VarDeclStmt" />
+    <node concept="3EZMnI" id="7mB3viLbaWV" role="2wV5jI">
+      <node concept="3F0ifn" id="7mB3viLbaX8" role="3EZMnx">
+        <property role="3F0ifm" value="var" />
+      </node>
+      <node concept="3F1sOY" id="7mB3viLbaX2" role="3EZMnx">
+        <ref role="1NtTu8" to="qulx:7mB3viLbaWO" resolve="decl" />
+        <node concept="A1WHr" id="7mB3viLbcxv" role="3vIgyS">
+          <ref role="2ZyFGn" to="qulx:7mB3viLbaW_" resolve="VarDecl" />
+        </node>
+      </node>
+      <node concept="3EZMnI" id="7mB3viLbaXg" role="3EZMnx">
+        <node concept="VPM3Z" id="7mB3viLbaXi" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F0ifn" id="7mB3viLbaXt" role="3EZMnx">
+          <property role="3F0ifm" value="=" />
+        </node>
+        <node concept="3F1sOY" id="7mB3viLbaXz" role="3EZMnx">
+          <ref role="1NtTu8" to="qulx:7mB3viLbaWQ" resolve="init" />
+        </node>
+        <node concept="l2Vlx" id="7mB3viLbaXl" role="2iSdaV" />
+        <node concept="pkWqt" id="7mB3viLbaXB" role="pqm2j">
+          <node concept="3clFbS" id="7mB3viLbaXC" role="2VODD2">
+            <node concept="3clFbF" id="7mB3viLbaXJ" role="3cqZAp">
+              <node concept="2OqwBi" id="7mB3viLbc2_" role="3clFbG">
+                <node concept="2OqwBi" id="7mB3viLbbaX" role="2Oq$k0">
+                  <node concept="pncrf" id="7mB3viLbaXI" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="7mB3viLbbEf" role="2OqNvi">
+                    <ref role="3Tt5mk" to="qulx:7mB3viLbaWQ" resolve="init" />
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="7mB3viLbcxn" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="l2Vlx" id="7mB3viLbaWY" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="IW6AY" id="7mB3viLbcyj">
+    <ref role="aqKnT" to="qulx:7mB3viLbaW_" resolve="VarDecl" />
+    <node concept="1Qtc8_" id="7mB3viLbcyk" role="IW6Ez">
+      <node concept="3cWJ9i" id="7mB3viLbcyo" role="1Qtc8$">
+        <node concept="CtIbL" id="7mB3viLbcyq" role="CtIbM">
+          <property role="CtIbK" value="RIGHT" />
+        </node>
+      </node>
+      <node concept="IWgqT" id="7mB3viLbcyu" role="1Qtc8A">
+        <node concept="1hCUdq" id="7mB3viLbcyv" role="1hCUd6">
+          <node concept="3clFbS" id="7mB3viLbcyw" role="2VODD2">
+            <node concept="3clFbF" id="7mB3viLbcyI" role="3cqZAp">
+              <node concept="Xl_RD" id="7mB3viLbcyH" role="3clFbG">
+                <property role="Xl_RC" value="=" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWg2L" id="7mB3viLbcyx" role="IWgqQ">
+          <node concept="3clFbS" id="7mB3viLbcyy" role="2VODD2">
+            <node concept="3clFbF" id="7mB3viLbeSs" role="3cqZAp">
+              <node concept="2OqwBi" id="7mB3viLbgEc" role="3clFbG">
+                <node concept="2OqwBi" id="7mB3viLbg7r" role="2Oq$k0">
+                  <node concept="1PxgMI" id="7mB3viLbfYa" role="2Oq$k0">
+                    <property role="1BlNFB" value="true" />
+                    <node concept="chp4Y" id="7mB3viLbfYr" role="3oSUPX">
+                      <ref role="cht4Q" to="qulx:7mB3viLbaW$" resolve="VarDeclStmt" />
+                    </node>
+                    <node concept="2OqwBi" id="7mB3viLbf5f" role="1m5AlR">
+                      <node concept="7Obwk" id="7mB3viLbeSq" role="2Oq$k0" />
+                      <node concept="1mfA1w" id="7mB3viLbfhs" role="2OqNvi" />
+                    </node>
+                  </node>
+                  <node concept="3TrEf2" id="7mB3viLbglz" role="2OqNvi">
+                    <ref role="3Tt5mk" to="qulx:7mB3viLbaWQ" resolve="init" />
+                  </node>
+                </node>
+                <node concept="2DeJnY" id="7mB3viLbh39" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="27VH4U" id="7mB3viLbcyP" role="2jiSrf">
+          <node concept="3clFbS" id="7mB3viLbcyQ" role="2VODD2">
+            <node concept="3clFbF" id="7mB3viLbcz0" role="3cqZAp">
+              <node concept="2OqwBi" id="7mB3viLberK" role="3clFbG">
+                <node concept="2OqwBi" id="7mB3viLbdJS" role="2Oq$k0">
+                  <node concept="1PxgMI" id="7mB3viLbdx4" role="2Oq$k0">
+                    <property role="1BlNFB" value="true" />
+                    <node concept="chp4Y" id="7mB3viLbdxo" role="3oSUPX">
+                      <ref role="cht4Q" to="qulx:7mB3viLbaW$" resolve="VarDeclStmt" />
+                    </node>
+                    <node concept="2OqwBi" id="7mB3viLbcOA" role="1m5AlR">
+                      <node concept="7Obwk" id="7mB3viLbcyZ" role="2Oq$k0" />
+                      <node concept="1mfA1w" id="7mB3viLbd4m" role="2OqNvi" />
+                    </node>
+                  </node>
+                  <node concept="3TrEf2" id="7mB3viLbe1D" role="2OqNvi">
+                    <ref role="3Tt5mk" to="qulx:7mB3viLbaWQ" resolve="init" />
+                  </node>
+                </node>
+                <node concept="3w_OXm" id="7mB3viLbeSk" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="7mB3viLbp30">
+    <ref role="1XX52x" to="qulx:7mB3viLbp2X" resolve="Int" />
+    <node concept="3EZMnI" id="7mB3viLbp32" role="2wV5jI">
+      <node concept="3F0A7n" id="7mB3viLbp39" role="3EZMnx">
+        <ref role="1NtTu8" to="qulx:7mB3viLbp2Y" resolve="val" />
+      </node>
+      <node concept="l2Vlx" id="7mB3viLbp35" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="3p36aQ" id="7mB3viLbp3_">
+    <ref role="aqKnT" to="qulx:7mB3viLbp2X" resolve="Int" />
+    <node concept="3eGOop" id="7mB3viLbp3J" role="3ft7WO">
+      <node concept="ucgPf" id="7mB3viLbp3K" role="3aKz83">
+        <node concept="3clFbS" id="7mB3viLbp3L" role="2VODD2">
+          <node concept="3cpWs8" id="7mB3viLbqzk" role="3cqZAp">
+            <node concept="3cpWsn" id="7mB3viLbqzl" role="3cpWs9">
+              <property role="TrG5h" value="node" />
+              <node concept="3Tqbb2" id="7mB3viLbqzj" role="1tU5fm">
+                <ref role="ehGHo" to="qulx:7mB3viLbp2X" resolve="Int" />
+              </node>
+              <node concept="2ShNRf" id="7mB3viLbqzm" role="33vP2m">
+                <node concept="3zrR0B" id="7mB3viLbqzn" role="2ShVmc">
+                  <node concept="3Tqbb2" id="7mB3viLbqzo" role="3zrR0E">
+                    <ref role="ehGHo" to="qulx:7mB3viLbp2X" resolve="Int" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7mB3viLbxS1" role="3cqZAp">
+            <node concept="2OqwBi" id="7mB3viLbzqQ" role="3clFbG">
+              <node concept="2OqwBi" id="7mB3viLby1T" role="2Oq$k0">
+                <node concept="37vLTw" id="7mB3viLbxRZ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7mB3viLbqzl" resolve="node" />
+                </node>
+                <node concept="3TrcHB" id="7mB3viLbytZ" role="2OqNvi">
+                  <ref role="3TsBF5" to="qulx:7mB3viLbp2Y" resolve="val" />
+                </node>
+              </node>
+              <node concept="tyxLq" id="7mB3viLb$9F" role="2OqNvi">
+                <node concept="2YIFZM" id="7mB3viLb$D4" role="tz02z">
+                  <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String):java.lang.Integer" resolve="valueOf" />
+                  <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
+                  <node concept="ub8z3" id="7mB3viLb$Lt" role="37wK5m" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7mB3viLbp7G" role="3cqZAp">
+            <node concept="37vLTw" id="7mB3viLbqzp" role="3clFbG">
+              <ref role="3cqZAo" node="7mB3viLbqzl" resolve="node" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16NfWO" id="7mB3viLbqCS" role="upBLP">
+        <node concept="uGdhv" id="7mB3viLbqGX" role="16NeZM">
+          <node concept="3clFbS" id="7mB3viLbqGZ" role="2VODD2">
+            <node concept="2ty0qM" id="7mB3viLbr6M" role="3cqZAp">
+              <node concept="1Qi9sc" id="7mB3viLbr6N" role="1YN4dH">
+                <node concept="1OJ37Q" id="7mB3viLbrwX" role="1QigWp">
+                  <node concept="2t4tHJ" id="7mB3viLbrog" role="1OLpdg" />
+                  <node concept="1OJ37Q" id="7mB3viLbtoc" role="1OLqdY">
+                    <node concept="1OClNT" id="7mB3viLbtfv" role="1OLpdg">
+                      <node concept="1SSJmt" id="7mB3viLbrwW" role="1OLDsb">
+                        <node concept="1Tadzz" id="7mB3viLbrDD" role="1T5LoC">
+                          <ref role="1Takfv" to="tpfp:h5SUwpi" resolve="\d" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2t4AhP" id="7mB3viLbtob" role="1OLqdY" />
+                  </node>
+                </node>
+              </node>
+              <node concept="ub8z3" id="7mB3viLbrfA" role="2ty3UH" />
+              <node concept="3clFbS" id="7mB3viLbr6Q" role="2tyzPh">
+                <node concept="3cpWs6" id="7mB3viLbtwT" role="3cqZAp">
+                  <node concept="ub8z3" id="7mB3viLbtM5" role="3cqZAk" />
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="7mB3viLbu3L" role="3cqZAp">
+              <node concept="10Nm6u" id="7mB3viLb$Uy" role="3cqZAk" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="7mB3viLbCLs">
+    <ref role="1XX52x" to="qulx:7mB3viLbCL0" resolve="Type" />
+    <node concept="3EZMnI" id="7mB3viLbCLu" role="2wV5jI">
+      <node concept="3F0A7n" id="7mB3viLbCLC" role="3EZMnx">
+        <ref role="1NtTu8" to="qulx:7mB3viLbCL1" resolve="name" />
+        <node concept="A1WHr" id="7mB3viLhj$X" role="3vIgyS">
+          <ref role="2ZyFGn" to="qulx:7mB3viLbCL0" resolve="Type" />
+        </node>
+      </node>
+      <node concept="3EZMnI" id="7mB3viLggsV" role="3EZMnx">
+        <node concept="VPM3Z" id="7mB3viLggsX" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F0ifn" id="7mB3viLgkNs" role="3EZMnx">
+          <property role="3F0ifm" value="(" />
+          <node concept="11L4FC" id="7mB3viLglp7" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="11LMrY" id="7mB3viLglpc" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="3F0A7n" id="7mB3viLgl6e" role="3EZMnx">
+          <ref role="1NtTu8" to="qulx:7mB3viLggsO" resolve="val" />
+        </node>
+        <node concept="3F0ifn" id="7mB3viLglfG" role="3EZMnx">
+          <property role="3F0ifm" value=")" />
+          <node concept="11L4FC" id="7mB3viLglpg" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="l2Vlx" id="7mB3viLggt0" role="2iSdaV" />
+        <node concept="pkWqt" id="7mB3viLggt8" role="pqm2j">
+          <node concept="3clFbS" id="7mB3viLggt9" role="2VODD2">
+            <node concept="3clFbF" id="7mB3viLgg$s" role="3cqZAp">
+              <node concept="3y3z36" id="7mB3viLgkwp" role="3clFbG">
+                <node concept="10Nm6u" id="7mB3viLgkDX" role="3uHU7w" />
+                <node concept="2OqwBi" id="7mB3viLggKY" role="3uHU7B">
+                  <node concept="pncrf" id="7mB3viLgg$r" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="7mB3viLghud" role="2OqNvi">
+                    <ref role="3TsBF5" to="qulx:7mB3viLggsO" resolve="val" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="l2Vlx" id="7mB3viLbCLx" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="7mB3viLdltV">
+    <ref role="1XX52x" to="qulx:7mB3viLdltS" resolve="StrConst" />
+    <node concept="3EZMnI" id="7mB3viLdltX" role="2wV5jI">
+      <node concept="3F0ifn" id="7mB3viLdlu4" role="3EZMnx">
+        <property role="3F0ifm" value="'" />
+        <node concept="11LMrY" id="7mB3viLdvn$" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F0A7n" id="7mB3viLdlui" role="3EZMnx">
+        <ref role="1NtTu8" to="qulx:7mB3viLdltT" resolve="val" />
+      </node>
+      <node concept="3F0ifn" id="7mB3viLdlua" role="3EZMnx">
+        <property role="3F0ifm" value="'" />
+        <node concept="11L4FC" id="7mB3viLdvnA" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="l2Vlx" id="7mB3viLdlu0" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="3p36aQ" id="7mB3viLdluK">
+    <ref role="aqKnT" to="qulx:7mB3viLdltS" resolve="StrConst" />
+    <node concept="3eGOop" id="7mB3viLdluR" role="3ft7WO">
+      <node concept="ucgPf" id="7mB3viLdluS" role="3aKz83">
+        <node concept="3clFbS" id="7mB3viLdluT" role="2VODD2">
+          <node concept="3clFbF" id="7mB3viLdlyO" role="3cqZAp">
+            <node concept="2ShNRf" id="7mB3viLdlyM" role="3clFbG">
+              <node concept="3zrR0B" id="7mB3viLdlIa" role="2ShVmc">
+                <node concept="3Tqbb2" id="7mB3viLdlIc" role="3zrR0E">
+                  <ref role="ehGHo" to="qulx:7mB3viLdltS" resolve="StrConst" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="16NfWO" id="7mB3viLdm6v" role="upBLP">
+        <node concept="uGdhv" id="7mB3viLdmeQ" role="16NeZM">
+          <node concept="3clFbS" id="7mB3viLdmeS" role="2VODD2">
+            <node concept="3clFbF" id="7mB3viLdmnu" role="3cqZAp">
+              <node concept="Xl_RD" id="7mB3viLdmnt" role="3clFbG">
+                <property role="Xl_RC" value="'" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3VyMlK" id="7mB3viLdma_" role="3ft7WO" />
+  </node>
+  <node concept="IW6AY" id="7mB3viLgWoG">
+    <ref role="aqKnT" to="qulx:7mB3viLbCL0" resolve="Type" />
+    <node concept="1Qtc8_" id="7mB3viLgWoH" role="IW6Ez">
+      <node concept="3cWJ9i" id="7mB3viLgWoL" role="1Qtc8$">
+        <node concept="CtIbL" id="7mB3viLgWoN" role="CtIbM">
+          <property role="CtIbK" value="RIGHT" />
+        </node>
+      </node>
+      <node concept="IWgqT" id="7mB3viLgWoR" role="1Qtc8A">
+        <node concept="1hCUdq" id="7mB3viLgWoS" role="1hCUd6">
+          <node concept="3clFbS" id="7mB3viLgWoT" role="2VODD2">
+            <node concept="1QpiS5" id="7mB3viLh3gF" role="3cqZAp">
+              <node concept="1Qi9sc" id="7mB3viLh3gG" role="1YN4dH">
+                <node concept="1OJ37Q" id="7mB3viLh89n" role="1QigWp">
+                  <node concept="2t4tHJ" id="7mB3viLh7co" role="1OLpdg" />
+                  <node concept="1OJ37Q" id="7mB3viLh8qx" role="1OLqdY">
+                    <node concept="1OJ37Q" id="7mB3viLh9eh" role="1OLqdY">
+                      <node concept="1P8g2x" id="7mB3viLh8z9" role="1OLpdg">
+                        <node concept="1OCmVF" id="7mB3viLhpEo" role="1P8hpE">
+                          <node concept="1SYyG9" id="7mB3viLh8WP" role="1OLDsb">
+                            <ref role="1SYXPG" to="tpfp:h5SUJUw" resolve="\w" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2t4AhP" id="7mB3viLh9eg" role="1OLqdY" />
+                    </node>
+                    <node concept="1OC9wW" id="7mB3viLh89m" role="1OLpdg">
+                      <property role="1OCb_u" value="(" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbS" id="7mB3viLh3gI" role="1Qpmdr">
+                <node concept="3cpWs6" id="7mB3viLh9mY" role="3cqZAp">
+                  <node concept="ub8z3" id="7mB3viLh9Ca" role="3cqZAk" />
+                </node>
+              </node>
+              <node concept="ub8z3" id="7mB3viLha_Y" role="1QpSPf" />
+            </node>
+            <node concept="3cpWs6" id="7mB3viLh9TW" role="3cqZAp">
+              <node concept="10Nm6u" id="7mB3viLhabT" role="3cqZAk" />
+            </node>
+          </node>
+        </node>
+        <node concept="IWg2L" id="7mB3viLgWoU" role="IWgqQ">
+          <node concept="3clFbS" id="7mB3viLgWoV" role="2VODD2">
+            <node concept="3clFbF" id="7mB3viLgYO5" role="3cqZAp">
+              <node concept="37vLTI" id="7mB3viLh0Xc" role="3clFbG">
+                <node concept="2OqwBi" id="7mB3viLh1na" role="37vLTx">
+                  <node concept="ub8z3" id="7mB3viLh13D" role="2Oq$k0" />
+                  <node concept="liA8E" id="7mB3viLh2bE" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.substring(int):java.lang.String" resolve="substring" />
+                    <node concept="3cmrfG" id="7mB3viLh2io" role="37wK5m">
+                      <property role="3cmrfH" value="1" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="7mB3viLgYVf" role="37vLTJ">
+                  <node concept="7Obwk" id="7mB3viLgYO4" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="7mB3viLgZ5H" role="2OqNvi">
+                    <ref role="3TsBF5" to="qulx:7mB3viLggsO" resolve="val" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7mB3viLhvtv" role="3cqZAp">
+              <node concept="2OqwBi" id="7mB3viLhw1z" role="3clFbG">
+                <node concept="1Q80Hx" id="7mB3viLhvtt" role="2Oq$k0" />
+                <node concept="liA8E" id="7mB3viLhwvk" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorContext.selectWRTFocusPolicy(org.jetbrains.mps.openapi.model.SNode):void" resolve="selectWRTFocusPolicy" />
+                  <node concept="7Obwk" id="7mB3viLhx3z" role="37wK5m" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="27VH4U" id="7mB3viLgWN8" role="2jiSrf">
+          <node concept="3clFbS" id="7mB3viLgWN9" role="2VODD2">
+            <node concept="3clFbF" id="7mB3viLgWUy" role="3cqZAp">
+              <node concept="3clFbC" id="7mB3viLgYoQ" role="3clFbG">
+                <node concept="10Nm6u" id="7mB3viLgYEC" role="3uHU7w" />
+                <node concept="2OqwBi" id="7mB3viLgX74" role="3uHU7B">
+                  <node concept="7Obwk" id="7mB3viLgWUx" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="7mB3viLgXK6" role="2OqNvi">
+                    <ref role="3TsBF5" to="qulx:7mB3viLggsO" resolve="val" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps
index a9c2723f..f81c0d27 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps
@@ -12,12 +12,23 @@
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
+        <property id="4628067390765956807" name="final" index="R5$K2" />
+        <property id="4628067390765956802" name="abstract" index="R5$K7" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
+        <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
+      </concept>
+      <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
+        <reference id="1169127628841" name="intfc" index="PrY4T" />
       </concept>
       <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
         <property id="1096454100552" name="rootable" index="19KtqR" />
         <reference id="1071489389519" name="extends" index="1TJDcQ" />
+        <child id="1169129564478" name="implements" index="PzmwI" />
+      </concept>
+      <concept id="1071489288299" name="jetbrains.mps.lang.structure.structure.PropertyDeclaration" flags="ig" index="1TJgyi">
+        <property id="241647608299431129" name="propertyId" index="IQ2nx" />
+        <reference id="1082985295845" name="dataType" index="AX2Wp" />
       </concept>
       <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
         <property id="1071599776563" name="role" index="20kJfa" />
@@ -35,34 +46,107 @@
   </registry>
   <node concept="1TIwiD" id="7lt0LtPHOlU">
     <property role="EcuMT" value="8456919074565735802" />
-    <property role="TrG5h" value="Container" />
+    <property role="TrG5h" value="Root" />
     <property role="19KtqR" value="true" />
-    <property role="34LRSv" value="Container" />
+    <property role="34LRSv" value="root" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="7lt0LtPHOme" role="1TKVEi">
       <property role="IQ2ns" value="8456919074565735822" />
       <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="statement" />
+      <property role="20kJfa" value="stmt" />
       <property role="20lbJX" value="0..n" />
-      <ref role="20lvS9" node="7lt0LtPHOm6" resolve="Stmt" />
+      <ref role="20lvS9" node="7mB3viLb8nE" resolve="Stmt" />
+    </node>
+    <node concept="PrWs8" id="7mB3viLaATe" role="PzmwI">
+      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
   </node>
   <node concept="1TIwiD" id="7lt0LtPHOm6">
     <property role="EcuMT" value="8456919074565735814" />
-    <property role="TrG5h" value="Stmt" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <property role="TrG5h" value="ExprStmt" />
+    <ref role="1TJDcQ" node="7mB3viLb8nE" resolve="Stmt" />
     <node concept="1TJgyj" id="7lt0LtPHOmo" role="1TKVEi">
       <property role="IQ2ns" value="8456919074565735832" />
       <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="expression" />
-      <property role="20lbJX" value="0..n" />
+      <property role="20kJfa" value="expr" />
+      <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="7lt0LtPHOmg" resolve="Expr" />
     </node>
   </node>
   <node concept="1TIwiD" id="7lt0LtPHOmg">
     <property role="EcuMT" value="8456919074565735824" />
     <property role="TrG5h" value="Expr" />
+    <property role="R5$K7" value="true" />
+    <property role="R5$K2" value="false" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
+  <node concept="1TIwiD" id="7mB3viLb8nE">
+    <property role="EcuMT" value="8477760168143914474" />
+    <property role="TrG5h" value="Stmt" />
+    <property role="R5$K7" value="true" />
+    <property role="R5$K2" value="false" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+  </node>
+  <node concept="1TIwiD" id="7mB3viLbaW$">
+    <property role="EcuMT" value="8477760168143925028" />
+    <property role="TrG5h" value="VarDeclStmt" />
+    <ref role="1TJDcQ" node="7mB3viLb8nE" resolve="Stmt" />
+    <node concept="1TJgyj" id="7mB3viLbaWO" role="1TKVEi">
+      <property role="IQ2ns" value="8477760168143925044" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="decl" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" node="7mB3viLbaW_" resolve="VarDecl" />
+    </node>
+    <node concept="1TJgyj" id="7mB3viLbaWQ" role="1TKVEi">
+      <property role="IQ2ns" value="8477760168143925046" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="init" />
+      <ref role="20lvS9" node="7lt0LtPHOmg" resolve="Expr" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="7mB3viLbaW_">
+    <property role="EcuMT" value="8477760168143925029" />
+    <property role="TrG5h" value="VarDecl" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="PrWs8" id="7mB3viLbaWA" role="PzmwI">
+      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="7mB3viLbp2X">
+    <property role="EcuMT" value="8477760168143982781" />
+    <property role="TrG5h" value="Int" />
+    <ref role="1TJDcQ" node="7lt0LtPHOmg" resolve="Expr" />
+    <node concept="1TJgyi" id="7mB3viLbp2Y" role="1TKVEl">
+      <property role="IQ2nx" value="8477760168143982782" />
+      <property role="TrG5h" value="val" />
+      <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="7mB3viLbCL0">
+    <property role="EcuMT" value="8477760168144047168" />
+    <property role="TrG5h" value="Type" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyi" id="7mB3viLbCL1" role="1TKVEl">
+      <property role="IQ2nx" value="8477760168144047169" />
+      <property role="TrG5h" value="name" />
+      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
+    </node>
+    <node concept="1TJgyi" id="7mB3viLggsO" role="1TKVEl">
+      <property role="IQ2nx" value="8477760168145258292" />
+      <property role="TrG5h" value="val" />
+      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="7mB3viLdltS">
+    <property role="EcuMT" value="8477760168144492408" />
+    <property role="TrG5h" value="StrConst" />
+    <ref role="1TJDcQ" node="7lt0LtPHOmg" resolve="Expr" />
+    <node concept="1TJgyi" id="7mB3viLdltT" role="1TKVEl">
+      <property role="IQ2nx" value="8477760168144492409" />
+      <property role="TrG5h" value="val" />
+      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index 793d757d..687622ff 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -5,20 +5,23 @@
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
     <use id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
     <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
+    <import index="zuft" ref="r:65f97255-4bb1-4783-acd6-a4ed5a1088e2(jetbrains.mps.typechecking.testlang.types)" />
+    <import index="qulx" ref="r:ec0979fb-ae37-4823-9eaa-8550d9f5c6fd(jetbrains.mps.typechecking.testlang.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="qulx" ref="r:ec0979fb-ae37-4823-9eaa-8550d9f5c6fd(jetbrains.mps.typechecking.testlang.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1153422305557" name="jetbrains.mps.baseLanguage.structure.LessThanOrEqualsExpression" flags="nn" index="2dkUwp" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
-      </concept>
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
       <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" />
@@ -26,21 +29,30 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <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="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -52,31 +64,47 @@
       <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="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <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="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <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>
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
-      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
-        <child id="1144226360166" name="iterable" index="1DdaDG" />
-      </concept>
-      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
-        <child id="1144230900587" name="variable" index="1Duv9x" />
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
-        <child id="1196350785114" name="quotedNode" index="2c44tc" />
+      <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>
     </language>
     <language id="942985d5-7bcf-46ee-8b79-7b662eaebb4e" name="jetbrains.mps.dataform">
@@ -109,30 +137,45 @@
       <concept id="8829335963593820278" name="jetbrains.mps.logic.structure.LogicalVariable" flags="ng" index="a7P8L">
         <reference id="8829335963593822893" name="declaration" index="a7OzE" />
       </concept>
-      <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
-      <concept id="6856711987710888499" name="jetbrains.mps.logic.structure.TreeFormLiteral" flags="ng" index="Hz6ka">
-        <child id="6856711987710888500" name="root" index="Hz6kd" />
+      <concept id="8829335963591530299" name="jetbrains.mps.logic.structure.ExpressionLogicalVariable" flags="ng" index="aZ4PW">
+        <child id="8829335963591530990" name="expression" index="aZ4eD" />
       </concept>
-      <concept id="7571593955706137573" name="jetbrains.mps.logic.structure.Value" flags="ng" index="1oi5XN">
-        <property id="7571593955706137638" name="value" index="1oi5yK" />
+      <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
+      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalExpression" flags="ng" index="1nq8_$">
+        <child id="4780620083400582654" name="logical" index="1nq8_t" />
+      </concept>
+      <concept id="2455719244613908503" name="jetbrains.mps.logic.structure.ValueOfLogicalExpression" flags="ng" index="1TmgYN">
+        <child id="2455719244613924416" name="logical" index="1Tms7$" />
+      </concept>
+    </language>
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
+        <property id="1167245565795" name="severity" index="35gtTG" />
+        <child id="1167227463056" name="logExpression" index="34bqiv" />
       </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="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
-        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <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="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
-      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
-        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      <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="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="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
     </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">
@@ -146,52 +189,75 @@
       <concept id="8456919074560454386" name="jetbrains.mps.lang.coderules.structure.ParameterContainer" flags="ng" index="0eUR_">
         <child id="8456919074560454898" name="parameter" index="0eVf_" />
       </concept>
+      <concept id="1618328391714763069" name="jetbrains.mps.lang.coderules.structure.MacroTable" flags="ng" index="0oKg$">
+        <child id="1618328391714763070" name="macro" index="0oKgB" />
+      </concept>
+      <concept id="1618328391714763491" name="jetbrains.mps.lang.coderules.structure.MacroDeclaration" flags="ng" index="0oKvU">
+        <child id="7670825977262353027" name="input" index="3eYTkm" />
+        <child id="8908809128802132746" name="parameter" index="3tC56T" />
+        <child id="8908809128801952514" name="body" index="3unh6L" />
+      </concept>
       <concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
         <child id="7871500063866331596" name="queryStage" index="92CTm" />
+        <child id="3026409000515988658" name="parameter" index="2_cLD1" />
         <child id="3026409000513569515" name="queryKind" index="2_lZgo" />
       </concept>
       <concept id="9035818301008609703" name="jetbrains.mps.lang.coderules.structure.QueryTemplate" flags="ng" index="2bWyPT">
         <child id="7871500063838282362" name="code" index="fHCRw" />
       </concept>
-      <concept id="4992889260816483106" name="jetbrains.mps.lang.coderules.structure.Condition" flags="ng" index="cBwPQ" />
       <concept id="6958395084019752" name="jetbrains.mps.lang.coderules.structure.SNodeSetTypeOperation" flags="ng" index="2ra22R">
         <child id="6958395084020241" name="typeExpr" index="2ra2ae" />
       </concept>
-      <concept id="6958395097955138" name="jetbrains.mps.lang.coderules.structure.SNodeReportOperation" flags="ng" index="2s7oft">
-        <property id="6958395097963305" name="kind" index="2s7ueQ" />
-        <child id="6958395097963208" name="text" index="2s7u9n" />
-      </concept>
       <concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
         <child id="6691972578451986151" name="input" index="2t_VXX" />
       </concept>
+      <concept id="3026409000516001347" name="jetbrains.mps.lang.coderules.structure.QueryParameterReference" flags="ng" index="2_cIyK">
+        <reference id="3026409000516001528" name="declaration" index="2_cIwb" />
+      </concept>
+      <concept id="3026409000515975840" name="jetbrains.mps.lang.coderules.structure.QueryParameterDeclaration" flags="ng" index="2_cOLj">
+        <child id="3026409000516797621" name="type" index="2_9F96" />
+      </concept>
       <concept id="8335224865066015764" name="jetbrains.mps.lang.coderules.structure.Handler" flags="ng" index="AVZre">
+        <reference id="3541122455446356437" name="extends" index="2YbDB9" />
         <child id="1980609059185345194" name="constraint" index="8PkJo" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
-      <concept id="6856711987714624232" name="jetbrains.mps.lang.coderules.structure.ExpressionItem" flags="ng" index="HKQnh">
-        <child id="6856711987714624233" name="code" index="HKQng" />
+      <concept id="7670825977262541651" name="jetbrains.mps.lang.coderules.structure.MacroInputReference" flags="ng" index="3eTFj6">
+        <reference id="7670825977262541652" name="declaration" index="3eTFj1" />
+      </concept>
+      <concept id="7670825977262339471" name="jetbrains.mps.lang.coderules.structure.MacroInputDeclaration" flags="ng" index="3eYOCq">
+        <child id="7670825977262355988" name="type" index="3eYSA1" />
       </concept>
       <concept id="1302893676238672057" name="jetbrains.mps.lang.coderules.structure.ExpandPseudoConstraint" flags="ng" index="1imXTs">
         <child id="1302893676238674275" name="logical" index="1imXu6" />
         <child id="1302893676238672106" name="origin" index="1imXSf" />
       </concept>
-      <concept id="3575255234196628445" name="jetbrains.mps.lang.coderules.structure.RequireStatement" flags="ng" index="1mebxG">
-        <child id="3575255234196628696" name="node" index="1mebXD" />
-      </concept>
       <concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
         <child id="8456919074565751439" name="parameter" index="0UC6o" />
+        <child id="3575255234174969659" name="guard" index="1nLNMa" />
         <child id="3575255234174969658" name="head" index="1nLNMb" />
         <child id="3575255234174969660" name="body" index="1nLNMd" />
       </concept>
       <concept id="3575255234174969615" name="jetbrains.mps.lang.coderules.structure.RuleTemplate" flags="ng" index="1nLNMY">
-        <child id="3575255234175001641" name="condition" index="1nLFYo" />
         <child id="3575255234174969633" name="input" index="1nLNMg" />
         <child id="3575255234174969628" name="code" index="1nLNMH" />
       </concept>
       <concept id="3575255234174969664" name="jetbrains.mps.lang.coderules.structure.ConstraintRuleStatement" flags="ng" index="1nLNNL">
         <child id="3575255234174969665" name="rule" index="1nLNNK" />
       </concept>
+      <concept id="8908809128804390455" name="jetbrains.mps.lang.coderules.structure.MacroLogicalExpression" flags="ng" index="3txIi4" />
+      <concept id="8908809128802132672" name="jetbrains.mps.lang.coderules.structure.MacroParameterDeclaration" flags="ng" index="3tC51N">
+        <child id="8908809128802132718" name="type" index="3tC51t" />
+        <child id="8908809128803441142" name="init" index="3tH6H5" />
+      </concept>
+      <concept id="8908809128802381130" name="jetbrains.mps.lang.coderules.structure.MacroParameterReference" flags="ng" index="3tDTZT">
+        <reference id="8908809128802381395" name="parameter" index="3tDTNw" />
+      </concept>
+      <concept id="8908809128803504920" name="jetbrains.mps.lang.coderules.structure.InitBlock" flags="ng" index="3tHm6F" />
+      <concept id="8908809128801951589" name="jetbrains.mps.lang.coderules.structure.MacroBody" flags="ng" index="3uniRm">
+        <child id="8908809128801951592" name="code" index="3uniRr" />
+      </concept>
       <concept id="5372587443968979218" name="jetbrains.mps.lang.coderules.structure.ExpressionConstraint" flags="ng" index="3wWvb2">
         <child id="5372587443968983820" name="expression" index="3wWo3s" />
       </concept>
@@ -200,17 +266,13 @@
       <concept id="7368070394769139970" name="jetbrains.mps.lang.coderules.structure.RuleInputReference" flags="ng" index="3A2sRY">
         <reference id="7368070394769213644" name="declaration" index="3A2yKK" />
       </concept>
-      <concept id="7368070394770780974" name="jetbrains.mps.lang.coderules.structure.UnifiesConstraint" flags="ng" index="3A8Hvi">
-        <child id="7368070394770793930" name="value" index="3A8w4Q" />
-        <child id="7368070394770793388" name="assignee" index="3A8wtg" />
-      </concept>
       <concept id="7368070394766963750" name="jetbrains.mps.lang.coderules.structure.Head" flags="ng" index="3Aq93q">
         <property id="7368070394767443940" name="keep" index="3ArMco" />
       </concept>
       <concept id="7368070394766963523" name="jetbrains.mps.lang.coderules.structure.RuleComponent" flags="ng" index="3Aq9uZ">
         <child id="2316688792939037645" name="logic" index="3Ip0Jz" />
-        <child id="965748826975413053" name="parameter" index="3Nuqhd" />
       </concept>
+      <concept id="7368070394766966158" name="jetbrains.mps.lang.coderules.structure.Guard" flags="ng" index="3Aq9_M" />
       <concept id="7368070394766966388" name="jetbrains.mps.lang.coderules.structure.Body" flags="ng" index="3Aq9E8" />
       <concept id="7368070394766978092" name="jetbrains.mps.lang.coderules.structure.EmitConstraintStatement" flags="ng" index="3Aqczg">
         <child id="7368070394767031348" name="constraint" index="3Aqpz8" />
@@ -232,414 +294,22 @@
         <child id="1877115349178398815" name="right" index="3GeI8D" />
         <child id="1877115349178398813" name="left" index="3GeI8F" />
       </concept>
+      <concept id="1553157749316176827" name="jetbrains.mps.lang.coderules.structure.PatternLogicalVariable" flags="ng" index="1HFMs5">
+        <child id="5131913661993028915" name="variable" index="1uarlU" />
+        <child id="5131913661993028917" name="value" index="1uarlW" />
+      </concept>
       <concept id="2316688792938826204" name="jetbrains.mps.lang.coderules.structure.ConstraintLogicalClause" flags="ng" index="3I6s7M">
         <child id="2316688792938826214" name="constraint" index="3I6s78" />
       </concept>
       <concept id="2316688792938825384" name="jetbrains.mps.lang.coderules.structure.LogicalClauseList" flags="ng" index="3I6sU6">
         <child id="2316688792938825385" name="clauses" index="3I6sU7" />
       </concept>
-      <concept id="2316688792939428589" name="jetbrains.mps.lang.coderules.structure.TemplateLogicalClause" flags="ng" index="3IrJb3">
-        <child id="2316688792939428590" name="code" index="3IrJb0" />
-      </concept>
       <concept id="965748826975413063" name="jetbrains.mps.lang.coderules.structure.RulePartParameterDeclaration" flags="ng" index="3NuqgR" />
     </language>
   </registry>
-  <node concept="AVZre" id="36tQV5Ao9p_">
-    <property role="TrG5h" value="Foobar" />
-    <node concept="1nLNMY" id="36tQV5Ao9qv" role="1nK1Vg">
-      <property role="TrG5h" value="test" />
-      <node concept="3clFbS" id="36tQV5Ao9qw" role="1nLNMH">
-        <node concept="1mebxG" id="7lt0LtOVMbx" role="3cqZAp">
-          <node concept="3A2sRY" id="7lt0LtOVMh4" role="1mebXD">
-            <ref role="3A2yKK" node="36tQV5A_oxu" resolve="attr" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="oI9Yr_udY" role="3cqZAp" />
-        <node concept="3clFbF" id="oI9Ys1dGH" role="3cqZAp">
-          <node concept="2OqwBi" id="oI9Ys1fyg" role="3clFbG">
-            <node concept="2OqwBi" id="oI9Ys1dU5" role="2Oq$k0">
-              <node concept="3A2sRY" id="oI9Ys1dGF" role="2Oq$k0">
-                <ref role="3A2yKK" node="36tQV5A_oxu" resolve="attr" />
-              </node>
-              <node concept="2W$R8B" id="oI9Ys1fiw" role="2OqNvi" />
-            </node>
-            <node concept="2ra22R" id="oI9Ys1gRH" role="2OqNvi">
-              <node concept="10Nm6u" id="oI9Ys1gVp" role="2ra2ae" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="oI9Ys1jeT" role="3cqZAp" />
-        <node concept="3clFbF" id="oI9Ys1Od2" role="3cqZAp">
-          <node concept="2OqwBi" id="oI9Ys1OqS" role="3clFbG">
-            <node concept="3A2sRY" id="oI9Ys1Od0" role="2Oq$k0">
-              <ref role="3A2yKK" node="36tQV5A_oxu" resolve="attr" />
-            </node>
-            <node concept="2s7oft" id="oI9Ys27_Q" role="2OqNvi">
-              <property role="2s7ueQ" value="error" />
-              <node concept="Xl_RD" id="oI9Ys2j_x" role="2s7u9n">
-                <property role="Xl_RC" value="blah" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="oI9Ys1O4g" role="3cqZAp" />
-        <node concept="1nLNNL" id="oI9Ys1jmX" role="3cqZAp">
-          <node concept="1nLNMm" id="oI9Ys1jmZ" role="1nLNNK">
-            <node concept="3Aq9E8" id="1mdVbTSjMO6" role="1nLNMd">
-              <node concept="3I6sU6" id="1mdVbTSjMO7" role="3Ip0Jz">
-                <node concept="3I6s7M" id="1mdVbTSjMOr" role="3I6sU7">
-                  <node concept="3Aqt3T" id="1mdVbTSjMOq" role="3I6s78">
-                    <ref role="3AqCNq" node="36tQV5ADNk_" resolve="bar" />
-                    <node concept="a7P8L" id="1mdVbTSjNcS" role="3AunhB">
-                      <ref role="a7OzE" node="oI9Ys1juo" resolve="TTT" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9E8" id="oI9Ys1jtA" role="1nLNMd">
-              <node concept="3I6sU6" id="oI9Ys1jtB" role="3Ip0Jz">
-                <node concept="3I6s7M" id="oI9Ys1jv2" role="3I6sU7">
-                  <node concept="3A8Hvi" id="oI9Ys1juW" role="3I6s78">
-                    <node concept="a7P8L" id="oI9Ys1jvc" role="3A8wtg">
-                      <ref role="a7OzE" node="oI9Ys1juo" resolve="TTT" />
-                    </node>
-                    <node concept="ns1u0" id="JOGAOsVtsz" role="3A8w4Q">
-                      <ref role="ns1xF" node="JOGAOsVt6y" resolve="Foo" />
-                      <node concept="nsMwS" id="JOGAOsVts$" role="ns1xD">
-                        <ref role="nsMwP" node="JOGAOsVt6$" resolve="bar" />
-                        <node concept="Xl_RD" id="oI9Ys1jzA" role="nsMwV">
-                          <property role="Xl_RC" value="foo" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="0eUR_" id="oI9Ys1jul" role="0UC6o">
-              <node concept="3NuqgR" id="oI9Ys1jun" role="0eVf_">
-                <node concept="aZer4" id="oI9Ys1juo" role="3XD1gS">
-                  <property role="TrG5h" value="TTT" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="oI9Ys1dA9" role="3cqZAp" />
-        <node concept="3cpWs8" id="36tQV5AKngS" role="3cqZAp">
-          <node concept="3cpWsn" id="36tQV5AKngV" role="3cpWs9">
-            <property role="TrG5h" value="str" />
-            <node concept="17QB3L" id="36tQV5AKngQ" role="1tU5fm" />
-            <node concept="Xl_RD" id="36tQV5AKnhT" role="33vP2m">
-              <property role="Xl_RC" value="text" />
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="36tQV5AKHu1" role="3cqZAp">
-          <node concept="3clFbS" id="36tQV5AKHu3" role="2LFqv$">
-            <node concept="1nLNNL" id="36tQV5AB4mv" role="3cqZAp">
-              <node concept="1nLNMm" id="36tQV5AB4mx" role="1nLNNK">
-                <node concept="3Aq9E8" id="36tQV5ADNkx" role="1nLNMd">
-                  <node concept="3I6sU6" id="36tQV5ADNky" role="3Ip0Jz">
-                    <node concept="3IrJb3" id="36tQV5AKnfR" role="3I6sU7">
-                      <node concept="3clFbS" id="36tQV5AKnfS" role="3IrJb0">
-                        <node concept="3clFbJ" id="36tQV5AKnfV" role="3cqZAp">
-                          <node concept="3eOSWO" id="36tQV5AKpat" role="3clFbw">
-                            <node concept="3cmrfG" id="36tQV5AKpaw" role="3uHU7w">
-                              <property role="3cmrfH" value="0" />
-                            </node>
-                            <node concept="2OqwBi" id="36tQV5AKnEG" role="3uHU7B">
-                              <node concept="37vLTw" id="36tQV5AKnlL" role="2Oq$k0">
-                                <ref role="3cqZAo" node="36tQV5AKngV" resolve="str" />
-                              </node>
-                              <node concept="liA8E" id="36tQV5AKomS" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbS" id="36tQV5AKnfX" role="3clFbx">
-                            <node concept="3Aqczg" id="36tQV5AKq9$" role="3cqZAp">
-                              <node concept="3Aqt3T" id="36tQV5AKq9z" role="3Aqpz8">
-                                <ref role="3AqCNq" node="36tQV5ADNk_" resolve="bar" />
-                                <node concept="a7P8L" id="36tQV5AKqdA" role="3AunhB">
-                                  <ref role="a7OzE" node="36tQV5ADNkj" resolve="AAA" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbJ" id="36tQV5AKC84" role="3cqZAp">
-                          <node concept="3clFbS" id="36tQV5AKC86" role="3clFbx">
-                            <node concept="3Aqczg" id="36tQV5AKDC$" role="3cqZAp">
-                              <node concept="3Aqt3T" id="36tQV5AKDCy" role="3Aqpz8">
-                                <ref role="3AqCNq" node="36tQV5ADNk_" resolve="bar" />
-                                <node concept="Hz6ka" id="36tQV5AKDCD" role="3AunhB">
-                                  <node concept="1oi5XN" id="36tQV5AKDCJ" role="Hz6kd">
-                                    <property role="1oi5yK" value="text" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="17R0WA" id="36tQV5AKDyy" role="3clFbw">
-                            <node concept="Xl_RD" id="36tQV5AKD$G" role="3uHU7w">
-                              <property role="Xl_RC" value="qux" />
-                            </node>
-                            <node concept="2OqwBi" id="36tQV5AKCmu" role="3uHU7B">
-                              <node concept="3A2sRY" id="36tQV5AKCdT" role="2Oq$k0">
-                                <ref role="3A2yKK" node="36tQV5A_oxu" resolve="attr" />
-                              </node>
-                              <node concept="3TrcHB" id="36tQV5AKCwc" role="2OqNvi">
-                                <ref role="3TsBF5" to="tpck:hnGE5uv" resolve="virtualPackage" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3Aq93q" id="36tQV5ALYt4" role="1nLNMb">
-                  <property role="3ArMco" value="true" />
-                  <node concept="3I6sU6" id="36tQV5ALYt5" role="3Ip0Jz" />
-                  <node concept="3NuqgR" id="36tQV5ALYyT" role="3Nuqhd">
-                    <node concept="aZer4" id="36tQV5ALYyU" role="3XD1gS">
-                      <property role="TrG5h" value="T" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3Aq93q" id="36tQV5ADNjn" role="1nLNMb">
-                  <node concept="3I6sU6" id="36tQV5ADNjo" role="3Ip0Jz">
-                    <node concept="3I6s7M" id="36tQV5ADNkc" role="3I6sU7">
-                      <node concept="3Aqt3T" id="36tQV5ADNkb" role="3I6s78">
-                        <ref role="3AqCNq" node="36tQV5ADNjJ" resolve="foo" />
-                        <node concept="a7P8L" id="36tQV5ADNks" role="3AunhB">
-                          <ref role="a7OzE" node="36tQV5ADNkj" resolve="AAA" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3NuqgR" id="36tQV5ADNki" role="3Nuqhd">
-                    <node concept="aZer4" id="36tQV5ADNkj" role="3XD1gS">
-                      <property role="TrG5h" value="AAA" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="36tQV5AKHu4" role="1Duv9x">
-            <property role="TrG5h" value="nnn" />
-            <node concept="3Tqbb2" id="36tQV5ALjuj" role="1tU5fm" />
-          </node>
-          <node concept="2OqwBi" id="36tQV5ALi6Z" role="1DdaDG">
-            <node concept="3A2sRY" id="36tQV5ALhR8" role="2Oq$k0">
-              <ref role="3A2yKK" node="36tQV5A_oxu" resolve="attr" />
-            </node>
-            <node concept="2Rf3mk" id="36tQV5ALir4" role="2OqNvi">
-              <node concept="1xMEDy" id="36tQV5ALir6" role="1xVPHs">
-                <node concept="chp4Y" id="36tQV5ALirO" role="ri$Ld">
-                  <ref role="cht4Q" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1mdVbTRVYrd" role="3cqZAp" />
-        <node concept="1nLNNL" id="oI9YrdiPZ" role="3cqZAp">
-          <node concept="1nLNMm" id="oI9YrdiQ1" role="1nLNNK">
-            <node concept="3Aq93q" id="1mdVbTRSfoK" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="1mdVbTRSfoL" role="3Ip0Jz" />
-            </node>
-            <node concept="3Aq9E8" id="oI9YrdiWh" role="1nLNMd">
-              <node concept="3I6sU6" id="oI9YrdiWi" role="3Ip0Jz">
-                <node concept="3I6s7M" id="oI9YrdiWm" role="3I6sU7">
-                  <node concept="3wWvb2" id="oI9YrdiWl" role="3I6s78">
-                    <node concept="2OqwBi" id="oI9Yrdjke" role="3wWo3s">
-                      <node concept="2OqwBi" id="oI9YrDb4o" role="2Oq$k0">
-                        <node concept="3A2sRY" id="oI9Yrdjdi" role="2Oq$k0">
-                          <ref role="3A2yKK" node="36tQV5A_oxu" resolve="attr" />
-                        </node>
-                        <node concept="2W$R8B" id="oI9YrDcMe" role="2OqNvi" />
-                      </node>
-                      <node concept="2ra22R" id="oI9Yrdkza" role="2OqNvi">
-                        <node concept="2c44tf" id="oI9Yrdkzx" role="2ra2ae">
-                          <node concept="3Tqbb2" id="oI9Yrdk$G" role="2c44tc" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="oI9Ys2m_3" role="3I6sU7">
-                  <node concept="3wWvb2" id="oI9Ys2m_1" role="3I6s78">
-                    <node concept="2OqwBi" id="oI9Ys2nbg" role="3wWo3s">
-                      <node concept="3A2sRY" id="oI9Ys2n4l" role="2Oq$k0">
-                        <ref role="3A2yKK" node="36tQV5A_oxu" resolve="attr" />
-                      </node>
-                      <node concept="2s7oft" id="oI9Ys2ozS" role="2OqNvi">
-                        <property role="2s7ueQ" value="error" />
-                        <node concept="Xl_RD" id="oI9Ys2o$x" role="2s7u9n">
-                          <property role="Xl_RC" value="blah" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="0eUR_" id="1mdVbTRSfoP" role="0UC6o">
-              <node concept="3NuqgR" id="1mdVbTRSfoR" role="0eVf_">
-                <node concept="aZer4" id="1mdVbTRSfoS" role="3XD1gS">
-                  <property role="TrG5h" value="GGG" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="oI9YrdiJL" role="3cqZAp" />
-      </node>
-      <node concept="2t___k" id="36tQV5A_oxt" role="1nLNMg">
-        <ref role="2t_S0q" to="tpck:4uZwTti3_$T" resolve="Attribute" />
-        <node concept="3A20r5" id="36tQV5A_oxu" role="2t_VXX">
-          <property role="TrG5h" value="attr" />
-        </node>
-      </node>
-      <node concept="cBwPQ" id="36tQV5ALoUi" role="1nLFYo">
-        <node concept="3clFbS" id="36tQV5ALoUj" role="16YjZG">
-          <node concept="3clFbF" id="36tQV5ALp0k" role="3cqZAp">
-            <node concept="2OqwBi" id="36tQV5ALp8U" role="3clFbG">
-              <node concept="3A2sRY" id="36tQV5ALp0j" role="2Oq$k0">
-                <ref role="3A2yKK" node="36tQV5A_oxu" resolve="attr" />
-              </node>
-              <node concept="3x8VRR" id="36tQV5ALqz2" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3AqmO8" id="3IIf9O_JfC9" role="8PkJo">
-      <property role="TrG5h" value="main" />
-    </node>
-    <node concept="3AqmO8" id="36tQV5ADNjJ" role="8PkJo">
-      <property role="TrG5h" value="foo" />
-      <node concept="1zAUYm" id="36tQV5ADNk9" role="1zAUyy">
-        <property role="TrG5h" value="t" />
-      </node>
-    </node>
-    <node concept="3AqmO8" id="36tQV5ADNk_" role="8PkJo">
-      <property role="TrG5h" value="bar" />
-      <node concept="1zAUYm" id="36tQV5ADNl1" role="1zAUyy">
-        <property role="TrG5h" value="t" />
-      </node>
-    </node>
-    <node concept="1nLNMY" id="12QmIo_7_05" role="1nK1Vg">
-      <property role="TrG5h" value="base" />
-      <node concept="3clFbS" id="12QmIo_7_06" role="1nLNMH">
-        <node concept="1nLNNL" id="12QmIo_7_07" role="3cqZAp">
-          <node concept="1nLNMm" id="12QmIo_7_08" role="1nLNNK">
-            <node concept="0eUR_" id="34$A1Mfalx_" role="0UC6o">
-              <node concept="3NuqgR" id="34$A1MfalxB" role="0eVf_">
-                <node concept="aZer4" id="34$A1MfalxC" role="3XD1gS">
-                  <property role="TrG5h" value="T" />
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq93q" id="34$A1Mfalxm" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="34$A1Mfalxn" role="3Ip0Jz">
-                <node concept="3I6s7M" id="34$A1Mfalxr" role="3I6sU7">
-                  <node concept="3Aqt3T" id="34$A1Mfalxq" role="3I6s78">
-                    <ref role="3AqCNq" node="36tQV5ADNjJ" resolve="foo" />
-                    <node concept="a7P8L" id="34$A1MfalxL" role="3AunhB">
-                      <ref role="a7OzE" node="34$A1MfalxC" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9E8" id="3$nR4PM7XQT" role="1nLNMd">
-              <node concept="3I6sU6" id="3$nR4PM7XQU" role="3Ip0Jz">
-                <node concept="3I6s7M" id="3$nR4PM7XQY" role="3I6sU7">
-                  <node concept="3wWvb2" id="3$nR4PM7XQX" role="3I6s78">
-                    <node concept="2OqwBi" id="3$nR4PM7XXK" role="3wWo3s">
-                      <node concept="3A2sRY" id="3$nR4PM7XRm" role="2Oq$k0">
-                        <ref role="3A2yKK" node="3$nR4PM7XR2" resolve="bc" />
-                      </node>
-                      <node concept="2s7oft" id="3$nR4PM7YA8" role="2OqNvi">
-                        <property role="2s7ueQ" value="error" />
-                        <node concept="Xl_RD" id="3$nR4PM7YAI" role="2s7u9n">
-                          <property role="Xl_RC" value="blah" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2t___k" id="3$nR4PM7XR1" role="1nLNMg">
-        <ref role="2t_S0q" to="tpck:gw2VY9q" resolve="BaseConcept" />
-        <node concept="3A20r5" id="3$nR4PM7XR2" role="2t_VXX">
-          <property role="TrG5h" value="bc" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="AVZre" id="7lt0LtPHRYY">
-    <property role="TrG5h" value="Type" />
-    <node concept="1nLNMY" id="7lt0LtPHRZ8" role="1nK1Vg">
-      <property role="TrG5h" value="exprTypeof" />
-      <node concept="3clFbS" id="7lt0LtPHRZ9" role="1nLNMH">
-        <node concept="1nLNNL" id="7lt0LtPHRZ_" role="3cqZAp">
-          <node concept="1nLNMm" id="7lt0LtPHRZA" role="1nLNNK">
-            <node concept="3Aq9E8" id="7lt0LtPHRZD" role="1nLNMd">
-              <node concept="3I6sU6" id="7lt0LtPHRZE" role="3Ip0Jz">
-                <node concept="3I6s7M" id="7lt0LtPHS0f" role="3I6sU7">
-                  <node concept="3A8Hvi" id="7lt0LtPHS09" role="3I6s78">
-                    <node concept="a7P8L" id="7lt0LtPIYZ7" role="3A8wtg">
-                      <ref role="a7OzE" node="7lt0LtPIm0Y" resolve="T" />
-                    </node>
-                    <node concept="ns1u0" id="JOGAOsVts_" role="3A8w4Q">
-                      <ref role="ns1xF" node="JOGAOsVt6y" resolve="Foo" />
-                      <node concept="nsMwS" id="JOGAOsVtsA" role="ns1xD">
-                        <ref role="nsMwP" node="JOGAOsVt6$" resolve="bar" />
-                        <node concept="Xl_RD" id="7lt0LtPIZ7Q" role="nsMwV">
-                          <property role="Xl_RC" value="BLAH" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq93q" id="7lt0LtPHS0p" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="7lt0LtPHS0q" role="3Ip0Jz" />
-            </node>
-            <node concept="0eUR_" id="7lt0LtPIm0V" role="0UC6o">
-              <node concept="3NuqgR" id="7lt0LtPIm0X" role="0eVf_">
-                <node concept="aZer4" id="7lt0LtPIm0Y" role="3XD1gS">
-                  <property role="TrG5h" value="T" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2t___k" id="7lt0LtPHRZc" role="1nLNMg">
-        <ref role="2t_S0q" to="qulx:7lt0LtPHOmg" resolve="Expr" />
-        <node concept="3A20r5" id="7lt0LtPHRZd" role="2t_VXX">
-          <property role="TrG5h" value="expr" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="AVZre" id="7lt0LtPOZVe">
     <property role="TrG5h" value="Recover" />
+    <ref role="2YbDB9" node="7mB3viLbCp8" resolve="Typeof" />
     <node concept="3AqmO8" id="7lt0LtPOZVl" role="8PkJo">
       <property role="TrG5h" value="recover" />
     </node>
@@ -662,34 +332,110 @@
                 <node concept="aZer4" id="7lt0LtPOZW8" role="3XD1gS">
                   <property role="TrG5h" value="T" />
                 </node>
+                <node concept="aZer4" id="7mB3viLdI2x" role="3XD1gS">
+                  <property role="TrG5h" value="Name" />
+                </node>
                 <node concept="aZer4" id="7lt0LtPP29U" role="3XD1gS">
-                  <property role="TrG5h" value="Node" />
+                  <property role="TrG5h" value="Val" />
                 </node>
               </node>
             </node>
             <node concept="3Aq9E8" id="7lt0LtPP11l" role="1nLNMd">
               <node concept="3I6sU6" id="7lt0LtPP11m" role="3Ip0Jz">
-                <node concept="3I6s7M" id="7lt0LtPP29M" role="3I6sU7">
-                  <node concept="3GeI9q" id="7lt0LtPP29G" role="3I6s78">
-                    <node concept="a7P8L" id="7lt0LtPP2ab" role="3GeI8F">
-                      <ref role="a7OzE" node="7lt0LtPP29U" resolve="Node" />
-                    </node>
-                    <node concept="HKQnh" id="7lt0LtPP2an" role="3GeI8D">
-                      <node concept="2c44tf" id="7lt0LtPP2as" role="HKQng">
-                        <node concept="17QB3L" id="7lt0LtPP2aI" role="2c44tc" />
+                <node concept="3I6s7M" id="7mB3viLbDsi" role="3I6sU7">
+                  <node concept="3wWvb2" id="7mB3viLbDsg" role="3I6s78">
+                    <node concept="2OqwBi" id="7mB3viLbDYy" role="3wWo3s">
+                      <node concept="2OqwBi" id="7mB3viLbDzy" role="2Oq$k0">
+                        <node concept="3A2sRY" id="7mB3viLbDsv" role="2Oq$k0">
+                          <ref role="3A2yKK" node="7lt0LtPOZVo" resolve="bc" />
+                        </node>
+                        <node concept="2W$R8B" id="7mB3viLbDHU" role="2OqNvi" />
+                      </node>
+                      <node concept="2ra22R" id="7mB3viLbE7i" role="2OqNvi">
+                        <node concept="2pJPEk" id="7mB3viLbEmP" role="2ra2ae">
+                          <node concept="2pJPED" id="7mB3viLbEmQ" role="2pJPEn">
+                            <ref role="2pJxaS" to="qulx:7mB3viLbCL0" resolve="Type" />
+                            <node concept="2pJxcG" id="7mB3viLbEmR" role="2pJxcM">
+                              <ref role="2pJxcJ" to="qulx:7mB3viLbCL1" resolve="name" />
+                              <node concept="2OqwBi" id="7mB3viLnpMG" role="2pJxcZ">
+                                <node concept="1TmgYN" id="7mB3viLdI8l" role="2Oq$k0">
+                                  <node concept="1nq8_$" id="7mB3viLdI8Z" role="1Tms7$">
+                                    <node concept="a7P8L" id="7mB3viLdI8X" role="1nq8_t">
+                                      <ref role="a7OzE" node="7mB3viLdI2x" resolve="Name" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="7mB3viLnqu3" role="2OqNvi">
+                                  <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="2pJxcG" id="7mB3viLhVif" role="2pJxcM">
+                              <ref role="2pJxcJ" to="qulx:7mB3viLggsO" resolve="val" />
+                              <node concept="2OqwBi" id="7mB3viLnqLm" role="2pJxcZ">
+                                <node concept="1TmgYN" id="7mB3viLhVjF" role="2Oq$k0">
+                                  <node concept="1nq8_$" id="7mB3viLhVjG" role="1Tms7$">
+                                    <node concept="a7P8L" id="7mB3viLhVjH" role="1nq8_t">
+                                      <ref role="a7OzE" node="7lt0LtPP29U" resolve="Val" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="7mB3viLnrsH" role="2OqNvi">
+                                  <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3I6s7M" id="7lt0LtPP11q" role="3I6sU7">
-                  <node concept="3Aqt3T" id="7lt0LtPP11p" role="3I6s78">
-                    <ref role="3AqCNq" node="7lt0LtPOZWJ" resolve="typeNode" />
-                    <node concept="a7P8L" id="7lt0LtPP2b1" role="3AunhB">
-                      <ref role="a7OzE" node="7lt0LtPP29U" resolve="Node" />
+              </node>
+            </node>
+            <node concept="3Aq93q" id="7mB3viLbLCU" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="7mB3viLbLCV" role="3Ip0Jz">
+                <node concept="3I6s7M" id="7mB3viLbLDf" role="3I6sU7">
+                  <node concept="3Aqt3T" id="7mB3viLbLDe" role="3I6s78">
+                    <ref role="3AqCNq" node="7lt0LtPOZVl" resolve="recover" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="7mB3viLbCK8" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="7mB3viLbCK9" role="3Ip0Jz">
+                <node concept="3I6s7M" id="7mB3viLbCKf" role="3I6sU7">
+                  <node concept="3Aqt3T" id="7mB3viLbCKe" role="3I6s78">
+                    <ref role="3AqCNq" node="7mB3viLbCp9" resolve="typeof" />
+                    <node concept="3BlFb$" id="7mB3viLbCKk" role="3AunhB">
+                      <node concept="3A2sRY" id="7mB3viLbCKx" role="3BlFb_">
+                        <ref role="3A2yKK" node="7lt0LtPOZVo" resolve="bc" />
+                      </node>
                     </node>
-                    <node concept="3BlFb$" id="7lt0LtPP2b7" role="3AunhB">
-                      <node concept="3A2sRY" id="7lt0LtPP2bh" role="3BlFb_">
-                        <ref role="3A2yKK" node="7lt0LtPOZVo" resolve="expr" />
+                    <node concept="1HFMs5" id="7mB3viLbLJw" role="3AunhB">
+                      <node concept="a7P8L" id="7mB3viLbCKD" role="1uarlU">
+                        <ref role="a7OzE" node="7lt0LtPOZW8" resolve="T" />
+                      </node>
+                      <node concept="ns1u0" id="7mB3viLbLNi" role="1uarlW">
+                        <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
+                        <node concept="nsMwS" id="7mB3viLdI7t" role="ns1xD">
+                          <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
+                          <node concept="1nq8_$" id="7mB3viLdI7A" role="nsMwV">
+                            <node concept="a7P8L" id="7mB3viLdI7$" role="1nq8_t">
+                              <ref role="a7OzE" node="7mB3viLdI2x" resolve="Name" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="nsMwS" id="7mB3viLbLNk" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
+                          <node concept="1nq8_$" id="7mB3viLbLOy" role="nsMwV">
+                            <node concept="a7P8L" id="7mB3viLbLOw" role="1nq8_t">
+                              <ref role="a7OzE" node="7lt0LtPP29U" resolve="Val" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -700,26 +446,9 @@
         </node>
       </node>
       <node concept="2t___k" id="7lt0LtPOZVn" role="1nLNMg">
-        <ref role="2t_S0q" to="qulx:7lt0LtPHOmg" resolve="Expr" />
+        <ref role="2t_S0q" to="tpck:gw2VY9q" resolve="BaseConcept" />
         <node concept="3A20r5" id="7lt0LtPOZVo" role="2t_VXX">
-          <property role="TrG5h" value="expr" />
-        </node>
-      </node>
-    </node>
-    <node concept="1nLNMY" id="JOGAOsHzhm" role="1nK1Vg">
-      <property role="TrG5h" value="asdasdasd" />
-      <node concept="3clFbS" id="JOGAOsHzhn" role="1nLNMH">
-        <node concept="3clFbH" id="3IIf9OArhiN" role="3cqZAp" />
-        <node concept="1nLNNL" id="JOGAOsHziB" role="3cqZAp">
-          <node concept="1nLNMm" id="JOGAOsHziC" role="1nLNNK">
-            <node concept="0eUR_" id="JOGAOsHziK" role="0UC6o">
-              <node concept="3NuqgR" id="JOGAOsHziM" role="0eVf_">
-                <node concept="aZer4" id="JOGAOsHziN" role="3XD1gS">
-                  <property role="TrG5h" value="T" />
-                </node>
-              </node>
-            </node>
-          </node>
+          <property role="TrG5h" value="bc" />
         </node>
       </node>
     </node>
@@ -727,19 +456,175 @@
   <node concept="ns1xd" id="JOGAOsVt6x">
     <property role="TrG5h" value="Types" />
     <node concept="ns1x$" id="JOGAOsVt6y" role="ns1xc">
-      <property role="TrG5h" value="Foo" />
+      <property role="TrG5h" value="Type" />
       <node concept="nspSf" id="JOGAOsVt6z" role="ns1xx">
+        <node concept="nssqF" id="7mB3viLdDa5" role="nspSe">
+          <property role="TrG5h" value="name" />
+        </node>
         <node concept="nssqF" id="JOGAOsVt6$" role="nspSe">
-          <property role="TrG5h" value="bar" />
+          <property role="TrG5h" value="val" />
           <property role="nspS5" value="false" />
         </node>
       </node>
     </node>
   </node>
   <node concept="AVZre" id="3IIf9OArhmM">
-    <property role="TrG5h" value="Promote" />
+    <property role="TrG5h" value="Convert" />
+    <node concept="1nLNMY" id="7mB3viLi4pn" role="1nK1Vg">
+      <property role="TrG5h" value="integerLessThan" />
+      <node concept="3clFbS" id="7mB3viLi4po" role="1nLNMH">
+        <node concept="1nLNNL" id="7mB3viLi4pI" role="3cqZAp">
+          <node concept="1nLNMm" id="7mB3viLi4pJ" role="1nLNNK">
+            <node concept="0eUR_" id="7mB3viLi4pN" role="0UC6o">
+              <node concept="3NuqgR" id="7mB3viLi4pP" role="0eVf_">
+                <node concept="aZer4" id="7mB3viLi4pQ" role="3XD1gS">
+                  <property role="TrG5h" value="A" />
+                </node>
+                <node concept="aZer4" id="7mB3viLi4qh" role="3XD1gS">
+                  <property role="TrG5h" value="B" />
+                </node>
+                <node concept="aZer4" id="7mB3viLi4pZ" role="3XD1gS">
+                  <property role="TrG5h" value="AVal" />
+                </node>
+                <node concept="aZer4" id="7mB3viLi4qx" role="3XD1gS">
+                  <property role="TrG5h" value="BVal" />
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="7mB3viLi4qS" role="1nLNMb">
+              <property role="3ArMco" value="false" />
+              <node concept="3I6sU6" id="7mB3viLi4qT" role="3Ip0Jz">
+                <node concept="3I6s7M" id="7mB3viLi4qX" role="3I6sU7">
+                  <node concept="3Aqt3T" id="7mB3viLi4qW" role="3I6s78">
+                    <ref role="3AqCNq" node="3IIf9OArhmN" resolve="convert" />
+                    <node concept="1HFMs5" id="7mB3viLi4r6" role="3AunhB">
+                      <node concept="a7P8L" id="7mB3viLi4r2" role="1uarlU">
+                        <ref role="a7OzE" node="7mB3viLi4pQ" resolve="A" />
+                      </node>
+                      <node concept="ns1u0" id="7mB3viLi4rf" role="1uarlW">
+                        <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
+                        <node concept="nsMwS" id="7mB3viLi4rl" role="ns1xD">
+                          <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
+                          <node concept="Xl_RD" id="7mB3viLi4rr" role="nsMwV">
+                            <property role="Xl_RC" value="Integer" />
+                          </node>
+                        </node>
+                        <node concept="nsMwS" id="7mB3viLi4rh" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
+                          <node concept="1nq8_$" id="7mB3viLi4v0" role="nsMwV">
+                            <node concept="a7P8L" id="7mB3viLi4uY" role="1nq8_t">
+                              <ref role="a7OzE" node="7mB3viLi4pZ" resolve="AVal" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="7mB3viLi4vX" role="3AunhB">
+                      <node concept="a7P8L" id="7mB3viLi4wP" role="1uarlU">
+                        <ref role="a7OzE" node="7mB3viLi4qh" resolve="B" />
+                      </node>
+                      <node concept="ns1u0" id="7mB3viLi4vZ" role="1uarlW">
+                        <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
+                        <node concept="nsMwS" id="7mB3viLi4w0" role="ns1xD">
+                          <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
+                          <node concept="Xl_RD" id="7mB3viLi4w1" role="nsMwV">
+                            <property role="Xl_RC" value="Integer" />
+                          </node>
+                        </node>
+                        <node concept="nsMwS" id="7mB3viLi4w2" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
+                          <node concept="1nq8_$" id="7mB3viLi4w3" role="nsMwV">
+                            <node concept="a7P8L" id="7mB3viLi4wZ" role="1nq8_t">
+                              <ref role="a7OzE" node="7mB3viLi4qx" resolve="BVal" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9_M" id="7mB3viLicii" role="1nLNMa">
+              <node concept="3I6sU6" id="7mB3viLicij" role="3Ip0Jz">
+                <node concept="3I6s7M" id="7mB3viLicio" role="3I6sU7">
+                  <node concept="3wWvb2" id="7mB3viLicin" role="3I6s78">
+                    <node concept="2dkUwp" id="7mB3viLie3k" role="3wWo3s">
+                      <node concept="2YIFZM" id="7mB3viLiciz" role="3uHU7B">
+                        <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String):java.lang.Integer" resolve="valueOf" />
+                        <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
+                        <node concept="2OqwBi" id="7mB3viLnfuc" role="37wK5m">
+                          <node concept="1TmgYN" id="7mB3viLicQJ" role="2Oq$k0">
+                            <node concept="1nq8_$" id="7mB3viLicSp" role="1Tms7$">
+                              <node concept="a7P8L" id="7mB3viLicSn" role="1nq8_t">
+                                <ref role="a7OzE" node="7mB3viLi4pZ" resolve="AVal" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="7mB3viLngpb" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2YIFZM" id="7mB3viLie5Z" role="3uHU7w">
+                        <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String):java.lang.Integer" resolve="valueOf" />
+                        <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
+                        <node concept="2OqwBi" id="7mB3viLngPv" role="37wK5m">
+                          <node concept="1TmgYN" id="7mB3viLie60" role="2Oq$k0">
+                            <node concept="1nq8_$" id="7mB3viLie61" role="1Tms7$">
+                              <node concept="a7P8L" id="7mB3viLieeF" role="1nq8_t">
+                                <ref role="a7OzE" node="7mB3viLi4qx" resolve="BVal" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="7mB3viLnhM8" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7mB3viLien3" role="3cqZAp" />
+        <node concept="1nLNNL" id="7mB3viLiewM" role="3cqZAp">
+          <node concept="1nLNMm" id="7mB3viLiewO" role="1nLNNK">
+            <node concept="3Aq9E8" id="7mB3viLieDS" role="1nLNMd">
+              <node concept="3I6sU6" id="7mB3viLieDT" role="3Ip0Jz">
+                <node concept="3I6s7M" id="7mB3viLieEm" role="3I6sU7">
+                  <node concept="3wWvb2" id="7mB3viLieEl" role="3I6s78">
+                    <node concept="3clFbT" id="7mB3viLieEp" role="3wWo3s">
+                      <property role="3clFbU" value="false" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="7mB3viLieDW" role="1nLNMb">
+              <property role="3ArMco" value="false" />
+              <node concept="3I6sU6" id="7mB3viLieDX" role="3Ip0Jz">
+                <node concept="3I6s7M" id="7mB3viLieE1" role="3I6sU7">
+                  <node concept="3Aqt3T" id="7mB3viLieE0" role="3I6s78">
+                    <ref role="3AqCNq" node="3IIf9OArhmN" resolve="convert" />
+                    <node concept="a7P8L" id="7mB3viLieE9" role="3AunhB">
+                      <ref role="a7OzE" node="7mB3viLi4pQ" resolve="A" />
+                    </node>
+                    <node concept="a7P8L" id="7mB3viLieEf" role="3AunhB">
+                      <ref role="a7OzE" node="7mB3viLi4qh" resolve="B" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3AqmO8" id="3IIf9OArhmN" role="8PkJo">
-      <property role="TrG5h" value="promote" />
+      <property role="TrG5h" value="convert" />
       <node concept="1zAUYm" id="3IIf9OArhmP" role="1zAUyy">
         <property role="TrG5h" value="subtype" />
       </node>
@@ -749,58 +634,17 @@
     </node>
   </node>
   <node concept="92CTh" id="6OXbTD$fzih">
-    <property role="TrG5h" value="Query_sample" />
+    <property role="TrG5h" value="TypecheckQuery" />
     <node concept="2bWyPT" id="6OXbTD$fzli" role="92CTm">
       <property role="TrG5h" value="main" />
       <node concept="3clFbS" id="6OXbTD$fzlj" role="fHCRw">
-        <node concept="3cpWs8" id="6OXbTD$fzlm" role="3cqZAp">
-          <node concept="3cpWsn" id="6OXbTD$fzln" role="3cpWs9">
-            <property role="TrG5h" value="inputA" />
-            <node concept="3Tqbb2" id="6OXbTD$fzlo" role="1tU5fm" />
-            <node concept="10Nm6u" id="6OXbTD$fzlp" role="33vP2m" />
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6OXbTD$fzlq" role="3cqZAp">
-          <node concept="3cpWsn" id="6OXbTD$fzlr" role="3cpWs9">
-            <property role="TrG5h" value="inputB" />
-            <node concept="3Tqbb2" id="6OXbTD$fzls" role="1tU5fm" />
-            <node concept="10Nm6u" id="6OXbTD$fzlt" role="33vP2m" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="6OXbTD$fzlu" role="3cqZAp" />
         <node concept="1nLNNL" id="6OXbTD$fzlv" role="3cqZAp">
           <node concept="1nLNMm" id="6OXbTD$fzlw" role="1nLNNK">
-            <node concept="3Aq9E8" id="6OXbTD$fzlx" role="1nLNMd">
-              <node concept="3I6sU6" id="6OXbTD$fzly" role="3Ip0Jz">
-                <node concept="3I6s7M" id="6OXbTD$fzlz" role="3I6sU7">
-                  <node concept="1imXTs" id="6OXbTD$fzl$" role="3I6s78">
-                    <node concept="a7P8L" id="6OXbTD$fzl_" role="1imXu6">
-                      <ref role="a7OzE" node="6OXbTD$fzlL" resolve="A" />
-                    </node>
-                    <node concept="37vLTw" id="6OXbTD$fzlA" role="1imXSf">
-                      <ref role="3cqZAo" node="6OXbTD$fzln" resolve="inputA" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="6OXbTD$fzlB" role="3I6sU7">
-                  <node concept="1imXTs" id="6OXbTD$fzlC" role="3I6s78">
-                    <node concept="a7P8L" id="6OXbTD$fzlD" role="1imXu6">
-                      <ref role="a7OzE" node="6OXbTD$fzlM" resolve="B" />
-                    </node>
-                    <node concept="37vLTw" id="6OXbTD$fzlE" role="1imXSf">
-                      <ref role="3cqZAo" node="6OXbTD$fzlr" resolve="inputB" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="6OXbTD$fzlF" role="3I6sU7">
-                  <node concept="3Aqt3T" id="6OXbTD$fzlG" role="3I6s78">
-                    <ref role="3AqCNq" node="3IIf9OArhmN" resolve="promote" />
-                    <node concept="a7P8L" id="6OXbTD$fzlH" role="3AunhB">
-                      <ref role="a7OzE" node="6OXbTD$fzlL" resolve="A" />
-                    </node>
-                    <node concept="a7P8L" id="6OXbTD$fzlI" role="3AunhB">
-                      <ref role="a7OzE" node="6OXbTD$fzlM" resolve="B" />
-                    </node>
+            <node concept="3Aq9E8" id="7mB3viLbExB" role="1nLNMd">
+              <node concept="3I6sU6" id="7mB3viLbExC" role="3Ip0Jz">
+                <node concept="3I6s7M" id="7mB3viLbExU" role="3I6sU7">
+                  <node concept="3Aqt3T" id="7mB3viLbExT" role="3I6s78">
+                    <ref role="3AqCNq" node="7lt0LtPOZVl" resolve="recover" />
                   </node>
                 </node>
               </node>
@@ -824,5 +668,440 @@
       <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
     </node>
   </node>
+  <node concept="AVZre" id="7mB3viLbCp8">
+    <property role="TrG5h" value="Typeof" />
+    <node concept="3AqmO8" id="7mB3viLbCp9" role="8PkJo">
+      <property role="TrG5h" value="typeof" />
+      <node concept="1zAUYm" id="7mB3viLbCpb" role="1zAUyy">
+        <property role="TrG5h" value="loc" />
+      </node>
+      <node concept="1zAUYm" id="7mB3viLbCpd" role="1zAUyy">
+        <property role="TrG5h" value="type" />
+      </node>
+    </node>
+    <node concept="1nLNMY" id="7lt0LtPHRZ8" role="1nK1Vg">
+      <property role="TrG5h" value="exprTypeof" />
+      <node concept="3clFbS" id="7lt0LtPHRZ9" role="1nLNMH">
+        <node concept="1nLNNL" id="7mB3viLbCo_" role="3cqZAp">
+          <node concept="1nLNMm" id="7mB3viLbCoA" role="1nLNNK">
+            <node concept="3Aq9E8" id="7mB3viLbCoN" role="1nLNMd">
+              <node concept="3I6sU6" id="7mB3viLbCoO" role="3Ip0Jz">
+                <node concept="3I6s7M" id="7mB3viLcDAS" role="3I6sU7">
+                  <node concept="1imXTs" id="7mB3viLcDAM" role="3I6s78">
+                    <node concept="a7P8L" id="7mB3viLcDBe" role="1imXu6">
+                      <ref role="a7OzE" node="7mB3viLcDAk" resolve="T" />
+                    </node>
+                    <node concept="3A2sRY" id="7mB3viLcDBj" role="1imXSf">
+                      <ref role="3A2yKK" node="7lt0LtPHRZd" resolve="expr" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="7mB3viLbCph" role="3I6sU7">
+                  <node concept="3Aqt3T" id="7mB3viLbCpk" role="3I6s78">
+                    <ref role="3AqCNq" node="7mB3viLbCp9" resolve="typeof" />
+                    <node concept="3BlFb$" id="7mB3viLbCpp" role="3AunhB">
+                      <node concept="3A2sRY" id="7mB3viLbCpy" role="3BlFb_">
+                        <ref role="3A2yKK" node="7lt0LtPHRZd" resolve="expr" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="7mB3viLcGwk" role="3AunhB">
+                      <ref role="a7OzE" node="7mB3viLcDAk" resolve="T" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="7mB3viLcDAc" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="7mB3viLcDAd" role="3Ip0Jz" />
+            </node>
+            <node concept="0eUR_" id="7mB3viLcDAh" role="0UC6o">
+              <node concept="3NuqgR" id="7mB3viLcDAj" role="0eVf_">
+                <node concept="aZer4" id="7mB3viLcDAk" role="3XD1gS">
+                  <property role="TrG5h" value="T" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="7lt0LtPHRZc" role="1nLNMg">
+        <ref role="2t_S0q" to="qulx:7lt0LtPHOmg" resolve="Expr" />
+        <node concept="3A20r5" id="7lt0LtPHRZd" role="2t_VXX">
+          <property role="TrG5h" value="expr" />
+        </node>
+      </node>
+    </node>
+    <node concept="1nLNMY" id="7mB3viLddjG" role="1nK1Vg">
+      <property role="TrG5h" value="varTypeof" />
+      <node concept="3clFbS" id="7mB3viLddjH" role="1nLNMH">
+        <node concept="3cpWs8" id="7mB3viLdfuX" role="3cqZAp">
+          <node concept="3cpWsn" id="7mB3viLdfuY" role="3cpWs9">
+            <property role="TrG5h" value="init" />
+            <node concept="3Tqbb2" id="7mB3viLdfuW" role="1tU5fm">
+              <ref role="ehGHo" to="qulx:7lt0LtPHOmg" resolve="Expr" />
+            </node>
+            <node concept="2OqwBi" id="7mB3viLdfuZ" role="33vP2m">
+              <node concept="1PxgMI" id="7mB3viLdfv0" role="2Oq$k0">
+                <property role="1BlNFB" value="true" />
+                <node concept="chp4Y" id="7mB3viLdfv1" role="3oSUPX">
+                  <ref role="cht4Q" to="qulx:7mB3viLbaW$" resolve="VarDeclStmt" />
+                </node>
+                <node concept="2OqwBi" id="7mB3viLdfv2" role="1m5AlR">
+                  <node concept="3A2sRY" id="7mB3viLdfv3" role="2Oq$k0">
+                    <ref role="3A2yKK" node="7mB3viLddke" resolve="varDecl" />
+                  </node>
+                  <node concept="1mfA1w" id="7mB3viLdfv4" role="2OqNvi" />
+                </node>
+              </node>
+              <node concept="3TrEf2" id="7mB3viLdfv5" role="2OqNvi">
+                <ref role="3Tt5mk" to="qulx:7mB3viLbaWQ" resolve="init" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7mB3viLddkz" role="3cqZAp">
+          <node concept="2OqwBi" id="7mB3viLdf0t" role="3clFbw">
+            <node concept="37vLTw" id="7mB3viLdfv6" role="2Oq$k0">
+              <ref role="3cqZAo" node="7mB3viLdfuY" resolve="init" />
+            </node>
+            <node concept="3x8VRR" id="7mB3viLdfr$" role="2OqNvi" />
+          </node>
+          <node concept="3clFbS" id="7mB3viLddk_" role="3clFbx">
+            <node concept="1nLNNL" id="7mB3viLdf$Q" role="3cqZAp">
+              <node concept="1nLNMm" id="7mB3viLdf$R" role="1nLNNK">
+                <node concept="3Aq93q" id="7mB3viLdf$U" role="1nLNMb">
+                  <property role="3ArMco" value="true" />
+                  <node concept="3I6sU6" id="7mB3viLdf$V" role="3Ip0Jz">
+                    <node concept="3I6s7M" id="7mB3viLdf_c" role="3I6sU7">
+                      <node concept="3Aqt3T" id="7mB3viLdf_b" role="3I6s78">
+                        <ref role="3AqCNq" node="7mB3viLbCp9" resolve="typeof" />
+                        <node concept="3BlFb$" id="7mB3viLdf_h" role="3AunhB">
+                          <node concept="37vLTw" id="7mB3viLdf_q" role="3BlFb_">
+                            <ref role="3cqZAo" node="7mB3viLdfuY" resolve="init" />
+                          </node>
+                        </node>
+                        <node concept="a7P8L" id="7mB3viLdf_A" role="3AunhB">
+                          <ref role="a7OzE" node="7mB3viLdf_2" resolve="T" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="0eUR_" id="7mB3viLdf$Z" role="0UC6o">
+                  <node concept="3NuqgR" id="7mB3viLdf_1" role="0eVf_">
+                    <node concept="aZer4" id="7mB3viLdf_2" role="3XD1gS">
+                      <property role="TrG5h" value="T" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3Aq9E8" id="7mB3viLdfAx" role="1nLNMd">
+                  <node concept="3I6sU6" id="7mB3viLdfAy" role="3Ip0Jz">
+                    <node concept="3I6s7M" id="7mB3viLdfAA" role="3I6sU7">
+                      <node concept="3Aqt3T" id="7mB3viLdfA_" role="3I6s78">
+                        <ref role="3AqCNq" node="7mB3viLbCp9" resolve="typeof" />
+                        <node concept="3BlFb$" id="7mB3viLdfAL" role="3AunhB">
+                          <node concept="3A2sRY" id="7mB3viLdfAU" role="3BlFb_">
+                            <ref role="3A2yKK" node="7mB3viLddke" resolve="varDecl" />
+                          </node>
+                        </node>
+                        <node concept="a7P8L" id="7mB3viLdfB6" role="3AunhB">
+                          <ref role="a7OzE" node="7mB3viLdf_2" resolve="T" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="7mB3viLddkd" role="1nLNMg">
+        <ref role="2t_S0q" to="qulx:7mB3viLbaW_" resolve="VarDecl" />
+        <node concept="3A20r5" id="7mB3viLddke" role="2t_VXX">
+          <property role="TrG5h" value="varDecl" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="7mB3viLc$Nn">
+    <property role="TrG5h" value="Util" />
+    <node concept="2tJIrI" id="7mB3viLc$NF" role="jymVt" />
+    <node concept="2YIFZL" id="7mB3viLc$NQ" role="jymVt">
+      <property role="TrG5h" value="log" />
+      <node concept="37vLTG" id="7mB3viLc$Os" role="3clF46">
+        <property role="TrG5h" value="msg" />
+        <node concept="17QB3L" id="7mB3viLc$OJ" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="7mB3viLc$NS" role="3clF45" />
+      <node concept="3Tm1VV" id="7mB3viLc$NT" role="1B3o_S" />
+      <node concept="3clFbS" id="7mB3viLc$NU" role="3clF47">
+        <node concept="34ab3g" id="7mB3viLc$Pj" role="3cqZAp">
+          <property role="35gtTG" value="error" />
+          <node concept="3cpWs3" id="7mB3viLc_7T" role="34bqiv">
+            <node concept="37vLTw" id="7mB3viLc_8d" role="3uHU7w">
+              <ref role="3cqZAo" node="7mB3viLc$Os" resolve="msg" />
+            </node>
+            <node concept="Xl_RD" id="7mB3viLc$Pl" role="3uHU7B">
+              <property role="Xl_RC" value="*** " />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="7mB3viLc$No" role="1B3o_S" />
+  </node>
+  <node concept="0oKg$" id="7mB3viLcERs">
+    <property role="TrG5h" value="Macros" />
+    <node concept="0oKvU" id="7mB3viLcERt" role="0oKgB">
+      <property role="TrG5h" value="integer" />
+      <node concept="3eYOCq" id="7mB3viLcERu" role="3eYTkm">
+        <property role="TrG5h" value="intExpr" />
+        <node concept="3Tqbb2" id="7mB3viLcERv" role="3eYSA1">
+          <ref role="ehGHo" to="qulx:7mB3viLbp2X" resolve="Int" />
+        </node>
+      </node>
+      <node concept="3uniRm" id="7mB3viLcERP" role="3unh6L">
+        <node concept="3clFbS" id="7mB3viLcERW" role="3uniRr">
+          <node concept="3Aqczg" id="7mB3viLcOg5" role="3cqZAp">
+            <node concept="3GeI9q" id="7mB3viLcOfZ" role="3Aqpz8">
+              <node concept="aZ4PW" id="7mB3viLcOgX" role="3GeI8F">
+                <node concept="3txIi4" id="7mB3viLcOh3" role="aZ4eD" />
+              </node>
+              <node concept="ns1u0" id="7mB3viLcOh9" role="3GeI8D">
+                <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
+                <node concept="nsMwS" id="7mB3viLdDgZ" role="ns1xD">
+                  <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
+                  <node concept="Xl_RD" id="7mB3viLdDh5" role="nsMwV">
+                    <property role="Xl_RC" value="Integer" />
+                  </node>
+                </node>
+                <node concept="nsMwS" id="7mB3viLcOhb" role="ns1xD">
+                  <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
+                  <node concept="3tDTZT" id="7mB3viLcOhf" role="nsMwV">
+                    <ref role="3tDTNw" node="7mB3viLcFeJ" resolve="val" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3tC51N" id="7mB3viLcFeJ" role="3tC56T">
+        <property role="TrG5h" value="val" />
+        <node concept="3uibUv" id="7mB3viLcKo9" role="3tC51t">
+          <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
+        </node>
+        <node concept="3tHm6F" id="7mB3viLcFf3" role="3tH6H5">
+          <node concept="3clFbS" id="7mB3viLcFf4" role="16YjZG">
+            <node concept="3clFbF" id="7mB3viLcFfr" role="3cqZAp">
+              <node concept="2OqwBi" id="7mB3viLcFoW" role="3clFbG">
+                <node concept="3eTFj6" id="7mB3viLcFfq" role="2Oq$k0">
+                  <ref role="3eTFj1" node="7mB3viLcERu" resolve="intExpr" />
+                </node>
+                <node concept="3TrcHB" id="7mB3viLcFKP" role="2OqNvi">
+                  <ref role="3TsBF5" to="qulx:7mB3viLbp2Y" resolve="val" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="0oKvU" id="7mB3viLdC0Z" role="0oKgB">
+      <property role="TrG5h" value="string" />
+      <node concept="3eYOCq" id="7mB3viLdC10" role="3eYTkm">
+        <property role="TrG5h" value="str" />
+        <node concept="3Tqbb2" id="7mB3viLdC11" role="3eYSA1">
+          <ref role="ehGHo" to="qulx:7mB3viLdltS" resolve="StrConst" />
+        </node>
+      </node>
+      <node concept="3tC51N" id="7mB3viLdC1x" role="3tC56T">
+        <property role="TrG5h" value="val" />
+        <node concept="17QB3L" id="7mB3viLdC1_" role="3tC51t" />
+        <node concept="3tHm6F" id="7mB3viLdC1K" role="3tH6H5">
+          <node concept="3clFbS" id="7mB3viLdC1L" role="16YjZG">
+            <node concept="3clFbF" id="7mB3viLdC1X" role="3cqZAp">
+              <node concept="2OqwBi" id="7mB3viLdCbs" role="3clFbG">
+                <node concept="3eTFj6" id="7mB3viLdC1W" role="2Oq$k0">
+                  <ref role="3eTFj1" node="7mB3viLdC10" resolve="str" />
+                </node>
+                <node concept="3TrcHB" id="7mB3viLdD6v" role="2OqNvi">
+                  <ref role="3TsBF5" to="qulx:7mB3viLdltT" resolve="val" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uniRm" id="7mB3viLdD9E" role="3unh6L">
+        <node concept="3clFbS" id="7mB3viLdD9K" role="3uniRr">
+          <node concept="3Aqczg" id="7mB3viLdD9J" role="3cqZAp">
+            <node concept="3GeI9q" id="7mB3viLdD9G" role="3Aqpz8">
+              <node concept="aZ4PW" id="7mB3viLdD9Q" role="3GeI8F">
+                <node concept="3txIi4" id="7mB3viLdD9W" role="aZ4eD" />
+              </node>
+              <node concept="ns1u0" id="7mB3viLdDcc" role="3GeI8D">
+                <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
+                <node concept="nsMwS" id="7mB3viLdDce" role="ns1xD">
+                  <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
+                  <node concept="Xl_RD" id="7mB3viLdDcD" role="nsMwV">
+                    <property role="Xl_RC" value="String" />
+                  </node>
+                </node>
+                <node concept="nsMwS" id="7mB3viLdDci" role="ns1xD">
+                  <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
+                  <node concept="3tDTZT" id="7mB3viLdDco" role="nsMwV">
+                    <ref role="3tDTNw" node="7mB3viLdC1x" resolve="val" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="0oKvU" id="7mB3viLgfXb" role="0oKgB">
+      <property role="TrG5h" value="type" />
+      <node concept="3eYOCq" id="7mB3viLgfXc" role="3eYTkm">
+        <property role="TrG5h" value="type" />
+        <node concept="3Tqbb2" id="7mB3viLgfXd" role="3eYSA1">
+          <ref role="ehGHo" to="qulx:7mB3viLbCL0" resolve="Type" />
+        </node>
+      </node>
+      <node concept="3tC51N" id="7mB3viLgfY3" role="3tC56T">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="7mB3viLgfY7" role="3tC51t" />
+        <node concept="3tHm6F" id="7mB3viLgfYi" role="3tH6H5">
+          <node concept="3clFbS" id="7mB3viLgfYj" role="16YjZG">
+            <node concept="3clFbF" id="7mB3viLgfYv" role="3cqZAp">
+              <node concept="2OqwBi" id="7mB3viLgg7c" role="3clFbG">
+                <node concept="3eTFj6" id="7mB3viLgfYu" role="2Oq$k0">
+                  <ref role="3eTFj1" node="7mB3viLgfXc" resolve="type" />
+                </node>
+                <node concept="3TrcHB" id="7mB3viLgglE" role="2OqNvi">
+                  <ref role="3TsBF5" to="qulx:7mB3viLbCL1" resolve="name" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3tC51N" id="7mB3viLhRTr" role="3tC56T">
+        <property role="TrG5h" value="val" />
+        <node concept="17QB3L" id="7mB3viLhRTB" role="3tC51t" />
+        <node concept="3tHm6F" id="7mB3viLhRTE" role="3tH6H5">
+          <node concept="3clFbS" id="7mB3viLhRTF" role="16YjZG">
+            <node concept="3clFbF" id="7mB3viLhRTR" role="3cqZAp">
+              <node concept="2OqwBi" id="7mB3viLhS2$" role="3clFbG">
+                <node concept="3eTFj6" id="7mB3viLhRTQ" role="2Oq$k0">
+                  <ref role="3eTFj1" node="7mB3viLgfXc" resolve="type" />
+                </node>
+                <node concept="3TrcHB" id="7mB3viLhScU" role="2OqNvi">
+                  <ref role="3TsBF5" to="qulx:7mB3viLggsO" resolve="val" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uniRm" id="7mB3viLggrJ" role="3unh6L">
+        <node concept="3clFbS" id="7mB3viLggrP" role="3uniRr">
+          <node concept="3Aqczg" id="7mB3viLggrO" role="3cqZAp">
+            <node concept="3GeI9q" id="7mB3viLggrL" role="3Aqpz8">
+              <node concept="aZ4PW" id="7mB3viLggrV" role="3GeI8F">
+                <node concept="3txIi4" id="7mB3viLggs1" role="aZ4eD" />
+              </node>
+              <node concept="ns1u0" id="7mB3viLggs9" role="3GeI8D">
+                <ref role="ns1xF" node="JOGAOsVt6y" resolve="Type" />
+                <node concept="nsMwS" id="7mB3viLggsn" role="ns1xD">
+                  <ref role="nsMwP" node="7mB3viLdDa5" resolve="name" />
+                  <node concept="3tDTZT" id="7mB3viLggsz" role="nsMwV">
+                    <ref role="3tDTNw" node="7mB3viLgfY3" resolve="name" />
+                  </node>
+                </node>
+                <node concept="nsMwS" id="7mB3viLggsC" role="ns1xD">
+                  <ref role="nsMwP" node="JOGAOsVt6$" resolve="val" />
+                  <node concept="3tDTZT" id="7mB3viLhSoQ" role="nsMwV">
+                    <ref role="3tDTNw" node="7mB3viLhRTr" resolve="val" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="92CTh" id="7mB3viLg9a7">
+    <property role="TrG5h" value="ConvertQuery" />
+    <node concept="2_cOLj" id="7mB3viLg9eu" role="2_cLD1">
+      <property role="TrG5h" value="from" />
+      <node concept="3Tqbb2" id="7mB3viLg9fg" role="2_9F96" />
+    </node>
+    <node concept="2_cOLj" id="7mB3viLg9fj" role="2_cLD1">
+      <property role="TrG5h" value="to" />
+      <node concept="3Tqbb2" id="7mB3viLg9g7" role="2_9F96" />
+    </node>
+    <node concept="2bWyPT" id="7mB3viLg9bK" role="92CTm">
+      <property role="TrG5h" value="main" />
+      <node concept="3clFbS" id="7mB3viLg9bL" role="fHCRw">
+        <node concept="1nLNNL" id="7mB3viLg9c$" role="3cqZAp">
+          <node concept="1nLNMm" id="7mB3viLg9cA" role="1nLNNK">
+            <node concept="3Aq9E8" id="7mB3viLg9eq" role="1nLNMd">
+              <node concept="3I6sU6" id="7mB3viLg9er" role="3Ip0Jz">
+                <node concept="3I6s7M" id="7mB3viLieE$" role="3I6sU7">
+                  <node concept="1imXTs" id="7mB3viLieEx" role="3I6s78">
+                    <node concept="a7P8L" id="7mB3viLieEJ" role="1imXu6">
+                      <ref role="a7OzE" node="7mB3viLg9gi" resolve="From" />
+                    </node>
+                    <node concept="2_cIyK" id="7mB3viLieF0" role="1imXSf">
+                      <ref role="2_cIwb" node="7mB3viLg9eu" resolve="from" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="7mB3viLieF9" role="3I6sU7">
+                  <node concept="1imXTs" id="7mB3viLieF3" role="3I6s78">
+                    <node concept="a7P8L" id="7mB3viLieFo" role="1imXu6">
+                      <ref role="a7OzE" node="7mB3viLg9gr" resolve="To" />
+                    </node>
+                    <node concept="2_cIyK" id="7mB3viLieFy" role="1imXSf">
+                      <ref role="2_cIwb" node="7mB3viLg9fj" resolve="to" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="7mB3viLieFT" role="3I6sU7">
+                  <node concept="3Aqt3T" id="7mB3viLieFR" role="3I6s78">
+                    <ref role="3AqCNq" node="3IIf9OArhmN" resolve="convert" />
+                    <node concept="a7P8L" id="7mB3viLieGe" role="3AunhB">
+                      <ref role="a7OzE" node="7mB3viLg9gi" resolve="From" />
+                    </node>
+                    <node concept="a7P8L" id="7mB3viLieG6" role="3AunhB">
+                      <ref role="a7OzE" node="7mB3viLg9gr" resolve="To" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="0eUR_" id="7mB3viLg9gf" role="0UC6o">
+              <node concept="3NuqgR" id="7mB3viLg9gh" role="0eVf_">
+                <node concept="aZer4" id="7mB3viLg9gi" role="3XD1gS">
+                  <property role="TrG5h" value="From" />
+                </node>
+                <node concept="aZer4" id="7mB3viLg9gr" role="3XD1gS">
+                  <property role="TrG5h" value="To" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="10M0yZ" id="7mB3viLg9aJ" role="2_lZgo">
+      <ref role="3cqZAo" to="1g4i:4t7Xo7inO_s" resolve="CONVERT" />
+      <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index 982fdaf5..1cf7fccb 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -54,7 +54,6 @@
       <concept id="7389400916848050060" name="jetbrains.mps.build.structure.BuildLayout_NamedContainer" flags="ng" index="3981dR">
         <child id="4380385936562148502" name="containerName" index="Nbhlr" />
       </concept>
-      <concept id="7389400916848036997" name="jetbrains.mps.build.structure.BuildLayout_Node" flags="ng" index="39821Y" />
       <concept id="7389400916848036984" name="jetbrains.mps.build.structure.BuildLayout_Folder" flags="ng" index="398223" />
       <concept id="7389400916848136194" name="jetbrains.mps.build.structure.BuildFolderMacro" flags="ng" index="398rNT">
         <child id="7389400916848144618" name="defaultPath" index="398pKh" />
@@ -176,9 +175,6 @@
       <node concept="22LTRF" id="5pz4PwHqsv1" role="22LTRK">
         <ref role="22LTRG" node="5pz4PwHqqGu" resolve="typechecking-test" />
       </node>
-      <node concept="22LTRF" id="5zsw4w3d7Ee" role="22LTRK">
-        <ref role="22LTRG" node="5zsw4w3d6M3" resolve="baseLanguageExt" />
-      </node>
       <node concept="NbPM2" id="5pz4PwHrDMq" role="1S4sKv">
         <node concept="3Mxwew" id="5pz4PwHrDMp" role="3MwsjC">
           <property role="3MwjfP" value="true" />
@@ -942,7 +938,7 @@
         </node>
         <node concept="1SiIV0" id="78H58oeMJTi" role="3bR37C">
           <node concept="3bR9La" id="78H58oeMJTj" role="1SiIV1">
-            <property role="3bR36h" value="false" />
+            <property role="3bR36h" value="true" />
             <ref role="3bR37D" node="NKt6yomVLS" resolve="jetbrains.mps.lang.typechecking.runtime" />
           </node>
         </node>
@@ -1170,86 +1166,143 @@
     </node>
     <node concept="2G$12M" id="5pz4PwHqqGu" role="3989C9">
       <property role="TrG5h" value="typechecking-test" />
-      <node concept="1E1JtA" id="5pz4PwHqqS4" role="2G$12L">
+      <node concept="1E1JtD" id="7mB3viLuogo" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.typechecking.testlang" />
+        <property role="3LESm3" value="3a1f0f04-b5e0-43be-884e-b856bfdeca21" />
+        <property role="2GAjPV" value="false" />
+        <node concept="55IIr" id="7mB3viLuogp" role="3LF7KH">
+          <node concept="2Ry0Ak" id="7mB3viLuouJ" role="iGT6I">
+            <property role="2Ry0Am" value="coderules" />
+            <node concept="2Ry0Ak" id="7mB3viLuoH4" role="2Ry0An">
+              <property role="2Ry0Am" value="languages" />
+              <node concept="2Ry0Ak" id="7mB3viLuoVp" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.typechecking.testlang" />
+                <node concept="2Ry0Ak" id="7mB3viLupgQ" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.typechecking.testlang.mpl" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7mB3viLupM4" role="3bR37C">
+          <node concept="3bR9La" id="7mB3viLupM5" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7mB3viLupM6" role="3bR37C">
+          <node concept="3bR9La" id="7mB3viLupM7" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
+          </node>
+        </node>
+        <node concept="1yeLz9" id="7mB3viLupM8" role="1TViLv">
+          <property role="TrG5h" value="jetbrains.mps.typechecking.testlang#3575255234175341581" />
+          <property role="3LESm3" value="1f130d77-1d29-44cb-bef3-bde05978c2c7" />
+          <property role="2GAjPV" value="false" />
+        </node>
+        <node concept="1SiIV0" id="7mB3viLurcE" role="3bR37C">
+          <node concept="3bR9La" id="7mB3viLurcF" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7mB3viLuogo" resolve="jetbrains.mps.typechecking.testlang" />
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtA" id="7mB3viLuq51" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.typechecking.testlang.sandbox" />
+        <property role="3LESm3" value="f9bad4b1-59da-4f20-8feb-9f4cc4ad872e" />
+        <property role="2GAjPV" value="false" />
+        <node concept="55IIr" id="7mB3viLuq54" role="3LF7KH">
+          <node concept="2Ry0Ak" id="7mB3viLuqkh" role="iGT6I">
+            <property role="2Ry0Am" value="coderules" />
+            <node concept="2Ry0Ak" id="7mB3viLuqzi" role="2Ry0An">
+              <property role="2Ry0Am" value="solutions" />
+              <node concept="2Ry0Ak" id="7mB3viLuqMj" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.typechecking.testlang.sandbox" />
+                <node concept="2Ry0Ak" id="7mB3viLur1k" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.typechecking.testlang.sandbox.msd" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtA" id="7mB3viLwG3m" role="2G$12L">
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="jetbrains.mps.typechecking.test" />
         <property role="3LESm3" value="c9670c16-a215-41fb-8784-04b14329799d" />
         <property role="2GAjPV" value="false" />
         <property role="aoJFB" value="sources and tests" />
-        <node concept="55IIr" id="5pz4PwHqqS5" role="3LF7KH">
-          <node concept="2Ry0Ak" id="5pz4PwHqrc5" role="iGT6I">
+        <node concept="55IIr" id="7mB3viLwG3p" role="3LF7KH">
+          <node concept="2Ry0Ak" id="7mB3viLwGj2" role="iGT6I">
             <property role="2Ry0Am" value="coderules" />
-            <node concept="2Ry0Ak" id="5pz4PwHqrm6" role="2Ry0An">
+            <node concept="2Ry0Ak" id="7mB3viLwGyn" role="2Ry0An">
               <property role="2Ry0Am" value="solutions" />
-              <node concept="2Ry0Ak" id="5pz4PwHqrw7" role="2Ry0An">
+              <node concept="2Ry0Ak" id="7mB3viLwGLG" role="2Ry0An">
                 <property role="2Ry0Am" value="jetbrains.mps.typechecking.test" />
-                <node concept="2Ry0Ak" id="5mkBzAMMwxw" role="2Ry0An">
+                <node concept="2Ry0Ak" id="7mB3viLwHnT" role="2Ry0An">
                   <property role="2Ry0Am" value="jetbrains.mps.typechecking.test.msd" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="5pz4PwHqrJa" role="3bR37C">
-          <node concept="3bR9La" id="5pz4PwHqrJb" role="1SiIV1">
+        <node concept="1SiIV0" id="7mB3viLwHzT" role="3bR37C">
+          <node concept="3bR9La" id="7mB3viLwHzU" role="1SiIV1">
             <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
-        <node concept="1SiIV0" id="5pz4PwHqrJg" role="3bR37C">
-          <node concept="3bR9La" id="5pz4PwHqrJh" role="1SiIV1">
+        <node concept="1SiIV0" id="7mB3viLwHzV" role="3bR37C">
+          <node concept="3bR9La" id="7mB3viLwHzW" role="1SiIV1">
             <property role="3bR36h" value="false" />
             <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
           </node>
         </node>
-        <node concept="1SiIV0" id="5pz4PwHqrJi" role="3bR37C">
-          <node concept="3bR9La" id="5pz4PwHqrJj" role="1SiIV1">
+        <node concept="1SiIV0" id="7mB3viLwHzX" role="3bR37C">
+          <node concept="3bR9La" id="7mB3viLwHzY" role="1SiIV1">
             <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="5pz4PwHqrJk" role="3bR37C">
-          <node concept="3bR9La" id="5pz4PwHqrJl" role="1SiIV1">
+        <node concept="1SiIV0" id="7mB3viLwHzZ" role="3bR37C">
+          <node concept="3bR9La" id="7mB3viLwH$0" role="1SiIV1">
             <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
-        <node concept="1SiIV0" id="5pz4PwHqrJm" role="3bR37C">
-          <node concept="3bR9La" id="5pz4PwHqrJn" role="1SiIV1">
+        <node concept="1SiIV0" id="7mB3viLwH$1" role="3bR37C">
+          <node concept="3bR9La" id="7mB3viLwH$2" role="1SiIV1">
             <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="5w_kaFFWUQc" role="3bR37C">
-          <node concept="3bR9La" id="5w_kaFFWUQd" role="1SiIV1">
+        <node concept="1SiIV0" id="7mB3viLwH$3" role="3bR37C">
+          <node concept="3bR9La" id="7mB3viLwH$4" role="1SiIV1">
             <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
+            <ref role="3bR37D" node="7mB3viLuogo" resolve="jetbrains.mps.typechecking.testlang" />
           </node>
         </node>
-        <node concept="3rtmxn" id="3Z6zOnxMp$B" role="3bR31x">
-          <node concept="3LXTmp" id="3Z6zOnxMp$C" role="3rtmxm">
-            <node concept="3qWCbU" id="3Z6zOnxMp$D" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
-            </node>
-            <node concept="55IIr" id="3Z6zOnxMp$E" role="3LXTmr">
-              <node concept="2Ry0Ak" id="3Z6zOnxMp$F" role="iGT6I">
-                <property role="2Ry0Am" value="coderules" />
-                <node concept="2Ry0Ak" id="3Z6zOnxMp$G" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="3Z6zOnxMp$H" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.typechecking.test" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w31FXA" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w31FXB" role="1SiIV1">
+        <node concept="1SiIV0" id="7mB3viLwH$5" role="3bR37C">
+          <node concept="3bR9La" id="7mB3viLwH$6" role="1SiIV1">
             <property role="3bR36h" value="false" />
             <ref role="3bR37D" node="NKt6yomVLS" resolve="jetbrains.mps.lang.typechecking.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="7mB3viLwH$7" role="3bR37C">
+          <node concept="3bR9La" id="7mB3viLwH$8" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7mB3viLuq51" resolve="jetbrains.mps.typechecking.testlang.sandbox" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7mB3viLwH$9" role="3bR37C">
+          <node concept="3bR9La" id="7mB3viLwH$a" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="78H58oeeFzd" role="3989C9">
@@ -2089,216 +2142,6 @@
         </node>
       </node>
     </node>
-    <node concept="2G$12M" id="5zsw4w3d6M3" role="3989C9">
-      <property role="TrG5h" value="baseLanguageExt" />
-      <node concept="1E1JtD" id="5zsw4w3d6W7" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.baseLanguageExt" />
-        <property role="3LESm3" value="0fda14cc-a416-4c81-869a-2175d8b3325d" />
-        <property role="2GAjPV" value="false" />
-        <node concept="55IIr" id="5zsw4w3d6W8" role="3LF7KH">
-          <node concept="2Ry0Ak" id="5zsw4w3d6We" role="iGT6I">
-            <property role="2Ry0Am" value="samples" />
-            <node concept="2Ry0Ak" id="5zsw4w3d6Wj" role="2Ry0An">
-              <property role="2Ry0Am" value="mpscore" />
-              <node concept="2Ry0Ak" id="5zsw4w3d6Wo" role="2Ry0An">
-                <property role="2Ry0Am" value="languages" />
-                <node concept="2Ry0Ak" id="5zsw4w3d6Wt" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt" />
-                  <node concept="2Ry0Ak" id="5zsw4w3d6Wy" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt.mpl" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d736" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d737" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d738" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d739" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d73a" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d73b" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d73c" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d73d" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d73e" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d73f" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d73g" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d73h" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="78H58oeeGcw" resolve="jetbrains.mps.controlflow" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d73i" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d73j" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d73k" role="3bR37C">
-          <node concept="1Busua" id="5zsw4w3d73l" role="1SiIV1">
-            <ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
-        </node>
-      </node>
-      <node concept="1E1JtA" id="5zsw4w3d7bT" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.baseLanguageExt.test" />
-        <property role="3LESm3" value="e44e7802-2e40-482b-9b1c-6d42660a6a11" />
-        <property role="2GAjPV" value="false" />
-        <property role="aoJFB" value="sources and tests" />
-        <node concept="55IIr" id="5zsw4w3d7ch" role="3LF7KH">
-          <node concept="2Ry0Ak" id="5zsw4w3d7cI" role="iGT6I">
-            <property role="2Ry0Am" value="samples" />
-            <node concept="2Ry0Ak" id="5zsw4w3d7cN" role="2Ry0An">
-              <property role="2Ry0Am" value="mpscore" />
-              <node concept="2Ry0Ak" id="5zsw4w3d7cS" role="2Ry0An">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="5zsw4w3d7cX" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt.test" />
-                  <node concept="2Ry0Ak" id="5zsw4w3d7d2" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt.test.msd" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d7jM" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d7jN" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d7jO" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d7jP" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d7jQ" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d7jR" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d7jS" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d7jT" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d7jU" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d7jV" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KZ0" resolve="jetbrains.mps.baseLanguageInternal" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d7jW" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d7jX" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLpd" resolve="jetbrains.mps.logic.test" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d7jY" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d7jZ" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="5zsw4w3d6W7" resolve="jetbrains.mps.baseLanguageExt" />
-          </node>
-        </node>
-      </node>
-      <node concept="1E1JtA" id="5zsw4w3d7kq" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.typechecking.sample" />
-        <property role="3LESm3" value="3ddddf69-9ff0-426b-9365-51ae7356fb82" />
-        <property role="2GAjPV" value="false" />
-        <node concept="55IIr" id="5zsw4w3d7kr" role="3LF7KH">
-          <node concept="2Ry0Ak" id="5zsw4w3d7ks" role="iGT6I">
-            <property role="2Ry0Am" value="samples" />
-            <node concept="2Ry0Ak" id="5zsw4w3d7kt" role="2Ry0An">
-              <property role="2Ry0Am" value="mpscore" />
-              <node concept="2Ry0Ak" id="5zsw4w3d7ku" role="2Ry0An">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="5zsw4w3d7kv" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample" />
-                  <node concept="2Ry0Ak" id="5zsw4w3d7lK" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.msd" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d7k_" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d7kA" role="1SiIV1">
-            <property role="3bR36h" value="true" />
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-      </node>
-      <node concept="1E1JtA" id="5zsw4w3d7sU" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.typechecking.sample.test" />
-        <property role="3LESm3" value="1b65dfe8-24ff-41c3-9a3e-70f102942455" />
-        <property role="2GAjPV" value="false" />
-        <property role="aoJFB" value="sources and tests" />
-        <node concept="55IIr" id="5zsw4w3d7sV" role="3LF7KH">
-          <node concept="2Ry0Ak" id="5zsw4w3d7sW" role="iGT6I">
-            <property role="2Ry0Am" value="samples" />
-            <node concept="2Ry0Ak" id="5zsw4w3d7sX" role="2Ry0An">
-              <property role="2Ry0Am" value="mpscore" />
-              <node concept="2Ry0Ak" id="5zsw4w3d7sY" role="2Ry0An">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="5zsw4w3d7sZ" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.test" />
-                  <node concept="2Ry0Ak" id="5zsw4w3d7uj" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.test.msd" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d7_r" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d7_s" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d7_v" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d7_w" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5zsw4w3d85K" role="3bR37C">
-          <node concept="3bR9La" id="5zsw4w3d85L" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="5zsw4w3d7kq" resolve="jetbrains.mps.typechecking.sample" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2sgV4H" id="7Ant4WkHLmd" role="1l3spa">
       <ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
       <node concept="398BVA" id="7Ant4WkHLme" role="2JcizS">
@@ -2329,7 +2172,6 @@
     </node>
     <node concept="55IIr" id="1BDNG5xBZgh" role="auvoZ" />
     <node concept="1l3spV" id="1BDNG5xBZgi" role="1l3spN">
-      <node concept="39821Y" id="5zsw4w2PYzi" role="39821P" />
       <node concept="398223" id="7Ant4WkHLAp" role="39821P">
         <node concept="L2wRC" id="JOGAOsFE1x" role="39821P">
           <ref role="L2wRA" node="JOGAOsFCCM" resolve="jetbrains.mps.dataform" />
@@ -2377,7 +2219,13 @@
           <ref role="L2wRA" node="55Q$YFtvwQY" resolve="jetbrains.mps.typechecking.ui" />
         </node>
         <node concept="L2wRC" id="5pz4PwHqt4r" role="39821P">
-          <ref role="L2wRA" node="5pz4PwHqqS4" resolve="jetbrains.mps.typechecking.test" />
+          <ref role="L2wRA" node="7mB3viLuogo" resolve="jetbrains.mps.typechecking.testlang" />
+        </node>
+        <node concept="L2wRC" id="7mB3viLurvO" role="39821P">
+          <ref role="L2wRA" node="7mB3viLuq51" resolve="jetbrains.mps.typechecking.testlang.sandbox" />
+        </node>
+        <node concept="L2wRC" id="7mB3viLwHSf" role="39821P">
+          <ref role="L2wRA" node="7mB3viLwG3m" resolve="jetbrains.mps.typechecking.test" />
         </node>
         <node concept="L2wRC" id="7ee4LalqWl7" role="39821P">
           <ref role="L2wRA" node="3u5wJtgiSM" resolve="jetbrains.mps.lang.smodel.types" />
@@ -2402,18 +2250,6 @@
         <node concept="L2wRC" id="46o4wsHrP6K" role="39821P">
           <ref role="L2wRA" node="46o4wsH5PJF" resolve="jetbrains.mps.typechecking.annotation" />
         </node>
-        <node concept="L2wRC" id="5zsw4w3d7Aw" role="39821P">
-          <ref role="L2wRA" node="5zsw4w3d6W7" resolve="jetbrains.mps.baseLanguageExt" />
-        </node>
-        <node concept="L2wRC" id="5zsw4w3d8zu" role="39821P">
-          <ref role="L2wRA" node="5zsw4w3d7bT" resolve="jetbrains.mps.baseLanguageExt.test" />
-        </node>
-        <node concept="L2wRC" id="5zsw4w3d7BW" role="39821P">
-          <ref role="L2wRA" node="5zsw4w3d7kq" resolve="jetbrains.mps.typechecking.sample" />
-        </node>
-        <node concept="L2wRC" id="5zsw4w3d7Dq" role="39821P">
-          <ref role="L2wRA" node="5zsw4w3d7sU" resolve="jetbrains.mps.typechecking.sample.test" />
-        </node>
         <node concept="398223" id="7Ant4WkHLmR" role="39821P">
           <node concept="3_J27D" id="7Ant4WkHLmS" role="Nbhlr">
             <node concept="3Mxwew" id="7Ant4WkHLmT" role="3MwsjC">
diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
index ca8cefe3..da178884 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
@@ -16,7 +16,7 @@
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
-    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
+    <use id="3a1f0f04-b5e0-43be-884e-b856bfdeca21" name="jetbrains.mps.typechecking.testlang" version="0" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -49,6 +49,8 @@
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
     <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
     <import index="u46i" ref="r:c2760840-3210-4ad4-9e64-a2dfd53620e1(jetbrains.mps.lang.typechecking.aspect)" />
+    <import index="sppd" ref="r:0e60ac07-77c3-4d5c-b40d-73e8fd128592(jetbrains.mps.typechecking.testlang.sandbox.test)" />
+    <import index="qulx" ref="r:ec0979fb-ae37-4823-9eaa-8550d9f5c6fd(jetbrains.mps.typechecking.testlang.structure)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@@ -109,13 +111,11 @@
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
-      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
         <child id="1070534934091" name="type" index="10QFUM" />
         <child id="1070534934092" name="expression" index="10QFUP" />
       </concept>
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
@@ -146,9 +146,6 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -169,10 +166,8 @@
       <concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
         <child id="1171903916107" name="bound" index="3qUE_r" />
       </concept>
-      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
-        <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
@@ -205,12 +200,27 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
-        <property id="6489343236075007666" name="label" index="3hQQBS" />
-        <child id="1196350785111" name="expression" index="2c44t1" />
+    <language id="3a1f0f04-b5e0-43be-884e-b856bfdeca21" name="jetbrains.mps.typechecking.testlang">
+      <concept id="8456919074565735802" name="jetbrains.mps.typechecking.testlang.structure.Root" flags="ng" index="0U$pH">
+        <child id="8456919074565735822" name="stmt" index="0U$qp" />
       </concept>
-      <concept id="1196350785117" name="jetbrains.mps.lang.quotation.structure.ReferenceAntiquotation" flags="ng" index="2c44tb" />
+      <concept id="8477760168144047168" name="jetbrains.mps.typechecking.testlang.structure.Type" flags="ng" index="34yo6O">
+        <property id="8477760168144047169" name="name" index="34yo6P" />
+        <property id="8477760168145258292" name="val" index="34TwF0" />
+      </concept>
+      <concept id="8477760168143982781" name="jetbrains.mps.typechecking.testlang.structure.Int" flags="ng" index="34yDP9">
+        <property id="8477760168143982782" name="val" index="34yDPa" />
+      </concept>
+      <concept id="8477760168143925028" name="jetbrains.mps.typechecking.testlang.structure.VarDeclStmt" flags="ng" index="34yUbg">
+        <child id="8477760168143925044" name="decl" index="34yUb0" />
+        <child id="8477760168143925046" name="init" index="34yUb2" />
+      </concept>
+      <concept id="8477760168143925029" name="jetbrains.mps.typechecking.testlang.structure.VarDecl" flags="ng" index="34yUbh" />
+      <concept id="8477760168144492408" name="jetbrains.mps.typechecking.testlang.structure.StrConst" flags="ng" index="34$_Ec">
+        <property id="8477760168144492409" name="val" index="34$_Ed" />
+      </concept>
+    </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
         <child id="1196350785114" name="quotedNode" index="2c44tc" />
       </concept>
@@ -218,6 +228,7 @@
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
         <reference id="7256306938026143658" name="target" index="2aWVGs" />
+        <child id="7256306938026143676" name="child" index="2aWVGa" />
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
@@ -249,9 +260,15 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
+      <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
+        <child id="1138662048170" name="value" index="tz02z" />
+      </concept>
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
+      <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
+        <child id="3648723375513868575" name="repositoryArg" index="Vysub" />
+      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -262,24 +279,24 @@
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
       <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
+      <concept id="3648723375513868532" name="jetbrains.mps.lang.smodel.structure.NodePointer_ResolveOperation" flags="ng" index="Vyspw" />
       <concept id="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
-      <concept id="597763930871270009" name="jetbrains.mps.lang.smodel.structure.ChildNodeRefExpression" flags="nn" index="3fl2lp">
-        <reference id="597763930871272016" name="targetNode" index="3fl3PK" />
-        <child id="597763930871272014" name="parent" index="3fl3PI" />
-      </concept>
+      <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
-      <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
-        <reference id="1219352800908" name="referentNode" index="3B5MYn" />
-      </concept>
       <concept id="1206482823744" name="jetbrains.mps.lang.smodel.structure.Model_AddRootOperation" flags="nn" index="3BYIHo">
         <child id="1206482823746" name="nodeArgument" index="3BYIHq" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <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>
@@ -288,10 +305,6 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="3364660638048049745" name="jetbrains.mps.lang.core.structure.LinkAttribute" flags="ng" index="A9Btn">
-        <property id="1757699476691236116" name="linkRole" index="2qtEX8" />
-        <property id="1341860900488019036" name="linkId" index="P3scX" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -335,31 +348,23 @@
         <node concept="1QHqEK" id="14$_tTxzYFT" role="3cqZAp">
           <node concept="1QHqEC" id="14$_tTxzYFV" role="1QHqEI">
             <node concept="3clFbS" id="14$_tTxzYFX" role="1bW5cS">
-              <node concept="3cpWs8" id="14$_tTxzPUB" role="3cqZAp">
-                <node concept="3cpWsn" id="14$_tTxzPUC" role="3cpWs9">
-                  <property role="TrG5h" value="cls" />
-                  <node concept="3Tqbb2" id="14$_tTxzQ78" role="1tU5fm">
-                    <ref role="ehGHo" to="tpee:fz12cDA" resolve="ClassConcept" />
+              <node concept="3cpWs8" id="7mB3viLe1a1" role="3cqZAp">
+                <node concept="3cpWsn" id="7mB3viLe1a2" role="3cpWs9">
+                  <property role="TrG5h" value="demo" />
+                  <node concept="3Tqbb2" id="7mB3viLe19W" role="1tU5fm">
+                    <ref role="ehGHo" to="qulx:7lt0LtPHOlU" resolve="Root" />
                   </node>
-                  <node concept="1PxgMI" id="14$_tTx$u1V" role="33vP2m">
-                    <node concept="chp4Y" id="14$_tTx$uBy" role="3oSUPX">
-                      <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
-                    </node>
-                    <node concept="2OqwBi" id="14$_tTx$rok" role="1m5AlR">
-                      <node concept="2JrnkZ" id="3BqfYtgCQjd" role="2Oq$k0">
-                        <node concept="2tJFMh" id="3BqfYtgCQjc" role="2JrQYb">
-                          <node concept="ZC_QK" id="3BqfYtgCQjb" role="2tJFKM">
-                            <ref role="2aWVGs" to="tlxd:6$7vuu2uamo" resolve="Foo" />
-                          </node>
-                        </node>
+                  <node concept="2OqwBi" id="7mB3viLe1a3" role="33vP2m">
+                    <node concept="2tJFMh" id="7mB3viLe1a4" role="2Oq$k0">
+                      <node concept="ZC_QK" id="7mB3viLe1a5" role="2tJFKM">
+                        <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
                       </node>
-                      <node concept="liA8E" id="14$_tTx$rYh" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
-                        <node concept="2OqwBi" id="14$_tTx$syv" role="37wK5m">
-                          <node concept="1jxXqW" id="14$_tTx$sfe" role="2Oq$k0" />
-                          <node concept="liA8E" id="14$_tTx$tAG" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-                          </node>
+                    </node>
+                    <node concept="Vyspw" id="7mB3viLe1a6" role="2OqNvi">
+                      <node concept="2OqwBi" id="7mB3viLe1a7" role="Vysub">
+                        <node concept="1jxXqW" id="7mB3viLe1a8" role="2Oq$k0" />
+                        <node concept="liA8E" id="7mB3viLe1a9" role="2OqNvi">
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
                         </node>
                       </node>
                     </node>
@@ -371,13 +376,40 @@
                   <property role="TrG5h" value="unit" />
                   <node concept="H_c77" id="14$_tTxzUr8" role="1tU5fm" />
                   <node concept="2OqwBi" id="14$_tTxzUri" role="33vP2m">
-                    <node concept="37vLTw" id="14$_tTxzUrj" role="2Oq$k0">
-                      <ref role="3cqZAo" node="14$_tTxzPUC" resolve="cls" />
+                    <node concept="37vLTw" id="7mB3viLe2K7" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7mB3viLe1a2" resolve="demo" />
                     </node>
                     <node concept="I4A8Y" id="14$_tTxzUrk" role="2OqNvi" />
                   </node>
                 </node>
               </node>
+              <node concept="3cpWs8" id="7mB3viLem43" role="3cqZAp">
+                <node concept="3cpWsn" id="7mB3viLem44" role="3cpWs9">
+                  <property role="TrG5h" value="foo" />
+                  <node concept="3Tqbb2" id="7mB3viLem3Y" role="1tU5fm">
+                    <ref role="ehGHo" to="qulx:7mB3viLbaW_" resolve="VarDecl" />
+                  </node>
+                  <node concept="2OqwBi" id="7mB3viLem45" role="33vP2m">
+                    <node concept="2tJFMh" id="7mB3viLem46" role="2Oq$k0">
+                      <node concept="ZC_QK" id="7mB3viLem47" role="2tJFKM">
+                        <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
+                        <node concept="ZC_QK" id="7mB3viLem48" role="2aWVGa">
+                          <ref role="2aWVGs" to="sppd:7mB3viLblk7" resolve="foo" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Vyspw" id="7mB3viLem49" role="2OqNvi">
+                      <node concept="2OqwBi" id="7mB3viLem4a" role="Vysub">
+                        <node concept="1jxXqW" id="7mB3viLem4b" role="2Oq$k0" />
+                        <node concept="liA8E" id="7mB3viLem4c" role="2OqNvi">
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="7mB3viLeeGA" role="3cqZAp" />
               <node concept="3cpWs8" id="14$_tTxzTDv" role="3cqZAp">
                 <node concept="3cpWsn" id="14$_tTxzTDw" role="3cpWs9">
                   <property role="TrG5h" value="modelRepo" />
@@ -426,8 +458,8 @@
                       <ref role="37wK5l" to="qox2:4Z$O9mrQJgp" resolve="cachedTypes" />
                       <node concept="2OqwBi" id="443LGHB5OH6" role="37wK5m">
                         <node concept="2JrnkZ" id="443LGHB5Olz" role="2Oq$k0">
-                          <node concept="37vLTw" id="4vBwiiVuB1V" role="2JrQYb">
-                            <ref role="3cqZAo" node="14$_tTxzPUC" resolve="cls" />
+                          <node concept="37vLTw" id="7mB3viLe3ou" role="2JrQYb">
+                            <ref role="3cqZAo" node="7mB3viLe1a2" resolve="demo" />
                           </node>
                         </node>
                         <node concept="liA8E" id="443LGHB5PwJ" role="2OqNvi">
@@ -460,8 +492,8 @@
                           <ref role="37wK5l" to="qox2:6QH_LDtbsGz" resolve="updateCachedTypes" />
                           <node concept="2OqwBi" id="4vBwiiVtLmA" role="37wK5m">
                             <node concept="2JrnkZ" id="4vBwiiVtKYf" role="2Oq$k0">
-                              <node concept="37vLTw" id="4vBwiiVtG$O" role="2JrQYb">
-                                <ref role="3cqZAo" node="14$_tTxzPUC" resolve="cls" />
+                              <node concept="37vLTw" id="7mB3viLe3zX" role="2JrQYb">
+                                <ref role="3cqZAo" node="7mB3viLe1a2" resolve="demo" />
                               </node>
                             </node>
                             <node concept="liA8E" id="4vBwiiVtM9D" role="2OqNvi">
@@ -535,44 +567,65 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3cpWs8" id="7vt2fFwuRLZ" role="3cqZAp">
-                                <node concept="3cpWsn" id="7vt2fFwuRM0" role="3cpWs9">
-                                  <property role="TrG5h" value="clsType" />
-                                  <node concept="3Tqbb2" id="7vt2fFwuRLX" role="1tU5fm">
-                                    <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                              <node concept="3clFbH" id="7mB3viLe3Jx" role="3cqZAp" />
+                              <node concept="3cpWs8" id="7mB3viLe7Js" role="3cqZAp">
+                                <node concept="3cpWsn" id="7mB3viLe7Jt" role="3cpWs9">
+                                  <property role="TrG5h" value="typeNode" />
+                                  <node concept="3Tqbb2" id="7mB3viLe7Jq" role="1tU5fm">
+                                    <ref role="ehGHo" to="qulx:7mB3viLbCL0" resolve="Type" />
                                   </node>
-                                  <node concept="2ShNRf" id="7vt2fFwuRM1" role="33vP2m">
-                                    <node concept="3zrR0B" id="7vt2fFwuRM2" role="2ShVmc">
-                                      <node concept="3Tqbb2" id="7vt2fFwuRM3" role="3zrR0E">
-                                        <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                  <node concept="2ShNRf" id="7mB3viLe7Ju" role="33vP2m">
+                                    <node concept="3zrR0B" id="7mB3viLe7Jv" role="2ShVmc">
+                                      <node concept="3Tqbb2" id="7mB3viLe7Jw" role="3zrR0E">
+                                        <ref role="ehGHo" to="qulx:7mB3viLbCL0" resolve="Type" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbF" id="6QH_LDtetXP" role="3cqZAp">
-                                <node concept="37vLTI" id="6QH_LDteyw3" role="3clFbG">
-                                  <node concept="37vLTw" id="14$_tTxzWyW" role="37vLTx">
-                                    <ref role="3cqZAo" node="14$_tTxzPUC" resolve="cls" />
-                                  </node>
-                                  <node concept="2OqwBi" id="6QH_LDtewUA" role="37vLTJ">
-                                    <node concept="37vLTw" id="6QH_LDtewyz" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7vt2fFwuRM0" resolve="clsType" />
+                              <node concept="3clFbF" id="7mB3viLe8AJ" role="3cqZAp">
+                                <node concept="2OqwBi" id="7mB3viLeaHf" role="3clFbG">
+                                  <node concept="2OqwBi" id="7mB3viLe8Uq" role="2Oq$k0">
+                                    <node concept="37vLTw" id="7mB3viLe8AH" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="7mB3viLe7Jt" resolve="typeNode" />
                                     </node>
-                                    <node concept="3TrEf2" id="6QH_LDtexF8" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                                    <node concept="3TrcHB" id="7mB3viLea6s" role="2OqNvi">
+                                      <ref role="3TsBF5" to="qulx:7mB3viLbCL1" resolve="name" />
+                                    </node>
+                                  </node>
+                                  <node concept="tyxLq" id="7mB3viLebdC" role="2OqNvi">
+                                    <node concept="Xl_RD" id="7mB3viLenf6" role="tz02z">
+                                      <property role="Xl_RC" value="String" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
+                              <node concept="3clFbF" id="7mB3viLo$7G" role="3cqZAp">
+                                <node concept="2OqwBi" id="7mB3viLo_zj" role="3clFbG">
+                                  <node concept="2OqwBi" id="7mB3viLo$wr" role="2Oq$k0">
+                                    <node concept="37vLTw" id="7mB3viLo$7E" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="7mB3viLe7Jt" resolve="typeNode" />
+                                    </node>
+                                    <node concept="3TrcHB" id="7mB3viLo$Rl" role="2OqNvi">
+                                      <ref role="3TsBF5" to="qulx:7mB3viLggsO" resolve="val" />
+                                    </node>
+                                  </node>
+                                  <node concept="tyxLq" id="7mB3viLoA4G" role="2OqNvi">
+                                    <node concept="Xl_RD" id="7mB3viLoBfX" role="tz02z">
+                                      <property role="Xl_RC" value="test" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbH" id="7mB3viLe75j" role="3cqZAp" />
                               <node concept="3clFbF" id="7vt2fFwuSAJ" role="3cqZAp">
                                 <node concept="2OqwBi" id="7vt2fFwuSAL" role="3clFbG">
                                   <node concept="37vLTw" id="7vt2fFwuSAM" role="2Oq$k0">
                                     <ref role="3cqZAo" node="6QH_LDteuBh" resolve="typesModel" />
                                   </node>
                                   <node concept="3BYIHo" id="7vt2fFwuSAN" role="2OqNvi">
-                                    <node concept="37vLTw" id="7vt2fFwuSAO" role="3BYIHq">
-                                      <ref role="3cqZAo" node="7vt2fFwuRM0" resolve="clsType" />
+                                    <node concept="37vLTw" id="7mB3viLepLk" role="3BYIHq">
+                                      <ref role="3cqZAo" node="7mB3viLe7Jt" resolve="typeNode" />
                                     </node>
                                   </node>
                                 </node>
@@ -586,17 +639,17 @@
                                   <node concept="liA8E" id="6QH_LDtesSt" role="2OqNvi">
                                     <ref role="37wK5l" to="tj24:6QH_LDtcYUC" resolve="putType" />
                                     <node concept="2OqwBi" id="6QH_LDteGcY" role="37wK5m">
-                                      <node concept="2JrnkZ" id="6QH_LDteEw4" role="2Oq$k0">
-                                        <node concept="37vLTw" id="14$_tTxzY11" role="2JrQYb">
-                                          <ref role="3cqZAo" node="14$_tTxzPUC" resolve="cls" />
+                                      <node concept="2JrnkZ" id="7mB3viLesyS" role="2Oq$k0">
+                                        <node concept="37vLTw" id="7mB3viLeq7J" role="2JrQYb">
+                                          <ref role="3cqZAo" node="7mB3viLem44" resolve="foo" />
                                         </node>
                                       </node>
-                                      <node concept="liA8E" id="6QH_LDteGDm" role="2OqNvi">
+                                      <node concept="liA8E" id="7mB3viLet95" role="2OqNvi">
                                         <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
                                       </node>
                                     </node>
-                                    <node concept="37vLTw" id="6QH_LDte_a_" role="37wK5m">
-                                      <ref role="3cqZAo" node="7vt2fFwuRM0" resolve="clsType" />
+                                    <node concept="37vLTw" id="7mB3viLetmP" role="37wK5m">
+                                      <ref role="3cqZAo" node="7mB3viLe7Jt" resolve="typeNode" />
                                     </node>
                                   </node>
                                 </node>
@@ -634,8 +687,8 @@
                           <ref role="37wK5l" to="qox2:4Z$O9mrQJgp" resolve="cachedTypes" />
                           <node concept="2OqwBi" id="4vBwiiVuDf_" role="37wK5m">
                             <node concept="2JrnkZ" id="4vBwiiVuDfA" role="2Oq$k0">
-                              <node concept="37vLTw" id="4vBwiiVuDfB" role="2JrQYb">
-                                <ref role="3cqZAo" node="14$_tTxzPUC" resolve="cls" />
+                              <node concept="37vLTw" id="7mB3viLezeb" role="2JrQYb">
+                                <ref role="3cqZAo" node="7mB3viLe1a2" resolve="demo" />
                               </node>
                             </node>
                             <node concept="liA8E" id="4vBwiiVuDfC" role="2OqNvi">
@@ -674,8 +727,8 @@
                           <ref role="37wK5l" to="tj24:6QH_LDtffJj" resolve="typeOf" />
                           <node concept="2OqwBi" id="443LGHBdJJ$" role="37wK5m">
                             <node concept="2JrnkZ" id="443LGHBdJjh" role="2Oq$k0">
-                              <node concept="37vLTw" id="14$_tTxzWlq" role="2JrQYb">
-                                <ref role="3cqZAo" node="14$_tTxzPUC" resolve="cls" />
+                              <node concept="37vLTw" id="7mB3viLeu0q" role="2JrQYb">
+                                <ref role="3cqZAo" node="7mB3viLem44" resolve="foo" />
                               </node>
                             </node>
                             <node concept="liA8E" id="443LGHBdKCp" role="2OqNvi">
@@ -692,15 +745,9 @@
                         <ref role="3cqZAo" node="6QH_LDteITI" resolve="typeOfFoo" />
                       </node>
                       <node concept="2c44tf" id="6QH_LDtfLOJ" role="3uHU7B">
-                        <node concept="3uibUv" id="6QH_LDtfLOK" role="2c44tc">
-                          <node concept="2c44tb" id="6QH_LDtfLOL" role="lGtFl">
-                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
-                            <property role="2qtEX8" value="classifier" />
-                            <property role="3hQQBS" value="ClassifierType" />
-                            <node concept="37vLTw" id="14$_tTxzWkW" role="2c44t1">
-                              <ref role="3cqZAo" node="14$_tTxzPUC" resolve="cls" />
-                            </node>
-                          </node>
+                        <node concept="34yo6O" id="7mB3viLoqfr" role="2c44tc">
+                          <property role="34yo6P" value="String" />
+                          <property role="34TwF0" value="test" />
                         </node>
                       </node>
                     </node>
@@ -765,21 +812,20 @@
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs8" id="4BHjwwGUyPL" role="3cqZAp">
-                <node concept="3cpWsn" id="4BHjwwGUyPM" role="3cpWs9">
-                  <property role="TrG5h" value="cls" />
-                  <node concept="3Tqbb2" id="4BHjwwGUySV" role="1tU5fm" />
-                  <node concept="2OqwBi" id="4BHjwwGUyPN" role="33vP2m">
-                    <node concept="2JrnkZ" id="3BqfYtgCQja" role="2Oq$k0">
-                      <node concept="2tJFMh" id="3BqfYtgCQj9" role="2JrQYb">
-                        <node concept="ZC_QK" id="3BqfYtgCQj8" role="2tJFKM">
-                          <ref role="2aWVGs" to="tlxd:6$7vuu2uamo" resolve="Foo" />
-                        </node>
+              <node concept="3cpWs8" id="7mB3viLf32H" role="3cqZAp">
+                <node concept="3cpWsn" id="7mB3viLf32I" role="3cpWs9">
+                  <property role="TrG5h" value="demo" />
+                  <node concept="3Tqbb2" id="7mB3viLf32C" role="1tU5fm">
+                    <ref role="ehGHo" to="qulx:7lt0LtPHOlU" resolve="Root" />
+                  </node>
+                  <node concept="2OqwBi" id="7mB3viLf32J" role="33vP2m">
+                    <node concept="2tJFMh" id="7mB3viLf32K" role="2Oq$k0">
+                      <node concept="ZC_QK" id="7mB3viLf32L" role="2tJFKM">
+                        <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
                       </node>
                     </node>
-                    <node concept="liA8E" id="4BHjwwGUyPP" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
-                      <node concept="37vLTw" id="6OXbTD_oHct" role="37wK5m">
+                    <node concept="Vyspw" id="7mB3viLf32M" role="2OqNvi">
+                      <node concept="37vLTw" id="7mB3viLf32N" role="Vysub">
                         <ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
                       </node>
                     </node>
@@ -808,8 +854,8 @@
                             <ref role="37wK5l" to="u46i:7P_FdVPW9uU" resolve="allForModel" />
                             <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
                             <node concept="2OqwBi" id="5zsw4w31mBL" role="37wK5m">
-                              <node concept="37vLTw" id="5zsw4w31mBM" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4BHjwwGUyPM" resolve="cls" />
+                              <node concept="37vLTw" id="7mB3viLf4tH" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7mB3viLf32I" resolve="demo" />
                               </node>
                               <node concept="I4A8Y" id="5zsw4w31mBN" role="2OqNvi" />
                             </node>
@@ -892,8 +938,8 @@
                         <node concept="2HTt$P" id="3IIf9O_jgA8" role="2ShVmc">
                           <node concept="3Tqbb2" id="3IIf9O_jhoV" role="2HTBi0" />
                           <node concept="2OqwBi" id="6$7vuu2ujxV" role="2HTEbv">
-                            <node concept="37vLTw" id="4BHjwwGVaCH" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4BHjwwGUyPM" resolve="cls" />
+                            <node concept="37vLTw" id="7mB3viLf4TT" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7mB3viLf32I" resolve="demo" />
                             </node>
                             <node concept="2Rxl7S" id="6$7vuu2ujxX" role="2OqNvi" />
                           </node>
@@ -1088,48 +1134,25 @@
                     </node>
                   </node>
                   <node concept="3clFbH" id="4BHjwwGUGNB" role="3cqZAp" />
-                  <node concept="3cpWs8" id="14$_tTxxmeg" role="3cqZAp">
-                    <node concept="3cpWsn" id="14$_tTxxmeh" role="3cpWs9">
-                      <property role="TrG5h" value="varo" />
-                      <node concept="3Tqbb2" id="14$_tTxxmed" role="1tU5fm">
-                        <ref role="ehGHo" to="tpee:fzcpWvJ" resolve="LocalVariableDeclaration" />
-                      </node>
-                      <node concept="3fl2lp" id="14$_tTxxmei" role="33vP2m">
-                        <ref role="3fl3PK" to="tlxd:14$_tTxxemt" resolve="o" />
-                        <node concept="3fl2lp" id="14$_tTxxmej" role="3fl3PI">
-                          <ref role="3fl3PK" to="tlxd:6$7vuu2uaoc" resolve="bar" />
-                          <node concept="3B5_sB" id="14$_tTxxmek" role="3fl3PI">
-                            <ref role="3B5MYn" to="tlxd:6$7vuu2uamo" resolve="Foo" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3vwNmj" id="oI9YrxthE" role="3cqZAp">
                     <node concept="2YFouu" id="oI9YrxthF" role="3vwVQn">
                       <node concept="2c44tf" id="oI9YrxthG" role="3uHU7B">
-                        <node concept="3uibUv" id="oI9YrxthH" role="2c44tc">
-                          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+                        <node concept="34yo6O" id="7mB3viLfc4o" role="2c44tc">
+                          <property role="34yo6P" value="String" />
+                          <property role="34TwF0" value="test" />
                         </node>
                       </node>
                       <node concept="3EllGN" id="oI9Yrxybm" role="3uHU7w">
                         <node concept="37vLTw" id="oI9Yrxxd8" role="3ElQJh">
                           <ref role="3cqZAo" node="oI9YrxmUa" resolve="types" />
                         </node>
-                        <node concept="2OqwBi" id="oI9Yrx$tJ" role="3ElVtu">
-                          <node concept="2JrnkZ" id="oI9Yrx$tK" role="2Oq$k0">
-                            <node concept="2OqwBi" id="oI9Yrx$tL" role="2JrQYb">
-                              <node concept="37vLTw" id="oI9Yrx$tM" role="2Oq$k0">
-                                <ref role="3cqZAo" node="14$_tTxxmeh" resolve="varo" />
-                              </node>
-                              <node concept="3TrEf2" id="oI9Yrx$tN" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
-                              </node>
+                        <node concept="2tJFMh" id="7mB3viLfatV" role="3ElVtu">
+                          <node concept="ZC_QK" id="7mB3viLfatW" role="2tJFKM">
+                            <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
+                            <node concept="ZC_QK" id="7mB3viLfpHX" role="2aWVGa">
+                              <ref role="2aWVGs" to="sppd:7mB3viLblk7" resolve="foo" />
                             </node>
                           </node>
-                          <node concept="liA8E" id="oI9Yrx$tO" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                          </node>
                         </node>
                       </node>
                     </node>
@@ -1168,23 +1191,22 @@
         <node concept="1QHqEK" id="14$_tTxxKuC" role="3cqZAp">
           <node concept="1QHqEC" id="14$_tTxxKuE" role="1QHqEI">
             <node concept="3clFbS" id="14$_tTxxKuG" role="1bW5cS">
-              <node concept="3cpWs8" id="14$_tTxxL$m" role="3cqZAp">
-                <node concept="3cpWsn" id="14$_tTxxL$n" role="3cpWs9">
-                  <property role="TrG5h" value="cls" />
-                  <node concept="3Tqbb2" id="14$_tTxxL$o" role="1tU5fm" />
-                  <node concept="2OqwBi" id="14$_tTxxL$p" role="33vP2m">
-                    <node concept="2JrnkZ" id="3BqfYtgCQjj" role="2Oq$k0">
-                      <node concept="2tJFMh" id="3BqfYtgCQji" role="2JrQYb">
-                        <node concept="ZC_QK" id="3BqfYtgCQjh" role="2tJFKM">
-                          <ref role="2aWVGs" to="tlxd:6$7vuu2uamo" resolve="Foo" />
-                        </node>
+              <node concept="3cpWs8" id="7mB3viLfhiN" role="3cqZAp">
+                <node concept="3cpWsn" id="7mB3viLfhiO" role="3cpWs9">
+                  <property role="TrG5h" value="demo" />
+                  <node concept="3Tqbb2" id="7mB3viLfhiP" role="1tU5fm">
+                    <ref role="ehGHo" to="qulx:7lt0LtPHOlU" resolve="Root" />
+                  </node>
+                  <node concept="2OqwBi" id="7mB3viLfhiQ" role="33vP2m">
+                    <node concept="2tJFMh" id="7mB3viLfhiR" role="2Oq$k0">
+                      <node concept="ZC_QK" id="7mB3viLfhiS" role="2tJFKM">
+                        <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
                       </node>
                     </node>
-                    <node concept="liA8E" id="14$_tTxxL$r" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
-                      <node concept="2OqwBi" id="14$_tTxxL$s" role="37wK5m">
-                        <node concept="1jxXqW" id="14$_tTxxL$t" role="2Oq$k0" />
-                        <node concept="liA8E" id="14$_tTxxL$u" role="2OqNvi">
+                    <node concept="Vyspw" id="7mB3viLfhiT" role="2OqNvi">
+                      <node concept="2OqwBi" id="7mB3viLfkLD" role="Vysub">
+                        <node concept="1jxXqW" id="7mB3viLfkwd" role="2Oq$k0" />
+                        <node concept="liA8E" id="7mB3viLfmjL" role="2OqNvi">
                           <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
                         </node>
                       </node>
@@ -1201,8 +1223,8 @@
                   <node concept="2OqwBi" id="14$_tTxzzxJ" role="33vP2m">
                     <node concept="2JrnkZ" id="14$_tTxzzxK" role="2Oq$k0">
                       <node concept="2OqwBi" id="14$_tTxzzxL" role="2JrQYb">
-                        <node concept="37vLTw" id="14$_tTxzzxM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="14$_tTxxL$n" resolve="cls" />
+                        <node concept="37vLTw" id="7mB3viLfhLk" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7mB3viLfhiO" resolve="demo" />
                         </node>
                         <node concept="I4A8Y" id="14$_tTxzzxN" role="2OqNvi" />
                       </node>
@@ -1214,18 +1236,27 @@
                 </node>
               </node>
               <node concept="3clFbH" id="14$_tTxzzxP" role="3cqZAp" />
-              <node concept="3cpWs8" id="14$_tTxxQ5h" role="3cqZAp">
-                <node concept="3cpWsn" id="14$_tTxxQ5i" role="3cpWs9">
-                  <property role="TrG5h" value="varo" />
-                  <node concept="3Tqbb2" id="14$_tTxxQ5j" role="1tU5fm">
-                    <ref role="ehGHo" to="tpee:fzcpWvJ" resolve="LocalVariableDeclaration" />
+              <node concept="3cpWs8" id="7mB3viLf$oY" role="3cqZAp">
+                <node concept="3cpWsn" id="7mB3viLf$oZ" role="3cpWs9">
+                  <property role="TrG5h" value="foo" />
+                  <node concept="3Tqbb2" id="7mB3viLf$oT" role="1tU5fm">
+                    <ref role="ehGHo" to="qulx:7mB3viLbaW_" resolve="VarDecl" />
                   </node>
-                  <node concept="3fl2lp" id="14$_tTxxQ5k" role="33vP2m">
-                    <ref role="3fl3PK" to="tlxd:14$_tTxxemt" resolve="o" />
-                    <node concept="3fl2lp" id="14$_tTxxQ5l" role="3fl3PI">
-                      <ref role="3fl3PK" to="tlxd:6$7vuu2uaoc" resolve="bar" />
-                      <node concept="3B5_sB" id="14$_tTxxQ5m" role="3fl3PI">
-                        <ref role="3B5MYn" to="tlxd:6$7vuu2uamo" resolve="Foo" />
+                  <node concept="2OqwBi" id="7mB3viLf$p0" role="33vP2m">
+                    <node concept="2tJFMh" id="7mB3viLf$p1" role="2Oq$k0">
+                      <node concept="ZC_QK" id="7mB3viLf$p2" role="2tJFKM">
+                        <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
+                        <node concept="ZC_QK" id="7mB3viLf$p3" role="2aWVGa">
+                          <ref role="2aWVGs" to="sppd:7mB3viLblk7" resolve="foo" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Vyspw" id="7mB3viLf$p4" role="2OqNvi">
+                      <node concept="2OqwBi" id="7mB3viLf$p5" role="Vysub">
+                        <node concept="1jxXqW" id="7mB3viLf$p6" role="2Oq$k0" />
+                        <node concept="liA8E" id="7mB3viLf$p7" role="2OqNvi">
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -1241,12 +1272,21 @@
                       <node concept="2YIFZM" id="4t7Xo7iw4eI" role="33vP2m">
                         <ref role="37wK5l" to="1g4i:3IIf9O_u0Ck" resolve="typeOf" />
                         <ref role="1Pybhc" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
-                        <node concept="2OqwBi" id="14$_tTxxSAt" role="37wK5m">
-                          <node concept="37vLTw" id="14$_tTxxSjJ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="14$_tTxxQ5i" resolve="varo" />
+                        <node concept="2OqwBi" id="7mB3viLfF1U" role="37wK5m">
+                          <node concept="1PxgMI" id="7mB3viLfDMv" role="2Oq$k0">
+                            <property role="1BlNFB" value="true" />
+                            <node concept="chp4Y" id="7mB3viLfELQ" role="3oSUPX">
+                              <ref role="cht4Q" to="qulx:7mB3viLbaW$" resolve="VarDeclStmt" />
+                            </node>
+                            <node concept="2OqwBi" id="7mB3viLf_YP" role="1m5AlR">
+                              <node concept="37vLTw" id="7mB3viLf_bH" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7mB3viLf$oZ" resolve="foo" />
+                              </node>
+                              <node concept="1mfA1w" id="7mB3viLfBqX" role="2OqNvi" />
+                            </node>
                           </node>
-                          <node concept="3TrEf2" id="14$_tTxxUsB" role="2OqNvi">
-                            <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                          <node concept="3TrEf2" id="7mB3viLfGdP" role="2OqNvi">
+                            <ref role="3Tt5mk" to="qulx:7mB3viLbaWQ" resolve="init" />
                           </node>
                         </node>
                       </node>
@@ -1254,14 +1294,15 @@
                   </node>
                   <node concept="3vwNmj" id="6$7vuu2wZgV" role="3cqZAp">
                     <node concept="2YFouu" id="6$7vuu2wZgW" role="3vwVQn">
-                      <node concept="2c44tf" id="6$7vuu2wZh3" role="3uHU7B">
-                        <node concept="3uibUv" id="6$7vuu2wZh4" role="2c44tc">
-                          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                        </node>
-                      </node>
                       <node concept="37vLTw" id="6$7vuu2x1Qn" role="3uHU7w">
                         <ref role="3cqZAo" node="6$7vuu2wZdr" resolve="typeOfExpr" />
                       </node>
+                      <node concept="2c44tf" id="7mB3viLfGp9" role="3uHU7B">
+                        <node concept="34yo6O" id="7mB3viLfGpa" role="2c44tc">
+                          <property role="34yo6P" value="String" />
+                          <property role="34TwF0" value="test" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                   <node concept="3clFbH" id="14$_tTxxOY7" role="3cqZAp" />
@@ -1272,12 +1313,21 @@
                       <node concept="2YIFZM" id="4t7Xo7iw4eJ" role="33vP2m">
                         <ref role="37wK5l" to="1g4i:3IIf9O_u0Ck" resolve="typeOf" />
                         <ref role="1Pybhc" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
-                        <node concept="2OqwBi" id="3IIf9O_uwVx" role="37wK5m">
-                          <node concept="37vLTw" id="3IIf9O_uwVy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="14$_tTxxQ5i" resolve="varo" />
+                        <node concept="2OqwBi" id="7mB3viLfG$o" role="37wK5m">
+                          <node concept="1PxgMI" id="7mB3viLfG$p" role="2Oq$k0">
+                            <property role="1BlNFB" value="true" />
+                            <node concept="chp4Y" id="7mB3viLfG$q" role="3oSUPX">
+                              <ref role="cht4Q" to="qulx:7mB3viLbaW$" resolve="VarDeclStmt" />
+                            </node>
+                            <node concept="2OqwBi" id="7mB3viLfG$r" role="1m5AlR">
+                              <node concept="37vLTw" id="7mB3viLfG$s" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7mB3viLf$oZ" resolve="foo" />
+                              </node>
+                              <node concept="1mfA1w" id="7mB3viLfG$t" role="2OqNvi" />
+                            </node>
                           </node>
-                          <node concept="3TrEf2" id="3IIf9O_uwVz" role="2OqNvi">
-                            <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                          <node concept="3TrEf2" id="7mB3viLfG$u" role="2OqNvi">
+                            <ref role="3Tt5mk" to="qulx:7mB3viLbaWQ" resolve="init" />
                           </node>
                         </node>
                       </node>
@@ -1333,23 +1383,22 @@
         <node concept="1QHqEK" id="14$_tTxy29I" role="3cqZAp">
           <node concept="1QHqEC" id="14$_tTxy29K" role="1QHqEI">
             <node concept="3clFbS" id="14$_tTxy29M" role="1bW5cS">
-              <node concept="3cpWs8" id="14$_tTxycDZ" role="3cqZAp">
-                <node concept="3cpWsn" id="14$_tTxycE0" role="3cpWs9">
-                  <property role="TrG5h" value="cls" />
-                  <node concept="3Tqbb2" id="14$_tTxycE1" role="1tU5fm" />
-                  <node concept="2OqwBi" id="14$_tTxycE2" role="33vP2m">
-                    <node concept="2JrnkZ" id="3BqfYtgCQjg" role="2Oq$k0">
-                      <node concept="2tJFMh" id="3BqfYtgCQjf" role="2JrQYb">
-                        <node concept="ZC_QK" id="3BqfYtgCQje" role="2tJFKM">
-                          <ref role="2aWVGs" to="tlxd:6$7vuu2uamo" resolve="Foo" />
-                        </node>
+              <node concept="3cpWs8" id="7mB3viLfLns" role="3cqZAp">
+                <node concept="3cpWsn" id="7mB3viLfLnt" role="3cpWs9">
+                  <property role="TrG5h" value="demo" />
+                  <node concept="3Tqbb2" id="7mB3viLfLnu" role="1tU5fm">
+                    <ref role="ehGHo" to="qulx:7lt0LtPHOlU" resolve="Root" />
+                  </node>
+                  <node concept="2OqwBi" id="7mB3viLfLnv" role="33vP2m">
+                    <node concept="2tJFMh" id="7mB3viLfLnw" role="2Oq$k0">
+                      <node concept="ZC_QK" id="7mB3viLfLnx" role="2tJFKM">
+                        <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
                       </node>
                     </node>
-                    <node concept="liA8E" id="14$_tTxycE4" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
-                      <node concept="2OqwBi" id="14$_tTxycE5" role="37wK5m">
-                        <node concept="1jxXqW" id="14$_tTxycE6" role="2Oq$k0" />
-                        <node concept="liA8E" id="14$_tTxycE7" role="2OqNvi">
+                    <node concept="Vyspw" id="7mB3viLfLny" role="2OqNvi">
+                      <node concept="2OqwBi" id="7mB3viLfLnz" role="Vysub">
+                        <node concept="1jxXqW" id="7mB3viLfLn$" role="2Oq$k0" />
+                        <node concept="liA8E" id="7mB3viLfLn_" role="2OqNvi">
                           <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
                         </node>
                       </node>
@@ -1366,8 +1415,8 @@
                   <node concept="2OqwBi" id="14$_tTxz_CI" role="33vP2m">
                     <node concept="2JrnkZ" id="14$_tTxz_CJ" role="2Oq$k0">
                       <node concept="2OqwBi" id="14$_tTxz_CK" role="2JrQYb">
-                        <node concept="37vLTw" id="14$_tTxz_CL" role="2Oq$k0">
-                          <ref role="3cqZAo" node="14$_tTxycE0" resolve="cls" />
+                        <node concept="37vLTw" id="7mB3viLfLA9" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7mB3viLfLnt" resolve="demo" />
                         </node>
                         <node concept="I4A8Y" id="14$_tTxz_CM" role="2OqNvi" />
                       </node>
@@ -1379,18 +1428,27 @@
                 </node>
               </node>
               <node concept="3clFbH" id="14$_tTxz_CO" role="3cqZAp" />
-              <node concept="3cpWs8" id="14$_tTxycE8" role="3cqZAp">
-                <node concept="3cpWsn" id="14$_tTxycE9" role="3cpWs9">
-                  <property role="TrG5h" value="varo" />
-                  <node concept="3Tqbb2" id="14$_tTxycEa" role="1tU5fm">
-                    <ref role="ehGHo" to="tpee:fzcpWvJ" resolve="LocalVariableDeclaration" />
+              <node concept="3cpWs8" id="7mB3viLfNvh" role="3cqZAp">
+                <node concept="3cpWsn" id="7mB3viLfNvi" role="3cpWs9">
+                  <property role="TrG5h" value="foo" />
+                  <node concept="3Tqbb2" id="7mB3viLfNvj" role="1tU5fm">
+                    <ref role="ehGHo" to="qulx:7mB3viLbaW_" resolve="VarDecl" />
                   </node>
-                  <node concept="3fl2lp" id="14$_tTxycEb" role="33vP2m">
-                    <ref role="3fl3PK" to="tlxd:14$_tTxxemt" resolve="o" />
-                    <node concept="3fl2lp" id="14$_tTxycEc" role="3fl3PI">
-                      <ref role="3fl3PK" to="tlxd:6$7vuu2uaoc" resolve="bar" />
-                      <node concept="3B5_sB" id="14$_tTxycEd" role="3fl3PI">
-                        <ref role="3B5MYn" to="tlxd:6$7vuu2uamo" resolve="Foo" />
+                  <node concept="2OqwBi" id="7mB3viLfNvk" role="33vP2m">
+                    <node concept="2tJFMh" id="7mB3viLfNvl" role="2Oq$k0">
+                      <node concept="ZC_QK" id="7mB3viLfNvm" role="2tJFKM">
+                        <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
+                        <node concept="ZC_QK" id="7mB3viLfNvn" role="2aWVGa">
+                          <ref role="2aWVGs" to="sppd:7mB3viLblk7" resolve="foo" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Vyspw" id="7mB3viLfNvo" role="2OqNvi">
+                      <node concept="2OqwBi" id="7mB3viLfNvp" role="Vysub">
+                        <node concept="1jxXqW" id="7mB3viLfNvq" role="2Oq$k0" />
+                        <node concept="liA8E" id="7mB3viLfNvr" role="2OqNvi">
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -1403,28 +1461,38 @@
                       <property role="TrG5h" value="typeOfExpr" />
                       <node concept="3Tqbb2" id="3u5wJtbznr" role="1tU5fm" />
                       <node concept="2OqwBi" id="3u5wJtbznw" role="33vP2m">
-                        <node concept="2OqwBi" id="14$_tTxye4f" role="2Oq$k0">
-                          <node concept="37vLTw" id="14$_tTxydMC" role="2Oq$k0">
-                            <ref role="3cqZAo" node="14$_tTxycE9" resolve="varo" />
+                        <node concept="2W$R8B" id="3u5wJtbzny" role="2OqNvi" />
+                        <node concept="2OqwBi" id="7mB3viLfRod" role="2Oq$k0">
+                          <node concept="1PxgMI" id="7mB3viLfRoe" role="2Oq$k0">
+                            <property role="1BlNFB" value="true" />
+                            <node concept="chp4Y" id="7mB3viLfRof" role="3oSUPX">
+                              <ref role="cht4Q" to="qulx:7mB3viLbaW$" resolve="VarDeclStmt" />
+                            </node>
+                            <node concept="2OqwBi" id="7mB3viLfRog" role="1m5AlR">
+                              <node concept="37vLTw" id="7mB3viLfRoh" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7mB3viLfNvi" resolve="foo" />
+                              </node>
+                              <node concept="1mfA1w" id="7mB3viLfRoi" role="2OqNvi" />
+                            </node>
                           </node>
-                          <node concept="3TrEf2" id="14$_tTxyfVz" role="2OqNvi">
-                            <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                          <node concept="3TrEf2" id="7mB3viLfRoj" role="2OqNvi">
+                            <ref role="3Tt5mk" to="qulx:7mB3viLbaWQ" resolve="init" />
                           </node>
                         </node>
-                        <node concept="2W$R8B" id="3u5wJtbzny" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
                   <node concept="3vwNmj" id="3u5wJtb$z3" role="3cqZAp">
                     <node concept="2YFouu" id="3u5wJtb$z4" role="3vwVQn">
-                      <node concept="2c44tf" id="3u5wJtb$z5" role="3uHU7B">
-                        <node concept="3uibUv" id="3u5wJtb$z6" role="2c44tc">
-                          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                        </node>
-                      </node>
                       <node concept="37vLTw" id="3u5wJtb$z7" role="3uHU7w">
                         <ref role="3cqZAo" node="3u5wJtbznv" resolve="typeOfExpr" />
                       </node>
+                      <node concept="2c44tf" id="7mB3viLfSD5" role="3uHU7B">
+                        <node concept="34yo6O" id="7mB3viLfSD6" role="2c44tc">
+                          <property role="34yo6P" value="String" />
+                          <property role="34TwF0" value="test" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                   <node concept="3clFbH" id="3u5wJtb$yQ" role="3cqZAp" />
@@ -1433,15 +1501,24 @@
                       <property role="TrG5h" value="typeOfExpr2" />
                       <node concept="3Tqbb2" id="3u5wJtbATq" role="1tU5fm" />
                       <node concept="2OqwBi" id="3u5wJtbATr" role="33vP2m">
-                        <node concept="2OqwBi" id="14$_tTxygln" role="2Oq$k0">
-                          <node concept="37vLTw" id="14$_tTxyg4F" role="2Oq$k0">
-                            <ref role="3cqZAo" node="14$_tTxycE9" resolve="varo" />
+                        <node concept="2W$R8B" id="3u5wJtbATt" role="2OqNvi" />
+                        <node concept="2OqwBi" id="7mB3viLfRzf" role="2Oq$k0">
+                          <node concept="1PxgMI" id="7mB3viLfRzg" role="2Oq$k0">
+                            <property role="1BlNFB" value="true" />
+                            <node concept="chp4Y" id="7mB3viLfRzh" role="3oSUPX">
+                              <ref role="cht4Q" to="qulx:7mB3viLbaW$" resolve="VarDeclStmt" />
+                            </node>
+                            <node concept="2OqwBi" id="7mB3viLfRzi" role="1m5AlR">
+                              <node concept="37vLTw" id="7mB3viLfRzj" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7mB3viLfNvi" resolve="foo" />
+                              </node>
+                              <node concept="1mfA1w" id="7mB3viLfRzk" role="2OqNvi" />
+                            </node>
                           </node>
-                          <node concept="3TrEf2" id="14$_tTxyh9l" role="2OqNvi">
-                            <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                          <node concept="3TrEf2" id="7mB3viLfRzl" role="2OqNvi">
+                            <ref role="3Tt5mk" to="qulx:7mB3viLbaWQ" resolve="init" />
                           </node>
                         </node>
-                        <node concept="2W$R8B" id="3u5wJtbATt" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
@@ -1494,23 +1571,22 @@
         <node concept="1QHqEK" id="3IIf9OA4zM$" role="3cqZAp">
           <node concept="1QHqEC" id="3IIf9OA4zM_" role="1QHqEI">
             <node concept="3clFbS" id="3IIf9OA4zMA" role="1bW5cS">
-              <node concept="3cpWs8" id="3IIf9OA4zMB" role="3cqZAp">
-                <node concept="3cpWsn" id="3IIf9OA4zMC" role="3cpWs9">
-                  <property role="TrG5h" value="cls" />
-                  <node concept="3Tqbb2" id="3IIf9OA4zMD" role="1tU5fm" />
-                  <node concept="2OqwBi" id="3IIf9OA4zME" role="33vP2m">
-                    <node concept="2JrnkZ" id="3IIf9OA4zMF" role="2Oq$k0">
-                      <node concept="2tJFMh" id="3IIf9OA4zMG" role="2JrQYb">
-                        <node concept="ZC_QK" id="3IIf9OA4zMH" role="2tJFKM">
-                          <ref role="2aWVGs" to="tlxd:6$7vuu2uamo" resolve="Foo" />
-                        </node>
+              <node concept="3cpWs8" id="7mB3viLfUFr" role="3cqZAp">
+                <node concept="3cpWsn" id="7mB3viLfUFs" role="3cpWs9">
+                  <property role="TrG5h" value="demo" />
+                  <node concept="3Tqbb2" id="7mB3viLfUFt" role="1tU5fm">
+                    <ref role="ehGHo" to="qulx:7lt0LtPHOlU" resolve="Root" />
+                  </node>
+                  <node concept="2OqwBi" id="7mB3viLfUFu" role="33vP2m">
+                    <node concept="2tJFMh" id="7mB3viLfUFv" role="2Oq$k0">
+                      <node concept="ZC_QK" id="7mB3viLfUFw" role="2tJFKM">
+                        <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
                       </node>
                     </node>
-                    <node concept="liA8E" id="3IIf9OA4zMI" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
-                      <node concept="2OqwBi" id="3IIf9OA4zMJ" role="37wK5m">
-                        <node concept="1jxXqW" id="3IIf9OA4zMK" role="2Oq$k0" />
-                        <node concept="liA8E" id="3IIf9OA4zML" role="2OqNvi">
+                    <node concept="Vyspw" id="7mB3viLfUFx" role="2OqNvi">
+                      <node concept="2OqwBi" id="7mB3viLfUFy" role="Vysub">
+                        <node concept="1jxXqW" id="7mB3viLfUFz" role="2Oq$k0" />
+                        <node concept="liA8E" id="7mB3viLfUF$" role="2OqNvi">
                           <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
                         </node>
                       </node>
@@ -1527,8 +1603,8 @@
                   <node concept="2OqwBi" id="3IIf9OA4zMP" role="33vP2m">
                     <node concept="2JrnkZ" id="3IIf9OA4zMQ" role="2Oq$k0">
                       <node concept="2OqwBi" id="3IIf9OA4zMR" role="2JrQYb">
-                        <node concept="37vLTw" id="3IIf9OA4zMS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3IIf9OA4zMC" resolve="cls" />
+                        <node concept="37vLTw" id="7mB3viLfUVY" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7mB3viLfUFs" resolve="demo" />
                         </node>
                         <node concept="I4A8Y" id="3IIf9OA4zMT" role="2OqNvi" />
                       </node>
@@ -1540,91 +1616,103 @@
                 </node>
               </node>
               <node concept="3clFbH" id="3IIf9OA4zMV" role="3cqZAp" />
-              <node concept="3cpWs8" id="3IIf9OA4zMW" role="3cqZAp">
-                <node concept="3cpWsn" id="3IIf9OA4zMX" role="3cpWs9">
-                  <property role="TrG5h" value="o" />
-                  <node concept="3Tqbb2" id="3IIf9OA4zMY" role="1tU5fm">
-                    <ref role="ehGHo" to="tpee:fzcpWvJ" resolve="LocalVariableDeclaration" />
+              <node concept="3cpWs8" id="7mB3viLizhA" role="3cqZAp">
+                <node concept="3cpWsn" id="7mB3viLizhB" role="3cpWs9">
+                  <property role="TrG5h" value="bar" />
+                  <node concept="3Tqbb2" id="7mB3viLizhx" role="1tU5fm">
+                    <ref role="ehGHo" to="qulx:7mB3viLbaW_" resolve="VarDecl" />
                   </node>
-                  <node concept="3fl2lp" id="3IIf9OA4zMZ" role="33vP2m">
-                    <ref role="3fl3PK" to="tlxd:14$_tTxxemt" resolve="o" />
-                    <node concept="3fl2lp" id="3IIf9OA4zN0" role="3fl3PI">
-                      <ref role="3fl3PK" to="tlxd:6$7vuu2uaoc" resolve="bar" />
-                      <node concept="3B5_sB" id="3IIf9OA4zN1" role="3fl3PI">
-                        <ref role="3B5MYn" to="tlxd:6$7vuu2uamo" resolve="Foo" />
+                  <node concept="2OqwBi" id="7mB3viLizhC" role="33vP2m">
+                    <node concept="2tJFMh" id="7mB3viLizhD" role="2Oq$k0">
+                      <node concept="ZC_QK" id="7mB3viLizhE" role="2tJFKM">
+                        <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
+                        <node concept="ZC_QK" id="7mB3viLizhF" role="2aWVGa">
+                          <ref role="2aWVGs" to="sppd:7mB3viLdNfV" resolve="bar" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Vyspw" id="7mB3viLizhG" role="2OqNvi">
+                      <node concept="37vLTw" id="7mB3viLl8DV" role="Vysub">
+                        <ref role="3cqZAo" node="3IIf9OA4zMN" resolve="modelRepo" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs8" id="2BZXJecZ6D3" role="3cqZAp">
-                <node concept="3cpWsn" id="2BZXJecZ6D4" role="3cpWs9">
-                  <property role="TrG5h" value="str" />
-                  <node concept="3Tqbb2" id="2BZXJecZ6D5" role="1tU5fm">
-                    <ref role="ehGHo" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
+              <node concept="3cpWs8" id="7mB3viLiztF" role="3cqZAp">
+                <node concept="3cpWsn" id="7mB3viLiztG" role="3cpWs9">
+                  <property role="TrG5h" value="qux" />
+                  <node concept="3Tqbb2" id="7mB3viLiztH" role="1tU5fm">
+                    <ref role="ehGHo" to="qulx:7mB3viLbaW_" resolve="VarDecl" />
                   </node>
-                  <node concept="3fl2lp" id="2BZXJecZ6D6" role="33vP2m">
-                    <ref role="3fl3PK" to="tlxd:6$7vuu2uaoM" resolve="str" />
-                    <node concept="3fl2lp" id="2BZXJecZ6D7" role="3fl3PI">
-                      <ref role="3fl3PK" to="tlxd:6$7vuu2uaoc" resolve="bar" />
-                      <node concept="3B5_sB" id="2BZXJecZ6D8" role="3fl3PI">
-                        <ref role="3B5MYn" to="tlxd:6$7vuu2uamo" resolve="Foo" />
+                  <node concept="2OqwBi" id="7mB3viLiztI" role="33vP2m">
+                    <node concept="2tJFMh" id="7mB3viLiztJ" role="2Oq$k0">
+                      <node concept="ZC_QK" id="7mB3viLiztK" role="2tJFKM">
+                        <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
+                        <node concept="ZC_QK" id="7mB3viLiz_F" role="2aWVGa">
+                          <ref role="2aWVGs" to="sppd:7mB3viLioHH" resolve="qux" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Vyspw" id="7mB3viLiztM" role="2OqNvi">
+                      <node concept="37vLTw" id="7mB3viLl9CS" role="Vysub">
+                        <ref role="3cqZAo" node="3IIf9OA4zMN" resolve="modelRepo" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="3clFbH" id="7mB3viLinJf" role="3cqZAp" />
               <node concept="2GUZhq" id="3IIf9OA4zN2" role="3cqZAp">
                 <node concept="3clFbS" id="3IIf9OA4zN3" role="2GV8ay">
                   <node concept="3cpWs8" id="3IIf9OA4zN4" role="3cqZAp">
                     <node concept="3cpWsn" id="3IIf9OA4zN5" role="3cpWs9">
-                      <property role="TrG5h" value="typeOfExpr" />
+                      <property role="TrG5h" value="barType" />
                       <node concept="3Tqbb2" id="3IIf9OA4zN6" role="1tU5fm" />
-                      <node concept="2OqwBi" id="2BZXJecZ9TI" role="33vP2m">
-                        <node concept="37vLTw" id="2BZXJecZ9BN" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2BZXJecZ6D4" resolve="str" />
-                        </node>
-                        <node concept="3TrEf2" id="2BZXJecZbwD" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
+                      <node concept="2OqwBi" id="7mB3viLi_Ff" role="33vP2m">
+                        <node concept="37vLTw" id="7mB3viLi_dh" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7mB3viLizhB" resolve="bar" />
                         </node>
+                        <node concept="2W$R8B" id="7mB3viLiAIE" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
                   <node concept="3cpWs8" id="3IIf9OA4zNi" role="3cqZAp">
                     <node concept="3cpWsn" id="3IIf9OA4zNj" role="3cpWs9">
-                      <property role="TrG5h" value="declType" />
+                      <property role="TrG5h" value="quxType" />
                       <node concept="3Tqbb2" id="3IIf9OA4zNk" role="1tU5fm" />
                       <node concept="2OqwBi" id="2BZXJecZcow" role="33vP2m">
-                        <node concept="37vLTw" id="2BZXJecZbNM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3IIf9OA4zMX" resolve="o" />
-                        </node>
-                        <node concept="3TrEf2" id="2BZXJecZe68" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
+                        <node concept="37vLTw" id="7mB3viLiBqx" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7mB3viLiztG" resolve="qux" />
                         </node>
+                        <node concept="2W$R8B" id="7mB3viLiBHi" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFbH" id="7mB3viLiBOo" role="3cqZAp" />
                   <node concept="3vwNmj" id="3IIf9OA4zNc" role="3cqZAp">
                     <node concept="2YFouu" id="3IIf9OA4zNd" role="3vwVQn">
                       <node concept="2c44tf" id="3IIf9OA4zNe" role="3uHU7B">
-                        <node concept="3uibUv" id="2BZXJecZfxF" role="2c44tc">
-                          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+                        <node concept="34yo6O" id="7mB3viLiDA8" role="2c44tc">
+                          <property role="34yo6P" value="Integer" />
+                          <property role="34TwF0" value="123" />
                         </node>
                       </node>
                       <node concept="37vLTw" id="2BZXJecZfBo" role="3uHU7w">
-                        <ref role="3cqZAo" node="3IIf9OA4zN5" resolve="typeOfExpr" />
+                        <ref role="3cqZAo" node="3IIf9OA4zN5" resolve="barType" />
                       </node>
                     </node>
                   </node>
                   <node concept="3vwNmj" id="2BZXJecZfrs" role="3cqZAp">
                     <node concept="2YFouu" id="2BZXJecZfrt" role="3vwVQn">
-                      <node concept="2c44tf" id="2BZXJecZfru" role="3uHU7B">
-                        <node concept="3uibUv" id="2BZXJecZfrv" role="2c44tc">
-                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        </node>
-                      </node>
                       <node concept="37vLTw" id="2BZXJecZfrw" role="3uHU7w">
-                        <ref role="3cqZAo" node="3IIf9OA4zNj" resolve="declType" />
+                        <ref role="3cqZAo" node="3IIf9OA4zNj" resolve="quxType" />
+                      </node>
+                      <node concept="2c44tf" id="7mB3viLiFZo" role="3uHU7B">
+                        <node concept="34yo6O" id="7mB3viLiFZp" role="2c44tc">
+                          <property role="34yo6P" value="Integer" />
+                          <property role="34TwF0" value="1234" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -1637,10 +1725,10 @@
                         <ref role="37wK5l" to="1g4i:3IIf9OA4ZMD" resolve="convertsTo" />
                         <ref role="1Pybhc" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
                         <node concept="37vLTw" id="3IIf9OA557F" role="37wK5m">
-                          <ref role="3cqZAo" node="3IIf9OA4zN5" resolve="typeOfExpr" />
+                          <ref role="3cqZAo" node="3IIf9OA4zN5" resolve="barType" />
                         </node>
                         <node concept="37vLTw" id="3IIf9OA557G" role="37wK5m">
-                          <ref role="3cqZAo" node="3IIf9OA4zNj" resolve="declType" />
+                          <ref role="3cqZAo" node="3IIf9OA4zNj" resolve="quxType" />
                         </node>
                       </node>
                     </node>
@@ -1659,10 +1747,10 @@
                         <ref role="37wK5l" to="1g4i:3IIf9OA4ZMD" resolve="convertsTo" />
                         <ref role="1Pybhc" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
                         <node concept="37vLTw" id="2BZXJed03iD" role="37wK5m">
-                          <ref role="3cqZAo" node="3IIf9OA4zNj" resolve="declType" />
+                          <ref role="3cqZAo" node="3IIf9OA4zNj" resolve="quxType" />
                         </node>
                         <node concept="37vLTw" id="2BZXJed03iC" role="37wK5m">
-                          <ref role="3cqZAo" node="3IIf9OA4zN5" resolve="typeOfExpr" />
+                          <ref role="3cqZAo" node="3IIf9OA4zN5" resolve="barType" />
                         </node>
                       </node>
                     </node>
@@ -1719,42 +1807,34 @@
       <node concept="3clFbS" id="7y50OW6TxjR" role="3clF47">
         <node concept="3cpWs8" id="4BHjwwGTLX5" role="3cqZAp">
           <node concept="3cpWsn" id="4BHjwwGTLX6" role="3cpWs9">
-            <property role="TrG5h" value="test" />
+            <property role="TrG5h" value="demo" />
             <node concept="3Tqbb2" id="4BHjwwGTLX4" role="1tU5fm">
-              <ref role="ehGHo" to="tpee:fz12cDA" resolve="ClassConcept" />
+              <ref role="ehGHo" to="qulx:7lt0LtPHOlU" resolve="Root" />
             </node>
           </node>
         </node>
         <node concept="1QHqEK" id="4BHjwwGTNou" role="3cqZAp">
           <node concept="1QHqEC" id="4BHjwwGTNow" role="1QHqEI">
             <node concept="3clFbS" id="4BHjwwGTNoy" role="1bW5cS">
-              <node concept="3clFbF" id="4BHjwwGTMEi" role="3cqZAp">
-                <node concept="37vLTI" id="4BHjwwGTMEk" role="3clFbG">
-                  <node concept="1PxgMI" id="14$_tTxAWx6" role="37vLTx">
-                    <node concept="chp4Y" id="14$_tTxAWHD" role="3oSUPX">
-                      <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
-                    </node>
-                    <node concept="2OqwBi" id="14$_tTxAVKJ" role="1m5AlR">
-                      <node concept="2JrnkZ" id="3BqfYtgCQj7" role="2Oq$k0">
-                        <node concept="2tJFMh" id="3BqfYtgCQj6" role="2JrQYb">
-                          <node concept="ZC_QK" id="3BqfYtgCQj5" role="2tJFKM">
-                            <ref role="2aWVGs" to="tlxd:4nxCIBqyl_d" resolve="Test" />
-                          </node>
-                        </node>
+              <node concept="3clFbF" id="7mB3viLeMJ6" role="3cqZAp">
+                <node concept="37vLTI" id="7mB3viLeMJ8" role="3clFbG">
+                  <node concept="2OqwBi" id="7mB3viLeFc8" role="37vLTx">
+                    <node concept="2tJFMh" id="7mB3viLeCLn" role="2Oq$k0">
+                      <node concept="ZC_QK" id="7mB3viLeCLo" role="2tJFKM">
+                        <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
                       </node>
-                      <node concept="liA8E" id="14$_tTxAW0F" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
-                        <node concept="2OqwBi" id="14$_tTxAW4A" role="37wK5m">
-                          <node concept="1jxXqW" id="14$_tTxAW4B" role="2Oq$k0" />
-                          <node concept="liA8E" id="14$_tTxAW4C" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-                          </node>
+                    </node>
+                    <node concept="Vyspw" id="7mB3viLeFPF" role="2OqNvi">
+                      <node concept="2OqwBi" id="7mB3viLeGxa" role="Vysub">
+                        <node concept="1jxXqW" id="7mB3viLeGbM" role="2Oq$k0" />
+                        <node concept="liA8E" id="7mB3viLeHoB" role="2OqNvi">
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="37vLTw" id="4BHjwwGTMEo" role="37vLTJ">
-                    <ref role="3cqZAo" node="4BHjwwGTLX6" resolve="test" />
+                  <node concept="37vLTw" id="7mB3viLeMLr" role="37vLTJ">
+                    <ref role="3cqZAo" node="4BHjwwGTLX6" resolve="demo" />
                   </node>
                 </node>
               </node>
@@ -1783,7 +1863,7 @@
               <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
               <node concept="37vLTw" id="443LGHBj7CZ" role="37wK5m">
-                <ref role="3cqZAo" node="4BHjwwGTLX6" resolve="test" />
+                <ref role="3cqZAo" node="4BHjwwGTLX6" resolve="demo" />
               </node>
               <node concept="1jxXqW" id="443LGHBj7D0" role="37wK5m" />
             </node>
@@ -1795,7 +1875,7 @@
             <node concept="3clFbS" id="4BHjwwGTR8e" role="1bW5cS">
               <node concept="3cpWs8" id="7y50OW6ZH4l" role="3cqZAp">
                 <node concept="3cpWsn" id="7y50OW6ZH4m" role="3cpWs9">
-                  <property role="TrG5h" value="typeA" />
+                  <property role="TrG5h" value="typeFoo" />
                   <node concept="3Tqbb2" id="4BHjwwGqWQm" role="1tU5fm" />
                   <node concept="2OqwBi" id="7y50OW6ZH4n" role="33vP2m">
                     <node concept="37vLTw" id="443LGHBj7MB" role="2Oq$k0">
@@ -1803,21 +1883,13 @@
                     </node>
                     <node concept="liA8E" id="7y50OW6ZH4p" role="2OqNvi">
                       <ref role="37wK5l" to="tj24:6QH_LDtffJj" resolve="typeOf" />
-                      <node concept="2OqwBi" id="443LGHBjakV" role="37wK5m">
-                        <node concept="2JrnkZ" id="443LGHBja6M" role="2Oq$k0">
-                          <node concept="3fl2lp" id="4BHjwwGF1pq" role="2JrQYb">
-                            <ref role="3fl3PK" to="tlxd:4BHjwwGxjLz" resolve="varA" />
-                            <node concept="3fl2lp" id="4BHjwwGF14j" role="3fl3PI">
-                              <ref role="3fl3PK" to="tlxd:4BHjwwGxjBc" resolve="foo" />
-                              <node concept="3B5_sB" id="4BHjwwGF14k" role="3fl3PI">
-                                <ref role="3B5MYn" to="tlxd:4nxCIBqyl_d" resolve="Test" />
-                              </node>
-                            </node>
+                      <node concept="2tJFMh" id="7mB3viLeIwC" role="37wK5m">
+                        <node concept="ZC_QK" id="7mB3viLeIII" role="2tJFKM">
+                          <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
+                          <node concept="ZC_QK" id="7mB3viLeIXG" role="2aWVGa">
+                            <ref role="2aWVGs" to="sppd:7mB3viLblk7" resolve="foo" />
                           </node>
                         </node>
-                        <node concept="liA8E" id="443LGHBjaPK" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -1825,7 +1897,7 @@
               </node>
               <node concept="3cpWs8" id="7y50OW701J0" role="3cqZAp">
                 <node concept="3cpWsn" id="7y50OW701J1" role="3cpWs9">
-                  <property role="TrG5h" value="typeB" />
+                  <property role="TrG5h" value="typeBar" />
                   <node concept="3Tqbb2" id="4BHjwwGqWVs" role="1tU5fm" />
                   <node concept="2OqwBi" id="7y50OW701J3" role="33vP2m">
                     <node concept="37vLTw" id="443LGHBj7W9" role="2Oq$k0">
@@ -1833,21 +1905,13 @@
                     </node>
                     <node concept="liA8E" id="7y50OW701J5" role="2OqNvi">
                       <ref role="37wK5l" to="tj24:6QH_LDtffJj" resolve="typeOf" />
-                      <node concept="2OqwBi" id="443LGHBjbvp" role="37wK5m">
-                        <node concept="2JrnkZ" id="443LGHBjbk9" role="2Oq$k0">
-                          <node concept="3fl2lp" id="4BHjwwGF2US" role="2JrQYb">
-                            <ref role="3fl3PK" to="tlxd:4BHjwwGxjN$" resolve="varB" />
-                            <node concept="3fl2lp" id="4BHjwwGF2UT" role="3fl3PI">
-                              <ref role="3fl3PK" to="tlxd:4BHjwwGxjBc" resolve="foo" />
-                              <node concept="3B5_sB" id="4BHjwwGF2UU" role="3fl3PI">
-                                <ref role="3B5MYn" to="tlxd:4nxCIBqyl_d" resolve="Test" />
-                              </node>
-                            </node>
+                      <node concept="2tJFMh" id="7mB3viLeJ4H" role="37wK5m">
+                        <node concept="ZC_QK" id="7mB3viLeJ4I" role="2tJFKM">
+                          <ref role="2aWVGs" to="sppd:7lt0LtPHRY$" resolve="Demo" />
+                          <node concept="ZC_QK" id="7mB3viLeJdw" role="2aWVGa">
+                            <ref role="2aWVGs" to="sppd:7mB3viLdNfV" resolve="bar" />
                           </node>
                         </node>
-                        <node concept="liA8E" id="443LGHBjbUL" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -1855,24 +1919,23 @@
               </node>
               <node concept="JA50E" id="4BHjwwGEOwL" role="3cqZAp">
                 <node concept="37vLTw" id="4BHjwwGEQGR" role="JAdkl">
-                  <ref role="3cqZAo" node="7y50OW6ZH4m" resolve="typeA" />
+                  <ref role="3cqZAo" node="7y50OW6ZH4m" resolve="typeFoo" />
                 </node>
                 <node concept="2c44tf" id="4BHjwwGERqO" role="JA92f">
-                  <node concept="3uibUv" id="4BHjwwGESa4" role="2c44tc">
-                    <ref role="3uigEE" to="tlxd:4cKdPpqIRLR" resolve="Test.A" />
+                  <node concept="34yo6O" id="7mB3viLeJsd" role="2c44tc">
+                    <property role="34yo6P" value="String" />
+                    <property role="34TwF0" value="test" />
                   </node>
                 </node>
               </node>
               <node concept="JA50E" id="4BHjwwGESbj" role="3cqZAp">
                 <node concept="37vLTw" id="4BHjwwGET3g" role="JAdkl">
-                  <ref role="3cqZAo" node="7y50OW701J1" resolve="typeB" />
+                  <ref role="3cqZAo" node="7y50OW701J1" resolve="typeBar" />
                 </node>
                 <node concept="2c44tf" id="4BHjwwGESbl" role="JA92f">
-                  <node concept="3uibUv" id="4BHjwwGESgZ" role="2c44tc">
-                    <ref role="3uigEE" to="tlxd:7y50OW6ZXcE" resolve="Test.B" />
-                    <node concept="3uibUv" id="4BHjwwGET1S" role="11_B2D">
-                      <ref role="3uigEE" to="tlxd:4cKdPpqIRLR" resolve="Test.A" />
-                    </node>
+                  <node concept="34yo6O" id="7mB3viLeK$h" role="2c44tc">
+                    <property role="34yo6P" value="Integer" />
+                    <property role="34TwF0" value="123" />
                   </node>
                 </node>
               </node>
@@ -1885,66 +1948,44 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="4BHjwwGEMRI" role="3cqZAp" />
       </node>
     </node>
   </node>
   <node concept="1lH9Xt" id="3KwBCAABlTI">
     <property role="TrG5h" value="UpdateTypeCache" />
     <property role="26Nn1l" value="true" />
-    <node concept="1qefOq" id="3KwBCAABp2Q" role="1SKRRt">
-      <node concept="312cEu" id="6$7vuu2uamo" role="1qenE9">
-        <property role="TrG5h" value="Foo" />
-        <node concept="3clFb_" id="6$7vuu2uaoc" role="jymVt">
-          <property role="TrG5h" value="bar" />
-          <node concept="37vLTG" id="6$7vuu2uaoM" role="3clF46">
-            <property role="TrG5h" value="str" />
-            <node concept="3uibUv" id="6$7vuu2uapo" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-            </node>
+    <node concept="1qefOq" id="7mB3viLoF4d" role="1SKRRt">
+      <node concept="0U$pH" id="7lt0LtPHRY$" role="1qenE9">
+        <property role="TrG5h" value="Demo" />
+        <node concept="34yUbg" id="7mB3viLblk6" role="0U$qp">
+          <node concept="34yUbh" id="7mB3viLblk7" role="34yUb0">
+            <property role="TrG5h" value="foo" />
           </node>
-          <node concept="3cqZAl" id="6$7vuu2uaoe" role="3clF45" />
-          <node concept="3Tm1VV" id="6$7vuu2uaof" role="1B3o_S" />
-          <node concept="3clFbS" id="6$7vuu2uaog" role="3clF47">
-            <node concept="3clFbF" id="6$7vuu2uasa" role="3cqZAp">
-              <node concept="1rXfSq" id="6$7vuu2uas9" role="3clFbG">
-                <ref role="37wK5l" node="6$7vuu2uaqf" resolve="bazz" />
-                <node concept="37vLTw" id="6$7vuu2woUY" role="37wK5m">
-                  <ref role="3cqZAo" node="6$7vuu2uaoM" resolve="str" />
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="14$_tTxxems" role="3cqZAp">
-              <node concept="3cpWsn" id="14$_tTxxemt" role="3cpWs9">
-                <property role="TrG5h" value="o" />
-                <node concept="3uibUv" id="14$_tTxxemu" role="1tU5fm">
-                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                </node>
-                <node concept="37vLTw" id="14$_tTxxenZ" role="33vP2m">
-                  <ref role="3cqZAo" node="6$7vuu2uaoM" resolve="str" />
-                </node>
-                <node concept="3xLA65" id="3KwBCAABpa5" role="lGtFl">
-                  <property role="TrG5h" value="varo" />
-                </node>
-              </node>
-            </node>
+          <node concept="34$_Ec" id="7mB3viLdvny" role="34yUb2">
+            <property role="34$_Ed" value="test" />
           </node>
         </node>
-        <node concept="3clFb_" id="6$7vuu2uaqf" role="jymVt">
-          <property role="TrG5h" value="bazz" />
-          <node concept="37vLTG" id="6$7vuu2uaqV" role="3clF46">
-            <property role="TrG5h" value="obj" />
-            <node concept="3uibUv" id="6$7vuu2uarh" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
+        <node concept="34yUbg" id="7mB3viLdNfT" role="0U$qp">
+          <node concept="34yUbh" id="7mB3viLdNfV" role="34yUb0">
+            <property role="TrG5h" value="bar" />
+          </node>
+          <node concept="34yDP9" id="7mB3viLdNg5" role="34yUb2">
+            <property role="34yDPa" value="123" />
+          </node>
+          <node concept="3xLA65" id="7mB3viLoFYN" role="lGtFl">
+            <property role="TrG5h" value="bar" />
           </node>
-          <node concept="3cqZAl" id="6$7vuu2uaqh" role="3clF45" />
-          <node concept="3Tm1VV" id="6$7vuu2uaqi" role="1B3o_S" />
-          <node concept="3clFbS" id="6$7vuu2uaqj" role="3clF47" />
         </node>
-        <node concept="3Tm1VV" id="6$7vuu2uamp" role="1B3o_S" />
-        <node concept="3xLA65" id="3KwBCAABqv$" role="lGtFl">
-          <property role="TrG5h" value="cls" />
+        <node concept="34yUbg" id="7mB3viLioHG" role="0U$qp">
+          <node concept="34yUbh" id="7mB3viLioHH" role="34yUb0">
+            <property role="TrG5h" value="qux" />
+          </node>
+          <node concept="34yDP9" id="7mB3viLioHI" role="34yUb2">
+            <property role="34yDPa" value="1234" />
+          </node>
+        </node>
+        <node concept="3xLA65" id="7mB3viLoFoM" role="lGtFl">
+          <property role="TrG5h" value="demo" />
         </node>
       </node>
     </node>
@@ -1979,8 +2020,8 @@
             <node concept="2OqwBi" id="3KwBCAABwVV" role="33vP2m">
               <node concept="2JrnkZ" id="3KwBCAABwVW" role="2Oq$k0">
                 <node concept="2OqwBi" id="3KwBCAABwVX" role="2JrQYb">
-                  <node concept="3xONca" id="3KwBCAABwVY" role="2Oq$k0">
-                    <ref role="3xOPvv" node="3KwBCAABqv$" resolve="cls" />
+                  <node concept="3xONca" id="7mB3viLoFFN" role="2Oq$k0">
+                    <ref role="3xOPvv" node="7mB3viLoFoM" resolve="demo" />
                   </node>
                   <node concept="I4A8Y" id="3KwBCAABwVZ" role="2OqNvi" />
                 </node>
@@ -2003,11 +2044,11 @@
             <node concept="3Tqbb2" id="3KwBCAAB$Q6" role="1tU5fm" />
             <node concept="2OqwBi" id="3KwBCAAB$Q7" role="33vP2m">
               <node concept="2OqwBi" id="3KwBCAAB$Q8" role="2Oq$k0">
-                <node concept="3xONca" id="3KwBCAAB_4z" role="2Oq$k0">
-                  <ref role="3xOPvv" node="3KwBCAABpa5" resolve="varo" />
+                <node concept="3xONca" id="7mB3viLoFYP" role="2Oq$k0">
+                  <ref role="3xOPvv" node="7mB3viLoFYN" resolve="bar" />
                 </node>
-                <node concept="3TrEf2" id="3KwBCAAB$Qa" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                <node concept="3TrEf2" id="7mB3viLoGcs" role="2OqNvi">
+                  <ref role="3Tt5mk" to="qulx:7mB3viLbaWQ" resolve="init" />
                 </node>
               </node>
               <node concept="2W$R8B" id="3KwBCAAB$Qb" role="2OqNvi" />
@@ -2017,8 +2058,9 @@
         <node concept="3vwNmj" id="3KwBCAAB$Qc" role="3cqZAp">
           <node concept="2YFouu" id="3KwBCAAB$Qd" role="3vwVQn">
             <node concept="2c44tf" id="3KwBCAAB$Qe" role="3uHU7B">
-              <node concept="3uibUv" id="3KwBCAAB$Qf" role="2c44tc">
-                <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+              <node concept="34yo6O" id="7mB3viLoH6n" role="2c44tc">
+                <property role="34yo6P" value="Integer" />
+                <property role="34TwF0" value="123" />
               </node>
             </node>
             <node concept="37vLTw" id="3KwBCAAB$Qg" role="3uHU7w">
@@ -2033,11 +2075,11 @@
             <node concept="3Tqbb2" id="3KwBCAAB_a7" role="1tU5fm" />
             <node concept="2OqwBi" id="3KwBCAAB_a8" role="33vP2m">
               <node concept="2OqwBi" id="3KwBCAAB_a9" role="2Oq$k0">
-                <node concept="3xONca" id="3KwBCAAB_s$" role="2Oq$k0">
-                  <ref role="3xOPvv" node="3KwBCAABpa5" resolve="varo" />
+                <node concept="3xONca" id="7mB3viLoGg6" role="2Oq$k0">
+                  <ref role="3xOPvv" node="7mB3viLoFYN" resolve="bar" />
                 </node>
-                <node concept="3TrEf2" id="3KwBCAAB_ab" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                <node concept="3TrEf2" id="7mB3viLoGsw" role="2OqNvi">
+                  <ref role="3Tt5mk" to="qulx:7mB3viLbaWQ" resolve="init" />
                 </node>
               </node>
               <node concept="2W$R8B" id="3KwBCAAB_ac" role="2OqNvi" />
@@ -2056,17 +2098,17 @@
         <node concept="3clFbF" id="3KwBCAACFUT" role="3cqZAp">
           <node concept="2OqwBi" id="3KwBCAACHJq" role="3clFbG">
             <node concept="2OqwBi" id="3KwBCAACGe7" role="2Oq$k0">
-              <node concept="3xONca" id="3KwBCAACFUR" role="2Oq$k0">
-                <ref role="3xOPvv" node="3KwBCAABpa5" resolve="varo" />
+              <node concept="3xONca" id="7mB3viLoHMl" role="2Oq$k0">
+                <ref role="3xOPvv" node="7mB3viLoFYN" resolve="bar" />
               </node>
-              <node concept="3TrEf2" id="3KwBCAACHel" role="2OqNvi">
-                <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+              <node concept="3TrEf2" id="7mB3viLoIbz" role="2OqNvi">
+                <ref role="3Tt5mk" to="qulx:7mB3viLbaWQ" resolve="init" />
               </node>
             </node>
             <node concept="2oxUTD" id="3KwBCAACIlI" role="2OqNvi">
-              <node concept="2c44tf" id="3KwBCAACIA0" role="2oxUTC">
-                <node concept="3cmrfG" id="3KwBCAACIQE" role="2c44tc">
-                  <property role="3cmrfH" value="42" />
+              <node concept="2c44tf" id="7mB3viLoJb4" role="2oxUTC">
+                <node concept="34$_Ec" id="7mB3viLoJMN" role="2c44tc">
+                  <property role="34$_Ed" value="foo" />
                 </node>
               </node>
             </node>
@@ -2078,11 +2120,11 @@
             <node concept="3Tqbb2" id="3KwBCAACJFC" role="1tU5fm" />
             <node concept="2OqwBi" id="3KwBCAACJFD" role="33vP2m">
               <node concept="2OqwBi" id="3KwBCAACJFE" role="2Oq$k0">
-                <node concept="3xONca" id="3KwBCAACJFF" role="2Oq$k0">
-                  <ref role="3xOPvv" node="3KwBCAABpa5" resolve="varo" />
+                <node concept="3xONca" id="7mB3viLoKtZ" role="2Oq$k0">
+                  <ref role="3xOPvv" node="7mB3viLoFYN" resolve="bar" />
                 </node>
-                <node concept="3TrEf2" id="3KwBCAACJFG" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                <node concept="3TrEf2" id="7mB3viLoKFs" role="2OqNvi">
+                  <ref role="3Tt5mk" to="qulx:7mB3viLbaWQ" resolve="init" />
                 </node>
               </node>
               <node concept="2W$R8B" id="3KwBCAACJFH" role="2OqNvi" />
@@ -2094,7 +2136,10 @@
             <ref role="3cqZAo" node="3KwBCAACJFB" resolve="typeOfExpr3" />
           </node>
           <node concept="2c44tf" id="3KwBCAACR1H" role="JA92f">
-            <node concept="10Oyi0" id="3KwBCAACVav" role="2c44tc" />
+            <node concept="34yo6O" id="7mB3viLoL0e" role="2c44tc">
+              <property role="34yo6P" value="String" />
+              <property role="34TwF0" value="foo" />
+            </node>
           </node>
         </node>
         <node concept="3clFbH" id="3KwBCAACBmV" role="3cqZAp" />
@@ -2104,11 +2149,11 @@
             <node concept="3Tqbb2" id="3KwBCAACXaF" role="1tU5fm" />
             <node concept="2OqwBi" id="3KwBCAACXaG" role="33vP2m">
               <node concept="2OqwBi" id="3KwBCAACXaH" role="2Oq$k0">
-                <node concept="3xONca" id="3KwBCAACXaI" role="2Oq$k0">
-                  <ref role="3xOPvv" node="3KwBCAABpa5" resolve="varo" />
+                <node concept="3xONca" id="7mB3viLoLnq" role="2Oq$k0">
+                  <ref role="3xOPvv" node="7mB3viLoFYN" resolve="bar" />
                 </node>
-                <node concept="3TrEf2" id="3KwBCAACXaJ" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                <node concept="3TrEf2" id="7mB3viLoLHB" role="2OqNvi">
+                  <ref role="3Tt5mk" to="qulx:7mB3viLbaWQ" resolve="init" />
                 </node>
               </node>
               <node concept="2W$R8B" id="3KwBCAACXaK" role="2OqNvi" />
diff --git a/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/models/test.mps b/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/models/test.mps
index c0bd6a31..91927d72 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/models/test.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.testlang.sandbox/models/test.mps
@@ -7,21 +7,52 @@
   <imports />
   <registry>
     <language id="3a1f0f04-b5e0-43be-884e-b856bfdeca21" name="jetbrains.mps.typechecking.testlang">
-      <concept id="8456919074565735802" name="jetbrains.mps.typechecking.testlang.structure.Container" flags="ng" index="0U$pH">
-        <child id="8456919074565735822" name="statement" index="0U$qp" />
+      <concept id="8456919074565735802" name="jetbrains.mps.typechecking.testlang.structure.Root" flags="ng" index="0U$pH">
+        <child id="8456919074565735822" name="stmt" index="0U$qp" />
       </concept>
-      <concept id="8456919074565735824" name="jetbrains.mps.typechecking.testlang.structure.Expr" flags="ng" index="0U$q7" />
-      <concept id="8456919074565735814" name="jetbrains.mps.typechecking.testlang.structure.Stmt" flags="ng" index="0U$qh">
-        <child id="8456919074565735832" name="expression" index="0U$qf" />
+      <concept id="8477760168143982781" name="jetbrains.mps.typechecking.testlang.structure.Int" flags="ng" index="34yDP9">
+        <property id="8477760168143982782" name="val" index="34yDPa" />
+      </concept>
+      <concept id="8477760168143925028" name="jetbrains.mps.typechecking.testlang.structure.VarDeclStmt" flags="ng" index="34yUbg">
+        <child id="8477760168143925044" name="decl" index="34yUb0" />
+        <child id="8477760168143925046" name="init" index="34yUb2" />
+      </concept>
+      <concept id="8477760168143925029" name="jetbrains.mps.typechecking.testlang.structure.VarDecl" flags="ng" index="34yUbh" />
+      <concept id="8477760168144492408" name="jetbrains.mps.typechecking.testlang.structure.StrConst" flags="ng" index="34$_Ec">
+        <property id="8477760168144492409" name="val" index="34$_Ed" />
+      </concept>
+    </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">
+        <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
   </registry>
   <node concept="0U$pH" id="7lt0LtPHRY$">
-    <node concept="0U$qh" id="7lt0LtPHRYI" role="0U$qp">
-      <node concept="0U$q7" id="7lt0LtPHRYK" role="0U$qf" />
-      <node concept="0U$q7" id="7lt0LtPHRYM" role="0U$qf" />
-      <node concept="0U$q7" id="7lt0LtPHRYP" role="0U$qf" />
-      <node concept="0U$q7" id="7lt0LtPHRYT" role="0U$qf" />
+    <property role="TrG5h" value="Demo" />
+    <node concept="34yUbg" id="7mB3viLblk6" role="0U$qp">
+      <node concept="34yUbh" id="7mB3viLblk7" role="34yUb0">
+        <property role="TrG5h" value="foo" />
+      </node>
+      <node concept="34$_Ec" id="7mB3viLdvny" role="34yUb2">
+        <property role="34$_Ed" value="test" />
+      </node>
+    </node>
+    <node concept="34yUbg" id="7mB3viLdNfT" role="0U$qp">
+      <node concept="34yUbh" id="7mB3viLdNfV" role="34yUb0">
+        <property role="TrG5h" value="bar" />
+      </node>
+      <node concept="34yDP9" id="7mB3viLdNg5" role="34yUb2">
+        <property role="34yDPa" value="123" />
+      </node>
+    </node>
+    <node concept="34yUbg" id="7mB3viLioHG" role="0U$qp">
+      <node concept="34yUbh" id="7mB3viLioHH" role="34yUb0">
+        <property role="TrG5h" value="qux" />
+      </node>
+      <node concept="34yDP9" id="7mB3viLioHI" role="34yUb2">
+        <property role="34yDPa" value="1234" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd b/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
index 79b39a30..7ed601a2 100644
--- a/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
+++ b/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
@@ -14,7 +14,7 @@
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="true">f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)</dependency>
-    <dependency reexport="false">f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)</dependency>
+    <dependency reexport="true">f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />