From 51263e9b8b1d6882715d08ca1515a8169fa3b61a Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 12 Jun 2017 18:46:29 +0200
Subject: [PATCH] Reorganizing the code, optimize the number of solutions.
 Delete empty solutions.

---
 .mps/modules.xml                              |   12 +-
 build.xml                                     |  287 +----
 .../jetbrains.mps.typechecking.build.mps      |  158 +--
 .../jetbrains.mps.baseLanguageExt.mpl         |    4 +-
 .../jetbrains.mps.baseLanguageExt.types.mps   |  231 +++-
 ...rains.mps.lang.typesystem2.sample.test.msd |    2 +-
 .../typesystem2/sample/codeAnal@tests.mps     |    2 +-
 .../jetbrains.mps.lang.typesystem2.sample.msd |    2 +-
 .../mps/lang/typesystem2/sample/bounds.mps    |    2 +-
 .../lang/typesystem2/sample/bounds/bad.mps    |    2 +-
 .../mps/lang/typesystem2/sample/codeAnal.mps  |    2 +-
 .../lang/typesystem2/sample/helloWorld.mps    |    2 +-
 .../typesystem2/sample/simpleGenerics.mps     |    2 +-
 .../mps/lang/typesystem2/sample/slice.mps     |    2 +-
 ...typesystem2.samplechecker.handler.util.msd |   47 -
 .../typesystem2/samplechecker/handle/util.mps | 1129 -----------------
 ...ps.lang.typesystem2.samplechecker.test.msd |   46 -
 .../samplechecker/test/type@tests.mps         |  528 --------
 ...ains.mps.lang.typesystem2.sampleplugin.msd |    2 -
 .../lang/typesystem2/sampleplugin/plugin.mps  |   13 +-
 .../generator/template/main@generator.mps     |   14 +-
 .../jetbrains.mps.lang.typesystem2.mpl        |    2 -
 ...jetbrains.mps.lang.typesystem2.runtime.msd |    5 +-
 .../mps/lang/typesystem2/typechecking.mps     |  747 ++++++++++-
 .../jetbrains.mps.lang.typesystem2.test.msd   |    8 +-
 .../lang/typesystem2/typechecking@tests.mps   |  384 +++++-
 26 files changed, 1410 insertions(+), 2225 deletions(-)
 delete mode 100644 typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
 delete mode 100644 typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
 delete mode 100644 typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
 delete mode 100644 typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type@tests.mps

diff --git a/.mps/modules.xml b/.mps/modules.xml
index 05a0a3e1..0249f826 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -6,21 +6,19 @@
       <modulePath path="$PROJECT_DIR$/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" folder="logic" />
       <modulePath path="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" folder="logic" />
       <modulePath path="$PROJECT_DIR$/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" folder="logic" />
-      <modulePath path="$PROJECT_DIR$/plugin/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd" folder="plugin" />
+      <modulePath path="$PROJECT_DIR$/plugin/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd" folder="build" />
       <modulePath path="$PROJECT_DIR$/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="typechecking.baseLanguageExt" />
       <modulePath path="$PROJECT_DIR$/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" folder="typechecking.annotation" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="typechecking.baseLanguageExt" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd" folder="typechecking.sample" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd" folder="typechecking.sample" />
-      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="typechecking.baseLanguageExt" />
-      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd" folder="typechecking.template.handler" />
-      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd" folder="typechecking.template" />
-      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" folder="plugin" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" folder="typechecking.plugin" />
       <modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" folder="typesystem2" />
       <modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl" folder="typesystem2" />
       <modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd" folder="typesystem2" />
       <modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd" folder="typesystem2" />
       <modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd" folder="typesystem2" />
-      <modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd" folder="typesystem2" />
+      <modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd" folder="typechecking" />
     </projectModules>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 3d5e3bd3..2b9f5ed1 100644
--- a/build.xml
+++ b/build.xml
@@ -326,6 +326,7 @@
           <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="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
@@ -480,49 +481,6 @@
       <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.sampleplugin-models" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" type="solution" uuid="9c4ae21e-62e0-4110-95b7-191b357a42d2">
-        <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="23949432-aaff-4c03-b7da-26e4e956ccea(jetbrains.mps.baseLanguage.regexp.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.lang.typesystem2.samplechecker.handler.util-src.jar" descriptor="jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-      <fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.samplechecker.handler.util-models">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.samplechecker.handler.util-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.samplechecker.handler.util-models" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.test.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.test.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2.test.jar/META-INF/module.xml">
@@ -565,50 +523,6 @@
       <zipfileset file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.test-models" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.samplechecker.test.jar" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.samplechecker.test.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2.samplechecker.test.jar/META-INF/module.xml">
-      <module namespace="jetbrains.mps.lang.typesystem2.samplechecker.test" type="solution" uuid="fec0c515-766a-48ae-a50a-45de7ad21bd9">
-        <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="83f155ff-422c-4b5a-a2f2-b459302dd215(jetbrains.mps.baseLanguage.unitTest.libs)" />
-          <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="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.lang.typesystem2.samplechecker.test-src.jar" descriptor="jetbrains.mps.lang.typesystem2.samplechecker.test.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.samplechecker.test.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.test" />
-      <fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.samplechecker.test.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.samplechecker.test-models">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.samplechecker.test-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.samplechecker.test-models" prefix="module/models" />
-    </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">
@@ -1175,6 +1089,7 @@
           <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="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
@@ -1329,49 +1244,6 @@
       <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.sampleplugin-models1" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.jar1" />
-    <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.jar1/META-INF" />
-    <echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.jar1/META-INF/module.xml">
-      <module namespace="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" type="solution" uuid="9c4ae21e-62e0-4110-95b7-191b357a42d2">
-        <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="23949432-aaff-4c03-b7da-26e4e956ccea(jetbrains.mps.baseLanguage.regexp.runtime)" />
-          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
-          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
-          <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
-          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
-        </dependencies>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="jetbrains.mps.lang.typesystem2.samplechecker.handler.util-src.jar" descriptor="jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-      <fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" includes="icons/**, resources/**" />
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.jar1" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.samplechecker.handler.util-models1">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.tmp}/default/samplechecker.zip/samplechecker/languages/jetbrains.mps.lang.typesystem2.samplechecker.handler.util-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.samplechecker.handler.util-models1" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar1" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar1/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar1/META-INF/module.xml">
@@ -1471,7 +1343,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typesystem2.test, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.lang.typesystem2.sample.test, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.test" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typesystem2.test, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.lang.typesystem2.sample.test" />
   
   <target name="processResources" />
   
@@ -1576,7 +1448,6 @@
         <module file="${basedir}/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" />
         <module file="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl" />
         <module file="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd" />
-        <module file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd" />
         <module file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" />
         <module file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd" />
         <module file="${basedir}/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" />
@@ -1588,7 +1459,6 @@
       <chunk>
         <module file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd" />
         <module file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd" />
-        <module file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd" />
         <module file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd" />
       </chunk>
       <jvmargs>
@@ -1824,7 +1694,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1845,7 +1715,6 @@
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
@@ -1888,7 +1757,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933" depends="java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933" depends="java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1915,7 +1784,6 @@
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
@@ -1951,14 +1819,13 @@
     </javac>
   </target>
   
-  <target name="java.compile.java.modules.cycle.1" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.java.modules.cycle.1" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${build.tmp}/java.modules.cycle.1" />
     <javac destdir="${build.tmp}/java.modules.cycle.1" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
       <compilerarg value="-Xlint:none" />
       <src>
         <path location="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
         <path location="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
-        <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
@@ -1992,21 +1859,20 @@
         <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.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2034,7 +1900,6 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
@@ -2050,6 +1915,7 @@
         <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.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
@@ -2231,7 +2097,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2262,6 +2128,8 @@
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
@@ -2304,7 +2172,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.sampleplugin" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.sampleplugin" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2332,7 +2200,8 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
@@ -2350,51 +2219,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <pathelement path="${build.tmp}/java.modules.cycle.1" />
-      </classpath>
-    </javac>
-  </target>
-  
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" depends="java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
-    <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.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.6.2.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.regexp.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       </classpath>
     </javac>
   </target>
@@ -2449,7 +2273,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/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">
@@ -2470,7 +2294,6 @@
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
@@ -2651,79 +2474,6 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.test" depends="java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
-    <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.test" />
-    <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/source_gen" />
-        <pathelement path="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.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-environment.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-platform.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.lang.typesystem2.sampleplugin" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${artifacts.mps}/lib/mps-test.jar" />
-        <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
-        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
-        <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
-        <fileset file="${artifacts.mps}/lib/annotations.jar" />
-        <fileset file="${artifacts.mps}/lib/log4j.jar" />
-        <fileset file="${artifacts.mps}/lib/jdom.jar" />
-        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
-        <fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
-        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.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}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.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" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/junit-4.12.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-core-1.3.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/hamcrest-library-1.3-sources.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2-sources.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-2.8.2.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2-sources.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.libs/jmock-junit4-2.8.2.jar" />
-      </classpath>
-    </javac>
-  </target>
-  
   <target name="test.testconfig" depends="assemble">
     <path id="mps.libraries.path">
       <pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
@@ -2798,7 +2548,6 @@
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.helper.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.runtime.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sample.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sampleplugin.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.template.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.jar" />
@@ -2814,7 +2563,6 @@
     <path id="mps.tests.path">
       <pathelement location="${build.layout}/tests/jetbrains.mps.baseLanguageExt.test.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sample.test.jar" />
-      <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.samplechecker.test.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.test.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.test.jar" />
     </path>
@@ -2881,7 +2629,6 @@
     <delete dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/source_gen" />
     <delete dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/source_gen" />
     <delete dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
-    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
     <delete dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
     <delete dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/source_gen" />
@@ -2890,12 +2637,10 @@
     <delete dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.smodel.types/generator/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/source_gen" />
-    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/source_gen" />
     <delete dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/source_gen" />
     <delete dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/test_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/test_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/test_gen" />
-    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/test_gen" />
     <delete dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/test_gen" />
   </target>
 </project>
\ No newline at end of file
diff --git a/plugin/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/plugin/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index 4415d21e..8030da8e 100644
--- a/plugin/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/plugin/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -750,12 +750,6 @@
               <ref role="3bR37D" to="ffeo:6zkSwmUIjUj" resolve="jetbrains.mps.lang.aspect#3274906159125927726" />
             </node>
           </node>
-          <node concept="1SiIV0" id="1BDNG5xC10w" role="3bR37C">
-            <node concept="3bR9La" id="1BDNG5xC10x" role="1SiIV1">
-              <property role="3bR36h" value="false" />
-              <ref role="3bR37D" node="7Ant4Wk$48A" resolve="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-            </node>
-          </node>
         </node>
         <node concept="1SiIV0" id="wfREvqj2G8" role="3bR37C">
           <node concept="3bR9La" id="wfREvqj2G9" role="1SiIV1">
@@ -822,24 +816,12 @@
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
-        <node concept="1SiIV0" id="1BDNG5xC10S" role="3bR37C">
-          <node concept="3bR9La" id="1BDNG5xC10T" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4Wk$48A" resolve="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="1BDNG5xH$PD" role="3bR37C">
           <node concept="3bR9La" id="1BDNG5xH$PE" role="1SiIV1">
             <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
-        <node concept="1SiIV0" id="1BDNG5xH$PF" role="3bR37C">
-          <node concept="3bR9La" id="1BDNG5xH$PG" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.lang.typesystem2.sampleplugin" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUx9d" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1059,6 +1041,18 @@
             <ref role="3bR37D" node="7Ant4WkHLsF" resolve="jetbrains.mps.baseLanguageExt" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5w_kaFFWUQa" role="3bR37C">
+          <node concept="3bR9La" id="5w_kaFFWUQb" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.typesystem2.template" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5w_kaFFWUQc" role="3bR37C">
+          <node concept="3bR9La" id="5w_kaFFWUQd" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.lang.typesystem2.sampleplugin" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="65DJywFj0uW" role="3989C9">
@@ -1172,62 +1166,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6Lg2" resolve="jetbrains.mps.smodel.resources" />
           </node>
         </node>
-        <node concept="1SiIV0" id="wfREvqakYD" role="3bR37C">
-          <node concept="3bR9La" id="wfREvqakYE" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4Wk$48A" resolve="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-          </node>
-        </node>
-      </node>
-      <node concept="1E1JtA" id="7Ant4Wk$48A" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-        <property role="3LESm3" value="9c4ae21e-62e0-4110-95b7-191b357a42d2" />
-        <property role="2GAjPV" value="false" />
-        <node concept="55IIr" id="7Ant4Wk$48D" role="3LF7KH">
-          <node concept="2Ry0Ak" id="7Ant4Wk$4cR" role="iGT6I">
-            <property role="2Ry0Am" value="typechecking" />
-            <node concept="2Ry0Ak" id="7Ant4Wk$4gs" role="2Ry0An">
-              <property role="2Ry0Am" value="solutions" />
-              <node concept="2Ry0Ak" id="7Ant4Wk$4k1" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-                <node concept="2Ry0Ak" id="7Ant4Wk$4nA" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7Ant4Wk$4pq" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4Wk$4pr" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7Ant4Wk$4ps" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4Wk$4pt" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7Ant4Wk$4pu" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4Wk$4pv" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7Ant4Wk$4py" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4Wk$4pz" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="wfREvqapbX" role="3bR37C">
-          <node concept="3bR9La" id="wfREvqapbY" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
-          </node>
-        </node>
       </node>
     </node>
     <node concept="2G$12M" id="46o4wsH$idP" role="3989C9">
@@ -1312,12 +1250,6 @@
             <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
           </node>
         </node>
-        <node concept="1SiIV0" id="wfREvqakZn" role="3bR37C">
-          <node concept="3bR9La" id="wfREvqakZo" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4Wk$48A" resolve="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtA" id="46o4wsH5O3R" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1451,63 +1383,6 @@
           </node>
         </node>
       </node>
-      <node concept="1E1JtA" id="7Ant4WkHLsY" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="jetbrains.mps.lang.typesystem2.samplechecker.test" />
-        <property role="3LESm3" value="fec0c515-766a-48ae-a50a-45de7ad21bd9" />
-        <property role="2GAjPV" value="false" />
-        <property role="aoJFB" value="sources and tests" />
-        <node concept="55IIr" id="7Ant4WkHLsZ" role="3LF7KH">
-          <node concept="2Ry0Ak" id="7Ant4WkHLt0" role="iGT6I">
-            <property role="2Ry0Am" value="typechecking" />
-            <node concept="2Ry0Ak" id="7Ant4WkHLt1" role="2Ry0An">
-              <property role="2Ry0Am" value="solutions" />
-              <node concept="2Ry0Ak" id="7Ant4WkHLt2" role="2Ry0An">
-                <property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.samplechecker.test" />
-                <node concept="2Ry0Ak" id="7Ant4WkHLt3" role="2Ry0An">
-                  <property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.samplechecker.test.msd" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1eKXYsjQSBf" role="3bR37C">
-          <node concept="3bR9La" id="1eKXYsjQSBg" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1eKXYsjQSBh" role="3bR37C">
-          <node concept="3bR9La" id="1eKXYsjQSBi" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.typesystem2.template" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1eKXYsjQSBj" role="3bR37C">
-          <node concept="3bR9La" id="1eKXYsjQSBk" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1eKXYsjQSBl" role="3bR37C">
-          <node concept="3bR9La" id="1eKXYsjQSBm" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.lang.typesystem2.sampleplugin" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="wfREvqapdj" role="3bR37C">
-          <node concept="3bR9La" id="wfREvqapdk" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="5w_kaFF_5i2" role="3bR37C">
-          <node concept="3bR9La" id="5w_kaFF_5i3" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="2sgV4H" id="7Ant4WkHLmd" role="1l3spa">
       <ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
@@ -1557,9 +1432,6 @@
         <node concept="L2wRC" id="7Ant4WkHLmq" role="39821P">
           <ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.lang.typesystem2.sampleplugin" />
         </node>
-        <node concept="L2wRC" id="7Ant4WkHLmt" role="39821P">
-          <ref role="L2wRA" node="7Ant4Wk$48A" resolve="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-        </node>
         <node concept="L2wRC" id="5pz4PwHqt4r" role="39821P">
           <ref role="L2wRA" node="5pz4PwHqqS4" resolve="jetbrains.mps.lang.typesystem2.test" />
         </node>
@@ -1568,9 +1440,6 @@
             <property role="3MwjfP" value="tests" />
           </node>
         </node>
-        <node concept="L2wRC" id="7Ant4WkHLmP" role="39821P">
-          <ref role="L2wRA" node="7Ant4WkHLsY" resolve="jetbrains.mps.lang.typesystem2.samplechecker.test" />
-        </node>
         <node concept="L2wRC" id="7Ant4WkHLmQ" role="39821P">
           <ref role="L2wRA" node="7Ant4WkHLsF" resolve="jetbrains.mps.baseLanguageExt" />
         </node>
@@ -1669,9 +1538,6 @@
             <node concept="L2wRC" id="65DJywFj_1R" role="39821P">
               <ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.lang.typesystem2.sampleplugin" />
             </node>
-            <node concept="L2wRC" id="65DJywFk8$R" role="39821P">
-              <ref role="L2wRA" node="7Ant4Wk$48A" resolve="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
-            </node>
             <node concept="L2wRC" id="3u5wJtgSbK" role="39821P">
               <ref role="L2wRA" node="3u5wJtgiSM" resolve="jetbrains.mps.lang.smodel.types" />
             </node>
diff --git a/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl b/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
index b73c2bb6..e6c92f67 100644
--- a/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
+++ b/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
@@ -12,7 +12,6 @@
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
-    <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
@@ -45,14 +44,13 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
-    <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.lang.typesystem2.sampleLang)" version="0" />
-    <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
diff --git a/typechecking/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/typechecking/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 406a189e..9341be87 100644
--- a/typechecking/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/typechecking/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -20,7 +20,6 @@
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="4r4j" ref="r:94702bd0-f623-44e8-af0a-f2730f7d2518(jetbrains.mps.lang.typesystem2.samplechecker.handle.util)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
@@ -2173,9 +2172,9 @@
           <node concept="3I6s7M" id="4nIWweBDDq9" role="3I6sU7">
             <node concept="3A8Hvi" id="2q0gzCFJ8ut" role="3I6s78">
               <node concept="aYllk" id="2q0gzCFJ8uD" role="3A8w4Q">
-                <node concept="2YIFZM" id="2p$DpYKVPA6" role="aYrYs">
-                  <ref role="37wK5l" to="4r4j:1e3DfAArnOl" resolve="listOfLists" />
-                  <ref role="1Pybhc" to="4r4j:2zBk6uIjXRS" resolve="Lists" />
+                <node concept="2YIFZM" id="5w_kaFFR5BT" role="aYrYs">
+                  <ref role="37wK5l" node="1e3DfAArnOl" resolve="listOfLists" />
+                  <ref role="1Pybhc" node="2zBk6uIjXRS" resolve="Lists" />
                   <node concept="39rIew" id="3kjrYXAqwrH" role="37wK5m">
                     <ref role="39rHqR" node="2q0gzCFIXgU" resolve="subtypePaths" />
                   </node>
@@ -2351,9 +2350,9 @@
               <node concept="3Aqczg" id="7nkyKX6XUm1" role="3cqZAp">
                 <node concept="3A8Hvi" id="7nkyKX6XUm2" role="3Aqpz8">
                   <node concept="aYllk" id="7nkyKX6XUm3" role="3A8w4Q">
-                    <node concept="2YIFZM" id="7nkyKX6XUm4" role="aYrYs">
-                      <ref role="37wK5l" to="4r4j:1e3DfAArnOl" resolve="listOfLists" />
-                      <ref role="1Pybhc" to="4r4j:2zBk6uIjXRS" resolve="Lists" />
+                    <node concept="2YIFZM" id="5w_kaFFR5BU" role="aYrYs">
+                      <ref role="37wK5l" node="1e3DfAArnOl" resolve="listOfLists" />
+                      <ref role="1Pybhc" node="2zBk6uIjXRS" resolve="Lists" />
                       <node concept="2ShNRf" id="7nkyKX6Yp1J" role="37wK5m">
                         <node concept="Tc6Ow" id="7nkyKX6Yr5n" role="2ShVmc">
                           <node concept="_YKpA" id="7nkyKX6Yre9" role="HW$YZ">
@@ -2530,9 +2529,9 @@
               <node concept="3Aqczg" id="2jjvHNv9yAi" role="3cqZAp">
                 <node concept="3A8Hvi" id="2jjvHNv9yAj" role="3Aqpz8">
                   <node concept="aYllk" id="2jjvHNv9yAk" role="3A8w4Q">
-                    <node concept="2YIFZM" id="2jjvHNv9yAl" role="aYrYs">
-                      <ref role="37wK5l" to="4r4j:1e3DfAArnOl" resolve="listOfLists" />
-                      <ref role="1Pybhc" to="4r4j:2zBk6uIjXRS" resolve="Lists" />
+                    <node concept="2YIFZM" id="5w_kaFFR5BV" role="aYrYs">
+                      <ref role="37wK5l" node="1e3DfAArnOl" resolve="listOfLists" />
+                      <ref role="1Pybhc" node="2zBk6uIjXRS" resolve="Lists" />
                       <node concept="37vLTw" id="2jjvHNvcjbs" role="37wK5m">
                         <ref role="3cqZAo" node="2jjvHNvaKEe" resolve="paths" />
                       </node>
@@ -19784,5 +19783,217 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="2zBk6uIjXRS">
+    <property role="TrG5h" value="Lists" />
+    <property role="3GE5qa" value="relation" />
+    <node concept="2tJIrI" id="2zBk6uIk5Xl" role="jymVt" />
+    <node concept="3Tm1VV" id="2zBk6uIjXRT" role="1B3o_S" />
+    <node concept="2YIFZL" id="1e3DfAArnOl" role="jymVt">
+      <property role="TrG5h" value="listOfLists" />
+      <property role="IEkAT" value="false" />
+      <node concept="37vLTG" id="1e3DfAArnOm" role="3clF46">
+        <property role="TrG5h" value="nlists" />
+        <node concept="_YKpA" id="1e3DfAArnOn" role="1tU5fm">
+          <node concept="_YKpA" id="2shrukT_lYx" role="_ZDj9">
+            <node concept="3Tqbb2" id="2shrukT_ml1" role="_ZDj9" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="1e3DfAArnOp" role="3clF45">
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+      </node>
+      <node concept="3Tm1VV" id="1e3DfAArnOq" role="1B3o_S" />
+      <node concept="3clFbS" id="1e3DfAArnOr" role="3clF47">
+        <node concept="3clFbH" id="1e3DfAArnOs" role="3cqZAp" />
+        <node concept="3cpWs8" id="1e3DfAArnOt" role="3cqZAp">
+          <node concept="3cpWsn" id="1e3DfAArnOu" role="3cpWs9">
+            <property role="TrG5h" value="array" />
+            <node concept="10Q1$e" id="1e3DfAArnOv" role="1tU5fm">
+              <node concept="3uibUv" id="1e3DfAArnOw" role="10Q1$1">
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="1e3DfAArnOy" role="33vP2m">
+              <node concept="3$_iS1" id="1e3DfAArnOz" role="2ShVmc">
+                <node concept="3$GHV9" id="1e3DfAArnO$" role="3$GQph">
+                  <node concept="2OqwBi" id="1e3DfAArnO_" role="3$I4v7">
+                    <node concept="37vLTw" id="1e3DfAArnOA" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1e3DfAArnOm" resolve="nlists" />
+                    </node>
+                    <node concept="34oBXx" id="1e3DfAArnOB" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="3uibUv" id="1e3DfAArnOC" role="3$_nBY">
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="1e3DfAArnOD" role="3cqZAp">
+          <node concept="3cpWsn" id="1e3DfAArnOE" role="3cpWs9">
+            <property role="TrG5h" value="idx" />
+            <node concept="10Oyi0" id="1e3DfAArnOF" role="1tU5fm" />
+            <node concept="3cmrfG" id="1e3DfAArnOG" role="33vP2m">
+              <property role="3cmrfH" value="0" />
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="1e3DfAArnOH" role="3cqZAp">
+          <node concept="3clFbS" id="1e3DfAArnOI" role="2LFqv$">
+            <node concept="3clFbF" id="1e3DfAArnOJ" role="3cqZAp">
+              <node concept="37vLTI" id="1e3DfAArnOK" role="3clFbG">
+                <node concept="AH0OO" id="1e3DfAArnOL" role="37vLTJ">
+                  <node concept="3uNrnE" id="1e3DfAArnOM" role="AHEQo">
+                    <node concept="37vLTw" id="1e3DfAArnON" role="2$L3a6">
+                      <ref role="3cqZAo" node="1e3DfAArnOE" resolve="idx" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="1e3DfAArnOO" role="AHHXb">
+                    <ref role="3cqZAo" node="1e3DfAArnOu" resolve="array" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="2zBk6uIk6Ag" role="37vLTx">
+                  <ref role="37wK5l" node="1e3DfAArnP3" resolve="list" />
+                  <ref role="1Pybhc" node="2zBk6uIjXRS" resolve="Lists" />
+                  <node concept="37vLTw" id="1e3DfAArnOQ" role="37wK5m">
+                    <ref role="3cqZAo" node="1e3DfAArnOR" resolve="nlist" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="1e3DfAArnOR" role="1Duv9x">
+            <property role="TrG5h" value="nlist" />
+            <node concept="_YKpA" id="2shrukT_mE_" role="1tU5fm">
+              <node concept="3Tqbb2" id="2shrukT_mEA" role="_ZDj9" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="1e3DfAArnOT" role="1DdaDG">
+            <ref role="3cqZAo" node="1e3DfAArnOm" resolve="nlists" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="1e3DfAArnOU" role="3cqZAp" />
+        <node concept="3clFbF" id="1e3DfAArnOV" role="3cqZAp">
+          <node concept="2YIFZM" id="1e3DfAArnOX" role="3clFbG">
+            <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
+            <node concept="Xl_RD" id="1e3DfAArnOY" role="37wK5m">
+              <property role="Xl_RC" value="list" />
+            </node>
+            <node concept="2YIFZM" id="3t7_2FgCwcJ" role="37wK5m">
+              <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
+              <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+              <node concept="37vLTw" id="3t7_2FgCwcL" role="37wK5m">
+                <ref role="3cqZAo" node="1e3DfAArnOu" resolve="array" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2zBk6uIk71Q" role="jymVt" />
+    <node concept="2YIFZL" id="1e3DfAArnP3" role="jymVt">
+      <property role="TrG5h" value="list" />
+      <property role="IEkAT" value="false" />
+      <node concept="37vLTG" id="1e3DfAArnP4" role="3clF46">
+        <property role="TrG5h" value="nlist" />
+        <node concept="_YKpA" id="2shrukT_n08" role="1tU5fm">
+          <node concept="3Tqbb2" id="2shrukT_n09" role="_ZDj9" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="1e3DfAArnP6" role="3clF45">
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+      </node>
+      <node concept="3Tmbuc" id="1e3DfAArqls" role="1B3o_S" />
+      <node concept="3clFbS" id="1e3DfAArnP9" role="3clF47">
+        <node concept="3clFbH" id="1e3DfAArnPa" role="3cqZAp" />
+        <node concept="3cpWs8" id="1e3DfAArnPb" role="3cqZAp">
+          <node concept="3cpWsn" id="1e3DfAArnPc" role="3cpWs9">
+            <property role="TrG5h" value="array" />
+            <node concept="10Q1$e" id="1e3DfAArnPd" role="1tU5fm">
+              <node concept="3uibUv" id="1e3DfAArnPe" role="10Q1$1">
+                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="1e3DfAArnPg" role="33vP2m">
+              <node concept="3$_iS1" id="1e3DfAArnPh" role="2ShVmc">
+                <node concept="3$GHV9" id="1e3DfAArnPi" role="3$GQph">
+                  <node concept="2OqwBi" id="1e3DfAArnPj" role="3$I4v7">
+                    <node concept="37vLTw" id="1e3DfAArnPk" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1e3DfAArnP4" resolve="nlist" />
+                    </node>
+                    <node concept="34oBXx" id="1e3DfAArnPl" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="3uibUv" id="1e3DfAArnPm" role="3$_nBY">
+                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="1e3DfAArnPn" role="3cqZAp">
+          <node concept="3cpWsn" id="1e3DfAArnPo" role="3cpWs9">
+            <property role="TrG5h" value="idx" />
+            <node concept="10Oyi0" id="1e3DfAArnPp" role="1tU5fm" />
+            <node concept="3cmrfG" id="1e3DfAArnPq" role="33vP2m">
+              <property role="3cmrfH" value="0" />
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="1e3DfAArnPr" role="3cqZAp">
+          <node concept="3clFbS" id="1e3DfAArnPs" role="2LFqv$">
+            <node concept="3clFbF" id="1e3DfAArnPt" role="3cqZAp">
+              <node concept="37vLTI" id="1e3DfAArnPu" role="3clFbG">
+                <node concept="AH0OO" id="1e3DfAArnPv" role="37vLTJ">
+                  <node concept="3uNrnE" id="1e3DfAArnPw" role="AHEQo">
+                    <node concept="37vLTw" id="1e3DfAArnPx" role="2$L3a6">
+                      <ref role="3cqZAo" node="1e3DfAArnPo" resolve="idx" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="1e3DfAArnPy" role="AHHXb">
+                    <ref role="3cqZAo" node="1e3DfAArnPc" resolve="array" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="5w_kaFFSmjP" role="37vLTx">
+                  <ref role="37wK5l" to="hano:YGS68N6Tbl" resolve="anchorTreeForm" />
+                  <ref role="1Pybhc" to="hano:4OKkcnfu_xo" resolve="AnchorUtil" />
+                  <node concept="37vLTw" id="YGS68Nhrjb" role="37wK5m">
+                    <ref role="3cqZAo" node="1e3DfAArnP_" resolve="node" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="1e3DfAArnP_" role="1Duv9x">
+            <property role="TrG5h" value="node" />
+            <node concept="3Tqbb2" id="1e3DfAArnPA" role="1tU5fm" />
+          </node>
+          <node concept="37vLTw" id="1e3DfAArnPB" role="1DdaDG">
+            <ref role="3cqZAo" node="1e3DfAArnP4" resolve="nlist" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="1e3DfAArnPC" role="3cqZAp" />
+        <node concept="3clFbF" id="1e3DfAArnPD" role="3cqZAp">
+          <node concept="2YIFZM" id="1e3DfAArnPE" role="3clFbG">
+            <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
+            <node concept="Xl_RD" id="1e3DfAArnPF" role="37wK5m">
+              <property role="Xl_RC" value="list" />
+            </node>
+            <node concept="2YIFZM" id="3t7_2FgCsiN" role="37wK5m">
+              <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
+              <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+              <node concept="37vLTw" id="3t7_2FgCsiP" role="37wK5m">
+                <ref role="3cqZAo" node="1e3DfAArnPc" resolve="array" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2zBk6uIk78q" role="jymVt" />
+  </node>
 </model>
 
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
index c85b9c92..9509c0c6 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
@@ -18,13 +18,13 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
+    <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
     <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/codeAnal@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/codeAnal@tests.mps
index 462dc68d..f50de3fd 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/codeAnal@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/models/jetbrains/mps/lang/typesystem2/sample/codeAnal@tests.mps
@@ -6,7 +6,7 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
+    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
   </languages>
   <imports>
     <import index="hwt6" ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(jetbrains.mps.lang.typesystem2.sample.codeAnal)" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd
index 62ae17eb..5b0364e6 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd
@@ -12,9 +12,9 @@
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
     <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
index 447e6418..78ba23eb 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
-    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
+    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad.mps
index 7b274945..b6ac8050 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/bounds/bad.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
-    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
+    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
   </languages>
   <imports />
   <registry>
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/codeAnal.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/codeAnal.mps
index 1913c45d..b735f571 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/codeAnal.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/codeAnal.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
+    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
   </languages>
   <imports>
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
index d7f195bf..8c470c1f 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/helloWorld.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
-    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
+    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
   </languages>
   <imports>
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
index 29a4a9b0..de2ec4b8 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/simpleGenerics.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
-    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
+    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
   </languages>
   <imports>
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
index d4f6fd16..c3d256f9 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/models/jetbrains/mps/lang/typesystem2/sample/slice.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
-    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
+    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
deleted file mode 100644
index bfd12d6e..00000000
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" uuid="9c4ae21e-62e0-4110-95b7-191b357a42d2" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
-  <models>
-    <modelRoot contentPath="${module}" type="default">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <sourcePath />
-  <dependencies>
-    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
-    <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
-    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
-  </dependencies>
-  <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
-    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
-    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
-    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="0" />
-  </languageVersions>
-  <dependencyVersions>
-    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
-    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
-    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
-    <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
-    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
-    <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
-    <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
-  </dependencyVersions>
-</solution>
-
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
deleted file mode 100644
index fa334b6f..00000000
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/models/jetbrains/mps/lang/typesystem2/samplechecker/handle/util.mps
+++ /dev/null
@@ -1,1129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:94702bd0-f623-44e8-af0a-f2730f7d2518(jetbrains.mps.lang.typesystem2.samplechecker.handle.util)">
-  <persistence version="9" />
-  <languages>
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="0" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
-    <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports>
-    <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
-    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
-    <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
-    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
-  </imports>
-  <registry>
-    <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="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
-        <child id="1239714902950" name="expression" index="2$L3a6" />
-      </concept>
-      <concept id="1173175405605" name="jetbrains.mps.baseLanguage.structure.ArrayAccessExpression" flags="nn" index="AH0OO">
-        <child id="1173175577737" name="index" index="AHEQo" />
-        <child id="1173175590490" name="array" index="AHHXb" />
-      </concept>
-      <concept id="1461424660015405635" name="jetbrains.mps.baseLanguage.structure.EscapeOperation" flags="nn" index="EvHYZ" />
-      <concept id="1224848483129" name="jetbrains.mps.baseLanguage.structure.IBLDeprecatable" flags="ng" index="IEa8$">
-        <property id="1224848525476" name="isDeprecated" index="IEkAT" />
-      </concept>
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
-      </concept>
-      <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="1164879751025" name="jetbrains.mps.baseLanguage.structure.TryCatchStatement" flags="nn" index="SfApY">
-        <child id="1164879758292" name="body" index="SfCbr" />
-        <child id="1164903496223" name="catchClause" index="TEbGg" />
-      </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
-      <concept id="1164903280175" name="jetbrains.mps.baseLanguage.structure.CatchClause" flags="nn" index="TDmWw">
-        <child id="1164903359218" name="catchBody" index="TDEfX" />
-        <child id="1164903359217" name="throwable" index="TDEfY" />
-      </concept>
-      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
-      <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="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
-      <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
-        <child id="1070534760952" name="componentType" index="10Q1$1" />
-      </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">
-        <property id="1176718929932" name="isFinal" index="3TUv4t" />
-        <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="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <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">
-        <property id="4276006055363816570" name="isSynchronized" index="od$2w" />
-        <property id="1181808852946" name="isFinal" index="DiZV1" />
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </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="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-      </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="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
-      <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" />
-        <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
-      </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" />
-        <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" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-      <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
-      <concept id="1184950988562" name="jetbrains.mps.baseLanguage.structure.ArrayCreator" flags="nn" index="3$_iS1">
-        <child id="1184951007469" name="componentType" index="3$_nBY" />
-        <child id="1184952969026" name="dimensionExpression" index="3$GQph" />
-      </concept>
-      <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
-        <child id="1184953288404" name="expression" index="3$I4v7" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </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>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
-      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
-    </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="1167228628751" name="hasException" index="34fQS0" />
-        <property id="1167245565795" name="severity" index="35gtTG" />
-        <child id="1167227463056" name="logExpression" index="34bqiv" />
-        <child id="1167227561449" name="exception" index="34bMjA" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
-        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
-      </concept>
-      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
-        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
-      </concept>
-      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
-        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
-      </concept>
-      <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
-      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
-        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
-      </concept>
-      <concept id="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" />
-      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
-        <reference id="1138056395725" name="property" index="3TsBF5" />
-      </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
-      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
-        <reference id="1138056546658" name="link" index="3TtcxE" />
-      </concept>
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="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="1174909099093" name="jetbrains.mps.baseLanguage.regexp.structure.MatchVariableReferenceRegexp" flags="ng" index="2e2xP4">
-        <reference id="1174909113141" name="match" index="2e2_8$" />
-      </concept>
-      <concept id="1175161264766" name="jetbrains.mps.baseLanguage.regexp.structure.LineStartRegexp" flags="ng" index="2t4tHJ" />
-      <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="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="1174510540317" name="jetbrains.mps.baseLanguage.regexp.structure.InlineRegexpExpression" flags="nn" index="1Qi9sc">
-        <child id="1174510571016" name="regexp" index="1QigWp" />
-      </concept>
-      <concept id="1174556813606" name="jetbrains.mps.baseLanguage.regexp.structure.DotRegexp" flags="ng" index="1T2EwR" />
-      <concept id="1174564062919" name="jetbrains.mps.baseLanguage.regexp.structure.MatchParensRegexp" flags="ng" index="1Tukvm">
-        <child id="1174564160889" name="regexp" index="1TuGhC" />
-      </concept>
-      <concept id="1174565027678" name="jetbrains.mps.baseLanguage.regexp.structure.MatchVariableReference" flags="nn" index="1TxZTf">
-        <reference id="1174565035929" name="match" index="1Ty1U8" />
-      </concept>
-      <concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ng" index="1YMW5F">
-        <child id="1174653387388" name="regexp" index="1YN4dH" />
-      </concept>
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
-        <child id="1151688676805" name="elementType" index="_ZDj9" />
-      </concept>
-      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
-    </language>
-  </registry>
-  <node concept="312cEu" id="2zBk6uIjXRS">
-    <property role="TrG5h" value="Lists" />
-    <node concept="2tJIrI" id="2zBk6uIk5Xl" role="jymVt" />
-    <node concept="3Tm1VV" id="2zBk6uIjXRT" role="1B3o_S" />
-    <node concept="2YIFZL" id="1e3DfAArnOl" role="jymVt">
-      <property role="TrG5h" value="listOfLists" />
-      <property role="IEkAT" value="false" />
-      <node concept="37vLTG" id="1e3DfAArnOm" role="3clF46">
-        <property role="TrG5h" value="nlists" />
-        <node concept="_YKpA" id="1e3DfAArnOn" role="1tU5fm">
-          <node concept="_YKpA" id="2shrukT_lYx" role="_ZDj9">
-            <node concept="3Tqbb2" id="2shrukT_ml1" role="_ZDj9" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="1e3DfAArnOp" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-      </node>
-      <node concept="3Tm1VV" id="1e3DfAArnOq" role="1B3o_S" />
-      <node concept="3clFbS" id="1e3DfAArnOr" role="3clF47">
-        <node concept="3clFbH" id="1e3DfAArnOs" role="3cqZAp" />
-        <node concept="3cpWs8" id="1e3DfAArnOt" role="3cqZAp">
-          <node concept="3cpWsn" id="1e3DfAArnOu" role="3cpWs9">
-            <property role="TrG5h" value="array" />
-            <node concept="10Q1$e" id="1e3DfAArnOv" role="1tU5fm">
-              <node concept="3uibUv" id="1e3DfAArnOw" role="10Q1$1">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="1e3DfAArnOy" role="33vP2m">
-              <node concept="3$_iS1" id="1e3DfAArnOz" role="2ShVmc">
-                <node concept="3$GHV9" id="1e3DfAArnO$" role="3$GQph">
-                  <node concept="2OqwBi" id="1e3DfAArnO_" role="3$I4v7">
-                    <node concept="37vLTw" id="1e3DfAArnOA" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1e3DfAArnOm" resolve="nlists" />
-                    </node>
-                    <node concept="34oBXx" id="1e3DfAArnOB" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="3uibUv" id="1e3DfAArnOC" role="3$_nBY">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="1e3DfAArnOD" role="3cqZAp">
-          <node concept="3cpWsn" id="1e3DfAArnOE" role="3cpWs9">
-            <property role="TrG5h" value="idx" />
-            <node concept="10Oyi0" id="1e3DfAArnOF" role="1tU5fm" />
-            <node concept="3cmrfG" id="1e3DfAArnOG" role="33vP2m">
-              <property role="3cmrfH" value="0" />
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="1e3DfAArnOH" role="3cqZAp">
-          <node concept="3clFbS" id="1e3DfAArnOI" role="2LFqv$">
-            <node concept="3clFbF" id="1e3DfAArnOJ" role="3cqZAp">
-              <node concept="37vLTI" id="1e3DfAArnOK" role="3clFbG">
-                <node concept="AH0OO" id="1e3DfAArnOL" role="37vLTJ">
-                  <node concept="3uNrnE" id="1e3DfAArnOM" role="AHEQo">
-                    <node concept="37vLTw" id="1e3DfAArnON" role="2$L3a6">
-                      <ref role="3cqZAo" node="1e3DfAArnOE" resolve="idx" />
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="1e3DfAArnOO" role="AHHXb">
-                    <ref role="3cqZAo" node="1e3DfAArnOu" resolve="array" />
-                  </node>
-                </node>
-                <node concept="2YIFZM" id="2zBk6uIk6Ag" role="37vLTx">
-                  <ref role="37wK5l" node="1e3DfAArnP3" resolve="list" />
-                  <ref role="1Pybhc" node="2zBk6uIjXRS" resolve="Lists" />
-                  <node concept="37vLTw" id="1e3DfAArnOQ" role="37wK5m">
-                    <ref role="3cqZAo" node="1e3DfAArnOR" resolve="nlist" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="1e3DfAArnOR" role="1Duv9x">
-            <property role="TrG5h" value="nlist" />
-            <node concept="_YKpA" id="2shrukT_mE_" role="1tU5fm">
-              <node concept="3Tqbb2" id="2shrukT_mEA" role="_ZDj9" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="1e3DfAArnOT" role="1DdaDG">
-            <ref role="3cqZAo" node="1e3DfAArnOm" resolve="nlists" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="1e3DfAArnOU" role="3cqZAp" />
-        <node concept="3clFbF" id="1e3DfAArnOV" role="3cqZAp">
-          <node concept="2YIFZM" id="1e3DfAArnOX" role="3clFbG">
-            <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
-            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
-            <node concept="Xl_RD" id="1e3DfAArnOY" role="37wK5m">
-              <property role="Xl_RC" value="list" />
-            </node>
-            <node concept="2YIFZM" id="3t7_2FgCwcJ" role="37wK5m">
-              <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-              <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              <node concept="37vLTw" id="3t7_2FgCwcL" role="37wK5m">
-                <ref role="3cqZAo" node="1e3DfAArnOu" resolve="array" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2zBk6uIk71Q" role="jymVt" />
-    <node concept="2YIFZL" id="1e3DfAArnP3" role="jymVt">
-      <property role="TrG5h" value="list" />
-      <property role="IEkAT" value="false" />
-      <node concept="37vLTG" id="1e3DfAArnP4" role="3clF46">
-        <property role="TrG5h" value="nlist" />
-        <node concept="_YKpA" id="2shrukT_n08" role="1tU5fm">
-          <node concept="3Tqbb2" id="2shrukT_n09" role="_ZDj9" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="1e3DfAArnP6" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-      </node>
-      <node concept="3Tmbuc" id="1e3DfAArqls" role="1B3o_S" />
-      <node concept="3clFbS" id="1e3DfAArnP9" role="3clF47">
-        <node concept="3clFbH" id="1e3DfAArnPa" role="3cqZAp" />
-        <node concept="3cpWs8" id="1e3DfAArnPb" role="3cqZAp">
-          <node concept="3cpWsn" id="1e3DfAArnPc" role="3cpWs9">
-            <property role="TrG5h" value="array" />
-            <node concept="10Q1$e" id="1e3DfAArnPd" role="1tU5fm">
-              <node concept="3uibUv" id="1e3DfAArnPe" role="10Q1$1">
-                <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="1e3DfAArnPg" role="33vP2m">
-              <node concept="3$_iS1" id="1e3DfAArnPh" role="2ShVmc">
-                <node concept="3$GHV9" id="1e3DfAArnPi" role="3$GQph">
-                  <node concept="2OqwBi" id="1e3DfAArnPj" role="3$I4v7">
-                    <node concept="37vLTw" id="1e3DfAArnPk" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1e3DfAArnP4" resolve="nlist" />
-                    </node>
-                    <node concept="34oBXx" id="1e3DfAArnPl" role="2OqNvi" />
-                  </node>
-                </node>
-                <node concept="3uibUv" id="1e3DfAArnPm" role="3$_nBY">
-                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="1e3DfAArnPn" role="3cqZAp">
-          <node concept="3cpWsn" id="1e3DfAArnPo" role="3cpWs9">
-            <property role="TrG5h" value="idx" />
-            <node concept="10Oyi0" id="1e3DfAArnPp" role="1tU5fm" />
-            <node concept="3cmrfG" id="1e3DfAArnPq" role="33vP2m">
-              <property role="3cmrfH" value="0" />
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="1e3DfAArnPr" role="3cqZAp">
-          <node concept="3clFbS" id="1e3DfAArnPs" role="2LFqv$">
-            <node concept="3clFbF" id="1e3DfAArnPt" role="3cqZAp">
-              <node concept="37vLTI" id="1e3DfAArnPu" role="3clFbG">
-                <node concept="AH0OO" id="1e3DfAArnPv" role="37vLTJ">
-                  <node concept="3uNrnE" id="1e3DfAArnPw" role="AHEQo">
-                    <node concept="37vLTw" id="1e3DfAArnPx" role="2$L3a6">
-                      <ref role="3cqZAo" node="1e3DfAArnPo" resolve="idx" />
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="1e3DfAArnPy" role="AHHXb">
-                    <ref role="3cqZAo" node="1e3DfAArnPc" resolve="array" />
-                  </node>
-                </node>
-                <node concept="2YIFZM" id="YGS68Nhrja" role="37vLTx">
-                  <ref role="37wK5l" node="YGS68N6Tbl" resolve="anchorTreeForm" />
-                  <ref role="1Pybhc" node="4OKkcnfu_xo" resolve="AnchorUtil" />
-                  <node concept="37vLTw" id="YGS68Nhrjb" role="37wK5m">
-                    <ref role="3cqZAo" node="1e3DfAArnP_" resolve="node" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="1e3DfAArnP_" role="1Duv9x">
-            <property role="TrG5h" value="node" />
-            <node concept="3Tqbb2" id="1e3DfAArnPA" role="1tU5fm" />
-          </node>
-          <node concept="37vLTw" id="1e3DfAArnPB" role="1DdaDG">
-            <ref role="3cqZAo" node="1e3DfAArnP4" resolve="nlist" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="1e3DfAArnPC" role="3cqZAp" />
-        <node concept="3clFbF" id="1e3DfAArnPD" role="3cqZAp">
-          <node concept="2YIFZM" id="1e3DfAArnPE" role="3clFbG">
-            <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
-            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
-            <node concept="Xl_RD" id="1e3DfAArnPF" role="37wK5m">
-              <property role="Xl_RC" value="list" />
-            </node>
-            <node concept="2YIFZM" id="3t7_2FgCsiN" role="37wK5m">
-              <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-              <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
-              <node concept="37vLTw" id="3t7_2FgCsiP" role="37wK5m">
-                <ref role="3cqZAo" node="1e3DfAArnPc" resolve="array" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2zBk6uIk78q" role="jymVt" />
-  </node>
-  <node concept="312cEu" id="4OKkcnfu_xo">
-    <property role="TrG5h" value="AnchorUtil" />
-    <node concept="2tJIrI" id="_04VjSrBG0" role="jymVt" />
-    <node concept="Wx3nA" id="_04VjSrAWO" role="jymVt">
-      <property role="TrG5h" value="nodePattern" />
-      <property role="3TUv4t" value="false" />
-      <node concept="3uibUv" id="29_L5zQUhmb" role="1tU5fm">
-        <ref role="3uigEE" to="ni5j:~Pattern" resolve="Pattern" />
-      </node>
-      <node concept="3Tm6S6" id="29_L5zQUghB" role="1B3o_S" />
-      <node concept="2YIFZM" id="29_L5zQUldO" role="33vP2m">
-        <ref role="1Pybhc" to="ni5j:~Pattern" resolve="Pattern" />
-        <ref role="37wK5l" to="ni5j:~Pattern.compile(java.lang.String):java.util.regex.Pattern" resolve="compile" />
-        <node concept="Xl_RD" id="29_L5zQUlTG" role="37wK5m">
-          <property role="Xl_RC" value="node.*" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4OKkcnfu_xp" role="jymVt" />
-    <node concept="2YIFZL" id="4OKkcnfu_xq" role="jymVt">
-      <property role="TrG5h" value="anchorTreeForm" />
-      <node concept="37vLTG" id="4OKkcnfu_xr" role="3clF46">
-        <property role="TrG5h" value="concept" />
-        <node concept="3bZ5Sz" id="YGS68N6TkG" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="4OKkcnfu_xt" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-      </node>
-      <node concept="3Tm1VV" id="4OKkcnfu_xu" role="1B3o_S" />
-      <node concept="3clFbS" id="4OKkcnfu_xv" role="3clF47">
-        <node concept="3clFbF" id="4OKkcnfu_xw" role="3cqZAp">
-          <node concept="2YIFZM" id="4OKkcnfu_xy" role="3clFbG">
-            <ref role="37wK5l" node="4OKkcnfu_x_" resolve="anchor" />
-            <ref role="1Pybhc" node="4OKkcnfu_xo" resolve="AnchorUtil" />
-            <node concept="2OqwBi" id="YGS68N6TnA" role="37wK5m">
-              <node concept="37vLTw" id="4OKkcnfu_xz" role="2Oq$k0">
-                <ref role="3cqZAo" node="4OKkcnfu_xr" resolve="concept" />
-              </node>
-              <node concept="liA8E" id="YGS68N6Tqd" role="2OqNvi">
-                <ref role="37wK5l" to="c17a:~SAbstractConcept.getDeclarationNode():org.jetbrains.mps.openapi.model.SNode" resolve="getDeclarationNode" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="YGS68N6TfG" role="jymVt" />
-    <node concept="2YIFZL" id="YGS68N6Tbl" role="jymVt">
-      <property role="TrG5h" value="anchorTreeForm" />
-      <node concept="37vLTG" id="YGS68N6Tbm" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="YGS68N6Tbn" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="YGS68N6Tbo" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-      </node>
-      <node concept="3Tm1VV" id="YGS68N6Tbp" role="1B3o_S" />
-      <node concept="3clFbS" id="YGS68N6Tbq" role="3clF47">
-        <node concept="3clFbF" id="YGS68N6Tbr" role="3cqZAp">
-          <node concept="2YIFZM" id="YGS68N6Tbs" role="3clFbG">
-            <ref role="37wK5l" node="4OKkcnfu_x_" resolve="anchor" />
-            <ref role="1Pybhc" node="4OKkcnfu_xo" resolve="AnchorUtil" />
-            <node concept="37vLTw" id="YGS68N6Tbt" role="37wK5m">
-              <ref role="3cqZAo" node="YGS68N6Tbm" resolve="node" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1e3DfAArpWV" role="jymVt" />
-    <node concept="2YIFZL" id="_04VjSrAA8" role="jymVt">
-      <property role="TrG5h" value="extractReference" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="4pWvZ2njjN7" role="3clF47">
-        <node concept="3cpWs8" id="_04VjSsBtE" role="3cqZAp">
-          <node concept="3cpWsn" id="_04VjSsBtF" role="3cpWs9">
-            <property role="TrG5h" value="findValue" />
-            <node concept="3uibUv" id="_04VjSsBt_" role="1tU5fm">
-              <ref role="3uigEE" to="6exd:3JgCwkqkUKX" resolve="Finders.IValueFinder" />
-              <node concept="17QB3L" id="_04VjSsBtC" role="11_B2D" />
-            </node>
-            <node concept="2YIFZM" id="_04VjSsBtG" role="33vP2m">
-              <ref role="37wK5l" to="6exd:3JgCwkqd8va" resolve="findValue" />
-              <ref role="1Pybhc" to="6exd:3JgCwkqd3K7" resolve="Finders" />
-              <node concept="37vLTw" id="_04VjSsBtH" role="37wK5m">
-                <ref role="3cqZAo" node="4pWvZ2njjOw" resolve="anchor" />
-              </node>
-              <node concept="37vLTw" id="_04VjSsBtI" role="37wK5m">
-                <ref role="3cqZAo" node="_04VjSrAWO" resolve="nodePattern" />
-              </node>
-              <node concept="Xl_RD" id="_04VjSsBtJ" role="37wK5m">
-                <property role="Xl_RC" value="id" />
-              </node>
-              <node concept="17QB3L" id="_04VjSsBtK" role="3PaCim" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="_04VjSsBCB" role="3cqZAp">
-          <node concept="3clFbS" id="_04VjSsBCD" role="3clFbx">
-            <node concept="3cpWs8" id="_04VjSsu$T" role="3cqZAp">
-              <node concept="3cpWsn" id="_04VjSsu$U" role="3cpWs9">
-                <property role="TrG5h" value="id" />
-                <node concept="17QB3L" id="_04VjSsypj" role="1tU5fm" />
-                <node concept="2OqwBi" id="_04VjSsu$V" role="33vP2m">
-                  <node concept="37vLTw" id="_04VjSsBtL" role="2Oq$k0">
-                    <ref role="3cqZAo" node="_04VjSsBtF" resolve="findValue" />
-                  </node>
-                  <node concept="liA8E" id="_04VjSsu_0" role="2OqNvi">
-                    <ref role="37wK5l" to="6exd:3JgCwkqkUL2" resolve="result" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="SfApY" id="_04VjSsFWT" role="3cqZAp">
-              <node concept="3clFbS" id="_04VjSsFWV" role="SfCbr">
-                <node concept="3cpWs6" id="_04VjSsCR_" role="3cqZAp">
-                  <node concept="2YIFZM" id="HV6urVDdK5" role="3cqZAk">
-                    <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-                    <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="deserialize" />
-                    <node concept="2YIFZM" id="HV6urVDdLG" role="37wK5m">
-                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                      <node concept="37vLTw" id="_04VjSsu_1" role="37wK5m">
-                        <ref role="3cqZAo" node="_04VjSsu$U" resolve="id" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="_04VjSsGkm" role="3cqZAp" />
-              </node>
-              <node concept="TDmWw" id="_04VjSsFWW" role="TEbGg">
-                <node concept="3cpWsn" id="_04VjSsFWY" role="TDEfY">
-                  <property role="TrG5h" value="ex" />
-                  <node concept="3uibUv" id="_04VjSsG1U" role="1tU5fm">
-                    <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="_04VjSsFX2" role="TDEfX">
-                  <node concept="34ab3g" id="_04VjSsGpB" role="3cqZAp">
-                    <property role="35gtTG" value="warn" />
-                    <property role="34fQS0" value="true" />
-                    <node concept="3cpWs3" id="_04VjSuFwV" role="34bqiv">
-                      <node concept="Xl_RD" id="_04VjSuFxC" role="3uHU7w">
-                        <property role="Xl_RC" value="'" />
-                      </node>
-                      <node concept="3cpWs3" id="_04VjSsGRM" role="3uHU7B">
-                        <node concept="Xl_RD" id="_04VjSsGpD" role="3uHU7B">
-                          <property role="Xl_RC" value="error deserializing id='" />
-                        </node>
-                        <node concept="37vLTw" id="_04VjSsGT9" role="3uHU7w">
-                          <ref role="3cqZAo" node="_04VjSsu$U" resolve="id" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="_04VjSsGpF" role="34bMjA">
-                      <ref role="3cqZAo" node="_04VjSsFWY" resolve="ex" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="_04VjSsBWb" role="3clFbw">
-            <node concept="37vLTw" id="_04VjSsBIB" role="2Oq$k0">
-              <ref role="3cqZAo" node="_04VjSsBtF" resolve="findValue" />
-            </node>
-            <node concept="liA8E" id="_04VjSsCj7" role="2OqNvi">
-              <ref role="37wK5l" to="6exd:3JgCwkqkUKY" resolve="found" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="_04VjSsD6O" role="3cqZAp">
-          <node concept="10Nm6u" id="_04VjSsDcf" role="3cqZAk" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4pWvZ2njjOw" role="3clF46">
-        <property role="TrG5h" value="anchor" />
-        <node concept="3uibUv" id="4pWvZ2njjOx" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="HV6urVDcLx" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-      </node>
-      <node concept="3Tm1VV" id="HV6urVDbvo" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="6_UQWSXaUpR" role="jymVt" />
-    <node concept="2YIFZL" id="4OKkcnfu_x_" role="jymVt">
-      <property role="TrG5h" value="anchor" />
-      <node concept="3Tmbuc" id="1e3DfAAraC0" role="1B3o_S" />
-      <node concept="3uibUv" id="4OKkcnfu_xB" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-      </node>
-      <node concept="37vLTG" id="4OKkcnfu_xD" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="4OKkcnfu_xE" role="1tU5fm" />
-      </node>
-      <node concept="3clFbS" id="4OKkcnfu_xF" role="3clF47">
-        <node concept="3clFbJ" id="4OKkcnfu_xG" role="3cqZAp">
-          <node concept="3clFbS" id="4OKkcnfu_xH" role="3clFbx">
-            <node concept="3cpWs6" id="4OKkcnfu_xI" role="3cqZAp">
-              <node concept="2YIFZM" id="4OKkcnfu_xJ" role="3cqZAk">
-                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
-                <node concept="Xl_RD" id="4OKkcnfu_xK" role="37wK5m">
-                  <property role="Xl_RC" value="node_1" />
-                </node>
-                <node concept="2YIFZM" id="4OKkcnfu_xL" role="37wK5m">
-                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-                  <node concept="Xl_RD" id="4OKkcnfu_xM" role="37wK5m">
-                    <property role="Xl_RC" value="node" />
-                  </node>
-                  <node concept="Xl_RD" id="4OKkcnfu_xN" role="37wK5m">
-                    <property role="Xl_RC" value="null" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="4OKkcnfu_xO" role="3clFbw">
-            <node concept="10Nm6u" id="4OKkcnfu_xP" role="3uHU7w" />
-            <node concept="37vLTw" id="4OKkcnfu_xQ" role="3uHU7B">
-              <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="4OKkcnfu_xR" role="3cqZAp" />
-        <node concept="3cpWs8" id="4OKkcnfu_xS" role="3cqZAp">
-          <node concept="3cpWsn" id="4OKkcnfu_xT" role="3cpWs9">
-            <property role="TrG5h" value="cpt" />
-            <node concept="17QB3L" id="4OKkcnfu_xU" role="1tU5fm" />
-            <node concept="2OqwBi" id="4OKkcnfu_xV" role="33vP2m">
-              <node concept="2OqwBi" id="4OKkcnfu_xW" role="2Oq$k0">
-                <node concept="2JrnkZ" id="4OKkcnfu_xX" role="2Oq$k0">
-                  <node concept="37vLTw" id="4OKkcnfu_xY" role="2JrQYb">
-                    <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="4OKkcnfu_xZ" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getConcept():org.jetbrains.mps.openapi.language.SConcept" resolve="getConcept" />
-                </node>
-              </node>
-              <node concept="liA8E" id="4OKkcnfu_y0" role="2OqNvi">
-                <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="4OKkcnfu_y1" role="3cqZAp">
-          <node concept="3cpWsn" id="4OKkcnfu_y2" role="3cpWs9">
-            <property role="TrG5h" value="id" />
-            <node concept="17QB3L" id="4OKkcnfu_y3" role="1tU5fm" />
-            <node concept="2OqwBi" id="2zBk6uIkVZu" role="33vP2m">
-              <node concept="2OqwBi" id="4OKkcnfu_y5" role="2Oq$k0">
-                <node concept="2JrnkZ" id="4OKkcnfu_y6" role="2Oq$k0">
-                  <node concept="37vLTw" id="4OKkcnfu_y7" role="2JrQYb">
-                    <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="2zBk6uIkVtA" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                </node>
-              </node>
-              <node concept="liA8E" id="2zBk6uIkW$Z" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="4OKkcnfu_y9" role="3cqZAp" />
-        <node concept="3clFbJ" id="6infEALwMDs" role="3cqZAp">
-          <node concept="3clFbS" id="6infEALwMDu" role="3clFbx">
-            <node concept="3cpWs8" id="6infEALx4sE" role="3cqZAp">
-              <node concept="3cpWsn" id="6infEALx4sF" role="3cpWs9">
-                <property role="TrG5h" value="cls" />
-                <node concept="17QB3L" id="6infEALx4sz" role="1tU5fm" />
-                <node concept="2OqwBi" id="6infEALx4sG" role="33vP2m">
-                  <node concept="2OqwBi" id="6infEALx4sH" role="2Oq$k0">
-                    <node concept="1PxgMI" id="6infEALx4sI" role="2Oq$k0">
-                      <node concept="37vLTw" id="6infEALx4sJ" role="1m5AlR">
-                        <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
-                      </node>
-                      <node concept="chp4Y" id="6fXjIfxgngA" role="3oSUPX">
-                        <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
-                      </node>
-                    </node>
-                    <node concept="3TrEf2" id="6infEALx4sK" role="2OqNvi">
-                      <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                    </node>
-                  </node>
-                  <node concept="3TrcHB" id="6infEALx4sL" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="6infEALxfCY" role="3cqZAp">
-              <node concept="3cpWsn" id="6infEALxfCZ" role="3cpWs9">
-                <property role="TrG5h" value="cid" />
-                <node concept="17QB3L" id="2zBk6uIkUmB" role="1tU5fm" />
-                <node concept="2OqwBi" id="2zBk6uIkTgn" role="33vP2m">
-                  <node concept="2OqwBi" id="6infEALxfD1" role="2Oq$k0">
-                    <node concept="2JrnkZ" id="6infEALxfD2" role="2Oq$k0">
-                      <node concept="2OqwBi" id="4JRKVCvdyFf" role="2JrQYb">
-                        <node concept="1PxgMI" id="6infEALxfD3" role="2Oq$k0">
-                          <node concept="37vLTw" id="6infEALxfD4" role="1m5AlR">
-                            <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
-                          </node>
-                          <node concept="chp4Y" id="6fXjIfxgngD" role="3oSUPX">
-                            <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
-                          </node>
-                        </node>
-                        <node concept="3TrEf2" id="4JRKVCvd_0q" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="2zBk6uIkSHY" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="2zBk6uIkTOj" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="5_6ImQZjqKT" role="3cqZAp">
-              <node concept="3cpWsn" id="5_6ImQZjqKU" role="3cpWs9">
-                <property role="TrG5h" value="params" />
-                <node concept="2I9FWS" id="5_6ImQZjqKR" role="1tU5fm">
-                  <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
-                </node>
-                <node concept="2OqwBi" id="5_6ImQZjqKV" role="33vP2m">
-                  <node concept="1PxgMI" id="5_6ImQZjqKW" role="2Oq$k0">
-                    <property role="1BlNFB" value="true" />
-                    <node concept="37vLTw" id="5_6ImQZjqKX" role="1m5AlR">
-                      <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
-                    </node>
-                    <node concept="chp4Y" id="6fXjIfxgngB" role="3oSUPX">
-                      <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
-                    </node>
-                  </node>
-                  <node concept="3Tsc0h" id="5_6ImQZjqKY" role="2OqNvi">
-                    <ref role="3TtcxE" to="tpee:g91_B6F" resolve="parameter" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="5_6ImQZju9Q" role="3cqZAp">
-              <node concept="3cpWsn" id="5_6ImQZju9R" role="3cpWs9">
-                <property role="TrG5h" value="paramsArr" />
-                <node concept="10Q1$e" id="5_6ImQZju9S" role="1tU5fm">
-                  <node concept="3uibUv" id="5_6ImQZju9T" role="10Q1$1">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                  </node>
-                </node>
-                <node concept="2ShNRf" id="5_6ImQZju9U" role="33vP2m">
-                  <node concept="3$_iS1" id="5_6ImQZju9V" role="2ShVmc">
-                    <node concept="3$GHV9" id="5_6ImQZju9W" role="3$GQph">
-                      <node concept="2OqwBi" id="5_6ImQZju9X" role="3$I4v7">
-                        <node concept="37vLTw" id="5_6ImQZjvG2" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5_6ImQZjqKU" resolve="params" />
-                        </node>
-                        <node concept="34oBXx" id="5_6ImQZju9Z" role="2OqNvi" />
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="5_6ImQZjua0" role="3$_nBY">
-                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="5_6ImQZjua1" role="3cqZAp">
-              <node concept="3cpWsn" id="5_6ImQZjua2" role="3cpWs9">
-                <property role="TrG5h" value="idx" />
-                <node concept="10Oyi0" id="5_6ImQZjua3" role="1tU5fm" />
-                <node concept="3cmrfG" id="5_6ImQZjua4" role="33vP2m">
-                  <property role="3cmrfH" value="0" />
-                </node>
-              </node>
-            </node>
-            <node concept="1DcWWT" id="5_6ImQZjua5" role="3cqZAp">
-              <node concept="3clFbS" id="5_6ImQZjua6" role="2LFqv$">
-                <node concept="3clFbF" id="5_6ImQZjua7" role="3cqZAp">
-                  <node concept="37vLTI" id="5_6ImQZjua8" role="3clFbG">
-                    <node concept="AH0OO" id="5_6ImQZjua9" role="37vLTJ">
-                      <node concept="3uNrnE" id="5_6ImQZjuaa" role="AHEQo">
-                        <node concept="37vLTw" id="5_6ImQZjuab" role="2$L3a6">
-                          <ref role="3cqZAo" node="5_6ImQZjua2" resolve="idx" />
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="5_6ImQZjuac" role="AHHXb">
-                        <ref role="3cqZAo" node="5_6ImQZju9R" resolve="paramsArr" />
-                      </node>
-                    </node>
-                    <node concept="2YIFZM" id="5_6ImQZjuad" role="37vLTx">
-                      <ref role="37wK5l" node="4OKkcnfu_x_" resolve="anchor" />
-                      <ref role="1Pybhc" node="4OKkcnfu_xo" resolve="AnchorUtil" />
-                      <node concept="37vLTw" id="5_6ImQZjuae" role="37wK5m">
-                        <ref role="3cqZAo" node="5_6ImQZjuaf" resolve="p" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWsn" id="5_6ImQZjuaf" role="1Duv9x">
-                <property role="TrG5h" value="p" />
-                <node concept="3Tqbb2" id="5_6ImQZjuag" role="1tU5fm" />
-              </node>
-              <node concept="37vLTw" id="5_6ImQZjw0X" role="1DdaDG">
-                <ref role="3cqZAo" node="5_6ImQZjqKU" resolve="params" />
-              </node>
-            </node>
-            <node concept="3clFbH" id="5_6ImQZjoR_" role="3cqZAp" />
-            <node concept="3cpWs6" id="6infEALwTvt" role="3cqZAp">
-              <node concept="2YIFZM" id="6infEALwTvu" role="3cqZAk">
-                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
-                <node concept="Xl_RD" id="6infEALwTvv" role="37wK5m">
-                  <property role="Xl_RC" value="node_4" />
-                </node>
-                <node concept="2YIFZM" id="6infEALwTvw" role="37wK5m">
-                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-                  <node concept="Xl_RD" id="6infEALwTvx" role="37wK5m">
-                    <property role="Xl_RC" value="concept" />
-                  </node>
-                  <node concept="37vLTw" id="6infEALwTvy" role="37wK5m">
-                    <ref role="3cqZAo" node="4OKkcnfu_xT" resolve="cpt" />
-                  </node>
-                </node>
-                <node concept="2YIFZM" id="6infEALwTvz" role="37wK5m">
-                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-                  <node concept="Xl_RD" id="6infEALwTv$" role="37wK5m">
-                    <property role="Xl_RC" value="classifier" />
-                  </node>
-                  <node concept="37vLTw" id="6infEALxm0$" role="37wK5m">
-                    <ref role="3cqZAo" node="6infEALx4sF" resolve="cls" />
-                  </node>
-                </node>
-                <node concept="2YIFZM" id="6infEALwTvA" role="37wK5m">
-                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-                  <node concept="Xl_RD" id="6infEALwTvB" role="37wK5m">
-                    <property role="Xl_RC" value="cid" />
-                  </node>
-                  <node concept="37vLTw" id="6infEALxpB7" role="37wK5m">
-                    <ref role="3cqZAo" node="6infEALxfCZ" resolve="cid" />
-                  </node>
-                </node>
-                <node concept="2YIFZM" id="3t7_2FgCsY0" role="37wK5m">
-                  <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
-                  <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
-                  <node concept="Xl_RD" id="3t7_2FgCsY1" role="37wK5m">
-                    <property role="Xl_RC" value="parameter" />
-                  </node>
-                  <node concept="2YIFZM" id="3t7_2FgCvB0" role="37wK5m">
-                    <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
-                    <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                    <node concept="37vLTw" id="5_6ImQZjxi9" role="37wK5m">
-                      <ref role="3cqZAo" node="5_6ImQZju9R" resolve="paramsArr" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="6infEALwPKP" role="3clFbw">
-            <node concept="37vLTw" id="6infEALwO2S" role="2Oq$k0">
-              <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
-            </node>
-            <node concept="1mIQ4w" id="6infEALwRh6" role="2OqNvi">
-              <node concept="chp4Y" id="6infEALwRno" role="cj9EA">
-                <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6infEALwJNw" role="3cqZAp" />
-        <node concept="3clFbJ" id="4OKkcnfu_ya" role="3cqZAp">
-          <node concept="3clFbS" id="4OKkcnfu_yb" role="3clFbx">
-            <node concept="3cpWs8" id="4OKkcnfu_yc" role="3cqZAp">
-              <node concept="3cpWsn" id="4OKkcnfu_yd" role="3cpWs9">
-                <property role="TrG5h" value="name" />
-                <node concept="17QB3L" id="4OKkcnfu_ye" role="1tU5fm" />
-                <node concept="2OqwBi" id="4OKkcnfu_yf" role="33vP2m">
-                  <node concept="1PxgMI" id="4OKkcnfu_yg" role="2Oq$k0">
-                    <node concept="37vLTw" id="4OKkcnfu_yh" role="1m5AlR">
-                      <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
-                    </node>
-                    <node concept="chp4Y" id="6fXjIfxgngC" role="3oSUPX">
-                      <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                    </node>
-                  </node>
-                  <node concept="3TrcHB" id="4OKkcnfu_yi" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs6" id="4OKkcnfu_yj" role="3cqZAp">
-              <node concept="2YIFZM" id="4OKkcnfu_yk" role="3cqZAk">
-                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
-                <node concept="Xl_RD" id="4OKkcnfu_yl" role="37wK5m">
-                  <property role="Xl_RC" value="node_3" />
-                </node>
-                <node concept="2YIFZM" id="4OKkcnfu_ym" role="37wK5m">
-                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-                  <node concept="Xl_RD" id="4OKkcnfu_yn" role="37wK5m">
-                    <property role="Xl_RC" value="concept" />
-                  </node>
-                  <node concept="37vLTw" id="4OKkcnfu_yo" role="37wK5m">
-                    <ref role="3cqZAo" node="4OKkcnfu_xT" resolve="cpt" />
-                  </node>
-                </node>
-                <node concept="2YIFZM" id="4OKkcnfu_yp" role="37wK5m">
-                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-                  <node concept="Xl_RD" id="4OKkcnfu_yq" role="37wK5m">
-                    <property role="Xl_RC" value="name" />
-                  </node>
-                  <node concept="37vLTw" id="4OKkcnfu_yr" role="37wK5m">
-                    <ref role="3cqZAo" node="4OKkcnfu_yd" resolve="name" />
-                  </node>
-                </node>
-                <node concept="2YIFZM" id="4OKkcnfu_ys" role="37wK5m">
-                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-                  <node concept="Xl_RD" id="4OKkcnfu_yt" role="37wK5m">
-                    <property role="Xl_RC" value="id" />
-                  </node>
-                  <node concept="37vLTw" id="4OKkcnfu_yu" role="37wK5m">
-                    <ref role="3cqZAo" node="4OKkcnfu_y2" resolve="id" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="4OKkcnfu_yv" role="3clFbw">
-            <node concept="37vLTw" id="4OKkcnfu_yw" role="2Oq$k0">
-              <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
-            </node>
-            <node concept="1mIQ4w" id="4OKkcnfu_yx" role="2OqNvi">
-              <node concept="chp4Y" id="4OKkcnfu_yy" role="cj9EA">
-                <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="4OKkcnfu_yz" role="3cqZAp" />
-        <node concept="3cpWs8" id="4OKkcnfu_y$" role="3cqZAp">
-          <node concept="3cpWsn" id="4OKkcnfu_y_" role="3cpWs9">
-            <property role="TrG5h" value="text" />
-            <node concept="17QB3L" id="4OKkcnfu_yA" role="1tU5fm" />
-            <node concept="2OqwBi" id="4OKkcnfu_yB" role="33vP2m">
-              <node concept="2YIFZM" id="4OKkcnfu_yC" role="2Oq$k0">
-                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                <node concept="37vLTw" id="4OKkcnfu_yD" role="37wK5m">
-                  <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
-                </node>
-              </node>
-              <node concept="EvHYZ" id="4OKkcnfu_yE" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="2ty0qM" id="4OKkcnfu_yF" role="3cqZAp">
-          <node concept="1Qi9sc" id="4OKkcnfu_yG" role="1YN4dH">
-            <node concept="1OJ37Q" id="4OKkcnfu_yH" role="1QigWp">
-              <node concept="2t4tHJ" id="4OKkcnfu_yI" role="1OLpdg" />
-              <node concept="1OJ37Q" id="4OKkcnfu_yJ" role="1OLqdY">
-                <node concept="1Tukvm" id="4OKkcnfu_yK" role="1OLpdg">
-                  <property role="TrG5h" value="ascii" />
-                  <node concept="1OClNT" id="4OKkcnfu_yL" role="1TuGhC">
-                    <node concept="2e2xP4" id="4OKkcnfu_yM" role="1OLDsb">
-                      <ref role="2e2_8$" node="4OKkcnfu_yK" resolve="ascii" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="1OCmVF" id="4OKkcnfu_yN" role="1OLqdY">
-                  <node concept="1T2EwR" id="4OKkcnfu_yO" role="1OLDsb" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="4OKkcnfu_yP" role="2ty3UH">
-            <ref role="3cqZAo" node="4OKkcnfu_y_" resolve="text" />
-          </node>
-          <node concept="3clFbS" id="4OKkcnfu_yQ" role="2tyzPh">
-            <node concept="3cpWs6" id="4OKkcnfu_yR" role="3cqZAp">
-              <node concept="2YIFZM" id="4OKkcnfu_yS" role="3cqZAk">
-                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
-                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
-                <node concept="Xl_RD" id="4OKkcnfu_yT" role="37wK5m">
-                  <property role="Xl_RC" value="node_3" />
-                </node>
-                <node concept="2YIFZM" id="4OKkcnfu_yU" role="37wK5m">
-                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-                  <node concept="Xl_RD" id="4OKkcnfu_yV" role="37wK5m">
-                    <property role="Xl_RC" value="concept" />
-                  </node>
-                  <node concept="37vLTw" id="4OKkcnfu_yW" role="37wK5m">
-                    <ref role="3cqZAo" node="4OKkcnfu_xT" resolve="cpt" />
-                  </node>
-                </node>
-                <node concept="2YIFZM" id="4OKkcnfu_yX" role="37wK5m">
-                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-                  <node concept="Xl_RD" id="4OKkcnfu_yY" role="37wK5m">
-                    <property role="Xl_RC" value="text" />
-                  </node>
-                  <node concept="1TxZTf" id="4OKkcnfu_yZ" role="37wK5m">
-                    <ref role="1Ty1U8" node="4OKkcnfu_yK" resolve="ascii" />
-                  </node>
-                </node>
-                <node concept="2YIFZM" id="4OKkcnfu_z0" role="37wK5m">
-                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-                  <node concept="Xl_RD" id="4OKkcnfu_z1" role="37wK5m">
-                    <property role="Xl_RC" value="id" />
-                  </node>
-                  <node concept="37vLTw" id="4OKkcnfu_z2" role="37wK5m">
-                    <ref role="3cqZAo" node="4OKkcnfu_y2" resolve="id" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="4OKkcnfu_z3" role="3cqZAp" />
-        <node concept="3cpWs6" id="4OKkcnfu_z4" role="3cqZAp">
-          <node concept="2YIFZM" id="4OKkcnfu_z5" role="3cqZAk">
-            <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
-            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
-            <node concept="Xl_RD" id="4OKkcnfu_z6" role="37wK5m">
-              <property role="Xl_RC" value="node_2" />
-            </node>
-            <node concept="2YIFZM" id="4OKkcnfu_z7" role="37wK5m">
-              <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-              <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-              <node concept="Xl_RD" id="4OKkcnfu_z8" role="37wK5m">
-                <property role="Xl_RC" value="concept" />
-              </node>
-              <node concept="37vLTw" id="4OKkcnfu_z9" role="37wK5m">
-                <ref role="3cqZAo" node="4OKkcnfu_xT" resolve="cpt" />
-              </node>
-            </node>
-            <node concept="2YIFZM" id="4OKkcnfu_za" role="37wK5m">
-              <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
-              <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
-              <node concept="Xl_RD" id="4OKkcnfu_zb" role="37wK5m">
-                <property role="Xl_RC" value="id" />
-              </node>
-              <node concept="37vLTw" id="4OKkcnfu_zc" role="37wK5m">
-                <ref role="3cqZAo" node="4OKkcnfu_y2" resolve="id" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1e3DfAArpxG" role="jymVt" />
-    <node concept="3Tm1VV" id="4OKkcnfu_ze" role="1B3o_S" />
-  </node>
-</model>
-
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
deleted file mode 100644
index eaa3db49..00000000
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/jetbrains.mps.lang.typesystem2.samplechecker.test.msd
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.lang.typesystem2.samplechecker.test" uuid="fec0c515-766a-48ae-a50a-45de7ad21bd9" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
-  <models>
-    <modelRoot contentPath="${module}" type="default">
-      <sourceRoot location="models" />
-    </modelRoot>
-  </models>
-  <sourcePath />
-  <dependencies>
-    <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
-    <dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)</dependency>
-    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
-    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
-    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
-  </dependencies>
-  <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
-    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
-    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
-    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
-    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-    <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
-    <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
-    <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="1" />
-    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-  </languageVersions>
-  <dependencyVersions>
-    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
-    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
-    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
-    <module reference="fec0c515-766a-48ae-a50a-45de7ad21bd9(jetbrains.mps.lang.typesystem2.samplechecker.test)" version="0" />
-    <module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
-    <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
-    <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
-  </dependencyVersions>
-</solution>
-
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type@tests.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type@tests.mps
deleted file mode 100644
index 95e93857..00000000
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type@tests.mps
+++ /dev/null
@@ -1,528 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:2b3e6804-bc6d-4927-bcda-d2c5bfc10d0b(jetbrains.mps.lang.typesystem2.samplechecker.test.type@tests)">
-  <persistence version="9" />
-  <languages>
-    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="-1" />
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="-1" />
-    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
-    <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
-    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
-    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="-1" />
-    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
-  </languages>
-  <imports>
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.typesystem2.aspect)" />
-    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
-    <import index="tqvn" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.tempmodel(MPS.Core/)" />
-    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
-  </imports>
-  <registry>
-    <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
-      <concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
-        <property id="5097124989038916363" name="projectPath" index="2XOHcw" />
-      </concept>
-      <concept id="1225467090849" name="jetbrains.mps.lang.test.structure.ProjectExpression" flags="nn" index="1jxXqW" />
-      <concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
-        <child id="1216993439383" name="methods" index="1qtyYc" />
-        <child id="1217501822150" name="nodesToCheck" index="1SKRRt" />
-        <child id="1217501895093" name="testMethods" index="1SL9yI" />
-      </concept>
-      <concept id="1216989428737" name="jetbrains.mps.lang.test.structure.TestNode" flags="ng" index="1qefOq">
-        <child id="1216989461394" name="nodeToCheck" index="1qenE9" />
-      </concept>
-      <concept id="1210673684636" name="jetbrains.mps.lang.test.structure.TestNodeAnnotation" flags="ng" index="3xLA65" />
-      <concept id="1210674524691" name="jetbrains.mps.lang.test.structure.TestNodeReference" flags="nn" index="3xONca">
-        <reference id="1210674534086" name="declaration" index="3xOPvv" />
-      </concept>
-      <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
-    </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="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
-      </concept>
-      <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="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="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
-      <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="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
-      <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
-        <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
-      </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="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="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>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
-      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
-        <child id="1068580123160" name="condition" index="3clFbw" />
-        <child id="1068580123161" name="ifTrue" index="3clFbx" />
-      </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="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="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="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
-        <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" />
-        <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" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </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>
-      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
-      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
-        <property id="6329021646629104958" name="text" index="3SKdUp" />
-      </concept>
-      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
-        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
-    </language>
-    <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
-      <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
-        <reference id="1205756909548" name="member" index="2WH_rO" />
-      </concept>
-      <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
-      <concept id="1205769149993" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodCallOperation" flags="nn" index="2XshWL">
-        <child id="1205770614681" name="actualArgument" index="2XxRq1" />
-      </concept>
-    </language>
-    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
-      <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
-        <child id="7080278351417106681" name="expression" index="2Hmdds" />
-      </concept>
-      <concept id="8427750732757990717" name="jetbrains.mps.baseLanguage.unitTest.structure.BinaryAssert" flags="nn" index="3tpDYu">
-        <child id="8427750732757990725" name="actual" index="3tpDZA" />
-        <child id="8427750732757990724" name="expected" index="3tpDZB" />
-      </concept>
-      <concept id="1171985735491" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertSame" flags="nn" index="3vMLTj" />
-      <concept id="1172028177041" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNull" flags="nn" index="3ykFI1">
-        <child id="1172028236559" name="expression" index="3ykU8v" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
-    </language>
-  </registry>
-  <node concept="1lH9Xt" id="4nxCIBqxR0M">
-    <property role="TrG5h" value="SampleTypeAspect" />
-    <node concept="2XrIbr" id="7y50OW6ZKyB" role="1qtyYc">
-      <property role="TrG5h" value="typeTemplates" />
-      <node concept="37vLTG" id="7y50OW6ZKKa" role="3clF46">
-        <property role="TrG5h" value="model" />
-        <node concept="H_c77" id="7y50OW6ZKLy" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="7y50OW6ZKHy" role="3clF45">
-        <ref role="3uigEE" to="fqlx:1hX44vNlSIA" resolve="TypeTemplateIndex" />
-      </node>
-      <node concept="3clFbS" id="7y50OW6ZKyD" role="3clF47">
-        <node concept="3SKdUt" id="7y50OW707GY" role="3cqZAp">
-          <node concept="3SKdUq" id="7y50OW707H0" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME: assuming the model imports only one lang with types aspect" />
-          </node>
-        </node>
-        <node concept="3cpWs8" id="7y50OW6ZLiA" role="3cqZAp">
-          <node concept="3cpWsn" id="7y50OW6ZLiB" role="3cpWs9">
-            <property role="TrG5h" value="typeAspect" />
-            <node concept="3uibUv" id="7y50OW6ZLiC" role="1tU5fm">
-              <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
-            </node>
-            <node concept="2OqwBi" id="7y50OW6ZLiD" role="33vP2m">
-              <node concept="2WthIp" id="7y50OW6ZLiE" role="2Oq$k0" />
-              <node concept="2XshWL" id="7y50OW6ZLiF" role="2OqNvi">
-                <ref role="2WH_rO" node="4nxCIBqxS8B" resolve="firstTypeAspect" />
-                <node concept="37vLTw" id="7y50OW6ZLut" role="2XxRq1">
-                  <ref role="3cqZAo" node="7y50OW6ZKKa" resolve="model" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="7y50OW6ZS1_" role="3cqZAp">
-          <node concept="3cpWsn" id="7y50OW6ZS1A" role="3cpWs9">
-            <property role="TrG5h" value="typeTemplates" />
-            <node concept="3uibUv" id="7y50OW6ZS1r" role="1tU5fm">
-              <ref role="3uigEE" to="fqlx:1hX44vNlSIA" resolve="TypeTemplateIndex" />
-            </node>
-            <node concept="2ShNRf" id="7y50OW6ZS1B" role="33vP2m">
-              <node concept="1pGfFk" id="7y50OW6ZS1C" role="2ShVmc">
-                <ref role="37wK5l" to="fqlx:1hX44vNlSOK" resolve="TypeTemplateIndex" />
-                <node concept="2OqwBi" id="7y50OW6ZS1D" role="37wK5m">
-                  <node concept="37vLTw" id="7y50OW6ZS1E" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7y50OW6ZLiB" resolve="typeAspect" />
-                  </node>
-                  <node concept="liA8E" id="7y50OW6ZS1F" role="2OqNvi">
-                    <ref role="37wK5l" to="fqlx:2hteS6ClmbE" resolve="createTypeManifest" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3SKdUt" id="7y50OW70aZa" role="3cqZAp">
-          <node concept="3SKdUq" id="7y50OW70aZc" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME: assuming the type aspect defines only single type table" />
-          </node>
-        </node>
-        <node concept="3vMLTj" id="7y50OW6ZSAE" role="3cqZAp">
-          <node concept="3cmrfG" id="7y50OW6ZSBN" role="3tpDZB">
-            <property role="3cmrfH" value="1" />
-          </node>
-          <node concept="2OqwBi" id="7y50OW6ZUrY" role="3tpDZA">
-            <node concept="2OqwBi" id="7y50OW6ZTd5" role="2Oq$k0">
-              <node concept="37vLTw" id="7y50OW6ZT8n" role="2Oq$k0">
-                <ref role="3cqZAo" node="7y50OW6ZS1A" resolve="typeTemplates" />
-              </node>
-              <node concept="liA8E" id="7y50OW6ZU4F" role="2OqNvi">
-                <ref role="37wK5l" to="fqlx:4JJCDIn5F0n" resolve="typeTables" />
-              </node>
-            </node>
-            <node concept="34oBXx" id="7y50OW6ZVmR" role="2OqNvi" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="7y50OW6ZM3q" role="3cqZAp">
-          <node concept="37vLTw" id="7y50OW6ZS1G" role="3clFbG">
-            <ref role="3cqZAo" node="7y50OW6ZS1A" resolve="typeTemplates" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1LZb2c" id="7y50OW6TxjM" role="1SL9yI">
-      <property role="TrG5h" value="typechecking" />
-      <node concept="3cqZAl" id="7y50OW6TxjN" role="3clF45" />
-      <node concept="3clFbS" id="7y50OW6TxjR" role="3clF47">
-        <node concept="3cpWs8" id="7y50OW6ZE44" role="3cqZAp">
-          <node concept="3cpWsn" id="7y50OW6ZE45" role="3cpWs9">
-            <property role="TrG5h" value="checkTypes" />
-            <node concept="3uibUv" id="7y50OW6ZE42" role="1tU5fm">
-              <ref role="3uigEE" to="t5kh:7y50OW6XXpr" resolve="LaunchTypechecking.TypecheckingResult" />
-            </node>
-            <node concept="2YIFZM" id="7y50OW6ZE46" role="33vP2m">
-              <ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="3xONca" id="7y50OW6ZE47" role="37wK5m">
-                <ref role="3xOPvv" node="4nxCIBqymjB" resolve="class" />
-              </node>
-              <node concept="1jxXqW" id="7y50OW6ZE48" role="37wK5m" />
-            </node>
-          </node>
-        </node>
-        <node concept="3ykFI1" id="7y50OW6U9jy" role="3cqZAp">
-          <node concept="2OqwBi" id="7y50OW6ZEh5" role="3ykU8v">
-            <node concept="37vLTw" id="7y50OW6ZE8H" role="2Oq$k0">
-              <ref role="3cqZAo" node="7y50OW6ZE45" resolve="checkTypes" />
-            </node>
-            <node concept="liA8E" id="7y50OW6ZEtL" role="2OqNvi">
-              <ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7y50OW6ZGv$" role="3cqZAp" />
-        <node concept="3cpWs8" id="52a_GfIM9UR" role="3cqZAp">
-          <node concept="3cpWsn" id="52a_GfIM9US" role="3cpWs9">
-            <property role="TrG5h" value="typeModel" />
-            <node concept="3uibUv" id="52a_GfIM9UP" role="1tU5fm">
-              <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
-            </node>
-            <node concept="2OqwBi" id="52a_GfIM9UT" role="33vP2m">
-              <node concept="2YIFZM" id="52a_GfIM9UU" role="2Oq$k0">
-                <ref role="1Pybhc" to="tqvn:~TemporaryModels" resolve="TemporaryModels" />
-                <ref role="37wK5l" to="tqvn:~TemporaryModels.getInstance():jetbrains.mps.smodel.tempmodel.TemporaryModels" resolve="getInstance" />
-              </node>
-              <node concept="liA8E" id="52a_GfIM9UV" role="2OqNvi">
-                <ref role="37wK5l" to="tqvn:~TemporaryModels.create(boolean,jetbrains.mps.smodel.tempmodel.TempModuleOptions):org.jetbrains.mps.openapi.model.SModel" resolve="create" />
-                <node concept="3clFbT" id="52a_GfIM9UW" role="37wK5m">
-                  <property role="3clFbU" value="true" />
-                </node>
-                <node concept="2YIFZM" id="52a_GfIM9UX" role="37wK5m">
-                  <ref role="1Pybhc" to="tqvn:~TempModuleOptions" resolve="TempModuleOptions" />
-                  <ref role="37wK5l" to="tqvn:~TempModuleOptions.forDefaultModule():jetbrains.mps.smodel.tempmodel.TempModuleOptions" resolve="forDefaultModule" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7y50OW700$V" role="3cqZAp" />
-        <node concept="3cpWs8" id="7y50OW6ZH4l" role="3cqZAp">
-          <node concept="3cpWsn" id="7y50OW6ZH4m" role="3cpWs9">
-            <property role="TrG5h" value="termA" />
-            <node concept="3uibUv" id="7y50OW6ZH4g" role="1tU5fm">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-            </node>
-            <node concept="2OqwBi" id="7y50OW6ZH4n" role="33vP2m">
-              <node concept="37vLTw" id="7y50OW6ZH4o" role="2Oq$k0">
-                <ref role="3cqZAo" node="7y50OW6ZE45" resolve="checkTypes" />
-              </node>
-              <node concept="liA8E" id="7y50OW6ZH4p" role="2OqNvi">
-                <ref role="37wK5l" to="t5kh:7y50OW6XYoC" resolve="getType" />
-                <node concept="3xONca" id="7y50OW6ZH4q" role="37wK5m">
-                  <ref role="3xOPvv" node="1eKXYsjuWjw" resolve="fieldA" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="7y50OW701J0" role="3cqZAp">
-          <node concept="3cpWsn" id="7y50OW701J1" role="3cpWs9">
-            <property role="TrG5h" value="termB" />
-            <node concept="3uibUv" id="7y50OW701J2" role="1tU5fm">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-            </node>
-            <node concept="2OqwBi" id="7y50OW701J3" role="33vP2m">
-              <node concept="37vLTw" id="7y50OW701J4" role="2Oq$k0">
-                <ref role="3cqZAo" node="7y50OW6ZE45" resolve="checkTypes" />
-              </node>
-              <node concept="liA8E" id="7y50OW701J5" role="2OqNvi">
-                <ref role="37wK5l" to="t5kh:7y50OW6XYoC" resolve="getType" />
-                <node concept="3xONca" id="7y50OW701Tq" role="37wK5m">
-                  <ref role="3xOPvv" node="7y50OW6ZXVj" resolve="fieldB" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2Hmddi" id="7y50OW6ZIlS" role="3cqZAp">
-          <node concept="37vLTw" id="7y50OW6ZISl" role="2Hmdds">
-            <ref role="3cqZAo" node="7y50OW6ZH4m" resolve="termA" />
-          </node>
-        </node>
-        <node concept="2Hmddi" id="7y50OW70203" role="3cqZAp">
-          <node concept="37vLTw" id="7y50OW7026g" role="2Hmdds">
-            <ref role="3cqZAo" node="7y50OW701J1" resolve="termB" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="52a_GfIMadO" role="3cqZAp" />
-        <node concept="3clFbF" id="52a_GfIM6S5" role="3cqZAp">
-          <node concept="2OqwBi" id="52a_GfIM72F" role="3clFbG">
-            <node concept="2YIFZM" id="52a_GfIM6S7" role="2Oq$k0">
-              <ref role="37wK5l" to="tqvn:~TemporaryModels.getInstance():jetbrains.mps.smodel.tempmodel.TemporaryModels" resolve="getInstance" />
-              <ref role="1Pybhc" to="tqvn:~TemporaryModels" resolve="TemporaryModels" />
-            </node>
-            <node concept="liA8E" id="52a_GfIM7aQ" role="2OqNvi">
-              <ref role="37wK5l" to="tqvn:~TemporaryModels.dispose(org.jetbrains.mps.openapi.model.SModel):void" resolve="dispose" />
-              <node concept="37vLTw" id="52a_GfIM7E$" role="37wK5m">
-                <ref role="3cqZAo" node="52a_GfIM9US" resolve="typeModel" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2XrIbr" id="4nxCIBqxS8B" role="1qtyYc">
-      <property role="TrG5h" value="firstTypeAspect" />
-      <node concept="37vLTG" id="4nxCIBqxTLY" role="3clF46">
-        <property role="TrG5h" value="model" />
-        <node concept="H_c77" id="4nxCIBqxVB6" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="4nxCIBqxS8S" role="3clF45">
-        <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
-      </node>
-      <node concept="3clFbS" id="4nxCIBqxS8D" role="3clF47">
-        <node concept="3cpWs8" id="4hh0cTRbUS6" role="3cqZAp">
-          <node concept="3cpWsn" id="4hh0cTRbUS7" role="3cpWs9">
-            <property role="TrG5h" value="typesAspect" />
-            <node concept="3uibUv" id="4hh0cTRbURZ" role="1tU5fm">
-              <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
-            </node>
-            <node concept="10Nm6u" id="4xTpErk1C4t" role="33vP2m" />
-          </node>
-        </node>
-        <node concept="1DcWWT" id="4xTpErk1pjs" role="3cqZAp">
-          <node concept="3clFbS" id="4xTpErk1pju" role="2LFqv$">
-            <node concept="3clFbF" id="4xTpErk1zEf" role="3cqZAp">
-              <node concept="37vLTI" id="4xTpErk1zEh" role="3clFbG">
-                <node concept="2YIFZM" id="4hh0cTRbUS8" role="37vLTx">
-                  <ref role="37wK5l" to="fqlx:2hteS6Cndm6" resolve="forLanguage" />
-                  <ref role="1Pybhc" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
-                  <node concept="37vLTw" id="4xTpErk25DG" role="37wK5m">
-                    <ref role="3cqZAo" node="4xTpErk1pjv" resolve="lang" />
-                  </node>
-                  <node concept="2OqwBi" id="3GlpCDS_oBV" role="37wK5m">
-                    <node concept="1jxXqW" id="4nxCIBqypgi" role="2Oq$k0" />
-                    <node concept="liA8E" id="3GlpCDS_pPw" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="4xTpErk1zEl" role="37vLTJ">
-                  <ref role="3cqZAo" node="4hh0cTRbUS7" resolve="typesAspect" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="4xTpErk1MGG" role="3cqZAp">
-              <node concept="3clFbS" id="4xTpErk1MGI" role="3clFbx">
-                <node concept="3zACq4" id="4xTpErk1V4q" role="3cqZAp" />
-              </node>
-              <node concept="3y3z36" id="4xTpErk1S34" role="3clFbw">
-                <node concept="10Nm6u" id="4xTpErk1SiT" role="3uHU7w" />
-                <node concept="37vLTw" id="4xTpErk1PF$" role="3uHU7B">
-                  <ref role="3cqZAo" node="4hh0cTRbUS7" resolve="typesAspect" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="4xTpErk1pjv" role="1Duv9x">
-            <property role="TrG5h" value="lang" />
-            <node concept="3uibUv" id="4xTpErk1xEI" role="1tU5fm">
-              <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
-            </node>
-          </node>
-          <node concept="2YIFZM" id="4xTpErk1vp3" role="1DdaDG">
-            <ref role="1Pybhc" to="w1kc:~SModelOperations" resolve="SModelOperations" />
-            <ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel):java.util.Set" resolve="getAllLanguageImports" />
-            <node concept="37vLTw" id="4nxCIBqxXz7" role="37wK5m">
-              <ref role="3cqZAo" node="4nxCIBqxTLY" resolve="model" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="4nxCIBqxY1M" role="3cqZAp">
-          <node concept="37vLTw" id="4nxCIBqxYTl" role="3cqZAk">
-            <ref role="3cqZAo" node="4hh0cTRbUS7" resolve="typesAspect" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1qefOq" id="4nxCIBqyl_2" role="1SKRRt">
-      <node concept="312cEu" id="4nxCIBqyl_d" role="1qenE9">
-        <property role="TrG5h" value="Test" />
-        <node concept="2tJIrI" id="1eKXYsjuV4O" role="jymVt" />
-        <node concept="3HP615" id="4cKdPpqIRLR" role="jymVt">
-          <property role="2bfB8j" value="true" />
-          <property role="TrG5h" value="A" />
-          <node concept="3Tm1VV" id="4cKdPpqIRLS" role="1B3o_S" />
-        </node>
-        <node concept="2tJIrI" id="7y50OW6ZXx0" role="jymVt" />
-        <node concept="3HP615" id="7y50OW6ZXcE" role="jymVt">
-          <property role="2bfB8j" value="true" />
-          <property role="TrG5h" value="B" />
-          <node concept="3Tm1VV" id="7y50OW6ZXcF" role="1B3o_S" />
-          <node concept="16euLQ" id="7y50OW6ZXOs" role="16eVyc">
-            <property role="TrG5h" value="T" />
-          </node>
-        </node>
-        <node concept="2tJIrI" id="4cKdPpqKZY1" role="jymVt" />
-        <node concept="312cEg" id="1eKXYsjuVRn" role="jymVt">
-          <property role="TrG5h" value="fielda" />
-          <node concept="3Tm6S6" id="1eKXYsjuVRo" role="1B3o_S" />
-          <node concept="3uibUv" id="1eKXYsjuVYY" role="1tU5fm">
-            <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
-            <node concept="3xLA65" id="1eKXYsjHW0A" role="lGtFl">
-              <property role="TrG5h" value="typeA" />
-            </node>
-          </node>
-          <node concept="3xLA65" id="1eKXYsjuWjw" role="lGtFl">
-            <property role="TrG5h" value="fieldA" />
-          </node>
-        </node>
-        <node concept="2tJIrI" id="7y50OW6ZYeS" role="jymVt" />
-        <node concept="312cEg" id="7y50OW6ZXVf" role="jymVt">
-          <property role="TrG5h" value="fieldb" />
-          <node concept="3Tm6S6" id="7y50OW6ZXVg" role="1B3o_S" />
-          <node concept="3uibUv" id="7y50OW6ZXVh" role="1tU5fm">
-            <ref role="3uigEE" node="7y50OW6ZXcE" resolve="Test.B" />
-            <node concept="3xLA65" id="7y50OW6ZXVi" role="lGtFl">
-              <property role="TrG5h" value="typeB" />
-            </node>
-            <node concept="3uibUv" id="7y50OW6ZYzh" role="11_B2D">
-              <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
-            </node>
-          </node>
-          <node concept="3xLA65" id="7y50OW6ZXVj" role="lGtFl">
-            <property role="TrG5h" value="fieldB" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="4nxCIBqyl_e" role="1B3o_S" />
-        <node concept="3xLA65" id="4nxCIBqymjB" role="lGtFl">
-          <property role="TrG5h" value="class" />
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="2XOHcx" id="7t5VLKGQVAO">
-    <property role="2XOHcw" value="${logic_home}" />
-  </node>
-</model>
-
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
index eafa1174..90f7b751 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd
@@ -22,7 +22,6 @@
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)</dependency>
     <dependency reexport="false">274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)</dependency>
-    <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
@@ -56,7 +55,6 @@
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
-    <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
     <module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
index ae819f01..2c8509dc 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
@@ -68,7 +68,6 @@
     <import index="l7us" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.icons(MPS.Platform/)" />
     <import index="ewej" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.font(JDK/)" />
     <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
-    <import index="4r4j" ref="r:94702bd0-f623-44e8-af0a-f2730f7d2518(jetbrains.mps.lang.typesystem2.samplechecker.handle.util)" />
     <import index="b8lf" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.selection(MPS.Editor/)" />
     <import index="eh3q" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.text(MPS.Editor/)" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
@@ -15510,9 +15509,9 @@
                     <node concept="3uibUv" id="6QkkSolK_jV" role="1tU5fm">
                       <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
                     </node>
-                    <node concept="2YIFZM" id="_04VjSrGzZ" role="33vP2m">
-                      <ref role="37wK5l" to="4r4j:_04VjSrAA8" resolve="extractReference" />
-                      <ref role="1Pybhc" to="4r4j:4OKkcnfu_xo" resolve="AnchorUtil" />
+                    <node concept="2YIFZM" id="5w_kaFFSmjR" role="33vP2m">
+                      <ref role="37wK5l" to="hano:_04VjSrAA8" resolve="extractReference" />
+                      <ref role="1Pybhc" to="hano:4OKkcnfu_xo" resolve="AnchorUtil" />
                       <node concept="2YIFZM" id="_04VjSrG$0" role="37wK5m">
                         <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
                         <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
@@ -15812,9 +15811,9 @@
                   <node concept="3uibUv" id="2tI9bOla_7l" role="1tU5fm">
                     <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
                   </node>
-                  <node concept="2YIFZM" id="2tI9bOla_7m" role="33vP2m">
-                    <ref role="37wK5l" to="4r4j:_04VjSrAA8" resolve="extractReference" />
-                    <ref role="1Pybhc" to="4r4j:4OKkcnfu_xo" resolve="AnchorUtil" />
+                  <node concept="2YIFZM" id="5w_kaFFSmjS" role="33vP2m">
+                    <ref role="37wK5l" to="hano:_04VjSrAA8" resolve="extractReference" />
+                    <ref role="1Pybhc" to="hano:4OKkcnfu_xo" resolve="AnchorUtil" />
                     <node concept="2YIFZM" id="2tI9bOla_7n" role="37wK5m">
                       <ref role="37wK5l" to="6exd:6HT7BWBOXr$" resolve="ground" />
                       <ref role="1Pybhc" to="6exd:6HT7BWBOXme" resolve="TreeFormUtil" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 3e288c0b..a4fed6eb 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -39,7 +39,6 @@
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="4r4j" ref="r:94702bd0-f623-44e8-af0a-f2730f7d2518(jetbrains.mps.lang.typesystem2.samplechecker.handle.util)" />
     <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.typesystem2.util)" />
     <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
     <import index="nzob" ref="r:9c70dcd6-cd3e-4a40-a6f6-c3a41fef5269(jetbrains.mps.lang.typesystem2.plugin)" />
@@ -51,6 +50,7 @@
     <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
+    <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.typechecking)" implicit="true" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" implicit="true" />
   </imports>
@@ -7292,9 +7292,9 @@
           </node>
         </node>
         <node concept="gft3U" id="7jC45KccKR9" role="14YRTM">
-          <node concept="2YIFZM" id="7jC45KccKZV" role="gfFT$">
-            <ref role="37wK5l" to="4r4j:4OKkcnfu_xq" resolve="anchorTreeForm" />
-            <ref role="1Pybhc" to="4r4j:4OKkcnfu_xo" resolve="AnchorUtil" />
+          <node concept="2YIFZM" id="5w_kaFFSmjO" role="gfFT$">
+            <ref role="37wK5l" to="hano:4OKkcnfu_xq" resolve="anchorTreeForm" />
+            <ref role="1Pybhc" to="hano:4OKkcnfu_xo" resolve="AnchorUtil" />
             <node concept="10Nm6u" id="7jC45KccL0o" role="37wK5m">
               <node concept="29HgVG" id="7jC45KccL0G" role="lGtFl">
                 <node concept="3NFfHV" id="7jC45KccL0H" role="3NFExx">
@@ -7318,9 +7318,9 @@
     <node concept="3aamgX" id="YGS68NawGr" role="3acgRq">
       <ref role="30HIoZ" to="5j4j:7E86$tKskWj" resolve="LogicalValue" />
       <node concept="gft3U" id="YGS68NawGs" role="1lVwrX">
-        <node concept="2YIFZM" id="YGS68NawZA" role="gfFT$">
-          <ref role="37wK5l" to="4r4j:4OKkcnfu_xq" resolve="anchorTreeForm" />
-          <ref role="1Pybhc" to="4r4j:4OKkcnfu_xo" resolve="AnchorUtil" />
+        <node concept="2YIFZM" id="5w_kaFFSmjN" role="gfFT$">
+          <ref role="37wK5l" to="hano:4OKkcnfu_xq" resolve="anchorTreeForm" />
+          <ref role="1Pybhc" to="hano:4OKkcnfu_xo" resolve="AnchorUtil" />
           <node concept="10Nm6u" id="YGS68NawZB" role="37wK5m">
             <node concept="29HgVG" id="YGS68NawZC" role="lGtFl">
               <node concept="3NFfHV" id="YGS68NawZD" role="3NFExx">
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index 39c5e68b..b82a667b 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -27,7 +27,6 @@
         <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
         <dependency reexport="false">df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)</dependency>
         <dependency reexport="false">96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)</dependency>
-        <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
@@ -77,7 +76,6 @@
         <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.typesystem2)" version="0" />
         <module reference="21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.typesystem2#4578927328670739933)" version="0" />
         <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
-        <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
         <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
         <module reference="b19b2d23-1869-41e0-9ee6-8eaad9ffcd84(jetbrains.mps.lang.util.order#174635545557533742)" version="0" />
         <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
index d72df49f..5a6155de 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
@@ -12,8 +12,6 @@
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
-    <dependency reexport="false">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
-    <dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)</dependency>
   </dependencies>
@@ -23,6 +21,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
@@ -43,8 +42,6 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
-    <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
-    <module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps
index 737a8e53..27c029f8 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps
@@ -9,6 +9,7 @@
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
   </languages>
   <imports>
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
@@ -22,7 +23,6 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
-    <import index="4r4j" ref="r:94702bd0-f623-44e8-af0a-f2730f7d2518(jetbrains.mps.lang.typesystem2.samplechecker.handle.util)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.typesystem2.aspect)" />
     <import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.builtin.program)" />
     <import index="nz6g" ref="r:ac00f724-30be-446e-805c-2345efc460d7(jetbrains.mps.lang.typesystem2.program)" />
@@ -35,6 +35,8 @@
     <import index="umch" ref="r:4caa22a9-5195-4617-8800-5f9f74cc4480(jetbrains.mps.lang.typesystem2.helper.plugin)" />
     <import index="zx3l" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core(jetbrains.mps.logic.reactor/)" />
     <import index="cmfw" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.event(MPS.OpenAPI/)" />
+    <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -70,12 +72,17 @@
       <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
         <child id="1239714902950" name="expression" index="2$L3a6" />
       </concept>
+      <concept id="1173175405605" name="jetbrains.mps.baseLanguage.structure.ArrayAccessExpression" flags="nn" index="AH0OO">
+        <child id="1173175577737" name="index" index="AHEQo" />
+        <child id="1173175590490" name="array" index="AHHXb" />
+      </concept>
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
       <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
+      <concept id="1461424660015405635" name="jetbrains.mps.baseLanguage.structure.EscapeOperation" flags="nn" index="EvHYZ" />
       <concept id="1153952380246" name="jetbrains.mps.baseLanguage.structure.TryStatement" flags="nn" index="2GUZhq">
         <child id="1153952416686" name="body" index="2GV8ay" />
         <child id="1153952429843" name="finallyBody" index="2GVbov" />
@@ -233,6 +240,7 @@
       <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" />
+        <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
       </concept>
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
         <child id="1212687122400" name="typeParameter" index="1pMfVU" />
@@ -253,6 +261,13 @@
       <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
+      <concept id="1184950988562" name="jetbrains.mps.baseLanguage.structure.ArrayCreator" flags="nn" index="3$_iS1">
+        <child id="1184951007469" name="componentType" index="3$_nBY" />
+        <child id="1184952969026" name="dimensionExpression" index="3$GQph" />
+      </concept>
+      <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
+        <child id="1184953288404" name="expression" index="3$I4v7" />
+      </concept>
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -344,8 +359,15 @@
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
+      </concept>
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
+        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
+      </concept>
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
@@ -364,7 +386,19 @@
       <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">
+        <property id="1238684351431" name="asCast" index="1BlNFB" />
+      </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>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -382,6 +416,39 @@
         <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
       </concept>
     </language>
+    <language id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp">
+      <concept id="1174909099093" name="jetbrains.mps.baseLanguage.regexp.structure.MatchVariableReferenceRegexp" flags="ng" index="2e2xP4">
+        <reference id="1174909113141" name="match" index="2e2_8$" />
+      </concept>
+      <concept id="1175161264766" name="jetbrains.mps.baseLanguage.regexp.structure.LineStartRegexp" flags="ng" index="2t4tHJ" />
+      <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="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="1174510540317" name="jetbrains.mps.baseLanguage.regexp.structure.InlineRegexpExpression" flags="nn" index="1Qi9sc">
+        <child id="1174510571016" name="regexp" index="1QigWp" />
+      </concept>
+      <concept id="1174556813606" name="jetbrains.mps.baseLanguage.regexp.structure.DotRegexp" flags="ng" index="1T2EwR" />
+      <concept id="1174564062919" name="jetbrains.mps.baseLanguage.regexp.structure.MatchParensRegexp" flags="ng" index="1Tukvm">
+        <child id="1174564160889" name="regexp" index="1TuGhC" />
+      </concept>
+      <concept id="1174565027678" name="jetbrains.mps.baseLanguage.regexp.structure.MatchVariableReference" flags="nn" index="1TxZTf">
+        <reference id="1174565035929" name="match" index="1Ty1U8" />
+      </concept>
+      <concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ng" index="1YMW5F">
+        <child id="1174653387388" name="regexp" index="1YN4dH" />
+      </concept>
+    </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
@@ -2184,9 +2251,9 @@
           </node>
         </node>
         <node concept="3cpWs6" id="1CcQBrQmZQA" role="3cqZAp">
-          <node concept="2YIFZM" id="1CcQBrQmZQ$" role="3cqZAk">
-            <ref role="37wK5l" to="4r4j:_04VjSrAA8" resolve="extractReference" />
-            <ref role="1Pybhc" to="4r4j:4OKkcnfu_xo" resolve="AnchorUtil" />
+          <node concept="2YIFZM" id="5w_kaFFSmjQ" role="3cqZAk">
+            <ref role="37wK5l" node="_04VjSrAA8" resolve="extractReference" />
+            <ref role="1Pybhc" node="4OKkcnfu_xo" resolve="AnchorUtil" />
             <node concept="37vLTw" id="1CcQBrQmZQ_" role="37wK5m">
               <ref role="3cqZAo" node="1CcQBrQmZPT" resolve="anchor" />
             </node>
@@ -10114,5 +10181,677 @@
     <node concept="2tJIrI" id="4MqhgXUPV7S" role="jymVt" />
     <node concept="3Tm1VV" id="4MqhgXUBidP" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="4OKkcnfu_xo">
+    <property role="TrG5h" value="AnchorUtil" />
+    <node concept="2tJIrI" id="_04VjSrBG0" role="jymVt" />
+    <node concept="Wx3nA" id="_04VjSrAWO" role="jymVt">
+      <property role="TrG5h" value="nodePattern" />
+      <property role="3TUv4t" value="false" />
+      <node concept="3uibUv" id="29_L5zQUhmb" role="1tU5fm">
+        <ref role="3uigEE" to="ni5j:~Pattern" resolve="Pattern" />
+      </node>
+      <node concept="3Tm6S6" id="29_L5zQUghB" role="1B3o_S" />
+      <node concept="2YIFZM" id="29_L5zQUldO" role="33vP2m">
+        <ref role="1Pybhc" to="ni5j:~Pattern" resolve="Pattern" />
+        <ref role="37wK5l" to="ni5j:~Pattern.compile(java.lang.String):java.util.regex.Pattern" resolve="compile" />
+        <node concept="Xl_RD" id="29_L5zQUlTG" role="37wK5m">
+          <property role="Xl_RC" value="node.*" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4OKkcnfu_xp" role="jymVt" />
+    <node concept="2YIFZL" id="4OKkcnfu_xq" role="jymVt">
+      <property role="TrG5h" value="anchorTreeForm" />
+      <node concept="37vLTG" id="4OKkcnfu_xr" role="3clF46">
+        <property role="TrG5h" value="concept" />
+        <node concept="3bZ5Sz" id="YGS68N6TkG" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="4OKkcnfu_xt" role="3clF45">
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+      </node>
+      <node concept="3Tm1VV" id="4OKkcnfu_xu" role="1B3o_S" />
+      <node concept="3clFbS" id="4OKkcnfu_xv" role="3clF47">
+        <node concept="3clFbF" id="4OKkcnfu_xw" role="3cqZAp">
+          <node concept="2YIFZM" id="4OKkcnfu_xy" role="3clFbG">
+            <ref role="37wK5l" node="4OKkcnfu_x_" resolve="anchor" />
+            <ref role="1Pybhc" node="4OKkcnfu_xo" resolve="AnchorUtil" />
+            <node concept="2OqwBi" id="YGS68N6TnA" role="37wK5m">
+              <node concept="37vLTw" id="4OKkcnfu_xz" role="2Oq$k0">
+                <ref role="3cqZAo" node="4OKkcnfu_xr" resolve="concept" />
+              </node>
+              <node concept="liA8E" id="YGS68N6Tqd" role="2OqNvi">
+                <ref role="37wK5l" to="c17a:~SAbstractConcept.getDeclarationNode():org.jetbrains.mps.openapi.model.SNode" resolve="getDeclarationNode" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="YGS68N6TfG" role="jymVt" />
+    <node concept="2YIFZL" id="YGS68N6Tbl" role="jymVt">
+      <property role="TrG5h" value="anchorTreeForm" />
+      <node concept="37vLTG" id="YGS68N6Tbm" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="YGS68N6Tbn" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="YGS68N6Tbo" role="3clF45">
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+      </node>
+      <node concept="3Tm1VV" id="YGS68N6Tbp" role="1B3o_S" />
+      <node concept="3clFbS" id="YGS68N6Tbq" role="3clF47">
+        <node concept="3clFbF" id="YGS68N6Tbr" role="3cqZAp">
+          <node concept="2YIFZM" id="YGS68N6Tbs" role="3clFbG">
+            <ref role="37wK5l" node="4OKkcnfu_x_" resolve="anchor" />
+            <ref role="1Pybhc" node="4OKkcnfu_xo" resolve="AnchorUtil" />
+            <node concept="37vLTw" id="YGS68N6Tbt" role="37wK5m">
+              <ref role="3cqZAo" node="YGS68N6Tbm" resolve="node" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1e3DfAArpWV" role="jymVt" />
+    <node concept="2YIFZL" id="_04VjSrAA8" role="jymVt">
+      <property role="TrG5h" value="extractReference" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="4pWvZ2njjN7" role="3clF47">
+        <node concept="3cpWs8" id="_04VjSsBtE" role="3cqZAp">
+          <node concept="3cpWsn" id="_04VjSsBtF" role="3cpWs9">
+            <property role="TrG5h" value="findValue" />
+            <node concept="3uibUv" id="_04VjSsBt_" role="1tU5fm">
+              <ref role="3uigEE" to="6exd:3JgCwkqkUKX" resolve="Finders.IValueFinder" />
+              <node concept="17QB3L" id="_04VjSsBtC" role="11_B2D" />
+            </node>
+            <node concept="2YIFZM" id="_04VjSsBtG" role="33vP2m">
+              <ref role="37wK5l" to="6exd:3JgCwkqd8va" resolve="findValue" />
+              <ref role="1Pybhc" to="6exd:3JgCwkqd3K7" resolve="Finders" />
+              <node concept="37vLTw" id="_04VjSsBtH" role="37wK5m">
+                <ref role="3cqZAo" node="4pWvZ2njjOw" resolve="anchor" />
+              </node>
+              <node concept="37vLTw" id="_04VjSsBtI" role="37wK5m">
+                <ref role="3cqZAo" node="_04VjSrAWO" resolve="nodePattern" />
+              </node>
+              <node concept="Xl_RD" id="_04VjSsBtJ" role="37wK5m">
+                <property role="Xl_RC" value="id" />
+              </node>
+              <node concept="17QB3L" id="_04VjSsBtK" role="3PaCim" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="_04VjSsBCB" role="3cqZAp">
+          <node concept="3clFbS" id="_04VjSsBCD" role="3clFbx">
+            <node concept="3cpWs8" id="_04VjSsu$T" role="3cqZAp">
+              <node concept="3cpWsn" id="_04VjSsu$U" role="3cpWs9">
+                <property role="TrG5h" value="id" />
+                <node concept="17QB3L" id="_04VjSsypj" role="1tU5fm" />
+                <node concept="2OqwBi" id="_04VjSsu$V" role="33vP2m">
+                  <node concept="37vLTw" id="_04VjSsBtL" role="2Oq$k0">
+                    <ref role="3cqZAo" node="_04VjSsBtF" resolve="findValue" />
+                  </node>
+                  <node concept="liA8E" id="_04VjSsu_0" role="2OqNvi">
+                    <ref role="37wK5l" to="6exd:3JgCwkqkUL2" resolve="result" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="SfApY" id="_04VjSsFWT" role="3cqZAp">
+              <node concept="3clFbS" id="_04VjSsFWV" role="SfCbr">
+                <node concept="3cpWs6" id="_04VjSsCR_" role="3cqZAp">
+                  <node concept="2YIFZM" id="HV6urVDdK5" role="3cqZAk">
+                    <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+                    <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="deserialize" />
+                    <node concept="2YIFZM" id="HV6urVDdLG" role="37wK5m">
+                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <node concept="37vLTw" id="_04VjSsu_1" role="37wK5m">
+                        <ref role="3cqZAo" node="_04VjSsu$U" resolve="id" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="_04VjSsGkm" role="3cqZAp" />
+              </node>
+              <node concept="TDmWw" id="_04VjSsFWW" role="TEbGg">
+                <node concept="3cpWsn" id="_04VjSsFWY" role="TDEfY">
+                  <property role="TrG5h" value="ex" />
+                  <node concept="3uibUv" id="_04VjSsG1U" role="1tU5fm">
+                    <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="_04VjSsFX2" role="TDEfX">
+                  <node concept="34ab3g" id="_04VjSsGpB" role="3cqZAp">
+                    <property role="35gtTG" value="warn" />
+                    <property role="34fQS0" value="true" />
+                    <node concept="3cpWs3" id="_04VjSuFwV" role="34bqiv">
+                      <node concept="Xl_RD" id="_04VjSuFxC" role="3uHU7w">
+                        <property role="Xl_RC" value="'" />
+                      </node>
+                      <node concept="3cpWs3" id="_04VjSsGRM" role="3uHU7B">
+                        <node concept="Xl_RD" id="_04VjSsGpD" role="3uHU7B">
+                          <property role="Xl_RC" value="error deserializing id='" />
+                        </node>
+                        <node concept="37vLTw" id="_04VjSsGT9" role="3uHU7w">
+                          <ref role="3cqZAo" node="_04VjSsu$U" resolve="id" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="_04VjSsGpF" role="34bMjA">
+                      <ref role="3cqZAo" node="_04VjSsFWY" resolve="ex" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="_04VjSsBWb" role="3clFbw">
+            <node concept="37vLTw" id="_04VjSsBIB" role="2Oq$k0">
+              <ref role="3cqZAo" node="_04VjSsBtF" resolve="findValue" />
+            </node>
+            <node concept="liA8E" id="_04VjSsCj7" role="2OqNvi">
+              <ref role="37wK5l" to="6exd:3JgCwkqkUKY" resolve="found" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="_04VjSsD6O" role="3cqZAp">
+          <node concept="10Nm6u" id="_04VjSsDcf" role="3cqZAk" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4pWvZ2njjOw" role="3clF46">
+        <property role="TrG5h" value="anchor" />
+        <node concept="3uibUv" id="4pWvZ2njjOx" role="1tU5fm">
+          <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="HV6urVDcLx" role="3clF45">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+      <node concept="3Tm1VV" id="HV6urVDbvo" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="6_UQWSXaUpR" role="jymVt" />
+    <node concept="2YIFZL" id="4OKkcnfu_x_" role="jymVt">
+      <property role="TrG5h" value="anchor" />
+      <node concept="3Tmbuc" id="1e3DfAAraC0" role="1B3o_S" />
+      <node concept="3uibUv" id="4OKkcnfu_xB" role="3clF45">
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+      </node>
+      <node concept="37vLTG" id="4OKkcnfu_xD" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="4OKkcnfu_xE" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="4OKkcnfu_xF" role="3clF47">
+        <node concept="3clFbJ" id="4OKkcnfu_xG" role="3cqZAp">
+          <node concept="3clFbS" id="4OKkcnfu_xH" role="3clFbx">
+            <node concept="3cpWs6" id="4OKkcnfu_xI" role="3cqZAp">
+              <node concept="2YIFZM" id="4OKkcnfu_xJ" role="3cqZAk">
+                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
+                <node concept="Xl_RD" id="4OKkcnfu_xK" role="37wK5m">
+                  <property role="Xl_RC" value="node_1" />
+                </node>
+                <node concept="2YIFZM" id="4OKkcnfu_xL" role="37wK5m">
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <node concept="Xl_RD" id="4OKkcnfu_xM" role="37wK5m">
+                    <property role="Xl_RC" value="node" />
+                  </node>
+                  <node concept="Xl_RD" id="4OKkcnfu_xN" role="37wK5m">
+                    <property role="Xl_RC" value="null" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="4OKkcnfu_xO" role="3clFbw">
+            <node concept="10Nm6u" id="4OKkcnfu_xP" role="3uHU7w" />
+            <node concept="37vLTw" id="4OKkcnfu_xQ" role="3uHU7B">
+              <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4OKkcnfu_xR" role="3cqZAp" />
+        <node concept="3cpWs8" id="4OKkcnfu_xS" role="3cqZAp">
+          <node concept="3cpWsn" id="4OKkcnfu_xT" role="3cpWs9">
+            <property role="TrG5h" value="cpt" />
+            <node concept="17QB3L" id="4OKkcnfu_xU" role="1tU5fm" />
+            <node concept="2OqwBi" id="4OKkcnfu_xV" role="33vP2m">
+              <node concept="2OqwBi" id="4OKkcnfu_xW" role="2Oq$k0">
+                <node concept="2JrnkZ" id="4OKkcnfu_xX" role="2Oq$k0">
+                  <node concept="37vLTw" id="4OKkcnfu_xY" role="2JrQYb">
+                    <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="4OKkcnfu_xZ" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getConcept():org.jetbrains.mps.openapi.language.SConcept" resolve="getConcept" />
+                </node>
+              </node>
+              <node concept="liA8E" id="4OKkcnfu_y0" role="2OqNvi">
+                <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4OKkcnfu_y1" role="3cqZAp">
+          <node concept="3cpWsn" id="4OKkcnfu_y2" role="3cpWs9">
+            <property role="TrG5h" value="id" />
+            <node concept="17QB3L" id="4OKkcnfu_y3" role="1tU5fm" />
+            <node concept="2OqwBi" id="2zBk6uIkVZu" role="33vP2m">
+              <node concept="2OqwBi" id="4OKkcnfu_y5" role="2Oq$k0">
+                <node concept="2JrnkZ" id="4OKkcnfu_y6" role="2Oq$k0">
+                  <node concept="37vLTw" id="4OKkcnfu_y7" role="2JrQYb">
+                    <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="2zBk6uIkVtA" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                </node>
+              </node>
+              <node concept="liA8E" id="2zBk6uIkW$Z" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4OKkcnfu_y9" role="3cqZAp" />
+        <node concept="3clFbJ" id="6infEALwMDs" role="3cqZAp">
+          <node concept="3clFbS" id="6infEALwMDu" role="3clFbx">
+            <node concept="3cpWs8" id="6infEALx4sE" role="3cqZAp">
+              <node concept="3cpWsn" id="6infEALx4sF" role="3cpWs9">
+                <property role="TrG5h" value="cls" />
+                <node concept="17QB3L" id="6infEALx4sz" role="1tU5fm" />
+                <node concept="2OqwBi" id="6infEALx4sG" role="33vP2m">
+                  <node concept="2OqwBi" id="6infEALx4sH" role="2Oq$k0">
+                    <node concept="1PxgMI" id="6infEALx4sI" role="2Oq$k0">
+                      <node concept="37vLTw" id="6infEALx4sJ" role="1m5AlR">
+                        <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
+                      </node>
+                      <node concept="chp4Y" id="6fXjIfxgngA" role="3oSUPX">
+                        <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+                      </node>
+                    </node>
+                    <node concept="3TrEf2" id="6infEALx4sK" role="2OqNvi">
+                      <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                    </node>
+                  </node>
+                  <node concept="3TrcHB" id="6infEALx4sL" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="6infEALxfCY" role="3cqZAp">
+              <node concept="3cpWsn" id="6infEALxfCZ" role="3cpWs9">
+                <property role="TrG5h" value="cid" />
+                <node concept="17QB3L" id="2zBk6uIkUmB" role="1tU5fm" />
+                <node concept="2OqwBi" id="2zBk6uIkTgn" role="33vP2m">
+                  <node concept="2OqwBi" id="6infEALxfD1" role="2Oq$k0">
+                    <node concept="2JrnkZ" id="6infEALxfD2" role="2Oq$k0">
+                      <node concept="2OqwBi" id="4JRKVCvdyFf" role="2JrQYb">
+                        <node concept="1PxgMI" id="6infEALxfD3" role="2Oq$k0">
+                          <node concept="37vLTw" id="6infEALxfD4" role="1m5AlR">
+                            <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
+                          </node>
+                          <node concept="chp4Y" id="6fXjIfxgngD" role="3oSUPX">
+                            <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+                          </node>
+                        </node>
+                        <node concept="3TrEf2" id="4JRKVCvd_0q" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="2zBk6uIkSHY" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="2zBk6uIkTOj" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="5_6ImQZjqKT" role="3cqZAp">
+              <node concept="3cpWsn" id="5_6ImQZjqKU" role="3cpWs9">
+                <property role="TrG5h" value="params" />
+                <node concept="2I9FWS" id="5_6ImQZjqKR" role="1tU5fm">
+                  <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
+                </node>
+                <node concept="2OqwBi" id="5_6ImQZjqKV" role="33vP2m">
+                  <node concept="1PxgMI" id="5_6ImQZjqKW" role="2Oq$k0">
+                    <property role="1BlNFB" value="true" />
+                    <node concept="37vLTw" id="5_6ImQZjqKX" role="1m5AlR">
+                      <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
+                    </node>
+                    <node concept="chp4Y" id="6fXjIfxgngB" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+                    </node>
+                  </node>
+                  <node concept="3Tsc0h" id="5_6ImQZjqKY" role="2OqNvi">
+                    <ref role="3TtcxE" to="tpee:g91_B6F" resolve="parameter" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="5_6ImQZju9Q" role="3cqZAp">
+              <node concept="3cpWsn" id="5_6ImQZju9R" role="3cpWs9">
+                <property role="TrG5h" value="paramsArr" />
+                <node concept="10Q1$e" id="5_6ImQZju9S" role="1tU5fm">
+                  <node concept="3uibUv" id="5_6ImQZju9T" role="10Q1$1">
+                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="5_6ImQZju9U" role="33vP2m">
+                  <node concept="3$_iS1" id="5_6ImQZju9V" role="2ShVmc">
+                    <node concept="3$GHV9" id="5_6ImQZju9W" role="3$GQph">
+                      <node concept="2OqwBi" id="5_6ImQZju9X" role="3$I4v7">
+                        <node concept="37vLTw" id="5_6ImQZjvG2" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5_6ImQZjqKU" resolve="params" />
+                        </node>
+                        <node concept="34oBXx" id="5_6ImQZju9Z" role="2OqNvi" />
+                      </node>
+                    </node>
+                    <node concept="3uibUv" id="5_6ImQZjua0" role="3$_nBY">
+                      <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="5_6ImQZjua1" role="3cqZAp">
+              <node concept="3cpWsn" id="5_6ImQZjua2" role="3cpWs9">
+                <property role="TrG5h" value="idx" />
+                <node concept="10Oyi0" id="5_6ImQZjua3" role="1tU5fm" />
+                <node concept="3cmrfG" id="5_6ImQZjua4" role="33vP2m">
+                  <property role="3cmrfH" value="0" />
+                </node>
+              </node>
+            </node>
+            <node concept="1DcWWT" id="5_6ImQZjua5" role="3cqZAp">
+              <node concept="3clFbS" id="5_6ImQZjua6" role="2LFqv$">
+                <node concept="3clFbF" id="5_6ImQZjua7" role="3cqZAp">
+                  <node concept="37vLTI" id="5_6ImQZjua8" role="3clFbG">
+                    <node concept="AH0OO" id="5_6ImQZjua9" role="37vLTJ">
+                      <node concept="3uNrnE" id="5_6ImQZjuaa" role="AHEQo">
+                        <node concept="37vLTw" id="5_6ImQZjuab" role="2$L3a6">
+                          <ref role="3cqZAo" node="5_6ImQZjua2" resolve="idx" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="5_6ImQZjuac" role="AHHXb">
+                        <ref role="3cqZAo" node="5_6ImQZju9R" resolve="paramsArr" />
+                      </node>
+                    </node>
+                    <node concept="2YIFZM" id="5_6ImQZjuad" role="37vLTx">
+                      <ref role="37wK5l" node="4OKkcnfu_x_" resolve="anchor" />
+                      <ref role="1Pybhc" node="4OKkcnfu_xo" resolve="AnchorUtil" />
+                      <node concept="37vLTw" id="5_6ImQZjuae" role="37wK5m">
+                        <ref role="3cqZAo" node="5_6ImQZjuaf" resolve="p" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWsn" id="5_6ImQZjuaf" role="1Duv9x">
+                <property role="TrG5h" value="p" />
+                <node concept="3Tqbb2" id="5_6ImQZjuag" role="1tU5fm" />
+              </node>
+              <node concept="37vLTw" id="5_6ImQZjw0X" role="1DdaDG">
+                <ref role="3cqZAo" node="5_6ImQZjqKU" resolve="params" />
+              </node>
+            </node>
+            <node concept="3clFbH" id="5_6ImQZjoR_" role="3cqZAp" />
+            <node concept="3cpWs6" id="6infEALwTvt" role="3cqZAp">
+              <node concept="2YIFZM" id="6infEALwTvu" role="3cqZAk">
+                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
+                <node concept="Xl_RD" id="6infEALwTvv" role="37wK5m">
+                  <property role="Xl_RC" value="node_4" />
+                </node>
+                <node concept="2YIFZM" id="6infEALwTvw" role="37wK5m">
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                  <node concept="Xl_RD" id="6infEALwTvx" role="37wK5m">
+                    <property role="Xl_RC" value="concept" />
+                  </node>
+                  <node concept="37vLTw" id="6infEALwTvy" role="37wK5m">
+                    <ref role="3cqZAo" node="4OKkcnfu_xT" resolve="cpt" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="6infEALwTvz" role="37wK5m">
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <node concept="Xl_RD" id="6infEALwTv$" role="37wK5m">
+                    <property role="Xl_RC" value="classifier" />
+                  </node>
+                  <node concept="37vLTw" id="6infEALxm0$" role="37wK5m">
+                    <ref role="3cqZAo" node="6infEALx4sF" resolve="cls" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="6infEALwTvA" role="37wK5m">
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                  <node concept="Xl_RD" id="6infEALwTvB" role="37wK5m">
+                    <property role="Xl_RC" value="cid" />
+                  </node>
+                  <node concept="37vLTw" id="6infEALxpB7" role="37wK5m">
+                    <ref role="3cqZAo" node="6infEALxfCZ" resolve="cid" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="3t7_2FgCsY0" role="37wK5m">
+                  <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+                  <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
+                  <node concept="Xl_RD" id="3t7_2FgCsY1" role="37wK5m">
+                    <property role="Xl_RC" value="parameter" />
+                  </node>
+                  <node concept="2YIFZM" id="3t7_2FgCvB0" role="37wK5m">
+                    <ref role="37wK5l" to="6exd:1OShD0HS45f" resolve="createList" />
+                    <ref role="1Pybhc" to="6exd:3OPtF03lco4" resolve="ListNode" />
+                    <node concept="37vLTw" id="5_6ImQZjxi9" role="37wK5m">
+                      <ref role="3cqZAo" node="5_6ImQZju9R" resolve="paramsArr" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="6infEALwPKP" role="3clFbw">
+            <node concept="37vLTw" id="6infEALwO2S" role="2Oq$k0">
+              <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
+            </node>
+            <node concept="1mIQ4w" id="6infEALwRh6" role="2OqNvi">
+              <node concept="chp4Y" id="6infEALwRno" role="cj9EA">
+                <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6infEALwJNw" role="3cqZAp" />
+        <node concept="3clFbJ" id="4OKkcnfu_ya" role="3cqZAp">
+          <node concept="3clFbS" id="4OKkcnfu_yb" role="3clFbx">
+            <node concept="3cpWs8" id="4OKkcnfu_yc" role="3cqZAp">
+              <node concept="3cpWsn" id="4OKkcnfu_yd" role="3cpWs9">
+                <property role="TrG5h" value="name" />
+                <node concept="17QB3L" id="4OKkcnfu_ye" role="1tU5fm" />
+                <node concept="2OqwBi" id="4OKkcnfu_yf" role="33vP2m">
+                  <node concept="1PxgMI" id="4OKkcnfu_yg" role="2Oq$k0">
+                    <node concept="37vLTw" id="4OKkcnfu_yh" role="1m5AlR">
+                      <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
+                    </node>
+                    <node concept="chp4Y" id="6fXjIfxgngC" role="3oSUPX">
+                      <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                    </node>
+                  </node>
+                  <node concept="3TrcHB" id="4OKkcnfu_yi" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="4OKkcnfu_yj" role="3cqZAp">
+              <node concept="2YIFZM" id="4OKkcnfu_yk" role="3cqZAk">
+                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
+                <node concept="Xl_RD" id="4OKkcnfu_yl" role="37wK5m">
+                  <property role="Xl_RC" value="node_3" />
+                </node>
+                <node concept="2YIFZM" id="4OKkcnfu_ym" role="37wK5m">
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                  <node concept="Xl_RD" id="4OKkcnfu_yn" role="37wK5m">
+                    <property role="Xl_RC" value="concept" />
+                  </node>
+                  <node concept="37vLTw" id="4OKkcnfu_yo" role="37wK5m">
+                    <ref role="3cqZAo" node="4OKkcnfu_xT" resolve="cpt" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="4OKkcnfu_yp" role="37wK5m">
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                  <node concept="Xl_RD" id="4OKkcnfu_yq" role="37wK5m">
+                    <property role="Xl_RC" value="name" />
+                  </node>
+                  <node concept="37vLTw" id="4OKkcnfu_yr" role="37wK5m">
+                    <ref role="3cqZAo" node="4OKkcnfu_yd" resolve="name" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="4OKkcnfu_ys" role="37wK5m">
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                  <node concept="Xl_RD" id="4OKkcnfu_yt" role="37wK5m">
+                    <property role="Xl_RC" value="id" />
+                  </node>
+                  <node concept="37vLTw" id="4OKkcnfu_yu" role="37wK5m">
+                    <ref role="3cqZAo" node="4OKkcnfu_y2" resolve="id" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="4OKkcnfu_yv" role="3clFbw">
+            <node concept="37vLTw" id="4OKkcnfu_yw" role="2Oq$k0">
+              <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
+            </node>
+            <node concept="1mIQ4w" id="4OKkcnfu_yx" role="2OqNvi">
+              <node concept="chp4Y" id="4OKkcnfu_yy" role="cj9EA">
+                <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4OKkcnfu_yz" role="3cqZAp" />
+        <node concept="3cpWs8" id="4OKkcnfu_y$" role="3cqZAp">
+          <node concept="3cpWsn" id="4OKkcnfu_y_" role="3cpWs9">
+            <property role="TrG5h" value="text" />
+            <node concept="17QB3L" id="4OKkcnfu_yA" role="1tU5fm" />
+            <node concept="2OqwBi" id="4OKkcnfu_yB" role="33vP2m">
+              <node concept="2YIFZM" id="4OKkcnfu_yC" role="2Oq$k0">
+                <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <node concept="37vLTw" id="4OKkcnfu_yD" role="37wK5m">
+                  <ref role="3cqZAo" node="4OKkcnfu_xD" resolve="node" />
+                </node>
+              </node>
+              <node concept="EvHYZ" id="4OKkcnfu_yE" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="2ty0qM" id="4OKkcnfu_yF" role="3cqZAp">
+          <node concept="1Qi9sc" id="4OKkcnfu_yG" role="1YN4dH">
+            <node concept="1OJ37Q" id="4OKkcnfu_yH" role="1QigWp">
+              <node concept="2t4tHJ" id="4OKkcnfu_yI" role="1OLpdg" />
+              <node concept="1OJ37Q" id="4OKkcnfu_yJ" role="1OLqdY">
+                <node concept="1Tukvm" id="4OKkcnfu_yK" role="1OLpdg">
+                  <property role="TrG5h" value="ascii" />
+                  <node concept="1OClNT" id="4OKkcnfu_yL" role="1TuGhC">
+                    <node concept="2e2xP4" id="4OKkcnfu_yM" role="1OLDsb">
+                      <ref role="2e2_8$" node="4OKkcnfu_yK" resolve="ascii" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="1OCmVF" id="4OKkcnfu_yN" role="1OLqdY">
+                  <node concept="1T2EwR" id="4OKkcnfu_yO" role="1OLDsb" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="4OKkcnfu_yP" role="2ty3UH">
+            <ref role="3cqZAo" node="4OKkcnfu_y_" resolve="text" />
+          </node>
+          <node concept="3clFbS" id="4OKkcnfu_yQ" role="2tyzPh">
+            <node concept="3cpWs6" id="4OKkcnfu_yR" role="3cqZAp">
+              <node concept="2YIFZM" id="4OKkcnfu_yS" role="3cqZAk">
+                <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+                <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
+                <node concept="Xl_RD" id="4OKkcnfu_yT" role="37wK5m">
+                  <property role="Xl_RC" value="node_3" />
+                </node>
+                <node concept="2YIFZM" id="4OKkcnfu_yU" role="37wK5m">
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                  <node concept="Xl_RD" id="4OKkcnfu_yV" role="37wK5m">
+                    <property role="Xl_RC" value="concept" />
+                  </node>
+                  <node concept="37vLTw" id="4OKkcnfu_yW" role="37wK5m">
+                    <ref role="3cqZAo" node="4OKkcnfu_xT" resolve="cpt" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="4OKkcnfu_yX" role="37wK5m">
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                  <node concept="Xl_RD" id="4OKkcnfu_yY" role="37wK5m">
+                    <property role="Xl_RC" value="text" />
+                  </node>
+                  <node concept="1TxZTf" id="4OKkcnfu_yZ" role="37wK5m">
+                    <ref role="1Ty1U8" node="4OKkcnfu_yK" resolve="ascii" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="4OKkcnfu_z0" role="37wK5m">
+                  <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+                  <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+                  <node concept="Xl_RD" id="4OKkcnfu_z1" role="37wK5m">
+                    <property role="Xl_RC" value="id" />
+                  </node>
+                  <node concept="37vLTw" id="4OKkcnfu_z2" role="37wK5m">
+                    <ref role="3cqZAo" node="4OKkcnfu_y2" resolve="id" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4OKkcnfu_z3" role="3cqZAp" />
+        <node concept="3cpWs6" id="4OKkcnfu_z4" role="3cqZAp">
+          <node concept="2YIFZM" id="4OKkcnfu_z5" role="3cqZAk">
+            <ref role="37wK5l" to="6exd:5JQSuNsxhfn" resolve="create" />
+            <ref role="1Pybhc" to="6exd:5JQSuNswOXL" resolve="CompositeNode" />
+            <node concept="Xl_RD" id="4OKkcnfu_z6" role="37wK5m">
+              <property role="Xl_RC" value="node_2" />
+            </node>
+            <node concept="2YIFZM" id="4OKkcnfu_z7" role="37wK5m">
+              <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+              <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+              <node concept="Xl_RD" id="4OKkcnfu_z8" role="37wK5m">
+                <property role="Xl_RC" value="concept" />
+              </node>
+              <node concept="37vLTw" id="4OKkcnfu_z9" role="37wK5m">
+                <ref role="3cqZAo" node="4OKkcnfu_xT" resolve="cpt" />
+              </node>
+            </node>
+            <node concept="2YIFZM" id="4OKkcnfu_za" role="37wK5m">
+              <ref role="1Pybhc" to="6exd:5JQSuNsx4Gq" resolve="Builder" />
+              <ref role="37wK5l" to="6exd:5JQSuNsx4I5" resolve="value" />
+              <node concept="Xl_RD" id="4OKkcnfu_zb" role="37wK5m">
+                <property role="Xl_RC" value="id" />
+              </node>
+              <node concept="37vLTw" id="4OKkcnfu_zc" role="37wK5m">
+                <ref role="3cqZAo" node="4OKkcnfu_y2" resolve="id" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1e3DfAArpxG" role="jymVt" />
+    <node concept="3Tm1VV" id="4OKkcnfu_ze" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd
index 31cba4dd..59e10476 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd
@@ -16,6 +16,8 @@
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)</dependency>
+    <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
+    <dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
@@ -23,13 +25,13 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
+    <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
     <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="1" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -38,6 +40,7 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
@@ -45,7 +48,8 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
-    <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.lang.typesystem2.sampleLang)" version="0" />
+    <module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)" version="0" />
+    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.lang.typesystem2.test)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/models/jetbrains/mps/lang/typesystem2/typechecking@tests.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/models/jetbrains/mps/lang/typesystem2/typechecking@tests.mps
index 1251d717..ae73dd73 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/models/jetbrains/mps/lang/typesystem2/typechecking@tests.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/models/jetbrains/mps/lang/typesystem2/typechecking@tests.mps
@@ -9,7 +9,9 @@
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
-    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
+    <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
+    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -28,6 +30,12 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
+    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.typesystem2.aspect)" />
+    <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.lang.typesystem2.sampleplugin.plugin)" />
+    <import index="tqvn" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.tempmodel(MPS.Core/)" />
+    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
+    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@@ -55,6 +63,7 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
       <concept id="1153952380246" name="jetbrains.mps.baseLanguage.structure.TryStatement" flags="nn" index="2GUZhq">
         <child id="1153952416686" name="body" index="2GV8ay" />
         <child id="1153952429843" name="finallyBody" index="2GVbov" />
@@ -78,10 +87,16 @@
       <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="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <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="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
+      <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
+        <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -101,9 +116,22 @@
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </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="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>
@@ -115,6 +143,7 @@
       </concept>
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
@@ -126,6 +155,8 @@
         <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" />
+      <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -135,6 +166,13 @@
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
         <child id="1144230900587" name="variable" index="1Duv9x" />
       </concept>
+      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
+      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
+        <property id="6329021646629104958" name="text" index="3SKdUp" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
+      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
@@ -145,7 +183,14 @@
       </concept>
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
+      <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+        <reference id="1205756909548" name="member" index="2WH_rO" />
+      </concept>
       <concept id="1205769003971" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodDeclaration" flags="ng" index="2XrIbr" />
+      <concept id="1205769149993" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodCallOperation" flags="nn" index="2XshWL">
+        <child id="1205770614681" name="actualArgument" index="2XxRq1" />
+      </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">
@@ -206,6 +251,9 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
+    </language>
     <language id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types">
       <concept id="7345257067587627589" name="jetbrains.mps.lang.smodel.types.structure.SNodeTypeOperation" flags="ng" index="2W$R8B" />
     </language>
@@ -1090,5 +1138,339 @@
       </node>
     </node>
   </node>
+  <node concept="1lH9Xt" id="4nxCIBqxR0M">
+    <property role="TrG5h" value="SampleTypeAspect" />
+    <node concept="2XrIbr" id="7y50OW6ZKyB" role="1qtyYc">
+      <property role="TrG5h" value="typeTemplates" />
+      <node concept="37vLTG" id="7y50OW6ZKKa" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="H_c77" id="7y50OW6ZKLy" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="7y50OW6ZKHy" role="3clF45">
+        <ref role="3uigEE" to="fqlx:1hX44vNlSIA" resolve="TypeTemplateIndex" />
+      </node>
+      <node concept="3clFbS" id="7y50OW6ZKyD" role="3clF47">
+        <node concept="3SKdUt" id="7y50OW707GY" role="3cqZAp">
+          <node concept="3SKdUq" id="7y50OW707H0" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME: assuming the model imports only one lang with types aspect" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7y50OW6ZLiA" role="3cqZAp">
+          <node concept="3cpWsn" id="7y50OW6ZLiB" role="3cpWs9">
+            <property role="TrG5h" value="typeAspect" />
+            <node concept="3uibUv" id="7y50OW6ZLiC" role="1tU5fm">
+              <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+            </node>
+            <node concept="2OqwBi" id="7y50OW6ZLiD" role="33vP2m">
+              <node concept="2WthIp" id="7y50OW6ZLiE" role="2Oq$k0" />
+              <node concept="2XshWL" id="7y50OW6ZLiF" role="2OqNvi">
+                <ref role="2WH_rO" node="4nxCIBqxS8B" resolve="firstTypeAspect" />
+                <node concept="37vLTw" id="7y50OW6ZLut" role="2XxRq1">
+                  <ref role="3cqZAo" node="7y50OW6ZKKa" resolve="model" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7y50OW6ZS1_" role="3cqZAp">
+          <node concept="3cpWsn" id="7y50OW6ZS1A" role="3cpWs9">
+            <property role="TrG5h" value="typeTemplates" />
+            <node concept="3uibUv" id="7y50OW6ZS1r" role="1tU5fm">
+              <ref role="3uigEE" to="fqlx:1hX44vNlSIA" resolve="TypeTemplateIndex" />
+            </node>
+            <node concept="2ShNRf" id="7y50OW6ZS1B" role="33vP2m">
+              <node concept="1pGfFk" id="7y50OW6ZS1C" role="2ShVmc">
+                <ref role="37wK5l" to="fqlx:1hX44vNlSOK" resolve="TypeTemplateIndex" />
+                <node concept="2OqwBi" id="7y50OW6ZS1D" role="37wK5m">
+                  <node concept="37vLTw" id="7y50OW6ZS1E" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7y50OW6ZLiB" resolve="typeAspect" />
+                  </node>
+                  <node concept="liA8E" id="7y50OW6ZS1F" role="2OqNvi">
+                    <ref role="37wK5l" to="fqlx:2hteS6ClmbE" resolve="createTypeManifest" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="7y50OW70aZa" role="3cqZAp">
+          <node concept="3SKdUq" id="7y50OW70aZc" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME: assuming the type aspect defines only single type table" />
+          </node>
+        </node>
+        <node concept="3vMLTj" id="7y50OW6ZSAE" role="3cqZAp">
+          <node concept="3cmrfG" id="7y50OW6ZSBN" role="3tpDZB">
+            <property role="3cmrfH" value="1" />
+          </node>
+          <node concept="2OqwBi" id="7y50OW6ZUrY" role="3tpDZA">
+            <node concept="2OqwBi" id="7y50OW6ZTd5" role="2Oq$k0">
+              <node concept="37vLTw" id="7y50OW6ZT8n" role="2Oq$k0">
+                <ref role="3cqZAo" node="7y50OW6ZS1A" resolve="typeTemplates" />
+              </node>
+              <node concept="liA8E" id="7y50OW6ZU4F" role="2OqNvi">
+                <ref role="37wK5l" to="fqlx:4JJCDIn5F0n" resolve="typeTables" />
+              </node>
+            </node>
+            <node concept="34oBXx" id="7y50OW6ZVmR" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="7y50OW6ZM3q" role="3cqZAp">
+          <node concept="37vLTw" id="7y50OW6ZS1G" role="3clFbG">
+            <ref role="3cqZAo" node="7y50OW6ZS1A" resolve="typeTemplates" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1LZb2c" id="7y50OW6TxjM" role="1SL9yI">
+      <property role="TrG5h" value="typechecking" />
+      <node concept="3cqZAl" id="7y50OW6TxjN" role="3clF45" />
+      <node concept="3clFbS" id="7y50OW6TxjR" role="3clF47">
+        <node concept="3cpWs8" id="7y50OW6ZE44" role="3cqZAp">
+          <node concept="3cpWsn" id="7y50OW6ZE45" role="3cpWs9">
+            <property role="TrG5h" value="checkTypes" />
+            <node concept="3uibUv" id="7y50OW6ZE42" role="1tU5fm">
+              <ref role="3uigEE" to="t5kh:7y50OW6XXpr" resolve="LaunchTypechecking.TypecheckingResult" />
+            </node>
+            <node concept="2YIFZM" id="7y50OW6ZE46" role="33vP2m">
+              <ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
+              <ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
+              <node concept="3xONca" id="7y50OW6ZE47" role="37wK5m">
+                <ref role="3xOPvv" node="4nxCIBqymjB" resolve="class" />
+              </node>
+              <node concept="1jxXqW" id="7y50OW6ZE48" role="37wK5m" />
+            </node>
+          </node>
+        </node>
+        <node concept="3ykFI1" id="7y50OW6U9jy" role="3cqZAp">
+          <node concept="2OqwBi" id="7y50OW6ZEh5" role="3ykU8v">
+            <node concept="37vLTw" id="7y50OW6ZE8H" role="2Oq$k0">
+              <ref role="3cqZAo" node="7y50OW6ZE45" resolve="checkTypes" />
+            </node>
+            <node concept="liA8E" id="7y50OW6ZEtL" role="2OqNvi">
+              <ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7y50OW6ZGv$" role="3cqZAp" />
+        <node concept="3cpWs8" id="52a_GfIM9UR" role="3cqZAp">
+          <node concept="3cpWsn" id="52a_GfIM9US" role="3cpWs9">
+            <property role="TrG5h" value="typeModel" />
+            <node concept="3uibUv" id="52a_GfIM9UP" role="1tU5fm">
+              <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+            </node>
+            <node concept="2OqwBi" id="52a_GfIM9UT" role="33vP2m">
+              <node concept="2YIFZM" id="52a_GfIM9UU" role="2Oq$k0">
+                <ref role="1Pybhc" to="tqvn:~TemporaryModels" resolve="TemporaryModels" />
+                <ref role="37wK5l" to="tqvn:~TemporaryModels.getInstance():jetbrains.mps.smodel.tempmodel.TemporaryModels" resolve="getInstance" />
+              </node>
+              <node concept="liA8E" id="52a_GfIM9UV" role="2OqNvi">
+                <ref role="37wK5l" to="tqvn:~TemporaryModels.create(boolean,jetbrains.mps.smodel.tempmodel.TempModuleOptions):org.jetbrains.mps.openapi.model.SModel" resolve="create" />
+                <node concept="3clFbT" id="52a_GfIM9UW" role="37wK5m">
+                  <property role="3clFbU" value="true" />
+                </node>
+                <node concept="2YIFZM" id="52a_GfIM9UX" role="37wK5m">
+                  <ref role="1Pybhc" to="tqvn:~TempModuleOptions" resolve="TempModuleOptions" />
+                  <ref role="37wK5l" to="tqvn:~TempModuleOptions.forDefaultModule():jetbrains.mps.smodel.tempmodel.TempModuleOptions" resolve="forDefaultModule" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7y50OW700$V" role="3cqZAp" />
+        <node concept="3cpWs8" id="7y50OW6ZH4l" role="3cqZAp">
+          <node concept="3cpWsn" id="7y50OW6ZH4m" role="3cpWs9">
+            <property role="TrG5h" value="termA" />
+            <node concept="3uibUv" id="7y50OW6ZH4g" role="1tU5fm">
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+            </node>
+            <node concept="2OqwBi" id="7y50OW6ZH4n" role="33vP2m">
+              <node concept="37vLTw" id="7y50OW6ZH4o" role="2Oq$k0">
+                <ref role="3cqZAo" node="7y50OW6ZE45" resolve="checkTypes" />
+              </node>
+              <node concept="liA8E" id="7y50OW6ZH4p" role="2OqNvi">
+                <ref role="37wK5l" to="t5kh:7y50OW6XYoC" resolve="getType" />
+                <node concept="3xONca" id="7y50OW6ZH4q" role="37wK5m">
+                  <ref role="3xOPvv" node="1eKXYsjuWjw" resolve="fieldA" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7y50OW701J0" role="3cqZAp">
+          <node concept="3cpWsn" id="7y50OW701J1" role="3cpWs9">
+            <property role="TrG5h" value="termB" />
+            <node concept="3uibUv" id="7y50OW701J2" role="1tU5fm">
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+            </node>
+            <node concept="2OqwBi" id="7y50OW701J3" role="33vP2m">
+              <node concept="37vLTw" id="7y50OW701J4" role="2Oq$k0">
+                <ref role="3cqZAo" node="7y50OW6ZE45" resolve="checkTypes" />
+              </node>
+              <node concept="liA8E" id="7y50OW701J5" role="2OqNvi">
+                <ref role="37wK5l" to="t5kh:7y50OW6XYoC" resolve="getType" />
+                <node concept="3xONca" id="7y50OW701Tq" role="37wK5m">
+                  <ref role="3xOPvv" node="7y50OW6ZXVj" resolve="fieldB" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Hmddi" id="7y50OW6ZIlS" role="3cqZAp">
+          <node concept="37vLTw" id="7y50OW6ZISl" role="2Hmdds">
+            <ref role="3cqZAo" node="7y50OW6ZH4m" resolve="termA" />
+          </node>
+        </node>
+        <node concept="2Hmddi" id="7y50OW70203" role="3cqZAp">
+          <node concept="37vLTw" id="7y50OW7026g" role="2Hmdds">
+            <ref role="3cqZAo" node="7y50OW701J1" resolve="termB" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="52a_GfIMadO" role="3cqZAp" />
+        <node concept="3clFbF" id="52a_GfIM6S5" role="3cqZAp">
+          <node concept="2OqwBi" id="52a_GfIM72F" role="3clFbG">
+            <node concept="2YIFZM" id="52a_GfIM6S7" role="2Oq$k0">
+              <ref role="37wK5l" to="tqvn:~TemporaryModels.getInstance():jetbrains.mps.smodel.tempmodel.TemporaryModels" resolve="getInstance" />
+              <ref role="1Pybhc" to="tqvn:~TemporaryModels" resolve="TemporaryModels" />
+            </node>
+            <node concept="liA8E" id="52a_GfIM7aQ" role="2OqNvi">
+              <ref role="37wK5l" to="tqvn:~TemporaryModels.dispose(org.jetbrains.mps.openapi.model.SModel):void" resolve="dispose" />
+              <node concept="37vLTw" id="52a_GfIM7E$" role="37wK5m">
+                <ref role="3cqZAo" node="52a_GfIM9US" resolve="typeModel" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2XrIbr" id="4nxCIBqxS8B" role="1qtyYc">
+      <property role="TrG5h" value="firstTypeAspect" />
+      <node concept="37vLTG" id="4nxCIBqxTLY" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="H_c77" id="4nxCIBqxVB6" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="4nxCIBqxS8S" role="3clF45">
+        <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+      </node>
+      <node concept="3clFbS" id="4nxCIBqxS8D" role="3clF47">
+        <node concept="3cpWs8" id="4hh0cTRbUS6" role="3cqZAp">
+          <node concept="3cpWsn" id="4hh0cTRbUS7" role="3cpWs9">
+            <property role="TrG5h" value="typesAspect" />
+            <node concept="3uibUv" id="4hh0cTRbURZ" role="1tU5fm">
+              <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+            </node>
+            <node concept="10Nm6u" id="4xTpErk1C4t" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="1DcWWT" id="4xTpErk1pjs" role="3cqZAp">
+          <node concept="3clFbS" id="4xTpErk1pju" role="2LFqv$">
+            <node concept="3clFbF" id="4xTpErk1zEf" role="3cqZAp">
+              <node concept="37vLTI" id="4xTpErk1zEh" role="3clFbG">
+                <node concept="2YIFZM" id="4hh0cTRbUS8" role="37vLTx">
+                  <ref role="37wK5l" to="fqlx:2hteS6Cndm6" resolve="forLanguage" />
+                  <ref role="1Pybhc" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+                  <node concept="37vLTw" id="4xTpErk25DG" role="37wK5m">
+                    <ref role="3cqZAo" node="4xTpErk1pjv" resolve="lang" />
+                  </node>
+                  <node concept="2OqwBi" id="3GlpCDS_oBV" role="37wK5m">
+                    <node concept="1jxXqW" id="4nxCIBqypgi" role="2Oq$k0" />
+                    <node concept="liA8E" id="3GlpCDS_pPw" role="2OqNvi">
+                      <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="4xTpErk1zEl" role="37vLTJ">
+                  <ref role="3cqZAo" node="4hh0cTRbUS7" resolve="typesAspect" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="4xTpErk1MGG" role="3cqZAp">
+              <node concept="3clFbS" id="4xTpErk1MGI" role="3clFbx">
+                <node concept="3zACq4" id="4xTpErk1V4q" role="3cqZAp" />
+              </node>
+              <node concept="3y3z36" id="4xTpErk1S34" role="3clFbw">
+                <node concept="10Nm6u" id="4xTpErk1SiT" role="3uHU7w" />
+                <node concept="37vLTw" id="4xTpErk1PF$" role="3uHU7B">
+                  <ref role="3cqZAo" node="4hh0cTRbUS7" resolve="typesAspect" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="4xTpErk1pjv" role="1Duv9x">
+            <property role="TrG5h" value="lang" />
+            <node concept="3uibUv" id="4xTpErk1xEI" role="1tU5fm">
+              <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+            </node>
+          </node>
+          <node concept="2YIFZM" id="4xTpErk1vp3" role="1DdaDG">
+            <ref role="1Pybhc" to="w1kc:~SModelOperations" resolve="SModelOperations" />
+            <ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel):java.util.Set" resolve="getAllLanguageImports" />
+            <node concept="37vLTw" id="4nxCIBqxXz7" role="37wK5m">
+              <ref role="3cqZAo" node="4nxCIBqxTLY" resolve="model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="4nxCIBqxY1M" role="3cqZAp">
+          <node concept="37vLTw" id="4nxCIBqxYTl" role="3cqZAk">
+            <ref role="3cqZAo" node="4hh0cTRbUS7" resolve="typesAspect" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1qefOq" id="4nxCIBqyl_2" role="1SKRRt">
+      <node concept="312cEu" id="4nxCIBqyl_d" role="1qenE9">
+        <property role="TrG5h" value="Test" />
+        <node concept="2tJIrI" id="1eKXYsjuV4O" role="jymVt" />
+        <node concept="3HP615" id="4cKdPpqIRLR" role="jymVt">
+          <property role="2bfB8j" value="true" />
+          <property role="TrG5h" value="A" />
+          <node concept="3Tm1VV" id="4cKdPpqIRLS" role="1B3o_S" />
+        </node>
+        <node concept="2tJIrI" id="7y50OW6ZXx0" role="jymVt" />
+        <node concept="3HP615" id="7y50OW6ZXcE" role="jymVt">
+          <property role="2bfB8j" value="true" />
+          <property role="TrG5h" value="B" />
+          <node concept="3Tm1VV" id="7y50OW6ZXcF" role="1B3o_S" />
+          <node concept="16euLQ" id="7y50OW6ZXOs" role="16eVyc">
+            <property role="TrG5h" value="T" />
+          </node>
+        </node>
+        <node concept="2tJIrI" id="4cKdPpqKZY1" role="jymVt" />
+        <node concept="312cEg" id="1eKXYsjuVRn" role="jymVt">
+          <property role="TrG5h" value="fielda" />
+          <node concept="3Tm6S6" id="1eKXYsjuVRo" role="1B3o_S" />
+          <node concept="3uibUv" id="1eKXYsjuVYY" role="1tU5fm">
+            <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
+            <node concept="3xLA65" id="1eKXYsjHW0A" role="lGtFl">
+              <property role="TrG5h" value="typeA" />
+            </node>
+          </node>
+          <node concept="3xLA65" id="1eKXYsjuWjw" role="lGtFl">
+            <property role="TrG5h" value="fieldA" />
+          </node>
+        </node>
+        <node concept="2tJIrI" id="7y50OW6ZYeS" role="jymVt" />
+        <node concept="312cEg" id="7y50OW6ZXVf" role="jymVt">
+          <property role="TrG5h" value="fieldb" />
+          <node concept="3Tm6S6" id="7y50OW6ZXVg" role="1B3o_S" />
+          <node concept="3uibUv" id="7y50OW6ZXVh" role="1tU5fm">
+            <ref role="3uigEE" node="7y50OW6ZXcE" resolve="Test.B" />
+            <node concept="3xLA65" id="7y50OW6ZXVi" role="lGtFl">
+              <property role="TrG5h" value="typeB" />
+            </node>
+            <node concept="3uibUv" id="7y50OW6ZYzh" role="11_B2D">
+              <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
+            </node>
+          </node>
+          <node concept="3xLA65" id="7y50OW6ZXVj" role="lGtFl">
+            <property role="TrG5h" value="fieldB" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="4nxCIBqyl_e" role="1B3o_S" />
+        <node concept="3xLA65" id="4nxCIBqymjB" role="lGtFl">
+          <property role="TrG5h" value="class" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>