diff --git a/build.xml b/build.xml
index 39849238..ac7d3c5f 100644
--- a/build.xml
+++ b/build.xml
@@ -542,6 +542,7 @@
           <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="83f155ff-422c-4b5a-a2f2-b459302dd215(jetbrains.mps.baseLanguage.unitTest.libs)" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
@@ -2261,6 +2262,7 @@
         <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" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index 51dc433d..584f4d03 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -1081,6 +1081,12 @@
             <ref role="3bR37D" node="55Q$YFtvwQY" resolve="jetbrains.mps.typechecking.ui" />
           </node>
         </node>
+        <node concept="1SiIV0" id="14$_tTxAZfS" role="3bR37C">
+          <node concept="3bR9La" id="14$_tTxAZfT" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="65DJywFj0uW" role="3989C9">
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
index 0bb108f6..cd372b29 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
@@ -19,6 +19,7 @@
     <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:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" 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" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
index 31112d79..cdc3fdb9 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
@@ -6,12 +6,15 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
     <import index="7rut" ref="r:b1bec7fa-733c-4182-bbd4-b266e3d7e6db(jetbrains.mps.typechecking.sample.bounds.bad)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.ui.plugin)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
+    <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">
@@ -20,16 +23,9 @@
       </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="1217501822150" name="nodesToCheck" index="1SKRRt" />
+        <property id="6339244025081158986" name="needsNoWriteAction" index="3OwPAg" />
         <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">
@@ -44,6 +40,15 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123135" name="body" index="3clF47" />
@@ -51,13 +56,27 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="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="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
+    </language>
+    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
+      <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
+      <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
+        <child id="1423104411234567454" name="repo" index="ukAjM" />
+        <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
+      </concept>
+      <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
@@ -72,14 +91,22 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      <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="1828409047608048457" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="nn" index="1N_AGu">
+        <reference id="1828409047608048458" name="referentNode" index="1N_AGt" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
       </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">
-        <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>
@@ -87,48 +114,67 @@
   </registry>
   <node concept="1lH9Xt" id="1N_0WA5DT3k">
     <property role="TrG5h" value="Typechecking" />
-    <node concept="1qefOq" id="1N_0WA5DTUS" role="1SKRRt">
-      <node concept="3uibUv" id="1N_0WA5DX6P" role="1qenE9">
-        <ref role="3uigEE" to="7rut:5s497Vrh6EY" resolve="Sample_bad1" />
-        <node concept="3xLA65" id="1N_0WA5DX6Z" role="lGtFl">
-          <property role="TrG5h" value="Test_Sample_bad1" />
-        </node>
-      </node>
-    </node>
-    <node concept="1qefOq" id="1N_0WA5J$6f" role="1SKRRt">
-      <node concept="3uibUv" id="1N_0WA5J$6g" role="1qenE9">
-        <ref role="3uigEE" to="7rut:4ekooLalg08" resolve="Sample_bad2" />
-        <node concept="3xLA65" id="1N_0WA5J$6h" role="lGtFl">
-          <property role="TrG5h" value="Test_Sample_bad2" />
-        </node>
-      </node>
-    </node>
+    <property role="3OwPAg" value="true" />
     <node concept="1LZb2c" id="1N_0WA5DT8G" role="1SL9yI">
       <property role="TrG5h" value="Sample_bad1" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="2Hmddi" id="4ekooLap0nE" role="3cqZAp">
-          <node concept="2OqwBi" id="6nJA6bpKqaJ" role="2Hmdds">
-            <node concept="2YIFZM" id="6IQb_RxcBBy" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="2OqwBi" id="6nJA6bpKq33" role="37wK5m">
-                <node concept="3xONca" id="6nJA6bpKq34" role="2Oq$k0">
-                  <ref role="3xOPvv" node="1N_0WA5DX6Z" resolve="Test_Sample_bad1" />
-                </node>
-                <node concept="3TrEf2" id="6nJA6bpKq35" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+        <node concept="1QHqEK" id="4BHjwwGJVjB" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGJVjD" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGJVjF" role="1bW5cS">
+              <node concept="3cpWs8" id="4BHjwwGJQYe" role="3cqZAp">
+                <node concept="3cpWsn" id="4BHjwwGJQYf" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="4BHjwwGJQYb" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                  <node concept="1PxgMI" id="4BHjwwGJT1y" role="33vP2m">
+                    <node concept="chp4Y" id="4BHjwwGJTcC" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                    <node concept="2OqwBi" id="4BHjwwGJRwn" role="1m5AlR">
+                      <node concept="1N_AGu" id="4BHjwwGJRfC" role="2Oq$k0">
+                        <ref role="1N_AGt" to="7rut:5s497Vrh6EY" resolve="Sample_bad1" />
+                      </node>
+                      <node concept="liA8E" id="4BHjwwGJRIX" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="4BHjwwGJS8O" role="37wK5m">
+                          <node concept="1jxXqW" id="4BHjwwGJRMu" role="2Oq$k0" />
+                          <node concept="liA8E" id="4BHjwwGJSNJ" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2Hmddi" id="4ekooLap0nE" role="3cqZAp">
+                <node concept="2OqwBi" id="6nJA6bpKqaJ" role="2Hmdds">
+                  <node concept="2YIFZM" id="6IQb_RxcBBy" role="2Oq$k0">
+                    <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
+                    <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
+                    <node concept="37vLTw" id="4BHjwwGJQYj" role="37wK5m">
+                      <ref role="3cqZAo" node="4BHjwwGJQYf" resolve="cls" />
+                    </node>
+                    <node concept="1jxXqW" id="6nJA6bpKq36" role="37wK5m" />
+                  </node>
+                  <node concept="liA8E" id="6nJA6bpKqof" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
+                  </node>
+                </node>
+                <node concept="3_1$Yv" id="4ekooLap0B2" role="3_9lra">
+                  <node concept="Xl_RD" id="4ekooLap0Lv" role="3_1BAH">
+                    <property role="Xl_RC" value="error expected" />
+                  </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6nJA6bpKq36" role="37wK5m" />
-            </node>
-            <node concept="liA8E" id="6nJA6bpKqof" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
             </node>
           </node>
-          <node concept="3_1$Yv" id="4ekooLap0B2" role="3_9lra">
-            <node concept="Xl_RD" id="4ekooLap0Lv" role="3_1BAH">
-              <property role="Xl_RC" value="error expected" />
+          <node concept="2OqwBi" id="4BHjwwGJVEk" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGJVtE" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGJWcQ" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -138,28 +184,62 @@
       <property role="TrG5h" value="Sample_bad2" />
       <node concept="3cqZAl" id="4ekooLap0Mz" role="3clF45" />
       <node concept="3clFbS" id="4ekooLap0M$" role="3clF47">
-        <node concept="2Hmddi" id="4ekooLap0MH" role="3cqZAp">
-          <node concept="2OqwBi" id="6nJA6bpKqCv" role="2Hmdds">
-            <node concept="2YIFZM" id="6IQb_RxcBBv" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="2OqwBi" id="6nJA6bpKqwN" role="37wK5m">
-                <node concept="3xONca" id="6nJA6bpKqwO" role="2Oq$k0">
-                  <ref role="3xOPvv" node="1N_0WA5J$6h" resolve="Test_Sample_bad2" />
-                </node>
-                <node concept="3TrEf2" id="6nJA6bpKqwP" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+        <node concept="1QHqEK" id="4BHjwwGJW_v" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGJW_x" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGJW_z" role="1bW5cS">
+              <node concept="3cpWs8" id="4BHjwwGJTGd" role="3cqZAp">
+                <node concept="3cpWsn" id="4BHjwwGJTGe" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="4BHjwwGJTGf" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                  <node concept="1PxgMI" id="4BHjwwGJTGg" role="33vP2m">
+                    <node concept="chp4Y" id="4BHjwwGJTGh" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                    <node concept="2OqwBi" id="4BHjwwGJTGi" role="1m5AlR">
+                      <node concept="1N_AGu" id="4BHjwwGJTGj" role="2Oq$k0">
+                        <ref role="1N_AGt" to="7rut:4ekooLalg08" resolve="Sample_bad2" />
+                      </node>
+                      <node concept="liA8E" id="4BHjwwGJTGk" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="4BHjwwGJTGl" role="37wK5m">
+                          <node concept="1jxXqW" id="4BHjwwGJTGm" role="2Oq$k0" />
+                          <node concept="liA8E" id="4BHjwwGJTGn" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2Hmddi" id="4ekooLap0MH" role="3cqZAp">
+                <node concept="2OqwBi" id="6nJA6bpKqCv" role="2Hmdds">
+                  <node concept="2YIFZM" id="6IQb_RxcBBv" role="2Oq$k0">
+                    <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
+                    <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
+                    <node concept="37vLTw" id="4BHjwwGJUba" role="37wK5m">
+                      <ref role="3cqZAo" node="4BHjwwGJTGe" resolve="cls" />
+                    </node>
+                    <node concept="1jxXqW" id="6nJA6bpKqwQ" role="37wK5m" />
+                  </node>
+                  <node concept="liA8E" id="6nJA6bpKqQf" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
+                  </node>
+                </node>
+                <node concept="3_1$Yv" id="4ekooLap0MN" role="3_9lra">
+                  <node concept="Xl_RD" id="4ekooLap0MO" role="3_1BAH">
+                    <property role="Xl_RC" value="error expected" />
+                  </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6nJA6bpKqwQ" role="37wK5m" />
-            </node>
-            <node concept="liA8E" id="6nJA6bpKqQf" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
             </node>
           </node>
-          <node concept="3_1$Yv" id="4ekooLap0MN" role="3_9lra">
-            <node concept="Xl_RD" id="4ekooLap0MO" role="3_1BAH">
-              <property role="Xl_RC" value="error expected" />
+          <node concept="2OqwBi" id="4BHjwwGJWPy" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGJWCJ" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGJXnX" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
index 7f5733d3..35ab6f94 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
@@ -9,12 +9,15 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="2" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
     <import index="f6t6" ref="r:9993217f-5bfa-4281-bc47-527677747cb2(jetbrains.mps.typechecking.sample.bounds)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.ui.plugin)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
+    <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">
@@ -23,16 +26,9 @@
       </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="1217501822150" name="nodesToCheck" index="1SKRRt" />
+        <property id="6339244025081158986" name="needsNoWriteAction" index="3OwPAg" />
         <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">
@@ -47,6 +43,15 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123135" name="body" index="3clF47" />
@@ -54,13 +59,27 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="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="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
+    </language>
+    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
+      <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
+      <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
+        <child id="1423104411234567454" name="repo" index="ukAjM" />
+        <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
+      </concept>
+      <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
@@ -75,14 +94,22 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      <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="1828409047608048457" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="nn" index="1N_AGu">
+        <reference id="1828409047608048458" name="referentNode" index="1N_AGt" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
       </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">
-        <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>
@@ -90,56 +117,67 @@
   </registry>
   <node concept="1lH9Xt" id="1N_0WA5DT3k">
     <property role="TrG5h" value="Typechecking" />
-    <node concept="1qefOq" id="1N_0WA5DTUS" role="1SKRRt">
-      <node concept="3uibUv" id="1N_0WA5DX6P" role="1qenE9">
-        <ref role="3uigEE" to="f6t6:5s497Vrh6EY" resolve="Sample" />
-        <node concept="3xLA65" id="1N_0WA5DX6Z" role="lGtFl">
-          <property role="TrG5h" value="Test_Sample" />
-        </node>
-      </node>
-    </node>
-    <node concept="1qefOq" id="1N_0WA5J$6f" role="1SKRRt">
-      <node concept="3uibUv" id="1N_0WA5J$6g" role="1qenE9">
-        <ref role="3uigEE" to="f6t6:2U6QFnZujaA" resolve="Sample2" />
-        <node concept="3xLA65" id="1N_0WA5J$6h" role="lGtFl">
-          <property role="TrG5h" value="Test_Sample2" />
-        </node>
-      </node>
-    </node>
-    <node concept="1qefOq" id="5DSQNPPS8V8" role="1SKRRt">
-      <node concept="3uibUv" id="5DSQNPPS8V9" role="1qenE9">
-        <ref role="3uigEE" to="f6t6:3yhgKRJ29Qs" resolve="Variance" />
-        <node concept="3xLA65" id="5DSQNPPS8Va" role="lGtFl">
-          <property role="TrG5h" value="Test_Variance" />
-        </node>
-      </node>
-    </node>
+    <property role="3OwPAg" value="true" />
     <node concept="1LZb2c" id="1N_0WA5DT8G" role="1SL9yI">
       <property role="TrG5h" value="Sample" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
-          <node concept="2OqwBi" id="6nJA6bpKr9l" role="3ykU8v">
-            <node concept="2YIFZM" id="6IQb_RxcBBx" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="2OqwBi" id="6nJA6bpKr0h" role="37wK5m">
-                <node concept="3xONca" id="6nJA6bpKr0i" role="2Oq$k0">
-                  <ref role="3xOPvv" node="1N_0WA5DX6Z" resolve="Test_Sample" />
-                </node>
-                <node concept="3TrEf2" id="6nJA6bpKr0j" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+        <node concept="1QHqEK" id="4BHjwwGJZh0" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGJZh2" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGJZh4" role="1bW5cS">
+              <node concept="3cpWs8" id="4BHjwwGJQYe" role="3cqZAp">
+                <node concept="3cpWsn" id="4BHjwwGJQYf" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="4BHjwwGJQYb" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                  <node concept="1PxgMI" id="4BHjwwGJT1y" role="33vP2m">
+                    <node concept="chp4Y" id="4BHjwwGJTcC" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                    <node concept="2OqwBi" id="4BHjwwGJRwn" role="1m5AlR">
+                      <node concept="1N_AGu" id="4BHjwwGJRfC" role="2Oq$k0">
+                        <ref role="1N_AGt" to="f6t6:5s497Vrh6EY" resolve="Sample" />
+                      </node>
+                      <node concept="liA8E" id="4BHjwwGJRIX" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="4BHjwwGJS8O" role="37wK5m">
+                          <node concept="1jxXqW" id="4BHjwwGJRMu" role="2Oq$k0" />
+                          <node concept="liA8E" id="4BHjwwGJSNJ" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
+                <node concept="2OqwBi" id="6nJA6bpKr9l" role="3ykU8v">
+                  <node concept="2YIFZM" id="6IQb_RxcBBx" role="2Oq$k0">
+                    <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
+                    <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
+                    <node concept="37vLTw" id="4BHjwwGJYJP" role="37wK5m">
+                      <ref role="3cqZAo" node="4BHjwwGJQYf" resolve="cls" />
+                    </node>
+                    <node concept="1jxXqW" id="6nJA6bpKr0k" role="37wK5m" />
+                  </node>
+                  <node concept="liA8E" id="6nJA6bpKrmZ" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
+                  </node>
+                </node>
+                <node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">
+                  <node concept="Xl_RD" id="1N_0WA5INjk" role="3_1BAH">
+                    <property role="Xl_RC" value="error while typechecking" />
+                  </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6nJA6bpKr0k" role="37wK5m" />
-            </node>
-            <node concept="liA8E" id="6nJA6bpKrmZ" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
             </node>
           </node>
-          <node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">
-            <node concept="Xl_RD" id="1N_0WA5INjk" role="3_1BAH">
-              <property role="Xl_RC" value="error while typechecking" />
+          <node concept="2OqwBi" id="4BHjwwGJZO2" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGJZt5" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGK0mv" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -149,28 +187,62 @@
       <property role="TrG5h" value="Sample2" />
       <node concept="3cqZAl" id="1N_0WA5J$AE" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5J$AF" role="3clF47">
-        <node concept="3ykFI1" id="1N_0WA5J$AO" role="3cqZAp">
-          <node concept="2OqwBi" id="6nJA6bpKrAI" role="3ykU8v">
-            <node concept="2YIFZM" id="6IQb_RxcBBA" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="2OqwBi" id="6nJA6bpKrtE" role="37wK5m">
-                <node concept="3xONca" id="6nJA6bpKrtF" role="2Oq$k0">
-                  <ref role="3xOPvv" node="1N_0WA5J$6h" resolve="Test_Sample2" />
-                </node>
-                <node concept="3TrEf2" id="6nJA6bpKrtG" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+        <node concept="1QHqEK" id="4BHjwwGK10A" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGK10B" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGK10C" role="1bW5cS">
+              <node concept="3cpWs8" id="4BHjwwGK10D" role="3cqZAp">
+                <node concept="3cpWsn" id="4BHjwwGK10E" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="4BHjwwGK10F" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                  <node concept="1PxgMI" id="4BHjwwGK10G" role="33vP2m">
+                    <node concept="chp4Y" id="4BHjwwGK10H" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                    <node concept="2OqwBi" id="4BHjwwGK10I" role="1m5AlR">
+                      <node concept="1N_AGu" id="4BHjwwGK10J" role="2Oq$k0">
+                        <ref role="1N_AGt" to="f6t6:2U6QFnZujaA" resolve="Sample2" />
+                      </node>
+                      <node concept="liA8E" id="4BHjwwGK10K" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="4BHjwwGK10L" role="37wK5m">
+                          <node concept="1jxXqW" id="4BHjwwGK10M" role="2Oq$k0" />
+                          <node concept="liA8E" id="4BHjwwGK10N" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3ykFI1" id="4BHjwwGK10O" role="3cqZAp">
+                <node concept="2OqwBi" id="4BHjwwGK10P" role="3ykU8v">
+                  <node concept="2YIFZM" id="4BHjwwGK10Q" role="2Oq$k0">
+                    <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
+                    <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
+                    <node concept="37vLTw" id="4BHjwwGK10R" role="37wK5m">
+                      <ref role="3cqZAo" node="4BHjwwGK10E" resolve="cls" />
+                    </node>
+                    <node concept="1jxXqW" id="4BHjwwGK10S" role="37wK5m" />
+                  </node>
+                  <node concept="liA8E" id="4BHjwwGK10T" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
+                  </node>
+                </node>
+                <node concept="3_1$Yv" id="4BHjwwGK10U" role="3_9lra">
+                  <node concept="Xl_RD" id="4BHjwwGK10V" role="3_1BAH">
+                    <property role="Xl_RC" value="error while typechecking" />
+                  </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6nJA6bpKrtH" role="37wK5m" />
-            </node>
-            <node concept="liA8E" id="6nJA6bpKrOo" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
             </node>
           </node>
-          <node concept="3_1$Yv" id="1N_0WA5J$AU" role="3_9lra">
-            <node concept="Xl_RD" id="1N_0WA5J$AV" role="3_1BAH">
-              <property role="Xl_RC" value="error while typechecking" />
+          <node concept="2OqwBi" id="4BHjwwGK10W" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGK10X" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGK10Y" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -180,28 +252,62 @@
       <property role="TrG5h" value="Variance" />
       <node concept="3cqZAl" id="5DSQNPPS8E9" role="3clF45" />
       <node concept="3clFbS" id="5DSQNPPS8Ea" role="3clF47">
-        <node concept="3ykFI1" id="5DSQNPPS8Eb" role="3cqZAp">
-          <node concept="2OqwBi" id="6nJA6bpKs9r" role="3ykU8v">
-            <node concept="2YIFZM" id="6IQb_RxcBBC" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="2OqwBi" id="6nJA6bpKrVb" role="37wK5m">
-                <node concept="3xONca" id="6nJA6bpKrVc" role="2Oq$k0">
-                  <ref role="3xOPvv" node="5DSQNPPS8Va" resolve="Test_Variance" />
-                </node>
-                <node concept="3TrEf2" id="6nJA6bpKrVd" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+        <node concept="1QHqEK" id="4BHjwwGK2cx" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGK2cy" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGK2cz" role="1bW5cS">
+              <node concept="3cpWs8" id="4BHjwwGK2c$" role="3cqZAp">
+                <node concept="3cpWsn" id="4BHjwwGK2c_" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="4BHjwwGK2cA" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                  <node concept="1PxgMI" id="4BHjwwGK2cB" role="33vP2m">
+                    <node concept="chp4Y" id="4BHjwwGK2cC" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                    <node concept="2OqwBi" id="4BHjwwGK2cD" role="1m5AlR">
+                      <node concept="1N_AGu" id="4BHjwwGK2cE" role="2Oq$k0">
+                        <ref role="1N_AGt" to="f6t6:3yhgKRJ29Qs" resolve="Variance" />
+                      </node>
+                      <node concept="liA8E" id="4BHjwwGK2cF" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="4BHjwwGK2cG" role="37wK5m">
+                          <node concept="1jxXqW" id="4BHjwwGK2cH" role="2Oq$k0" />
+                          <node concept="liA8E" id="4BHjwwGK2cI" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3ykFI1" id="4BHjwwGK2cJ" role="3cqZAp">
+                <node concept="2OqwBi" id="4BHjwwGK2cK" role="3ykU8v">
+                  <node concept="2YIFZM" id="4BHjwwGK2cL" role="2Oq$k0">
+                    <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
+                    <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
+                    <node concept="37vLTw" id="4BHjwwGK2cM" role="37wK5m">
+                      <ref role="3cqZAo" node="4BHjwwGK2c_" resolve="cls" />
+                    </node>
+                    <node concept="1jxXqW" id="4BHjwwGK2cN" role="37wK5m" />
+                  </node>
+                  <node concept="liA8E" id="4BHjwwGK2cO" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
+                  </node>
+                </node>
+                <node concept="3_1$Yv" id="4BHjwwGK2cP" role="3_9lra">
+                  <node concept="Xl_RD" id="4BHjwwGK2cQ" role="3_1BAH">
+                    <property role="Xl_RC" value="error while typechecking" />
+                  </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6nJA6bpKrVe" role="37wK5m" />
-            </node>
-            <node concept="liA8E" id="6nJA6bpKsq0" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
             </node>
           </node>
-          <node concept="3_1$Yv" id="5DSQNPPS8Eh" role="3_9lra">
-            <node concept="Xl_RD" id="5DSQNPPS8Ei" role="3_1BAH">
-              <property role="Xl_RC" value="error while typechecking" />
+          <node concept="2OqwBi" id="4BHjwwGK2cR" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGK2cS" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGK2cT" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
index 6b672e87..446aeb20 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
@@ -7,12 +7,15 @@
     <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.baseLanguageExt" version="0" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
     <import index="hwt6" ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(jetbrains.mps.typechecking.sample.codeAnal)" />
     <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.ui.plugin)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
+    <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">
@@ -21,16 +24,9 @@
       </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="1217501822150" name="nodesToCheck" index="1SKRRt" />
+        <property id="6339244025081158986" name="needsNoWriteAction" index="3OwPAg" />
         <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">
@@ -45,6 +41,15 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123135" name="body" index="3clF47" />
@@ -52,13 +57,27 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="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="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
+    </language>
+    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
+      <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
+      <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
+        <child id="1423104411234567454" name="repo" index="ukAjM" />
+        <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
+      </concept>
+      <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
@@ -73,14 +92,22 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      <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="1828409047608048457" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="nn" index="1N_AGu">
+        <reference id="1828409047608048458" name="referentNode" index="1N_AGt" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
       </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">
-        <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>
@@ -91,40 +118,67 @@
   </node>
   <node concept="1lH9Xt" id="1N_0WA5DT3k">
     <property role="TrG5h" value="Typechecking" />
-    <node concept="1qefOq" id="1N_0WA5DTUS" role="1SKRRt">
-      <node concept="3uibUv" id="1N_0WA5DX6P" role="1qenE9">
-        <ref role="3uigEE" to="hwt6:3489cc5$luO" resolve="Thinlet" />
-        <node concept="3xLA65" id="1N_0WA5DX6Z" role="lGtFl">
-          <property role="TrG5h" value="Test_Thinlet" />
-        </node>
-      </node>
-    </node>
+    <property role="3OwPAg" value="true" />
     <node concept="1LZb2c" id="1N_0WA5DT8G" role="1SL9yI">
       <property role="TrG5h" value="Thinlet" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
-          <node concept="2OqwBi" id="6nJA6bpKsEr" role="3ykU8v">
-            <node concept="2YIFZM" id="6IQb_RxcBB$" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="2OqwBi" id="6nJA6bpKsyR" role="37wK5m">
-                <node concept="3xONca" id="6nJA6bpKsyS" role="2Oq$k0">
-                  <ref role="3xOPvv" node="1N_0WA5DX6Z" resolve="Test_Thinlet" />
-                </node>
-                <node concept="3TrEf2" id="6nJA6bpKsyT" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+        <node concept="1QHqEK" id="4BHjwwGJZh0" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGJZh2" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGJZh4" role="1bW5cS">
+              <node concept="3cpWs8" id="4BHjwwGJQYe" role="3cqZAp">
+                <node concept="3cpWsn" id="4BHjwwGJQYf" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="4BHjwwGJQYb" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                  <node concept="1PxgMI" id="4BHjwwGJT1y" role="33vP2m">
+                    <node concept="chp4Y" id="4BHjwwGJTcC" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                    <node concept="2OqwBi" id="4BHjwwGJRwn" role="1m5AlR">
+                      <node concept="1N_AGu" id="4BHjwwGJRfC" role="2Oq$k0">
+                        <ref role="1N_AGt" to="hwt6:3489cc5$luO" resolve="Thinlet" />
+                      </node>
+                      <node concept="liA8E" id="4BHjwwGJRIX" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="4BHjwwGJS8O" role="37wK5m">
+                          <node concept="1jxXqW" id="4BHjwwGJRMu" role="2Oq$k0" />
+                          <node concept="liA8E" id="4BHjwwGJSNJ" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3ykFI1" id="4BHjwwGK3ei" role="3cqZAp">
+                <node concept="2OqwBi" id="6nJA6bpKr9l" role="3ykU8v">
+                  <node concept="2YIFZM" id="6IQb_RxcBBx" role="2Oq$k0">
+                    <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
+                    <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
+                    <node concept="37vLTw" id="4BHjwwGJYJP" role="37wK5m">
+                      <ref role="3cqZAo" node="4BHjwwGJQYf" resolve="cls" />
+                    </node>
+                    <node concept="1jxXqW" id="6nJA6bpKr0k" role="37wK5m" />
+                  </node>
+                  <node concept="liA8E" id="6nJA6bpKrmZ" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
+                  </node>
+                </node>
+                <node concept="3_1$Yv" id="4BHjwwGK3ej" role="3_9lra">
+                  <node concept="Xl_RD" id="4BHjwwGK3ek" role="3_1BAH">
+                    <property role="Xl_RC" value="error while typechecking" />
+                  </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6nJA6bpKsyU" role="37wK5m" />
-            </node>
-            <node concept="liA8E" id="6nJA6bpKsY6" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
             </node>
           </node>
-          <node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">
-            <node concept="Xl_RD" id="1N_0WA5INjk" role="3_1BAH">
-              <property role="Xl_RC" value="error while typechecking" />
+          <node concept="2OqwBi" id="4BHjwwGJZO2" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGJZt5" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGK0mv" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
index 99433ee0..7bda8391 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
@@ -5,12 +5,15 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="bs09" ref="r:28026be8-9bf8-4f54-9319-0ca8a6d1299d(jetbrains.mps.typechecking.sample.helloWorld)" />
     <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.ui.plugin)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
+    <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">
@@ -19,16 +22,9 @@
       </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="1217501822150" name="nodesToCheck" index="1SKRRt" />
+        <property id="6339244025081158986" name="needsNoWriteAction" index="3OwPAg" />
         <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">
@@ -43,6 +39,15 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123135" name="body" index="3clF47" />
@@ -50,13 +55,27 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="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="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
+    </language>
+    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
+      <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
+      <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
+        <child id="1423104411234567454" name="repo" index="ukAjM" />
+        <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
+      </concept>
+      <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
@@ -71,14 +90,22 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      <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="1828409047608048457" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="nn" index="1N_AGu">
+        <reference id="1828409047608048458" name="referentNode" index="1N_AGt" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
       </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">
-        <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>
@@ -89,48 +116,67 @@
   </node>
   <node concept="1lH9Xt" id="1N_0WA5DT3k">
     <property role="TrG5h" value="Typechecking" />
-    <node concept="1qefOq" id="1N_0WA5DTUS" role="1SKRRt">
-      <node concept="3uibUv" id="1N_0WA5DX6P" role="1qenE9">
-        <ref role="3uigEE" to="bs09:3Qp4N06bAlL" resolve="HelloWorld" />
-        <node concept="3xLA65" id="1N_0WA5DX6Z" role="lGtFl">
-          <property role="TrG5h" value="Test_HelloWorld" />
-        </node>
-      </node>
-    </node>
-    <node concept="1qefOq" id="7$Xw2YtL_mD" role="1SKRRt">
-      <node concept="3uibUv" id="7$Xw2YtL_mE" role="1qenE9">
-        <ref role="3uigEE" to="bs09:4$OyT8IR$52" resolve="TestInheritance" />
-        <node concept="3xLA65" id="7$Xw2YtL_mF" role="lGtFl">
-          <property role="TrG5h" value="Test_Inheritance" />
-        </node>
-      </node>
-    </node>
+    <property role="3OwPAg" value="true" />
     <node concept="1LZb2c" id="1N_0WA5DT8G" role="1SL9yI">
       <property role="TrG5h" value="HelloWorld" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
-          <node concept="2OqwBi" id="6nJA6bpKteJ" role="3ykU8v">
-            <node concept="2YIFZM" id="6IQb_RxcBBz" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="2OqwBi" id="6nJA6bpKt7j" role="37wK5m">
-                <node concept="3xONca" id="6nJA6bpKt7k" role="2Oq$k0">
-                  <ref role="3xOPvv" node="1N_0WA5DX6Z" resolve="Test_HelloWorld" />
-                </node>
-                <node concept="3TrEf2" id="6nJA6bpKt7l" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+        <node concept="1QHqEK" id="4BHjwwGJZh0" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGJZh2" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGJZh4" role="1bW5cS">
+              <node concept="3cpWs8" id="4BHjwwGJQYe" role="3cqZAp">
+                <node concept="3cpWsn" id="4BHjwwGJQYf" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="4BHjwwGJQYb" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                  <node concept="1PxgMI" id="4BHjwwGJT1y" role="33vP2m">
+                    <node concept="chp4Y" id="4BHjwwGJTcC" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                    <node concept="2OqwBi" id="4BHjwwGJRwn" role="1m5AlR">
+                      <node concept="1N_AGu" id="4BHjwwGJRfC" role="2Oq$k0">
+                        <ref role="1N_AGt" to="bs09:3Qp4N06bAlL" resolve="HelloWorld" />
+                      </node>
+                      <node concept="liA8E" id="4BHjwwGJRIX" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="4BHjwwGJS8O" role="37wK5m">
+                          <node concept="1jxXqW" id="4BHjwwGJRMu" role="2Oq$k0" />
+                          <node concept="liA8E" id="4BHjwwGJSNJ" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3ykFI1" id="4BHjwwGK46g" role="3cqZAp">
+                <node concept="2OqwBi" id="6nJA6bpKr9l" role="3ykU8v">
+                  <node concept="2YIFZM" id="6IQb_RxcBBx" role="2Oq$k0">
+                    <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
+                    <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
+                    <node concept="37vLTw" id="4BHjwwGJYJP" role="37wK5m">
+                      <ref role="3cqZAo" node="4BHjwwGJQYf" resolve="cls" />
+                    </node>
+                    <node concept="1jxXqW" id="6nJA6bpKr0k" role="37wK5m" />
+                  </node>
+                  <node concept="liA8E" id="6nJA6bpKrmZ" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
+                  </node>
+                </node>
+                <node concept="3_1$Yv" id="4BHjwwGK46h" role="3_9lra">
+                  <node concept="Xl_RD" id="4BHjwwGK46i" role="3_1BAH">
+                    <property role="Xl_RC" value="error while typechecking" />
+                  </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6nJA6bpKt7m" role="37wK5m" />
-            </node>
-            <node concept="liA8E" id="6nJA6bpKtyF" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
             </node>
           </node>
-          <node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">
-            <node concept="Xl_RD" id="1N_0WA5INjk" role="3_1BAH">
-              <property role="Xl_RC" value="error while typechecking" />
+          <node concept="2OqwBi" id="4BHjwwGJZO2" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGJZt5" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGK0mv" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -140,28 +186,62 @@
       <property role="TrG5h" value="TestInheritance" />
       <node concept="3cqZAl" id="7$Xw2YtL_l1" role="3clF45" />
       <node concept="3clFbS" id="7$Xw2YtL_l2" role="3clF47">
-        <node concept="3ykFI1" id="7$Xw2YtL_l3" role="3cqZAp">
-          <node concept="2OqwBi" id="6nJA6bpKtUh" role="3ykU8v">
-            <node concept="2YIFZM" id="6IQb_RxcBB_" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="2OqwBi" id="6nJA6bpKtBI" role="37wK5m">
-                <node concept="3xONca" id="6nJA6bpKtBJ" role="2Oq$k0">
-                  <ref role="3xOPvv" node="7$Xw2YtL_mF" resolve="Test_Inheritance" />
-                </node>
-                <node concept="3TrEf2" id="6nJA6bpKtBK" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+        <node concept="1QHqEK" id="4BHjwwGK4Oc" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGK4Od" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGK4Oe" role="1bW5cS">
+              <node concept="3cpWs8" id="4BHjwwGK4Of" role="3cqZAp">
+                <node concept="3cpWsn" id="4BHjwwGK4Og" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="4BHjwwGK4Oh" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                  <node concept="1PxgMI" id="4BHjwwGK4Oi" role="33vP2m">
+                    <node concept="chp4Y" id="4BHjwwGK4Oj" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                    <node concept="2OqwBi" id="4BHjwwGK4Ok" role="1m5AlR">
+                      <node concept="1N_AGu" id="4BHjwwGK4Ol" role="2Oq$k0">
+                        <ref role="1N_AGt" to="bs09:4$OyT8IR$52" resolve="TestInheritance" />
+                      </node>
+                      <node concept="liA8E" id="4BHjwwGK4Om" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="4BHjwwGK4On" role="37wK5m">
+                          <node concept="1jxXqW" id="4BHjwwGK4Oo" role="2Oq$k0" />
+                          <node concept="liA8E" id="4BHjwwGK4Op" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
+                <node concept="2OqwBi" id="4BHjwwGK4Oq" role="3ykU8v">
+                  <node concept="2YIFZM" id="4BHjwwGK4Or" role="2Oq$k0">
+                    <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
+                    <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
+                    <node concept="37vLTw" id="4BHjwwGK4Os" role="37wK5m">
+                      <ref role="3cqZAo" node="4BHjwwGK4Og" resolve="cls" />
+                    </node>
+                    <node concept="1jxXqW" id="4BHjwwGK4Ot" role="37wK5m" />
+                  </node>
+                  <node concept="liA8E" id="4BHjwwGK4Ou" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
+                  </node>
+                </node>
+                <node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">
+                  <node concept="Xl_RD" id="1N_0WA5INjk" role="3_1BAH">
+                    <property role="Xl_RC" value="error while typechecking" />
+                  </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6nJA6bpKtBL" role="37wK5m" />
-            </node>
-            <node concept="liA8E" id="6nJA6bpKuak" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
             </node>
           </node>
-          <node concept="3_1$Yv" id="7$Xw2YtL_l9" role="3_9lra">
-            <node concept="Xl_RD" id="7$Xw2YtL_la" role="3_1BAH">
-              <property role="Xl_RC" value="error while typechecking" />
+          <node concept="2OqwBi" id="4BHjwwGK4Ov" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGK4Ow" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGK4Ox" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
index 81b0ea56..e8ef0205 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
@@ -5,12 +5,15 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="waaz" ref="r:5669dd77-177e-474f-8fb2-c015a8eb4306(jetbrains.mps.typechecking.sample.simpleGenerics)" />
     <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.ui.plugin)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
+    <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">
@@ -19,16 +22,9 @@
       </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="1217501822150" name="nodesToCheck" index="1SKRRt" />
+        <property id="6339244025081158986" name="needsNoWriteAction" index="3OwPAg" />
         <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">
@@ -43,6 +39,15 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123135" name="body" index="3clF47" />
@@ -50,13 +55,27 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="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="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
+    </language>
+    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
+      <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
+      <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
+        <child id="1423104411234567454" name="repo" index="ukAjM" />
+        <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
+      </concept>
+      <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
@@ -71,14 +90,22 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      <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="1828409047608048457" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="nn" index="1N_AGu">
+        <reference id="1828409047608048458" name="referentNode" index="1N_AGt" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
       </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">
-        <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>
@@ -89,48 +116,67 @@
   </node>
   <node concept="1lH9Xt" id="1N_0WA5DT3k">
     <property role="TrG5h" value="Typechecking" />
-    <node concept="1qefOq" id="1N_0WA5DTUS" role="1SKRRt">
-      <node concept="3uibUv" id="1N_0WA5DX6P" role="1qenE9">
-        <ref role="3uigEE" to="waaz:3Qp4N06bAlL" resolve="SimpleGenerics" />
-        <node concept="3xLA65" id="1N_0WA5DX6Z" role="lGtFl">
-          <property role="TrG5h" value="Test_SimpleGenerics" />
-        </node>
-      </node>
-    </node>
-    <node concept="1qefOq" id="1N_0WA5JFiK" role="1SKRRt">
-      <node concept="3uibUv" id="1N_0WA5JFiL" role="1qenE9">
-        <ref role="3uigEE" to="waaz:623frvF_qs8" resolve="SimpleGenerics2" />
-        <node concept="3xLA65" id="1N_0WA5JFiM" role="lGtFl">
-          <property role="TrG5h" value="Test_SimpleGenerics2" />
-        </node>
-      </node>
-    </node>
+    <property role="3OwPAg" value="true" />
     <node concept="1LZb2c" id="1N_0WA5DT8G" role="1SL9yI">
       <property role="TrG5h" value="SimpleGenerics" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
-          <node concept="2OqwBi" id="6nJA6bpKuqD" role="3ykU8v">
-            <node concept="2YIFZM" id="6IQb_RxcBBw" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="2OqwBi" id="6nJA6bpKujd" role="37wK5m">
-                <node concept="3xONca" id="6nJA6bpKuje" role="2Oq$k0">
-                  <ref role="3xOPvv" node="1N_0WA5DX6Z" resolve="Test_SimpleGenerics" />
-                </node>
-                <node concept="3TrEf2" id="6nJA6bpKujf" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+        <node concept="1QHqEK" id="4BHjwwGJZh0" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGJZh2" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGJZh4" role="1bW5cS">
+              <node concept="3cpWs8" id="4BHjwwGJQYe" role="3cqZAp">
+                <node concept="3cpWsn" id="4BHjwwGJQYf" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="4BHjwwGJQYb" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                  <node concept="1PxgMI" id="4BHjwwGJT1y" role="33vP2m">
+                    <node concept="chp4Y" id="4BHjwwGJTcC" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                    <node concept="2OqwBi" id="4BHjwwGJRwn" role="1m5AlR">
+                      <node concept="1N_AGu" id="4BHjwwGJRfC" role="2Oq$k0">
+                        <ref role="1N_AGt" to="waaz:3Qp4N06bAlL" resolve="SimpleGenerics" />
+                      </node>
+                      <node concept="liA8E" id="4BHjwwGJRIX" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="4BHjwwGJS8O" role="37wK5m">
+                          <node concept="1jxXqW" id="4BHjwwGJRMu" role="2Oq$k0" />
+                          <node concept="liA8E" id="4BHjwwGJSNJ" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3ykFI1" id="4BHjwwGK5D1" role="3cqZAp">
+                <node concept="2OqwBi" id="6nJA6bpKr9l" role="3ykU8v">
+                  <node concept="2YIFZM" id="6IQb_RxcBBx" role="2Oq$k0">
+                    <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
+                    <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
+                    <node concept="37vLTw" id="4BHjwwGJYJP" role="37wK5m">
+                      <ref role="3cqZAo" node="4BHjwwGJQYf" resolve="cls" />
+                    </node>
+                    <node concept="1jxXqW" id="6nJA6bpKr0k" role="37wK5m" />
+                  </node>
+                  <node concept="liA8E" id="6nJA6bpKrmZ" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
+                  </node>
+                </node>
+                <node concept="3_1$Yv" id="4BHjwwGK5D2" role="3_9lra">
+                  <node concept="Xl_RD" id="4BHjwwGK5D3" role="3_1BAH">
+                    <property role="Xl_RC" value="error while typechecking" />
+                  </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6nJA6bpKujg" role="37wK5m" />
-            </node>
-            <node concept="liA8E" id="6nJA6bpKuCg" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
             </node>
           </node>
-          <node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">
-            <node concept="Xl_RD" id="1N_0WA5INjk" role="3_1BAH">
-              <property role="Xl_RC" value="error while typechecking" />
+          <node concept="2OqwBi" id="4BHjwwGJZO2" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGJZt5" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGK0mv" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -140,28 +186,62 @@
       <property role="TrG5h" value="SimpleGenerics2" />
       <node concept="3cqZAl" id="1N_0WA5JFrO" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5JFrP" role="3clF47">
-        <node concept="3ykFI1" id="1N_0WA5JFrQ" role="3cqZAp">
-          <node concept="2OqwBi" id="6nJA6bpKuOJ" role="3ykU8v">
-            <node concept="2YIFZM" id="6IQb_RxcBBu" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="2OqwBi" id="6nJA6bpKuHj" role="37wK5m">
-                <node concept="3xONca" id="6nJA6bpKuHk" role="2Oq$k0">
-                  <ref role="3xOPvv" node="1N_0WA5JFiM" resolve="Test_SimpleGenerics2" />
-                </node>
-                <node concept="3TrEf2" id="6nJA6bpKuHl" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+        <node concept="1QHqEK" id="4BHjwwGK6lB" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGK6lC" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGK6lD" role="1bW5cS">
+              <node concept="3cpWs8" id="4BHjwwGK6lE" role="3cqZAp">
+                <node concept="3cpWsn" id="4BHjwwGK6lF" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="4BHjwwGK6lG" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                  <node concept="1PxgMI" id="4BHjwwGK6lH" role="33vP2m">
+                    <node concept="chp4Y" id="4BHjwwGK6lI" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                    <node concept="2OqwBi" id="4BHjwwGK6lJ" role="1m5AlR">
+                      <node concept="1N_AGu" id="4BHjwwGK6lK" role="2Oq$k0">
+                        <ref role="1N_AGt" to="waaz:623frvF_qs8" resolve="SimpleGenerics2" />
+                      </node>
+                      <node concept="liA8E" id="4BHjwwGK6lL" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="4BHjwwGK6lM" role="37wK5m">
+                          <node concept="1jxXqW" id="4BHjwwGK6lN" role="2Oq$k0" />
+                          <node concept="liA8E" id="4BHjwwGK6lO" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
+                <node concept="2OqwBi" id="4BHjwwGK6lP" role="3ykU8v">
+                  <node concept="2YIFZM" id="4BHjwwGK6lQ" role="2Oq$k0">
+                    <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
+                    <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
+                    <node concept="37vLTw" id="4BHjwwGK6lR" role="37wK5m">
+                      <ref role="3cqZAo" node="4BHjwwGK6lF" resolve="cls" />
+                    </node>
+                    <node concept="1jxXqW" id="4BHjwwGK6lS" role="37wK5m" />
+                  </node>
+                  <node concept="liA8E" id="4BHjwwGK6lT" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
+                  </node>
+                </node>
+                <node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">
+                  <node concept="Xl_RD" id="1N_0WA5INjk" role="3_1BAH">
+                    <property role="Xl_RC" value="error while typechecking" />
+                  </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6nJA6bpKuHm" role="37wK5m" />
-            </node>
-            <node concept="liA8E" id="6nJA6bpKv2f" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
             </node>
           </node>
-          <node concept="3_1$Yv" id="1N_0WA5JFrW" role="3_9lra">
-            <node concept="Xl_RD" id="1N_0WA5JFrX" role="3_1BAH">
-              <property role="Xl_RC" value="error while typechecking" />
+          <node concept="2OqwBi" id="4BHjwwGK6lU" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGK6lV" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGK6lW" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
index 2a8a211a..bbceb9cf 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
@@ -5,12 +5,15 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="9oqm" ref="r:a8ff5933-0f6e-4d4a-af4a-5da865d78faf(jetbrains.mps.typechecking.sample.slice)" />
     <import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.ui.plugin)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
+    <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">
@@ -19,16 +22,9 @@
       </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="1217501822150" name="nodesToCheck" index="1SKRRt" />
+        <property id="6339244025081158986" name="needsNoWriteAction" index="3OwPAg" />
         <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">
@@ -43,6 +39,15 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123135" name="body" index="3clF47" />
@@ -50,13 +55,27 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="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="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
+    </language>
+    <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
+      <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
+      <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
+        <child id="1423104411234567454" name="repo" index="ukAjM" />
+        <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
+      </concept>
+      <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
@@ -71,14 +90,22 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      <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="1828409047608048457" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="nn" index="1N_AGu">
+        <reference id="1828409047608048458" name="referentNode" index="1N_AGt" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
       </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">
-        <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>
@@ -89,48 +116,67 @@
   </node>
   <node concept="1lH9Xt" id="1N_0WA5DT3k">
     <property role="TrG5h" value="Typechecking" />
-    <node concept="1qefOq" id="1N_0WA5DTUS" role="1SKRRt">
-      <node concept="3uibUv" id="1N_0WA5DX6P" role="1qenE9">
-        <ref role="3uigEE" to="9oqm:61vfVfpb5w1" resolve="ComplexTypeErasure" />
-        <node concept="3xLA65" id="1N_0WA5DX6Z" role="lGtFl">
-          <property role="TrG5h" value="Test_ComplexTypeErasure" />
-        </node>
-      </node>
-    </node>
-    <node concept="1qefOq" id="1N_0WA5JGhF" role="1SKRRt">
-      <node concept="3uibUv" id="1N_0WA5JGhG" role="1qenE9">
-        <ref role="3uigEE" to="9oqm:61vfVfp6EBu" resolve="GenericSubst" />
-        <node concept="3xLA65" id="1N_0WA5JGhH" role="lGtFl">
-          <property role="TrG5h" value="Test_GenericSubst" />
-        </node>
-      </node>
-    </node>
+    <property role="3OwPAg" value="true" />
     <node concept="1LZb2c" id="1N_0WA5DT8G" role="1SL9yI">
       <property role="TrG5h" value="ComplexTypeErasure" />
       <node concept="3cqZAl" id="1N_0WA5DT8H" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
-        <node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
-          <node concept="2OqwBi" id="6nJA6bpKvFr" role="3ykU8v">
-            <node concept="2YIFZM" id="6IQb_RxcBBt" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="2OqwBi" id="6nJA6bpKvcC" role="37wK5m">
-                <node concept="3xONca" id="6nJA6bpKvcD" role="2Oq$k0">
-                  <ref role="3xOPvv" node="1N_0WA5DX6Z" resolve="Test_ComplexTypeErasure" />
-                </node>
-                <node concept="3TrEf2" id="6nJA6bpKvcE" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+        <node concept="1QHqEK" id="4BHjwwGJZh0" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGJZh2" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGJZh4" role="1bW5cS">
+              <node concept="3cpWs8" id="4BHjwwGJQYe" role="3cqZAp">
+                <node concept="3cpWsn" id="4BHjwwGJQYf" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="4BHjwwGJQYb" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                  <node concept="1PxgMI" id="4BHjwwGJT1y" role="33vP2m">
+                    <node concept="chp4Y" id="4BHjwwGJTcC" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                    <node concept="2OqwBi" id="4BHjwwGJRwn" role="1m5AlR">
+                      <node concept="1N_AGu" id="4BHjwwGJRfC" role="2Oq$k0">
+                        <ref role="1N_AGt" to="9oqm:61vfVfpb5w1" resolve="ComplexTypeErasure" />
+                      </node>
+                      <node concept="liA8E" id="4BHjwwGJRIX" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="4BHjwwGJS8O" role="37wK5m">
+                          <node concept="1jxXqW" id="4BHjwwGJRMu" role="2Oq$k0" />
+                          <node concept="liA8E" id="4BHjwwGJSNJ" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3ykFI1" id="4BHjwwGK7kZ" role="3cqZAp">
+                <node concept="2OqwBi" id="6nJA6bpKr9l" role="3ykU8v">
+                  <node concept="2YIFZM" id="6IQb_RxcBBx" role="2Oq$k0">
+                    <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
+                    <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
+                    <node concept="37vLTw" id="4BHjwwGJYJP" role="37wK5m">
+                      <ref role="3cqZAo" node="4BHjwwGJQYf" resolve="cls" />
+                    </node>
+                    <node concept="1jxXqW" id="6nJA6bpKr0k" role="37wK5m" />
+                  </node>
+                  <node concept="liA8E" id="6nJA6bpKrmZ" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
+                  </node>
+                </node>
+                <node concept="3_1$Yv" id="4BHjwwGK7l0" role="3_9lra">
+                  <node concept="Xl_RD" id="4BHjwwGK7l1" role="3_1BAH">
+                    <property role="Xl_RC" value="error while typechecking" />
+                  </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6nJA6bpKvcF" role="37wK5m" />
-            </node>
-            <node concept="liA8E" id="6nJA6bpKvZn" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
             </node>
           </node>
-          <node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">
-            <node concept="Xl_RD" id="1N_0WA5INjk" role="3_1BAH">
-              <property role="Xl_RC" value="error while typechecking" />
+          <node concept="2OqwBi" id="4BHjwwGJZO2" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGJZt5" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGK0mv" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -140,28 +186,62 @@
       <property role="TrG5h" value="GenericSubst" />
       <node concept="3cqZAl" id="1N_0WA5JGiw" role="3clF45" />
       <node concept="3clFbS" id="1N_0WA5JGix" role="3clF47">
-        <node concept="3ykFI1" id="1N_0WA5JGiy" role="3cqZAp">
-          <node concept="2OqwBi" id="6nJA6bpKwkc" role="3ykU8v">
-            <node concept="2YIFZM" id="6IQb_RxcBBs" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
-              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="2OqwBi" id="6nJA6bpKw4q" role="37wK5m">
-                <node concept="3xONca" id="6nJA6bpKw4r" role="2Oq$k0">
-                  <ref role="3xOPvv" node="1N_0WA5JGhH" resolve="Test_GenericSubst" />
-                </node>
-                <node concept="3TrEf2" id="6nJA6bpKw4s" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+        <node concept="1QHqEK" id="4BHjwwGK8r$" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGK8r_" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGK8rA" role="1bW5cS">
+              <node concept="3cpWs8" id="4BHjwwGK8rB" role="3cqZAp">
+                <node concept="3cpWsn" id="4BHjwwGK8rC" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="4BHjwwGK8rD" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                  <node concept="1PxgMI" id="4BHjwwGK8rE" role="33vP2m">
+                    <node concept="chp4Y" id="4BHjwwGK8rF" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7pOWCK" resolve="Classifier" />
+                    </node>
+                    <node concept="2OqwBi" id="4BHjwwGK8rG" role="1m5AlR">
+                      <node concept="1N_AGu" id="4BHjwwGK8rH" role="2Oq$k0">
+                        <ref role="1N_AGt" to="9oqm:61vfVfp6EBu" resolve="GenericSubst" />
+                      </node>
+                      <node concept="liA8E" id="4BHjwwGK8rI" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="4BHjwwGK8rJ" role="37wK5m">
+                          <node concept="1jxXqW" id="4BHjwwGK8rK" role="2Oq$k0" />
+                          <node concept="liA8E" id="4BHjwwGK8rL" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
+                <node concept="2OqwBi" id="4BHjwwGK8rM" role="3ykU8v">
+                  <node concept="2YIFZM" id="4BHjwwGK8rN" role="2Oq$k0">
+                    <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
+                    <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
+                    <node concept="37vLTw" id="4BHjwwGK8rO" role="37wK5m">
+                      <ref role="3cqZAo" node="4BHjwwGK8rC" resolve="cls" />
+                    </node>
+                    <node concept="1jxXqW" id="4BHjwwGK8rP" role="37wK5m" />
+                  </node>
+                  <node concept="liA8E" id="4BHjwwGK8rQ" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
+                  </node>
+                </node>
+                <node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">
+                  <node concept="Xl_RD" id="1N_0WA5INjk" role="3_1BAH">
+                    <property role="Xl_RC" value="error while typechecking" />
+                  </node>
                 </node>
               </node>
-              <node concept="1jxXqW" id="6nJA6bpKw4t" role="37wK5m" />
-            </node>
-            <node concept="liA8E" id="6nJA6bpKwCp" role="2OqNvi">
-              <ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
             </node>
           </node>
-          <node concept="3_1$Yv" id="1N_0WA5JGiC" role="3_9lra">
-            <node concept="Xl_RD" id="1N_0WA5JGiD" role="3_1BAH">
-              <property role="Xl_RC" value="error while typechecking" />
+          <node concept="2OqwBi" id="4BHjwwGK8rR" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGK8rS" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGK8rT" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd b/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
index 6c6f9fde..80966204 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
+++ b/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
@@ -19,18 +19,23 @@
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
     <dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.typechecking.ui)</dependency>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
+    <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</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:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" 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:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <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:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="5" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.test/models/data.mps b/typechecking/solutions/jetbrains.mps.typechecking.test/models/data.mps
new file mode 100644
index 00000000..d96a8a20
--- /dev/null
+++ b/typechecking/solutions/jetbrains.mps.typechecking.test/models/data.mps
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:bc54949b-877a-412d-bb6d-5859d76db7ae(jetbrains.mps.lang.typechecking.test.data)" doNotGenerate="true">
+  <persistence version="9" />
+  <languages>
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
+    <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" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <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="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="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="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="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
+        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <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" />
+      <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="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="312cEu" id="4nxCIBqyl_d">
+    <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="3clFb_" id="4BHjwwGzeH3" role="jymVt">
+        <property role="1EzhhJ" value="true" />
+        <property role="TrG5h" value="a" />
+        <node concept="3uibUv" id="4BHjwwGzeJR" role="3clF45">
+          <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
+        </node>
+        <node concept="3Tm1VV" id="4BHjwwGzeH6" role="1B3o_S" />
+        <node concept="3clFbS" id="4BHjwwGzeH7" role="3clF47" />
+      </node>
+      <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="4BHjwwGxjyG" role="jymVt" />
+    <node concept="3clFb_" id="4BHjwwGxjBc" role="jymVt">
+      <property role="TrG5h" value="foo" />
+      <node concept="37vLTG" id="4BHjwwGza0K" role="3clF46">
+        <property role="TrG5h" value="a" />
+        <node concept="3uibUv" id="4BHjwwGza18" role="1tU5fm">
+          <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4BHjwwGza1Q" role="3clF46">
+        <property role="TrG5h" value="b" />
+        <node concept="3uibUv" id="4BHjwwGza2g" role="1tU5fm">
+          <ref role="3uigEE" node="7y50OW6ZXcE" resolve="Test.B" />
+          <node concept="3uibUv" id="4BHjwwGza2X" role="11_B2D">
+            <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="4BHjwwGxjBe" role="3clF45" />
+      <node concept="3Tm1VV" id="4BHjwwGxjBf" role="1B3o_S" />
+      <node concept="3clFbS" id="4BHjwwGxjBg" role="3clF47">
+        <node concept="3cpWs8" id="4BHjwwGxjLy" role="3cqZAp">
+          <node concept="3cpWsn" id="4BHjwwGxjLz" role="3cpWs9">
+            <property role="TrG5h" value="varA" />
+            <node concept="3uibUv" id="4BHjwwGxjL$" role="1tU5fm">
+              <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
+            </node>
+            <node concept="2OqwBi" id="4BHjwwGzeP1" role="33vP2m">
+              <node concept="37vLTw" id="4BHjwwGza4o" role="2Oq$k0">
+                <ref role="3cqZAo" node="4BHjwwGza0K" resolve="a" />
+              </node>
+              <node concept="liA8E" id="4BHjwwGzeWc" role="2OqNvi">
+                <ref role="37wK5l" node="4BHjwwGzeH3" resolve="a" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4BHjwwGxjNu" role="3cqZAp">
+          <node concept="3cpWsn" id="4BHjwwGxjN$" role="3cpWs9">
+            <property role="TrG5h" value="varB" />
+            <node concept="3uibUv" id="4BHjwwGxjNA" role="1tU5fm">
+              <ref role="3uigEE" node="7y50OW6ZXcE" resolve="Test.B" />
+              <node concept="3uibUv" id="4BHjwwGxjOG" role="11_B2D">
+                <ref role="3uigEE" node="4cKdPpqIRLR" resolve="Test.A" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4BHjwwGza5s" role="33vP2m">
+              <ref role="3cqZAo" node="4BHjwwGza1Q" resolve="b" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4BHjwwGCpKM" role="3cqZAp">
+          <node concept="1rXfSq" id="4BHjwwGCpKK" role="3clFbG">
+            <ref role="37wK5l" node="4BHjwwGxjBc" resolve="foo" />
+            <node concept="37vLTw" id="4BHjwwGCpM2" role="37wK5m">
+              <ref role="3cqZAo" node="4BHjwwGxjLz" resolve="varA" />
+            </node>
+            <node concept="37vLTw" id="4BHjwwGCpPQ" role="37wK5m">
+              <ref role="3cqZAo" node="4BHjwwGxjN$" resolve="varB" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="4nxCIBqyl_e" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="6$7vuu2uamo">
+    <property role="TrG5h" value="Foo" />
+    <node concept="3clFb_" id="6$7vuu2uaoc" role="jymVt">
+      <property role="TrG5h" value="bar" />
+      <node concept="37vLTG" id="6$7vuu2uaoM" role="3clF46">
+        <property role="TrG5h" value="str" />
+        <node concept="3uibUv" id="6$7vuu2uapo" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6$7vuu2uaoe" role="3clF45" />
+      <node concept="3Tm1VV" id="6$7vuu2uaof" role="1B3o_S" />
+      <node concept="3clFbS" id="6$7vuu2uaog" role="3clF47">
+        <node concept="3clFbF" id="6$7vuu2uasa" role="3cqZAp">
+          <node concept="1rXfSq" id="6$7vuu2uas9" role="3clFbG">
+            <ref role="37wK5l" node="6$7vuu2uaqf" resolve="bazz" />
+            <node concept="37vLTw" id="6$7vuu2woUY" role="37wK5m">
+              <ref role="3cqZAo" node="6$7vuu2uaoM" resolve="str" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="14$_tTxxems" role="3cqZAp">
+          <node concept="3cpWsn" id="14$_tTxxemt" role="3cpWs9">
+            <property role="TrG5h" value="o" />
+            <node concept="3uibUv" id="14$_tTxxemu" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+            <node concept="37vLTw" id="14$_tTxxenZ" role="33vP2m">
+              <ref role="3cqZAo" node="6$7vuu2uaoM" resolve="str" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3clFb_" id="6$7vuu2uaqf" role="jymVt">
+      <property role="TrG5h" value="bazz" />
+      <node concept="37vLTG" id="6$7vuu2uaqV" role="3clF46">
+        <property role="TrG5h" value="obj" />
+        <node concept="3uibUv" id="6$7vuu2uarh" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6$7vuu2uaqh" role="3clF45" />
+      <node concept="3Tm1VV" id="6$7vuu2uaqi" role="1B3o_S" />
+      <node concept="3clFbS" id="6$7vuu2uaqj" role="3clF47" />
+    </node>
+    <node concept="3Tm1VV" id="6$7vuu2uamp" role="1B3o_S" />
+  </node>
+</model>
+
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
index 6b5a0e6e..414253a2 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
@@ -12,6 +12,9 @@
     <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" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -31,31 +34,28 @@
     <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.typechecking.ui.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/)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
+    <import index="tlxd" ref="r:bc54949b-877a-412d-bb6d-5859d76db7ae(jetbrains.mps.lang.typechecking.test.data)" />
+    <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
+      <concept id="1211979288880" name="jetbrains.mps.lang.test.structure.AssertMatch" flags="nn" index="JA50E">
+        <child id="1211979305365" name="before" index="JA92f" />
+        <child id="1211979322383" name="after" index="JAdkl" />
+      </concept>
       <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" />
+        <property id="6339244025081158986" name="needsNoWriteAction" index="3OwPAg" />
         <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">
@@ -64,7 +64,6 @@
         <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" />
@@ -88,16 +87,9 @@
       <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>
@@ -107,32 +99,16 @@
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1164879685961" name="throwsItem" index="Sfmx6" />
         <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
       <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>
@@ -143,11 +119,6 @@
         <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="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
         <child id="1109201940907" name="parameter" index="11_B2D" />
@@ -156,26 +127,26 @@
         <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="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
+      <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
+      <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
+        <child id="1423104411234567454" name="repo" index="ukAjM" />
+        <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
+      </concept>
+      <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -183,16 +154,6 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </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">
         <property id="6489343236075007666" name="label" index="3hQQBS" />
@@ -204,6 +165,9 @@
       </concept>
     </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
+      <concept id="1216130694486" name="jetbrains.mps.baseLanguage.unitTest.structure.ITestCase" flags="ng" index="B2rLd">
+        <property id="6427619394892729757" name="canNotRunInProcess" index="26Nn1l" />
+      </concept>
       <concept id="7080278351417106679" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertIsNotNull" flags="nn" index="2Hmddi">
         <child id="7080278351417106681" name="expression" index="2Hmdds" />
       </concept>
@@ -220,6 +184,13 @@
       </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="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="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
@@ -227,12 +198,23 @@
       </concept>
       <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
+      <concept id="597763930871270009" name="jetbrains.mps.lang.smodel.structure.ChildNodeRefExpression" flags="nn" index="3fl2lp">
+        <reference id="597763930871272016" name="targetNode" index="3fl3PK" />
+        <child id="597763930871272014" name="parent" index="3fl3PI" />
+      </concept>
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
+      <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
+        <reference id="1219352800908" name="referentNode" index="3B5MYn" />
+      </concept>
       <concept id="1206482823744" name="jetbrains.mps.lang.smodel.structure.Model_AddRootOperation" flags="nn" index="3BYIHo">
         <child id="1206482823746" name="nodeArgument" index="3BYIHq" />
       </concept>
+      <concept id="1828409047608048457" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="nn" index="1N_AGu">
+        <reference id="1828409047608048458" name="referentNode" index="1N_AGt" />
+      </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
@@ -252,9 +234,6 @@
         <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>
@@ -264,248 +243,321 @@
   </node>
   <node concept="1lH9Xt" id="6QH_LDtdSk3">
     <property role="TrG5h" value="TypeCache" />
-    <node concept="1qefOq" id="6QH_LDtdTZR" role="1SKRRt">
-      <node concept="312cEu" id="6QH_LDtdTZT" role="1qenE9">
-        <property role="TrG5h" value="Foo" />
-        <node concept="3Tm1VV" id="6QH_LDtdTZU" role="1B3o_S" />
-        <node concept="3xLA65" id="6QH_LDtdU18" role="lGtFl">
-          <property role="TrG5h" value="foo" />
-        </node>
-      </node>
-    </node>
+    <property role="3OwPAg" value="true" />
+    <property role="26Nn1l" value="true" />
     <node concept="1LZb2c" id="6QH_LDtdSlj" role="1SL9yI">
       <property role="TrG5h" value="typeInitCache" />
       <node concept="3cqZAl" id="6QH_LDtdSlk" role="3clF45" />
       <node concept="3clFbS" id="6QH_LDtdSlo" role="3clF47">
-        <node concept="3cpWs8" id="6QH_LDtdVp3" role="3cqZAp">
-          <node concept="3cpWsn" id="6QH_LDtdVp4" role="3cpWs9">
-            <property role="TrG5h" value="unit" />
-            <node concept="H_c77" id="6QH_LDtdVp0" role="1tU5fm" />
-            <node concept="2OqwBi" id="6QH_LDtdVp5" role="33vP2m">
-              <node concept="3xONca" id="6QH_LDtdVp6" role="2Oq$k0">
-                <ref role="3xOPvv" node="6QH_LDtdU18" resolve="foo" />
-              </node>
-              <node concept="I4A8Y" id="6QH_LDtdVp7" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6QH_LDtdVFg" role="3cqZAp" />
-        <node concept="3cpWs8" id="6QH_LDtdTgr" role="3cqZAp">
-          <node concept="3cpWsn" id="6QH_LDtdTgs" role="3cpWs9">
-            <property role="TrG5h" value="tc" />
-            <node concept="3uibUv" id="6QH_LDtdTgp" role="1tU5fm">
-              <ref role="3uigEE" to="tj24:4Z$O9mrQIzY" resolve="Typechecking" />
-            </node>
-            <node concept="2YIFZM" id="55Q$YFtvvQb" role="33vP2m">
-              <ref role="37wK5l" to="tj24:4Z$O9mrQIG1" resolve="get" />
-              <ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="Typechecking" />
-              <node concept="2OqwBi" id="6QH_LDtdTwK" role="37wK5m">
-                <node concept="1jxXqW" id="6QH_LDtdTWQ" role="2Oq$k0" />
-                <node concept="liA8E" id="6QH_LDtdTVP" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6QH_LDtdVHj" role="3cqZAp">
-          <node concept="3cpWsn" id="6QH_LDtdVHk" role="3cpWs9">
-            <property role="TrG5h" value="typesCache" />
-            <node concept="3uibUv" id="6QH_LDtfmIh" role="1tU5fm">
-              <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="Typechecking.TypeCache" />
-            </node>
-            <node concept="2OqwBi" id="6QH_LDtdVHl" role="33vP2m">
-              <node concept="37vLTw" id="6QH_LDtdVHm" role="2Oq$k0">
-                <ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
-              </node>
-              <node concept="liA8E" id="6QH_LDtdVHn" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:4Z$O9mrQJgp" resolve="cachedTypes" />
-                <node concept="37vLTw" id="6QH_LDtdVHo" role="37wK5m">
-                  <ref role="3cqZAo" node="6QH_LDtdVp4" resolve="unit" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3ykFI1" id="6QH_LDtdYpJ" role="3cqZAp">
-          <node concept="37vLTw" id="6QH_LDtdYsF" role="3ykU8v">
-            <ref role="3cqZAo" node="6QH_LDtdVHk" resolve="typesCache" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="6QH_LDtdSlO" role="3cqZAp" />
-        <node concept="3cpWs8" id="6QH_LDtdXLJ" role="3cqZAp">
-          <node concept="3cpWsn" id="6QH_LDtdXLK" role="3cpWs9">
-            <property role="TrG5h" value="typeCache2" />
-            <node concept="3uibUv" id="6QH_LDtfmAJ" role="1tU5fm">
-              <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="Typechecking.TypeCache" />
-            </node>
-            <node concept="2OqwBi" id="6QH_LDtdXLL" role="33vP2m">
-              <node concept="37vLTw" id="6QH_LDtdXLM" role="2Oq$k0">
-                <ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
-              </node>
-              <node concept="liA8E" id="6QH_LDtdXLN" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:6QH_LDtbsGz" resolve="updateCachedTypes" />
-                <node concept="37vLTw" id="6QH_LDtdXLO" role="37wK5m">
-                  <ref role="3cqZAo" node="6QH_LDtdVp4" resolve="unit" />
-                </node>
-                <node concept="1bVj0M" id="6QH_LDtdXLP" role="37wK5m">
-                  <node concept="3clFbS" id="6QH_LDtdXLQ" role="1bW5cS">
-                    <node concept="3clFbH" id="6QH_LDtet4b" role="3cqZAp" />
-                    <node concept="3cpWs8" id="6QH_LDteuBg" role="3cqZAp">
-                      <node concept="3cpWsn" id="6QH_LDteuBh" role="3cpWs9">
-                        <property role="TrG5h" value="typesModel" />
-                        <node concept="H_c77" id="6QH_LDteuBc" role="1tU5fm" />
-                        <node concept="2OqwBi" id="6QH_LDteuBi" role="33vP2m">
-                          <node concept="37vLTw" id="6QH_LDteuBj" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6QH_LDtdXLR" resolve="typeCache" />
-                          </node>
-                          <node concept="liA8E" id="6QH_LDteuBk" role="2OqNvi">
-                            <ref role="37wK5l" to="tj24:6QH_LDtcxgx" resolve="typesModel" />
+        <node concept="1QHqEK" id="14$_tTxzYFT" role="3cqZAp">
+          <node concept="1QHqEC" id="14$_tTxzYFV" role="1QHqEI">
+            <node concept="3clFbS" id="14$_tTxzYFX" role="1bW5cS">
+              <node concept="3cpWs8" id="14$_tTxzPUB" role="3cqZAp">
+                <node concept="3cpWsn" id="14$_tTxzPUC" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="14$_tTxzQ78" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:fz12cDA" resolve="ClassConcept" />
+                  </node>
+                  <node concept="1PxgMI" id="14$_tTx$u1V" role="33vP2m">
+                    <node concept="chp4Y" id="14$_tTx$uBy" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
+                    </node>
+                    <node concept="2OqwBi" id="14$_tTx$rok" role="1m5AlR">
+                      <node concept="1N_AGu" id="14$_tTx$qwT" role="2Oq$k0">
+                        <ref role="1N_AGt" to="tlxd:6$7vuu2uamo" resolve="Foo" />
+                      </node>
+                      <node concept="liA8E" id="14$_tTx$rYh" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="14$_tTx$syv" role="37wK5m">
+                          <node concept="1jxXqW" id="14$_tTx$sfe" role="2Oq$k0" />
+                          <node concept="liA8E" id="14$_tTx$tAG" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3cpWs8" id="6QH_LDtewyr" role="3cqZAp">
-                      <node concept="3cpWsn" id="6QH_LDtewys" role="3cpWs9">
-                        <property role="TrG5h" value="clsType" />
-                        <node concept="3Tqbb2" id="6QH_LDtewyh" role="1tU5fm">
-                          <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="14$_tTxzUrg" role="3cqZAp">
+                <node concept="3cpWsn" id="14$_tTxzUrh" role="3cpWs9">
+                  <property role="TrG5h" value="unit" />
+                  <node concept="H_c77" id="14$_tTxzUr8" role="1tU5fm" />
+                  <node concept="2OqwBi" id="14$_tTxzUri" role="33vP2m">
+                    <node concept="37vLTw" id="14$_tTxzUrj" role="2Oq$k0">
+                      <ref role="3cqZAo" node="14$_tTxzPUC" resolve="cls" />
+                    </node>
+                    <node concept="I4A8Y" id="14$_tTxzUrk" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="14$_tTxzTDv" role="3cqZAp">
+                <node concept="3cpWsn" id="14$_tTxzTDw" role="3cpWs9">
+                  <property role="TrG5h" value="modelRepo" />
+                  <node concept="3uibUv" id="14$_tTxzTDj" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
+                  <node concept="2OqwBi" id="14$_tTxzTDx" role="33vP2m">
+                    <node concept="2JrnkZ" id="14$_tTxzTDy" role="2Oq$k0">
+                      <node concept="37vLTw" id="14$_tTxzUrl" role="2JrQYb">
+                        <ref role="3cqZAo" node="14$_tTxzUrh" resolve="unit" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="14$_tTxzTDA" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="14$_tTxzNf1" role="3cqZAp" />
+              <node concept="3cpWs8" id="6QH_LDtdTgr" role="3cqZAp">
+                <node concept="3cpWsn" id="6QH_LDtdTgs" role="3cpWs9">
+                  <property role="TrG5h" value="tc" />
+                  <node concept="3uibUv" id="6QH_LDtdTgp" role="1tU5fm">
+                    <ref role="3uigEE" to="tj24:4Z$O9mrQIzY" resolve="Typechecking" />
+                  </node>
+                  <node concept="2YIFZM" id="55Q$YFtvvQb" role="33vP2m">
+                    <ref role="37wK5l" to="tj24:4Z$O9mrQIG1" resolve="get" />
+                    <ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="Typechecking" />
+                    <node concept="37vLTw" id="14$_tTxzVwH" role="37wK5m">
+                      <ref role="3cqZAo" node="14$_tTxzTDw" resolve="modelRepo" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="6QH_LDtdVHj" role="3cqZAp">
+                <node concept="3cpWsn" id="6QH_LDtdVHk" role="3cpWs9">
+                  <property role="TrG5h" value="typesCache" />
+                  <node concept="3uibUv" id="6QH_LDtfmIh" role="1tU5fm">
+                    <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="Typechecking.TypeCache" />
+                  </node>
+                  <node concept="2OqwBi" id="6QH_LDtdVHl" role="33vP2m">
+                    <node concept="37vLTw" id="6QH_LDtdVHm" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
+                    </node>
+                    <node concept="liA8E" id="6QH_LDtdVHn" role="2OqNvi">
+                      <ref role="37wK5l" to="tj24:4Z$O9mrQJgp" resolve="cachedTypes" />
+                      <node concept="37vLTw" id="14$_tTxzVDX" role="37wK5m">
+                        <ref role="3cqZAo" node="14$_tTxzUrh" resolve="unit" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3ykFI1" id="6QH_LDtdYpJ" role="3cqZAp">
+                <node concept="37vLTw" id="6QH_LDtdYsF" role="3ykU8v">
+                  <ref role="3cqZAo" node="6QH_LDtdVHk" resolve="typesCache" />
+                </node>
+              </node>
+              <node concept="3clFbH" id="14$_tTx$ElE" role="3cqZAp" />
+              <node concept="2GUZhq" id="14$_tTx$j9K" role="3cqZAp">
+                <node concept="3clFbS" id="14$_tTx$j9M" role="2GV8ay">
+                  <node concept="3cpWs8" id="6QH_LDtdXLJ" role="3cqZAp">
+                    <node concept="3cpWsn" id="6QH_LDtdXLK" role="3cpWs9">
+                      <property role="TrG5h" value="typeCache2" />
+                      <node concept="3uibUv" id="6QH_LDtfmAJ" role="1tU5fm">
+                        <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="Typechecking.TypeCache" />
+                      </node>
+                      <node concept="2OqwBi" id="6QH_LDtdXLL" role="33vP2m">
+                        <node concept="37vLTw" id="6QH_LDtdXLM" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
                         </node>
-                        <node concept="2OqwBi" id="6QH_LDtewyt" role="33vP2m">
-                          <node concept="37vLTw" id="6QH_LDtewyu" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6QH_LDteuBh" resolve="typesModel" />
+                        <node concept="liA8E" id="6QH_LDtdXLN" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:6QH_LDtbsGz" resolve="updateCachedTypes" />
+                          <node concept="37vLTw" id="14$_tTxzVPf" role="37wK5m">
+                            <ref role="3cqZAo" node="14$_tTxzUrh" resolve="unit" />
                           </node>
-                          <node concept="3BYIHo" id="6QH_LDtewyv" role="2OqNvi">
-                            <node concept="2ShNRf" id="6QH_LDtewyw" role="3BYIHq">
-                              <node concept="3zrR0B" id="6QH_LDtewyx" role="2ShVmc">
-                                <node concept="3Tqbb2" id="6QH_LDtewyy" role="3zrR0E">
-                                  <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                          <node concept="1bVj0M" id="6QH_LDtdXLP" role="37wK5m">
+                            <node concept="3clFbS" id="6QH_LDtdXLQ" role="1bW5cS">
+                              <node concept="3clFbH" id="6QH_LDtet4b" role="3cqZAp" />
+                              <node concept="3cpWs8" id="6QH_LDteuBg" role="3cqZAp">
+                                <node concept="3cpWsn" id="6QH_LDteuBh" role="3cpWs9">
+                                  <property role="TrG5h" value="typesModel" />
+                                  <node concept="H_c77" id="6QH_LDteuBc" role="1tU5fm" />
+                                  <node concept="2OqwBi" id="6QH_LDteuBi" role="33vP2m">
+                                    <node concept="37vLTw" id="6QH_LDteuBj" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="6QH_LDtdXLR" resolve="typeCache" />
+                                    </node>
+                                    <node concept="liA8E" id="6QH_LDteuBk" role="2OqNvi">
+                                      <ref role="37wK5l" to="tj24:6QH_LDtcxgx" resolve="typesModel" />
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
+                              <node concept="3cpWs8" id="6QH_LDtewyr" role="3cqZAp">
+                                <node concept="3cpWsn" id="6QH_LDtewys" role="3cpWs9">
+                                  <property role="TrG5h" value="clsType" />
+                                  <node concept="3Tqbb2" id="6QH_LDtewyh" role="1tU5fm">
+                                    <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                  </node>
+                                  <node concept="2OqwBi" id="6QH_LDtewyt" role="33vP2m">
+                                    <node concept="37vLTw" id="6QH_LDtewyu" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="6QH_LDteuBh" resolve="typesModel" />
+                                    </node>
+                                    <node concept="3BYIHo" id="6QH_LDtewyv" role="2OqNvi">
+                                      <node concept="2ShNRf" id="6QH_LDtewyw" role="3BYIHq">
+                                        <node concept="3zrR0B" id="6QH_LDtewyx" role="2ShVmc">
+                                          <node concept="3Tqbb2" id="6QH_LDtewyy" role="3zrR0E">
+                                            <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbF" id="6QH_LDtetXP" role="3cqZAp">
+                                <node concept="37vLTI" id="6QH_LDteyw3" role="3clFbG">
+                                  <node concept="37vLTw" id="14$_tTxzWyW" role="37vLTx">
+                                    <ref role="3cqZAo" node="14$_tTxzPUC" resolve="cls" />
+                                  </node>
+                                  <node concept="2OqwBi" id="6QH_LDtewUA" role="37vLTJ">
+                                    <node concept="37vLTw" id="6QH_LDtewyz" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="6QH_LDtewys" resolve="clsType" />
+                                    </node>
+                                    <node concept="3TrEf2" id="6QH_LDtexF8" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbH" id="6QH_LDtetG2" role="3cqZAp" />
+                              <node concept="3clFbF" id="6QH_LDtesyR" role="3cqZAp">
+                                <node concept="2OqwBi" id="6QH_LDtesDH" role="3clFbG">
+                                  <node concept="37vLTw" id="6QH_LDtesyP" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="6QH_LDtdXLR" resolve="typeCache" />
+                                  </node>
+                                  <node concept="liA8E" id="6QH_LDtesSt" role="2OqNvi">
+                                    <ref role="37wK5l" to="tj24:6QH_LDtcYUC" resolve="putType" />
+                                    <node concept="2OqwBi" id="6QH_LDteGcY" role="37wK5m">
+                                      <node concept="2JrnkZ" id="6QH_LDteEw4" role="2Oq$k0">
+                                        <node concept="37vLTw" id="14$_tTxzY11" role="2JrQYb">
+                                          <ref role="3cqZAo" node="14$_tTxzPUC" resolve="cls" />
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="6QH_LDteGDm" role="2OqNvi">
+                                        <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                      </node>
+                                    </node>
+                                    <node concept="37vLTw" id="6QH_LDte_a_" role="37wK5m">
+                                      <ref role="3cqZAo" node="6QH_LDtewys" resolve="clsType" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbH" id="14$_tTx$yQN" role="3cqZAp" />
                             </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="6QH_LDtetXP" role="3cqZAp">
-                      <node concept="37vLTI" id="6QH_LDteyw3" role="3clFbG">
-                        <node concept="3xONca" id="6QH_LDteyD6" role="37vLTx">
-                          <ref role="3xOPvv" node="6QH_LDtdU18" resolve="foo" />
-                        </node>
-                        <node concept="2OqwBi" id="6QH_LDtewUA" role="37vLTJ">
-                          <node concept="37vLTw" id="6QH_LDtewyz" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6QH_LDtewys" resolve="clsType" />
-                          </node>
-                          <node concept="3TrEf2" id="6QH_LDtexF8" role="2OqNvi">
-                            <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="6QH_LDtetG2" role="3cqZAp" />
-                    <node concept="3clFbF" id="6QH_LDtesyR" role="3cqZAp">
-                      <node concept="2OqwBi" id="6QH_LDtesDH" role="3clFbG">
-                        <node concept="37vLTw" id="6QH_LDtesyP" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6QH_LDtdXLR" resolve="typeCache" />
-                        </node>
-                        <node concept="liA8E" id="6QH_LDtesSt" role="2OqNvi">
-                          <ref role="37wK5l" to="tj24:6QH_LDtcYUC" resolve="putType" />
-                          <node concept="2OqwBi" id="6QH_LDteGcY" role="37wK5m">
-                            <node concept="2JrnkZ" id="6QH_LDteEw4" role="2Oq$k0">
-                              <node concept="3xONca" id="6QH_LDtetdX" role="2JrQYb">
-                                <ref role="3xOPvv" node="6QH_LDtdU18" resolve="foo" />
+                            <node concept="37vLTG" id="6QH_LDtdXLR" role="1bW2Oz">
+                              <property role="TrG5h" value="typeCache" />
+                              <node concept="3uibUv" id="6QH_LDtdXLS" role="1tU5fm">
+                                <ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="Typechecking.UpdatableTypeCache" />
                               </node>
                             </node>
-                            <node concept="liA8E" id="6QH_LDteGDm" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                            </node>
-                          </node>
-                          <node concept="37vLTw" id="6QH_LDte_a_" role="37wK5m">
-                            <ref role="3cqZAo" node="6QH_LDtewys" resolve="clsType" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="6QH_LDtespS" role="3cqZAp" />
                   </node>
-                  <node concept="37vLTG" id="6QH_LDtdXLR" role="1bW2Oz">
-                    <property role="TrG5h" value="typeCache" />
-                    <node concept="3uibUv" id="6QH_LDtdXLS" role="1tU5fm">
-                      <ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="Typechecking.UpdatableTypeCache" />
+                  <node concept="3clFbH" id="14$_tTx$z38" role="3cqZAp" />
+                  <node concept="2Hmddi" id="6QH_LDtdY5q" role="3cqZAp">
+                    <node concept="37vLTw" id="6QH_LDtdYCG" role="2Hmdds">
+                      <ref role="3cqZAo" node="6QH_LDtdXLK" resolve="typeCache2" />
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="6QH_LDtdW91" role="3cqZAp" />
+                  <node concept="3cpWs8" id="6QH_LDtdZNt" role="3cqZAp">
+                    <node concept="3cpWsn" id="6QH_LDtdZNu" role="3cpWs9">
+                      <property role="TrG5h" value="typesCache3" />
+                      <node concept="3uibUv" id="6QH_LDtfmZy" role="1tU5fm">
+                        <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="Typechecking.TypeCache" />
+                      </node>
+                      <node concept="2OqwBi" id="6QH_LDtdZNv" role="33vP2m">
+                        <node concept="37vLTw" id="6QH_LDtdZNw" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
+                        </node>
+                        <node concept="liA8E" id="6QH_LDtdZNx" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:4Z$O9mrQJgp" resolve="cachedTypes" />
+                          <node concept="37vLTw" id="14$_tTxzW6X" role="37wK5m">
+                            <ref role="3cqZAo" node="14$_tTxzUrh" resolve="unit" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3vMLTj" id="6QH_LDte06l" role="3cqZAp">
+                    <node concept="37vLTw" id="6QH_LDte0h9" role="3tpDZB">
+                      <ref role="3cqZAo" node="6QH_LDtdXLK" resolve="typeCache2" />
+                    </node>
+                    <node concept="37vLTw" id="6QH_LDte0rc" role="3tpDZA">
+                      <ref role="3cqZAo" node="6QH_LDtdZNu" resolve="typesCache3" />
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="6QH_LDteGYQ" role="3cqZAp" />
+                  <node concept="3cpWs8" id="6QH_LDteITH" role="3cqZAp">
+                    <node concept="3cpWsn" id="6QH_LDteITI" role="3cpWs9">
+                      <property role="TrG5h" value="typeOfFoo" />
+                      <node concept="3Tqbb2" id="6QH_LDteITC" role="1tU5fm" />
+                      <node concept="2OqwBi" id="6QH_LDteITJ" role="33vP2m">
+                        <node concept="37vLTw" id="6QH_LDteITK" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6QH_LDtdZNu" resolve="typesCache3" />
+                        </node>
+                        <node concept="liA8E" id="6QH_LDteITL" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:6QH_LDtffJj" resolve="typeOf" />
+                          <node concept="37vLTw" id="14$_tTxzWlq" role="37wK5m">
+                            <ref role="3cqZAo" node="14$_tTxzPUC" resolve="cls" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3vwNmj" id="6QH_LDteJJk" role="3cqZAp">
+                    <node concept="2YFouu" id="6QH_LDtfLOH" role="3vwVQn">
+                      <node concept="37vLTw" id="6QH_LDtfLOI" role="3uHU7w">
+                        <ref role="3cqZAo" node="6QH_LDteITI" resolve="typeOfFoo" />
+                      </node>
+                      <node concept="2c44tf" id="6QH_LDtfLOJ" role="3uHU7B">
+                        <node concept="3uibUv" id="6QH_LDtfLOK" role="2c44tc">
+                          <node concept="2c44tb" id="6QH_LDtfLOL" role="lGtFl">
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
+                            <property role="2qtEX8" value="classifier" />
+                            <property role="3hQQBS" value="ClassifierType" />
+                            <node concept="37vLTw" id="14$_tTxzWkW" role="2c44t1">
+                              <ref role="3cqZAo" node="14$_tTxzPUC" resolve="cls" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="14$_tTx$lvD" role="3cqZAp" />
+                </node>
+                <node concept="3clFbS" id="14$_tTx$j9N" role="2GVbov">
+                  <node concept="3clFbF" id="14$_tTxAMey" role="3cqZAp">
+                    <node concept="2YIFZM" id="14$_tTxAP4o" role="3clFbG">
+                      <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="dispose" />
+                      <ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="Typechecking" />
+                      <node concept="37vLTw" id="14$_tTxAP4p" role="37wK5m">
+                        <ref role="3cqZAo" node="14$_tTxzTDw" resolve="modelRepo" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="14$_tTx$kBI" role="3cqZAp">
+                    <node concept="2YIFZM" id="14$_tTx$kBJ" role="3clFbG">
+                      <ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
+                      <ref role="37wK5l" to="umch:2zU3cYqyg2V" resolve="dispose" />
+                      <node concept="37vLTw" id="14$_tTx$kBK" role="37wK5m">
+                        <ref role="3cqZAo" node="14$_tTxzTDw" resolve="modelRepo" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-        </node>
-        <node concept="2Hmddi" id="6QH_LDtdY5q" role="3cqZAp">
-          <node concept="37vLTw" id="6QH_LDtdYCG" role="2Hmdds">
-            <ref role="3cqZAo" node="6QH_LDtdXLK" resolve="typeCache2" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="6QH_LDtdW91" role="3cqZAp" />
-        <node concept="3cpWs8" id="6QH_LDtdZNt" role="3cqZAp">
-          <node concept="3cpWsn" id="6QH_LDtdZNu" role="3cpWs9">
-            <property role="TrG5h" value="typesCache3" />
-            <node concept="3uibUv" id="6QH_LDtfmZy" role="1tU5fm">
-              <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="Typechecking.TypeCache" />
-            </node>
-            <node concept="2OqwBi" id="6QH_LDtdZNv" role="33vP2m">
-              <node concept="37vLTw" id="6QH_LDtdZNw" role="2Oq$k0">
-                <ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
-              </node>
-              <node concept="liA8E" id="6QH_LDtdZNx" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:4Z$O9mrQJgp" resolve="cachedTypes" />
-                <node concept="37vLTw" id="6QH_LDtdZNy" role="37wK5m">
-                  <ref role="3cqZAo" node="6QH_LDtdVp4" resolve="unit" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3vMLTj" id="6QH_LDte06l" role="3cqZAp">
-          <node concept="37vLTw" id="6QH_LDte0h9" role="3tpDZB">
-            <ref role="3cqZAo" node="6QH_LDtdXLK" resolve="typeCache2" />
-          </node>
-          <node concept="37vLTw" id="6QH_LDte0rc" role="3tpDZA">
-            <ref role="3cqZAo" node="6QH_LDtdZNu" resolve="typesCache3" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="6QH_LDteGYQ" role="3cqZAp" />
-        <node concept="3cpWs8" id="6QH_LDteITH" role="3cqZAp">
-          <node concept="3cpWsn" id="6QH_LDteITI" role="3cpWs9">
-            <property role="TrG5h" value="typeOfFoo" />
-            <node concept="3Tqbb2" id="6QH_LDteITC" role="1tU5fm" />
-            <node concept="2OqwBi" id="6QH_LDteITJ" role="33vP2m">
-              <node concept="37vLTw" id="6QH_LDteITK" role="2Oq$k0">
-                <ref role="3cqZAo" node="6QH_LDtdZNu" resolve="typesCache3" />
-              </node>
-              <node concept="liA8E" id="6QH_LDteITL" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:6QH_LDtffJj" resolve="typeOf" />
-                <node concept="3xONca" id="6QH_LDteITM" role="37wK5m">
-                  <ref role="3xOPvv" node="6QH_LDtdU18" resolve="foo" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3vwNmj" id="6QH_LDteJJk" role="3cqZAp">
-          <node concept="2YFouu" id="6QH_LDtfLOH" role="3vwVQn">
-            <node concept="37vLTw" id="6QH_LDtfLOI" role="3uHU7w">
-              <ref role="3cqZAo" node="6QH_LDteITI" resolve="typeOfFoo" />
-            </node>
-            <node concept="2c44tf" id="6QH_LDtfLOJ" role="3uHU7B">
-              <node concept="3uibUv" id="6QH_LDtfLOK" role="2c44tc">
-                <node concept="2c44tb" id="6QH_LDtfLOL" role="lGtFl">
-                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
-                  <property role="2qtEX8" value="classifier" />
-                  <property role="3hQQBS" value="ClassifierType" />
-                  <node concept="3xONca" id="6QH_LDtfLOM" role="2c44t1">
-                    <ref role="3xOPvv" node="6QH_LDtdU18" resolve="foo" />
-                  </node>
-                </node>
-              </node>
+          <node concept="2OqwBi" id="14$_tTx$1gb" role="ukAjM">
+            <node concept="1jxXqW" id="14$_tTx$0Xb" role="2Oq$k0" />
+            <node concept="liA8E" id="14$_tTx$20w" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -514,472 +566,499 @@
   </node>
   <node concept="1lH9Xt" id="6$7vuu2u9rP">
     <property role="TrG5h" value="TypecheckingFacade" />
-    <node concept="2XrIbr" id="6$7vuu2vnWT" role="1qtyYc">
-      <property role="TrG5h" value="sinkModel" />
-      <node concept="H_c77" id="6$7vuu2vo3x" role="3clF45" />
-      <node concept="3clFbS" id="6$7vuu2vnWV" role="3clF47">
-        <node concept="3cpWs8" id="WJyfsglt8y" role="3cqZAp">
-          <node concept="3cpWsn" id="WJyfsglt8z" role="3cpWs9">
-            <property role="TrG5h" value="source" />
-            <node concept="3uibUv" id="WJyfsgnH9z" role="1tU5fm">
-              <ref role="3uigEE" to="pa15:~PersistenceUtil$InMemoryStreamDataSource" resolve="PersistenceUtil.InMemoryStreamDataSource" />
-            </node>
-            <node concept="2ShNRf" id="WJyfsglt8_" role="33vP2m">
-              <node concept="1pGfFk" id="WJyfsglt8A" role="2ShVmc">
-                <ref role="37wK5l" to="pa15:~PersistenceUtil$InMemoryStreamDataSource.&lt;init&gt;()" resolve="PersistenceUtil.InMemoryStreamDataSource" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="WJyfsglt8B" role="3cqZAp">
-          <node concept="3cpWsn" id="WJyfsglt8C" role="3cpWs9">
-            <property role="TrG5h" value="options" />
-            <node concept="3uibUv" id="WJyfsglt8D" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-              <node concept="3uibUv" id="WJyfsglt8E" role="11_B2D">
-                <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-              </node>
-              <node concept="3uibUv" id="WJyfsglt8F" role="11_B2D">
-                <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-              </node>
-            </node>
-            <node concept="2YIFZM" id="WJyfsglt8G" role="33vP2m">
-              <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-              <ref role="37wK5l" to="33ny:~Collections.singletonMap(java.lang.Object,java.lang.Object):java.util.Map" resolve="singletonMap" />
-              <node concept="10M0yZ" id="WJyfsglt8H" role="37wK5m">
-                <ref role="1PxDUh" to="dush:~ModelFactory" resolve="ModelFactory" />
-                <ref role="3cqZAo" to="dush:~ModelFactory.OPTION_MODELNAME" resolve="OPTION_MODELNAME" />
-              </node>
-              <node concept="Xl_RD" id="WJyfsglt8I" role="37wK5m">
-                <property role="Xl_RC" value="types-model" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6$7vuu2vviB" role="3cqZAp">
-          <node concept="2OqwBi" id="2zU3cYq$lrv" role="3clFbG">
-            <node concept="2OqwBi" id="2zU3cYq$lrw" role="2Oq$k0">
-              <node concept="2YIFZM" id="2zU3cYq$lrx" role="2Oq$k0">
-                <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
-                <ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
-              </node>
-              <node concept="liA8E" id="2zU3cYq$lry" role="2OqNvi">
-                <ref role="37wK5l" to="dush:~PersistenceFacade.getDefaultModelFactory():org.jetbrains.mps.openapi.persistence.ModelFactory" resolve="getDefaultModelFactory" />
-              </node>
-            </node>
-            <node concept="liA8E" id="2zU3cYq$lrz" role="2OqNvi">
-              <ref role="37wK5l" to="dush:~ModelFactory.create(org.jetbrains.mps.openapi.persistence.DataSource,java.util.Map):org.jetbrains.mps.openapi.model.SModel" resolve="create" />
-              <node concept="37vLTw" id="2zU3cYq$lr$" role="37wK5m">
-                <ref role="3cqZAo" node="WJyfsglt8z" resolve="source" />
-              </node>
-              <node concept="37vLTw" id="2zU3cYq$lr_" role="37wK5m">
-                <ref role="3cqZAo" node="WJyfsglt8C" resolve="options" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="6$7vuu2vo3h" role="1B3o_S" />
-      <node concept="3uibUv" id="6$7vuu2vuKr" role="Sfmx6">
-        <ref role="3uigEE" to="guwi:~IOException" resolve="IOException" />
-      </node>
-    </node>
+    <property role="3OwPAg" value="true" />
+    <property role="26Nn1l" value="true" />
     <node concept="1LZb2c" id="6$7vuu2ubul" role="1SL9yI">
       <property role="TrG5h" value="typecheckingSteps" />
       <node concept="3cqZAl" id="6$7vuu2ubum" role="3clF45" />
       <node concept="3clFbS" id="6$7vuu2ubuq" role="3clF47">
-        <node concept="3cpWs8" id="6$7vuu2ucVz" role="3cqZAp">
-          <node concept="3cpWsn" id="6$7vuu2ucV$" role="3cpWs9">
-            <property role="TrG5h" value="unit" />
-            <node concept="H_c77" id="6$7vuu2ucVx" role="1tU5fm" />
-            <node concept="2OqwBi" id="6$7vuu2ucV_" role="33vP2m">
-              <node concept="3xONca" id="6$7vuu2ucVA" role="2Oq$k0">
-                <ref role="3xOPvv" node="6$7vuu2ubYm" resolve="cls" />
-              </node>
-              <node concept="I4A8Y" id="6$7vuu2ucVB" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6$7vuu2ugbw" role="3cqZAp">
-          <node concept="3cpWsn" id="6$7vuu2ugbx" role="3cpWs9">
-            <property role="TrG5h" value="repository" />
-            <node concept="3uibUv" id="6$7vuu2ugbs" role="1tU5fm">
-              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-            </node>
-            <node concept="2OqwBi" id="6$7vuu2ugby" role="33vP2m">
-              <node concept="2JrnkZ" id="6$7vuu2ugbz" role="2Oq$k0">
-                <node concept="37vLTw" id="6$7vuu2ugb$" role="2JrQYb">
-                  <ref role="3cqZAo" node="6$7vuu2ucV$" resolve="unit" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6$7vuu2ugb_" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6$7vuu2ugd_" role="3cqZAp" />
-        <node concept="3cpWs8" id="6$7vuu2ugt2" role="3cqZAp">
-          <node concept="3cpWsn" id="6$7vuu2ugt3" role="3cpWs9">
-            <property role="TrG5h" value="tplApp" />
-            <node concept="3uibUv" id="6$7vuu2ugsZ" role="1tU5fm">
-              <ref role="3uigEE" to="tj24:3GlpCDSxTG7" resolve="TypecheckingTemplates" />
-            </node>
-            <node concept="2ShNRf" id="6$7vuu2ugt4" role="33vP2m">
-              <node concept="1pGfFk" id="6$7vuu2ugt5" role="2ShVmc">
-                <ref role="37wK5l" to="tj24:3GlpCDSychS" resolve="TypecheckingTemplates" />
-                <node concept="37vLTw" id="6$7vuu2ugt6" role="37wK5m">
-                  <ref role="3cqZAo" node="6$7vuu2ugbx" resolve="repository" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6$7vuu2ujxQ" role="3cqZAp">
-          <node concept="3cpWsn" id="6$7vuu2ujxR" role="3cpWs9">
-            <property role="TrG5h" value="res" />
-            <node concept="3uibUv" id="6$7vuu2ujxH" role="1tU5fm">
-              <ref role="3uigEE" to="hano:7Oc59RSEjdb" resolve="Result" />
-            </node>
-            <node concept="2OqwBi" id="6$7vuu2ujxS" role="33vP2m">
-              <node concept="37vLTw" id="6$7vuu2ujxT" role="2Oq$k0">
-                <ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
-              </node>
-              <node concept="liA8E" id="6$7vuu2ujxU" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:3GlpCDSxTKz" resolve="applyTemplates" />
-                <node concept="2OqwBi" id="6$7vuu2ujxV" role="37wK5m">
-                  <node concept="3xONca" id="6$7vuu2ujxW" role="2Oq$k0">
-                    <ref role="3xOPvv" node="6$7vuu2ubYm" resolve="cls" />
+        <node concept="1QHqEK" id="4BHjwwGUr4u" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGUr4w" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGUr4y" role="1bW5cS">
+              <node concept="3cpWs8" id="4BHjwwGUyPL" role="3cqZAp">
+                <node concept="3cpWsn" id="4BHjwwGUyPM" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="4BHjwwGUySV" role="1tU5fm" />
+                  <node concept="2OqwBi" id="4BHjwwGUyPN" role="33vP2m">
+                    <node concept="1N_AGu" id="4BHjwwGUyPO" role="2Oq$k0">
+                      <ref role="1N_AGt" to="tlxd:6$7vuu2uamo" resolve="Foo" />
+                    </node>
+                    <node concept="liA8E" id="4BHjwwGUyPP" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                      <node concept="2OqwBi" id="4BHjwwGUyPQ" role="37wK5m">
+                        <node concept="1jxXqW" id="4BHjwwGUyPR" role="2Oq$k0" />
+                        <node concept="liA8E" id="4BHjwwGUyPS" role="2OqNvi">
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
-                  <node concept="2Rxl7S" id="6$7vuu2ujxX" role="2OqNvi" />
-                </node>
-                <node concept="Xl_RD" id="6$7vuu2ujxY" role="37wK5m">
-                  <property role="Xl_RC" value="test" />
                 </node>
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3vwNmj" id="6$7vuu2usrD" role="3cqZAp">
-          <node concept="2OqwBi" id="6$7vuu2usrE" role="3vwVQn">
-            <node concept="37vLTw" id="6$7vuu2usrF" role="2Oq$k0">
-              <ref role="3cqZAo" node="6$7vuu2ujxR" resolve="res" />
-            </node>
-            <node concept="liA8E" id="6$7vuu2usrG" role="2OqNvi">
-              <ref role="37wK5l" to="hano:7Oc59RS_hsj" resolve="isSuccessful" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6$7vuu2usrC" role="3cqZAp" />
-        <node concept="3cpWs8" id="6QH_LDtbV5P" role="3cqZAp">
-          <node concept="3cpWsn" id="6QH_LDtbV5Q" role="3cpWs9">
-            <property role="TrG5h" value="evaluator" />
-            <node concept="3uibUv" id="6QH_LDtbV5R" role="1tU5fm">
-              <ref role="3uigEE" to="hano:41ox5Vnk76a" resolve="ProgramEvaluator" />
-            </node>
-            <node concept="2ShNRf" id="6QH_LDtbV5S" role="33vP2m">
-              <node concept="1pGfFk" id="6QH_LDtbV5T" role="2ShVmc">
-                <ref role="37wK5l" to="hano:HV6urVFjOl" resolve="ProgramEvaluator" />
-                <node concept="2ShNRf" id="6QH_LDtbV5U" role="37wK5m">
-                  <node concept="1pGfFk" id="6QH_LDtbV5V" role="2ShVmc">
-                    <ref role="37wK5l" to="cxk7:3F6vMxqo1c$" resolve="DefaultSessionSolver" />
-                    <node concept="2OqwBi" id="6QH_LDtbV5W" role="37wK5m">
-                      <node concept="37vLTw" id="6QH_LDtbV5X" role="2Oq$k0">
+              <node concept="3cpWs8" id="14$_tTxzuR6" role="3cqZAp">
+                <node concept="3cpWsn" id="14$_tTxzuR7" role="3cpWs9">
+                  <property role="TrG5h" value="modelRepo" />
+                  <node concept="3uibUv" id="14$_tTxzuQX" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
+                  <node concept="2OqwBi" id="14$_tTxzuR8" role="33vP2m">
+                    <node concept="2JrnkZ" id="14$_tTxzuR9" role="2Oq$k0">
+                      <node concept="2OqwBi" id="14$_tTxzuRa" role="2JrQYb">
+                        <node concept="37vLTw" id="14$_tTxzuRb" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4BHjwwGUyPM" resolve="cls" />
+                        </node>
+                        <node concept="I4A8Y" id="14$_tTxzuRc" role="2OqNvi" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="14$_tTxzuRd" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="14$_tTxzzvw" role="3cqZAp" />
+              <node concept="3cpWs8" id="6$7vuu2ugt2" role="3cqZAp">
+                <node concept="3cpWsn" id="6$7vuu2ugt3" role="3cpWs9">
+                  <property role="TrG5h" value="tplApp" />
+                  <node concept="3uibUv" id="6$7vuu2ugsZ" role="1tU5fm">
+                    <ref role="3uigEE" to="tj24:3GlpCDSxTG7" resolve="TypecheckingTemplates" />
+                  </node>
+                  <node concept="2ShNRf" id="6$7vuu2ugt4" role="33vP2m">
+                    <node concept="1pGfFk" id="6$7vuu2ugt5" role="2ShVmc">
+                      <ref role="37wK5l" to="tj24:3GlpCDSychS" resolve="TypecheckingTemplates" />
+                      <node concept="37vLTw" id="14$_tTxzmFL" role="37wK5m">
+                        <ref role="3cqZAo" node="14$_tTxzuR7" resolve="modelRepo" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="6$7vuu2ujxQ" role="3cqZAp">
+                <node concept="3cpWsn" id="6$7vuu2ujxR" role="3cpWs9">
+                  <property role="TrG5h" value="res" />
+                  <node concept="3uibUv" id="6$7vuu2ujxH" role="1tU5fm">
+                    <ref role="3uigEE" to="hano:7Oc59RSEjdb" resolve="Result" />
+                  </node>
+                  <node concept="2OqwBi" id="6$7vuu2ujxS" role="33vP2m">
+                    <node concept="37vLTw" id="6$7vuu2ujxT" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
+                    </node>
+                    <node concept="liA8E" id="6$7vuu2ujxU" role="2OqNvi">
+                      <ref role="37wK5l" to="tj24:3GlpCDSxTKz" resolve="applyTemplates" />
+                      <node concept="2OqwBi" id="6$7vuu2ujxV" role="37wK5m">
+                        <node concept="37vLTw" id="4BHjwwGVaCH" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4BHjwwGUyPM" resolve="cls" />
+                        </node>
+                        <node concept="2Rxl7S" id="6$7vuu2ujxX" role="2OqNvi" />
+                      </node>
+                      <node concept="Xl_RD" id="6$7vuu2ujxY" role="37wK5m">
+                        <property role="Xl_RC" value="test" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3vwNmj" id="6$7vuu2usrD" role="3cqZAp">
+                <node concept="2OqwBi" id="6$7vuu2usrE" role="3vwVQn">
+                  <node concept="37vLTw" id="6$7vuu2usrF" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6$7vuu2ujxR" resolve="res" />
+                  </node>
+                  <node concept="liA8E" id="6$7vuu2usrG" role="2OqNvi">
+                    <ref role="37wK5l" to="hano:7Oc59RS_hsj" resolve="isSuccessful" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="4BHjwwGU$9d" role="3cqZAp" />
+              <node concept="3cpWs8" id="6QH_LDtbV5P" role="3cqZAp">
+                <node concept="3cpWsn" id="6QH_LDtbV5Q" role="3cpWs9">
+                  <property role="TrG5h" value="evaluator" />
+                  <node concept="3uibUv" id="6QH_LDtbV5R" role="1tU5fm">
+                    <ref role="3uigEE" to="hano:41ox5Vnk76a" resolve="ProgramEvaluator" />
+                  </node>
+                  <node concept="2ShNRf" id="6QH_LDtbV5S" role="33vP2m">
+                    <node concept="1pGfFk" id="6QH_LDtbV5T" role="2ShVmc">
+                      <ref role="37wK5l" to="hano:HV6urVFjOl" resolve="ProgramEvaluator" />
+                      <node concept="2ShNRf" id="6QH_LDtbV5U" role="37wK5m">
+                        <node concept="1pGfFk" id="6QH_LDtbV5V" role="2ShVmc">
+                          <ref role="37wK5l" to="cxk7:3F6vMxqo1c$" resolve="DefaultSessionSolver" />
+                          <node concept="2OqwBi" id="6QH_LDtbV5W" role="37wK5m">
+                            <node concept="37vLTw" id="6QH_LDtbV5X" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
+                            </node>
+                            <node concept="liA8E" id="6QH_LDtbV5Y" role="2OqNvi">
+                              <ref role="37wK5l" to="tj24:3GlpCDSyRnn" resolve="getExpressionSolver" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="3F6vMxqjuT0" role="3cqZAp">
+                <node concept="2OqwBi" id="3F6vMxqjuT1" role="3clFbG">
+                  <node concept="10M0yZ" id="5cDlfXt5oVE" role="2Oq$k0">
+                    <ref role="3cqZAo" to="zx3l:~EvaluationSessionImpl.Companion" resolve="Companion" />
+                    <ref role="1PxDUh" to="zx3l:~EvaluationSessionImpl" resolve="EvaluationSessionImpl" />
+                  </node>
+                  <node concept="liA8E" id="3F6vMxqjuT3" role="2OqNvi">
+                    <ref role="37wK5l" to="zx3l:~EvaluationSessionImpl$Companion.init():void" resolve="init" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="4BHjwwGUJFm" role="3cqZAp" />
+              <node concept="2GUZhq" id="6$7vuu2uPZO" role="3cqZAp">
+                <node concept="3clFbS" id="6$7vuu2uPZQ" role="2GV8ay">
+                  <node concept="3cpWs8" id="6QH_LDtbV6a" role="3cqZAp">
+                    <node concept="3cpWsn" id="6QH_LDtbV6b" role="3cpWs9">
+                      <property role="TrG5h" value="res2" />
+                      <node concept="3uibUv" id="6QH_LDtbV6c" role="1tU5fm">
+                        <ref role="3uigEE" to="hano:7Oc59RSEjdb" resolve="Result" />
+                      </node>
+                      <node concept="2YIFZM" id="1CcQBrQs0eX" role="33vP2m">
+                        <ref role="37wK5l" to="hano:7Oc59RSEjeq" resolve="OK" />
+                        <ref role="1Pybhc" to="hano:7Oc59RSEjdb" resolve="Result" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1DcWWT" id="1CcQBrQrTBa" role="3cqZAp">
+                    <node concept="3clFbS" id="1CcQBrQrTBd" role="2LFqv$">
+                      <node concept="3cpWs8" id="6QH_LDtbV5I" role="3cqZAp">
+                        <node concept="3cpWsn" id="6QH_LDtbV5J" role="3cpWs9">
+                          <property role="TrG5h" value="config" />
+                          <node concept="3uibUv" id="6QH_LDtbV5K" role="1tU5fm">
+                            <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+                          </node>
+                          <node concept="2YIFZM" id="6QH_LDtbV5L" role="33vP2m">
+                            <ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="newSession" />
+                            <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                            <node concept="37vLTw" id="1CcQBrQrWi4" role="37wK5m">
+                              <ref role="3cqZAo" node="1CcQBrQrTBe" resolve="program" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="1CcQBrQrYPT" role="3cqZAp">
+                        <node concept="37vLTI" id="1CcQBrQrYPV" role="3clFbG">
+                          <node concept="37vLTw" id="1CcQBrQrYPZ" role="37vLTJ">
+                            <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
+                          </node>
+                          <node concept="2OqwBi" id="1CcQBrQs3mU" role="37vLTx">
+                            <node concept="37vLTw" id="1CcQBrQs3e7" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
+                            </node>
+                            <node concept="liA8E" id="1CcQBrQs3tX" role="2OqNvi">
+                              <ref role="37wK5l" to="hano:7nkyKX7v7xb" resolve="and" />
+                              <node concept="2OqwBi" id="6QH_LDtbV6d" role="37wK5m">
+                                <node concept="37vLTw" id="6QH_LDtbV6e" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="6QH_LDtbV5Q" resolve="evaluator" />
+                                </node>
+                                <node concept="liA8E" id="6QH_LDtbV6f" role="2OqNvi">
+                                  <ref role="37wK5l" to="hano:HV6urVFrQ9" resolve="eval" />
+                                  <node concept="37vLTw" id="6QH_LDtbV6g" role="37wK5m">
+                                    <ref role="3cqZAo" node="6QH_LDtbV5J" resolve="config" />
+                                  </node>
+                                  <node concept="10M0yZ" id="6QH_LDtbV6h" role="37wK5m">
+                                    <ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                                    <ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3cpWsn" id="1CcQBrQrTBe" role="1Duv9x">
+                      <property role="TrG5h" value="program" />
+                      <node concept="3uibUv" id="1CcQBrQrTBi" role="1tU5fm">
+                        <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="1CcQBrQrTBj" role="1DdaDG">
+                      <node concept="37vLTw" id="1CcQBrQrTBk" role="2Oq$k0">
                         <ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
                       </node>
-                      <node concept="liA8E" id="6QH_LDtbV5Y" role="2OqNvi">
-                        <ref role="37wK5l" to="tj24:3GlpCDSyRnn" resolve="getExpressionSolver" />
+                      <node concept="liA8E" id="1CcQBrQrTBl" role="2OqNvi">
+                        <ref role="37wK5l" to="tj24:3GlpCDSyO$P" resolve="getPrograms" />
                       </node>
                     </node>
                   </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2GUZhq" id="6$7vuu2uPZO" role="3cqZAp">
-          <node concept="3clFbS" id="6$7vuu2uPZQ" role="2GV8ay">
-            <node concept="3clFbF" id="3F6vMxqjuT0" role="3cqZAp">
-              <node concept="2OqwBi" id="3F6vMxqjuT1" role="3clFbG">
-                <node concept="10M0yZ" id="5cDlfXt5oVE" role="2Oq$k0">
-                  <ref role="3cqZAo" to="zx3l:~EvaluationSessionImpl.Companion" resolve="Companion" />
-                  <ref role="1PxDUh" to="zx3l:~EvaluationSessionImpl" resolve="EvaluationSessionImpl" />
-                </node>
-                <node concept="liA8E" id="3F6vMxqjuT3" role="2OqNvi">
-                  <ref role="37wK5l" to="zx3l:~EvaluationSessionImpl$Companion.init():void" resolve="init" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="6$7vuu2uVEy" role="3cqZAp" />
-            <node concept="3cpWs8" id="6QH_LDtbV6a" role="3cqZAp">
-              <node concept="3cpWsn" id="6QH_LDtbV6b" role="3cpWs9">
-                <property role="TrG5h" value="res2" />
-                <node concept="3uibUv" id="6QH_LDtbV6c" role="1tU5fm">
-                  <ref role="3uigEE" to="hano:7Oc59RSEjdb" resolve="Result" />
-                </node>
-                <node concept="2YIFZM" id="1CcQBrQs0eX" role="33vP2m">
-                  <ref role="37wK5l" to="hano:7Oc59RSEjeq" resolve="OK" />
-                  <ref role="1Pybhc" to="hano:7Oc59RSEjdb" resolve="Result" />
-                </node>
-              </node>
-            </node>
-            <node concept="1DcWWT" id="1CcQBrQrTBa" role="3cqZAp">
-              <node concept="3clFbS" id="1CcQBrQrTBd" role="2LFqv$">
-                <node concept="3cpWs8" id="6QH_LDtbV5I" role="3cqZAp">
-                  <node concept="3cpWsn" id="6QH_LDtbV5J" role="3cpWs9">
-                    <property role="TrG5h" value="config" />
-                    <node concept="3uibUv" id="6QH_LDtbV5K" role="1tU5fm">
-                      <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
-                    </node>
-                    <node concept="2YIFZM" id="6QH_LDtbV5L" role="33vP2m">
-                      <ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="newSession" />
-                      <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                      <node concept="37vLTw" id="1CcQBrQrWi4" role="37wK5m">
-                        <ref role="3cqZAo" node="1CcQBrQrTBe" resolve="program" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="1CcQBrQrYPT" role="3cqZAp">
-                  <node concept="37vLTI" id="1CcQBrQrYPV" role="3clFbG">
-                    <node concept="37vLTw" id="1CcQBrQrYPZ" role="37vLTJ">
-                      <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
-                    </node>
-                    <node concept="2OqwBi" id="1CcQBrQs3mU" role="37vLTx">
-                      <node concept="37vLTw" id="1CcQBrQs3e7" role="2Oq$k0">
+                  <node concept="3vwNmj" id="6$7vuu2uk9h" role="3cqZAp">
+                    <node concept="2OqwBi" id="6$7vuu2uktV" role="3vwVQn">
+                      <node concept="37vLTw" id="6$7vuu2ut7B" role="2Oq$k0">
                         <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
                       </node>
-                      <node concept="liA8E" id="1CcQBrQs3tX" role="2OqNvi">
-                        <ref role="37wK5l" to="hano:7nkyKX7v7xb" resolve="and" />
-                        <node concept="2OqwBi" id="6QH_LDtbV6d" role="37wK5m">
-                          <node concept="37vLTw" id="6QH_LDtbV6e" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6QH_LDtbV5Q" resolve="evaluator" />
-                          </node>
-                          <node concept="liA8E" id="6QH_LDtbV6f" role="2OqNvi">
-                            <ref role="37wK5l" to="hano:HV6urVFrQ9" resolve="eval" />
-                            <node concept="37vLTw" id="6QH_LDtbV6g" role="37wK5m">
-                              <ref role="3cqZAo" node="6QH_LDtbV5J" resolve="config" />
+                      <node concept="liA8E" id="6$7vuu2ukRI" role="2OqNvi">
+                        <ref role="37wK5l" to="hano:7Oc59RS_hsj" resolve="isSuccessful" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="4BHjwwGUGNB" role="3cqZAp" />
+                  <node concept="3cpWs8" id="1CcQBrQng1x" role="3cqZAp">
+                    <node concept="3cpWsn" id="1CcQBrQng1y" role="3cpWs9">
+                      <property role="TrG5h" value="types" />
+                      <node concept="3uibUv" id="1CcQBrQng1v" role="1tU5fm">
+                        <ref role="3uigEE" to="tj24:6HT7BWBSFOV" resolve="TypeCollector" />
+                      </node>
+                      <node concept="2ShNRf" id="1CcQBrQng1z" role="33vP2m">
+                        <node concept="1pGfFk" id="1CcQBrQng1$" role="2ShVmc">
+                          <ref role="37wK5l" to="tj24:1CcQBrQmOiH" resolve="TypeCollector" />
+                          <node concept="2OqwBi" id="1CcQBrQskR9" role="37wK5m">
+                            <node concept="37vLTw" id="1CcQBrQskRa" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6QH_LDtbV5Q" resolve="evaluator" />
                             </node>
-                            <node concept="10M0yZ" id="6QH_LDtbV6h" role="37wK5m">
-                              <ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                              <ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
+                            <node concept="liA8E" id="1CcQBrQskRb" role="2OqNvi">
+                              <ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                </node>
-              </node>
-              <node concept="3cpWsn" id="1CcQBrQrTBe" role="1Duv9x">
-                <property role="TrG5h" value="program" />
-                <node concept="3uibUv" id="1CcQBrQrTBi" role="1tU5fm">
-                  <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="1CcQBrQrTBj" role="1DdaDG">
-                <node concept="37vLTw" id="1CcQBrQrTBk" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
-                </node>
-                <node concept="liA8E" id="1CcQBrQrTBl" role="2OqNvi">
-                  <ref role="37wK5l" to="tj24:3GlpCDSyO$P" resolve="getPrograms" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="1CcQBrQrSZj" role="3cqZAp" />
-            <node concept="3vwNmj" id="6$7vuu2uk9h" role="3cqZAp">
-              <node concept="2OqwBi" id="6$7vuu2uktV" role="3vwVQn">
-                <node concept="37vLTw" id="6$7vuu2ut7B" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
-                </node>
-                <node concept="liA8E" id="6$7vuu2ukRI" role="2OqNvi">
-                  <ref role="37wK5l" to="hano:7Oc59RS_hsj" resolve="isSuccessful" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="6$7vuu2uPZP" role="3cqZAp" />
-            <node concept="3cpWs8" id="1CcQBrQng1x" role="3cqZAp">
-              <node concept="3cpWsn" id="1CcQBrQng1y" role="3cpWs9">
-                <property role="TrG5h" value="types" />
-                <node concept="3uibUv" id="1CcQBrQng1v" role="1tU5fm">
-                  <ref role="3uigEE" to="tj24:6HT7BWBSFOV" resolve="TypeCollector" />
-                </node>
-                <node concept="2ShNRf" id="1CcQBrQng1z" role="33vP2m">
-                  <node concept="1pGfFk" id="1CcQBrQng1$" role="2ShVmc">
-                    <ref role="37wK5l" to="tj24:1CcQBrQmOiH" resolve="TypeCollector" />
-                    <node concept="2OqwBi" id="1CcQBrQskR9" role="37wK5m">
-                      <node concept="37vLTw" id="1CcQBrQskRa" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6QH_LDtbV5Q" resolve="evaluator" />
+                  <node concept="3clFbH" id="14$_tTxxHOq" role="3cqZAp" />
+                  <node concept="3cpWs8" id="14$_tTxxmeg" role="3cqZAp">
+                    <node concept="3cpWsn" id="14$_tTxxmeh" role="3cpWs9">
+                      <property role="TrG5h" value="varo" />
+                      <node concept="3Tqbb2" id="14$_tTxxmed" role="1tU5fm">
+                        <ref role="ehGHo" to="tpee:fzcpWvJ" resolve="LocalVariableDeclaration" />
                       </node>
-                      <node concept="liA8E" id="1CcQBrQskRb" role="2OqNvi">
-                        <ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3vwNmj" id="6$7vuu2vV32" role="3cqZAp">
-              <node concept="2YFouu" id="6$7vuu2vWLe" role="3vwVQn">
-                <node concept="2c44tf" id="6$7vuu2vYs4" role="3uHU7B">
-                  <node concept="3uibUv" id="6$7vuu2vZw6" role="2c44tc">
-                    <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="1CcQBrQocIM" role="3uHU7w">
-                  <node concept="37vLTw" id="1CcQBrQocCe" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1CcQBrQng1y" resolve="types" />
-                  </node>
-                  <node concept="liA8E" id="1CcQBrQoexC" role="2OqNvi">
-                    <ref role="37wK5l" to="tj24:1CcQBrQmO_H" resolve="typeNode" />
-                    <node concept="2OqwBi" id="6$7vuu2w3U0" role="37wK5m">
-                      <node concept="2JrnkZ" id="6$7vuu2w3Lh" role="2Oq$k0">
-                        <node concept="3xONca" id="6$7vuu2w20p" role="2JrQYb">
-                          <ref role="3xOPvv" node="6$7vuu2wqbE" resolve="expr" />
+                      <node concept="3fl2lp" id="14$_tTxxmei" role="33vP2m">
+                        <ref role="3fl3PK" to="tlxd:14$_tTxxemt" resolve="o" />
+                        <node concept="3fl2lp" id="14$_tTxxmej" role="3fl3PI">
+                          <ref role="3fl3PK" to="tlxd:6$7vuu2uaoc" resolve="bar" />
+                          <node concept="3B5_sB" id="14$_tTxxmek" role="3fl3PI">
+                            <ref role="3B5MYn" to="tlxd:6$7vuu2uamo" resolve="Foo" />
+                          </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="6$7vuu2w5d4" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                    </node>
+                  </node>
+                  <node concept="3vwNmj" id="14$_tTxxtZU" role="3cqZAp">
+                    <node concept="2YFouu" id="14$_tTxxtZV" role="3vwVQn">
+                      <node concept="2c44tf" id="14$_tTxxtZW" role="3uHU7B">
+                        <node concept="3uibUv" id="14$_tTxxtZX" role="2c44tc">
+                          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="14$_tTxxtZY" role="3uHU7w">
+                        <node concept="37vLTw" id="14$_tTxxtZZ" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1CcQBrQng1y" resolve="types" />
+                        </node>
+                        <node concept="liA8E" id="14$_tTxxu00" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:1CcQBrQmO_H" resolve="typeNode" />
+                          <node concept="2OqwBi" id="14$_tTxxu01" role="37wK5m">
+                            <node concept="2JrnkZ" id="14$_tTxxu02" role="2Oq$k0">
+                              <node concept="2OqwBi" id="14$_tTxxDge" role="2JrQYb">
+                                <node concept="37vLTw" id="14$_tTxxC04" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="14$_tTxxmeh" resolve="varo" />
+                                </node>
+                                <node concept="3TrEf2" id="14$_tTxxG5i" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="14$_tTxxu0e" role="2OqNvi">
+                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="1CcQBrQslUW" role="3cqZAp" />
+                </node>
+                <node concept="3clFbS" id="6$7vuu2uPZR" role="2GVbov">
+                  <node concept="3clFbF" id="6$7vuu2uR6h" role="3cqZAp">
+                    <node concept="2OqwBi" id="6$7vuu2uR6i" role="3clFbG">
+                      <node concept="10M0yZ" id="5cDlfXt5oWB" role="2Oq$k0">
+                        <ref role="3cqZAo" to="zx3l:~EvaluationSessionImpl.Companion" resolve="Companion" />
+                        <ref role="1PxDUh" to="zx3l:~EvaluationSessionImpl" resolve="EvaluationSessionImpl" />
+                      </node>
+                      <node concept="liA8E" id="6$7vuu2uR6k" role="2OqNvi">
+                        <ref role="37wK5l" to="zx3l:~EvaluationSessionImpl$Companion.deinit():void" resolve="deinit" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="1CcQBrQslUW" role="3cqZAp" />
           </node>
-          <node concept="3clFbS" id="6$7vuu2uPZR" role="2GVbov">
-            <node concept="3clFbF" id="6$7vuu2uR6h" role="3cqZAp">
-              <node concept="2OqwBi" id="6$7vuu2uR6i" role="3clFbG">
-                <node concept="10M0yZ" id="5cDlfXt5oWB" role="2Oq$k0">
-                  <ref role="3cqZAo" to="zx3l:~EvaluationSessionImpl.Companion" resolve="Companion" />
-                  <ref role="1PxDUh" to="zx3l:~EvaluationSessionImpl" resolve="EvaluationSessionImpl" />
-                </node>
-                <node concept="liA8E" id="6$7vuu2uR6k" role="2OqNvi">
-                  <ref role="37wK5l" to="zx3l:~EvaluationSessionImpl$Companion.deinit():void" resolve="deinit" />
-                </node>
-              </node>
+          <node concept="2OqwBi" id="4BHjwwGV8Ht" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGV81_" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGVaBV" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="6$7vuu2vebj" role="3cqZAp" />
       </node>
     </node>
     <node concept="1LZb2c" id="6$7vuu2wFYI" role="1SL9yI">
       <property role="TrG5h" value="typecheckingFacade" />
       <node concept="3cqZAl" id="6$7vuu2wFYJ" role="3clF45" />
       <node concept="3clFbS" id="6$7vuu2wFYN" role="3clF47">
-        <node concept="3cpWs8" id="6$7vuu2wKkc" role="3cqZAp">
-          <node concept="3cpWsn" id="6$7vuu2wKkd" role="3cpWs9">
-            <property role="TrG5h" value="unit" />
-            <node concept="H_c77" id="6$7vuu2wKke" role="1tU5fm" />
-            <node concept="2OqwBi" id="6$7vuu2wKkf" role="33vP2m">
-              <node concept="3xONca" id="6$7vuu2wKkg" role="2Oq$k0">
-                <ref role="3xOPvv" node="6$7vuu2ubYm" resolve="cls" />
-              </node>
-              <node concept="I4A8Y" id="6$7vuu2wKkh" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6$7vuu2wKki" role="3cqZAp">
-          <node concept="3cpWsn" id="6$7vuu2wKkj" role="3cpWs9">
-            <property role="TrG5h" value="repository" />
-            <node concept="3uibUv" id="6$7vuu2wKkk" role="1tU5fm">
-              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-            </node>
-            <node concept="2OqwBi" id="6$7vuu2wKkl" role="33vP2m">
-              <node concept="2JrnkZ" id="6$7vuu2wKkm" role="2Oq$k0">
-                <node concept="37vLTw" id="6$7vuu2wKkn" role="2JrQYb">
-                  <ref role="3cqZAo" node="6$7vuu2wKkd" resolve="unit" />
-                </node>
-              </node>
-              <node concept="liA8E" id="6$7vuu2wKko" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6$7vuu2wJjQ" role="3cqZAp" />
-        <node concept="2GUZhq" id="6$7vuu2xvuu" role="3cqZAp">
-          <node concept="3clFbS" id="6$7vuu2xvuw" role="2GV8ay">
-            <node concept="3clFbF" id="6$7vuu2xwxg" role="3cqZAp">
-              <node concept="2YIFZM" id="6$7vuu2xCvD" role="3clFbG">
-                <ref role="37wK5l" to="umch:2zU3cYqyaC9" resolve="init" />
-                <ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
-                <node concept="37vLTw" id="6$7vuu2xDwR" role="37wK5m">
-                  <ref role="3cqZAo" node="6$7vuu2wKkj" resolve="repository" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="6$7vuu2xEii" role="3cqZAp" />
-            <node concept="3cpWs8" id="6$7vuu2wZdq" role="3cqZAp">
-              <node concept="3cpWsn" id="6$7vuu2wZdr" role="3cpWs9">
-                <property role="TrG5h" value="typeOfExpr" />
-                <node concept="3Tqbb2" id="6$7vuu2wZdp" role="1tU5fm" />
-                <node concept="2OqwBi" id="6$7vuu2wZds" role="33vP2m">
-                  <node concept="2YIFZM" id="55Q$YFtvvQc" role="2Oq$k0">
-                    <ref role="37wK5l" to="tj24:7kaxm0sEy4A" resolve="getInstance" />
-                    <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingFacade" />
-                  </node>
-                  <node concept="liA8E" id="6$7vuu2wZdu" role="2OqNvi">
-                    <ref role="37wK5l" to="tj24:7kaxm0sEBHs" resolve="typeOf" />
-                    <node concept="3xONca" id="6$7vuu2wZdv" role="37wK5m">
-                      <ref role="3xOPvv" node="6$7vuu2wqbE" resolve="expr" />
+        <node concept="1QHqEK" id="14$_tTxxKuC" role="3cqZAp">
+          <node concept="1QHqEC" id="14$_tTxxKuE" role="1QHqEI">
+            <node concept="3clFbS" id="14$_tTxxKuG" role="1bW5cS">
+              <node concept="3cpWs8" id="14$_tTxxL$m" role="3cqZAp">
+                <node concept="3cpWsn" id="14$_tTxxL$n" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="14$_tTxxL$o" role="1tU5fm" />
+                  <node concept="2OqwBi" id="14$_tTxxL$p" role="33vP2m">
+                    <node concept="1N_AGu" id="14$_tTxxL$q" role="2Oq$k0">
+                      <ref role="1N_AGt" to="tlxd:6$7vuu2uamo" resolve="Foo" />
+                    </node>
+                    <node concept="liA8E" id="14$_tTxxL$r" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                      <node concept="2OqwBi" id="14$_tTxxL$s" role="37wK5m">
+                        <node concept="1jxXqW" id="14$_tTxxL$t" role="2Oq$k0" />
+                        <node concept="liA8E" id="14$_tTxxL$u" role="2OqNvi">
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3vwNmj" id="6$7vuu2wZgV" role="3cqZAp">
-              <node concept="2YFouu" id="6$7vuu2wZgW" role="3vwVQn">
-                <node concept="2c44tf" id="6$7vuu2wZh3" role="3uHU7B">
-                  <node concept="3uibUv" id="6$7vuu2wZh4" role="2c44tc">
-                    <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+              <node concept="3cpWs8" id="14$_tTxzzxG" role="3cqZAp">
+                <node concept="3cpWsn" id="14$_tTxzzxH" role="3cpWs9">
+                  <property role="TrG5h" value="modelRepo" />
+                  <node concept="3uibUv" id="14$_tTxzzxI" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
                   </node>
-                </node>
-                <node concept="37vLTw" id="6$7vuu2x1Qn" role="3uHU7w">
-                  <ref role="3cqZAo" node="6$7vuu2wZdr" resolve="typeOfExpr" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="6$7vuu2xGtF" role="3cqZAp" />
-            <node concept="3cpWs8" id="6$7vuu2xGoA" role="3cqZAp">
-              <node concept="3cpWsn" id="6$7vuu2xGoB" role="3cpWs9">
-                <property role="TrG5h" value="typeOfExpr2" />
-                <node concept="3Tqbb2" id="6$7vuu2xGoC" role="1tU5fm" />
-                <node concept="2OqwBi" id="6$7vuu2xGoD" role="33vP2m">
-                  <node concept="2YIFZM" id="55Q$YFtvvQd" role="2Oq$k0">
-                    <ref role="37wK5l" to="tj24:7kaxm0sEy4A" resolve="getInstance" />
-                    <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingFacade" />
-                  </node>
-                  <node concept="liA8E" id="6$7vuu2xGoF" role="2OqNvi">
-                    <ref role="37wK5l" to="tj24:7kaxm0sEBHs" resolve="typeOf" />
-                    <node concept="3xONca" id="6$7vuu2xGoG" role="37wK5m">
-                      <ref role="3xOPvv" node="6$7vuu2wqbE" resolve="expr" />
+                  <node concept="2OqwBi" id="14$_tTxzzxJ" role="33vP2m">
+                    <node concept="2JrnkZ" id="14$_tTxzzxK" role="2Oq$k0">
+                      <node concept="2OqwBi" id="14$_tTxzzxL" role="2JrQYb">
+                        <node concept="37vLTw" id="14$_tTxzzxM" role="2Oq$k0">
+                          <ref role="3cqZAo" node="14$_tTxxL$n" resolve="cls" />
+                        </node>
+                        <node concept="I4A8Y" id="14$_tTxzzxN" role="2OqNvi" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="14$_tTxzzxO" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3vMLTj" id="6$7vuu2xH$g" role="3cqZAp">
-              <node concept="37vLTw" id="6$7vuu2xIBQ" role="3tpDZB">
-                <ref role="3cqZAo" node="6$7vuu2wZdr" resolve="typeOfExpr" />
-              </node>
-              <node concept="37vLTw" id="6$7vuu2xJDk" role="3tpDZA">
-                <ref role="3cqZAo" node="6$7vuu2xGoB" resolve="typeOfExpr2" />
-              </node>
-            </node>
-            <node concept="3clFbH" id="6$7vuu2xDxg" role="3cqZAp" />
-          </node>
-          <node concept="3clFbS" id="6$7vuu2xvux" role="2GVbov">
-            <node concept="3clFbF" id="6$7vuu2xDxB" role="3cqZAp">
-              <node concept="2YIFZM" id="6$7vuu2xD$t" role="3clFbG">
-                <ref role="37wK5l" to="umch:2zU3cYqyg2V" resolve="dispose" />
-                <ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
-                <node concept="37vLTw" id="6$7vuu2xD$u" role="37wK5m">
-                  <ref role="3cqZAo" node="6$7vuu2wKkj" resolve="repository" />
+              <node concept="3clFbH" id="14$_tTxzzxP" role="3cqZAp" />
+              <node concept="3cpWs8" id="14$_tTxxQ5h" role="3cqZAp">
+                <node concept="3cpWsn" id="14$_tTxxQ5i" role="3cpWs9">
+                  <property role="TrG5h" value="varo" />
+                  <node concept="3Tqbb2" id="14$_tTxxQ5j" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:fzcpWvJ" resolve="LocalVariableDeclaration" />
+                  </node>
+                  <node concept="3fl2lp" id="14$_tTxxQ5k" role="33vP2m">
+                    <ref role="3fl3PK" to="tlxd:14$_tTxxemt" resolve="o" />
+                    <node concept="3fl2lp" id="14$_tTxxQ5l" role="3fl3PI">
+                      <ref role="3fl3PK" to="tlxd:6$7vuu2uaoc" resolve="bar" />
+                      <node concept="3B5_sB" id="14$_tTxxQ5m" role="3fl3PI">
+                        <ref role="3B5MYn" to="tlxd:6$7vuu2uamo" resolve="Foo" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
+              <node concept="2GUZhq" id="6$7vuu2xvuu" role="3cqZAp">
+                <node concept="3clFbS" id="6$7vuu2xvuw" role="2GV8ay">
+                  <node concept="3clFbH" id="6$7vuu2xEii" role="3cqZAp" />
+                  <node concept="3cpWs8" id="6$7vuu2wZdq" role="3cqZAp">
+                    <node concept="3cpWsn" id="6$7vuu2wZdr" role="3cpWs9">
+                      <property role="TrG5h" value="typeOfExpr" />
+                      <node concept="3Tqbb2" id="6$7vuu2wZdp" role="1tU5fm" />
+                      <node concept="2OqwBi" id="6$7vuu2wZds" role="33vP2m">
+                        <node concept="2YIFZM" id="55Q$YFtvvQc" role="2Oq$k0">
+                          <ref role="37wK5l" to="tj24:7kaxm0sEy4A" resolve="getInstance" />
+                          <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingFacade" />
+                        </node>
+                        <node concept="liA8E" id="6$7vuu2wZdu" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:7kaxm0sEBHs" resolve="typeOf" />
+                          <node concept="2OqwBi" id="14$_tTxxSAt" role="37wK5m">
+                            <node concept="37vLTw" id="14$_tTxxSjJ" role="2Oq$k0">
+                              <ref role="3cqZAo" node="14$_tTxxQ5i" resolve="varo" />
+                            </node>
+                            <node concept="3TrEf2" id="14$_tTxxUsB" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3vwNmj" id="6$7vuu2wZgV" role="3cqZAp">
+                    <node concept="2YFouu" id="6$7vuu2wZgW" role="3vwVQn">
+                      <node concept="2c44tf" id="6$7vuu2wZh3" role="3uHU7B">
+                        <node concept="3uibUv" id="6$7vuu2wZh4" role="2c44tc">
+                          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="6$7vuu2x1Qn" role="3uHU7w">
+                        <ref role="3cqZAo" node="6$7vuu2wZdr" resolve="typeOfExpr" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="14$_tTxxOY7" role="3cqZAp" />
+                  <node concept="3cpWs8" id="6$7vuu2xGoA" role="3cqZAp">
+                    <node concept="3cpWsn" id="6$7vuu2xGoB" role="3cpWs9">
+                      <property role="TrG5h" value="typeOfExpr2" />
+                      <node concept="3Tqbb2" id="6$7vuu2xGoC" role="1tU5fm" />
+                      <node concept="2OqwBi" id="6$7vuu2xGoD" role="33vP2m">
+                        <node concept="2YIFZM" id="55Q$YFtvvQd" role="2Oq$k0">
+                          <ref role="37wK5l" to="tj24:7kaxm0sEy4A" resolve="getInstance" />
+                          <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingFacade" />
+                        </node>
+                        <node concept="liA8E" id="6$7vuu2xGoF" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:7kaxm0sEBHs" resolve="typeOf" />
+                          <node concept="2OqwBi" id="14$_tTxxVJD" role="37wK5m">
+                            <node concept="37vLTw" id="14$_tTxxVJE" role="2Oq$k0">
+                              <ref role="3cqZAo" node="14$_tTxxQ5i" resolve="varo" />
+                            </node>
+                            <node concept="3TrEf2" id="14$_tTxxVJF" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3vMLTj" id="6$7vuu2xH$g" role="3cqZAp">
+                    <node concept="37vLTw" id="6$7vuu2xIBQ" role="3tpDZB">
+                      <ref role="3cqZAo" node="6$7vuu2wZdr" resolve="typeOfExpr" />
+                    </node>
+                    <node concept="37vLTw" id="6$7vuu2xJDk" role="3tpDZA">
+                      <ref role="3cqZAo" node="6$7vuu2xGoB" resolve="typeOfExpr2" />
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="6$7vuu2xDxg" role="3cqZAp" />
+                </node>
+                <node concept="3clFbS" id="6$7vuu2xvux" role="2GVbov">
+                  <node concept="3clFbF" id="14$_tTxAR_w" role="3cqZAp">
+                    <node concept="2YIFZM" id="14$_tTxAR_x" role="3clFbG">
+                      <ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="Typechecking" />
+                      <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="dispose" />
+                      <node concept="37vLTw" id="14$_tTxAR_y" role="37wK5m">
+                        <ref role="3cqZAo" node="14$_tTxzzxH" resolve="modelRepo" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="6$7vuu2xDxB" role="3cqZAp">
+                    <node concept="2YIFZM" id="6$7vuu2xD$t" role="3clFbG">
+                      <ref role="37wK5l" to="umch:2zU3cYqyg2V" resolve="dispose" />
+                      <ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
+                      <node concept="37vLTw" id="14$_tTxz_y9" role="37wK5m">
+                        <ref role="3cqZAo" node="14$_tTxzzxH" resolve="modelRepo" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="14$_tTxxK$x" role="3cqZAp" />
+            </node>
+          </node>
+          <node concept="2OqwBi" id="14$_tTxy4GA" role="ukAjM">
+            <node concept="1jxXqW" id="14$_tTxy3dO" role="2Oq$k0" />
+            <node concept="liA8E" id="14$_tTxy5mA" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -989,243 +1068,219 @@
       <property role="TrG5h" value="typeOf" />
       <node concept="3cqZAl" id="3u5wJtboAo" role="3clF45" />
       <node concept="3clFbS" id="3u5wJtboAs" role="3clF47">
-        <node concept="3cpWs8" id="3u5wJtbs79" role="3cqZAp">
-          <node concept="3cpWsn" id="3u5wJtbs7a" role="3cpWs9">
-            <property role="TrG5h" value="unit" />
-            <node concept="H_c77" id="3u5wJtbs7b" role="1tU5fm" />
-            <node concept="2OqwBi" id="3u5wJtbs7c" role="33vP2m">
-              <node concept="3xONca" id="3u5wJtbs7d" role="2Oq$k0">
-                <ref role="3xOPvv" node="6$7vuu2ubYm" resolve="cls" />
-              </node>
-              <node concept="I4A8Y" id="3u5wJtbs7e" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3u5wJtbs7f" role="3cqZAp">
-          <node concept="3cpWsn" id="3u5wJtbs7g" role="3cpWs9">
-            <property role="TrG5h" value="repository" />
-            <node concept="3uibUv" id="3u5wJtbs7h" role="1tU5fm">
-              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-            </node>
-            <node concept="2OqwBi" id="3u5wJtbs7i" role="33vP2m">
-              <node concept="2JrnkZ" id="3u5wJtbs7j" role="2Oq$k0">
-                <node concept="37vLTw" id="3u5wJtbs7k" role="2JrQYb">
-                  <ref role="3cqZAo" node="3u5wJtbs7a" resolve="unit" />
-                </node>
-              </node>
-              <node concept="liA8E" id="3u5wJtbs7l" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3u5wJtboNd" role="3cqZAp" />
-        <node concept="2GUZhq" id="3u5wJtbtkT" role="3cqZAp">
-          <node concept="3clFbS" id="3u5wJtbtkV" role="2GV8ay">
-            <node concept="3clFbF" id="3u5wJtbusQ" role="3cqZAp">
-              <node concept="2YIFZM" id="3u5wJtbusR" role="3clFbG">
-                <ref role="37wK5l" to="umch:2zU3cYqyaC9" resolve="init" />
-                <ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
-                <node concept="37vLTw" id="3u5wJtbusS" role="37wK5m">
-                  <ref role="3cqZAo" node="3u5wJtbs7g" resolve="repository" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="3u5wJtbwJS" role="3cqZAp" />
-            <node concept="3cpWs8" id="3u5wJtbznu" role="3cqZAp">
-              <node concept="3cpWsn" id="3u5wJtbznv" role="3cpWs9">
-                <property role="TrG5h" value="typeOfExpr" />
-                <node concept="3Tqbb2" id="3u5wJtbznr" role="1tU5fm" />
-                <node concept="2OqwBi" id="3u5wJtbznw" role="33vP2m">
-                  <node concept="3xONca" id="3u5wJtbznx" role="2Oq$k0">
-                    <ref role="3xOPvv" node="6$7vuu2wqbE" resolve="expr" />
-                  </node>
-                  <node concept="2W$R8B" id="3u5wJtbzny" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-            <node concept="3vwNmj" id="3u5wJtb$z3" role="3cqZAp">
-              <node concept="2YFouu" id="3u5wJtb$z4" role="3vwVQn">
-                <node concept="2c44tf" id="3u5wJtb$z5" role="3uHU7B">
-                  <node concept="3uibUv" id="3u5wJtb$z6" role="2c44tc">
-                    <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+        <node concept="1QHqEK" id="14$_tTxy29I" role="3cqZAp">
+          <node concept="1QHqEC" id="14$_tTxy29K" role="1QHqEI">
+            <node concept="3clFbS" id="14$_tTxy29M" role="1bW5cS">
+              <node concept="3cpWs8" id="14$_tTxycDZ" role="3cqZAp">
+                <node concept="3cpWsn" id="14$_tTxycE0" role="3cpWs9">
+                  <property role="TrG5h" value="cls" />
+                  <node concept="3Tqbb2" id="14$_tTxycE1" role="1tU5fm" />
+                  <node concept="2OqwBi" id="14$_tTxycE2" role="33vP2m">
+                    <node concept="1N_AGu" id="14$_tTxycE3" role="2Oq$k0">
+                      <ref role="1N_AGt" to="tlxd:6$7vuu2uamo" resolve="Foo" />
+                    </node>
+                    <node concept="liA8E" id="14$_tTxycE4" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                      <node concept="2OqwBi" id="14$_tTxycE5" role="37wK5m">
+                        <node concept="1jxXqW" id="14$_tTxycE6" role="2Oq$k0" />
+                        <node concept="liA8E" id="14$_tTxycE7" role="2OqNvi">
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="37vLTw" id="3u5wJtb$z7" role="3uHU7w">
-                  <ref role="3cqZAo" node="3u5wJtbznv" resolve="typeOfExpr" />
-                </node>
               </node>
-            </node>
-            <node concept="3clFbH" id="3u5wJtb$yQ" role="3cqZAp" />
-            <node concept="3cpWs8" id="3u5wJtbATo" role="3cqZAp">
-              <node concept="3cpWsn" id="3u5wJtbATp" role="3cpWs9">
-                <property role="TrG5h" value="typeOfExpr2" />
-                <node concept="3Tqbb2" id="3u5wJtbATq" role="1tU5fm" />
-                <node concept="2OqwBi" id="3u5wJtbATr" role="33vP2m">
-                  <node concept="3xONca" id="3u5wJtbATs" role="2Oq$k0">
-                    <ref role="3xOPvv" node="6$7vuu2wqbE" resolve="expr" />
+              <node concept="3cpWs8" id="14$_tTxz_CF" role="3cqZAp">
+                <node concept="3cpWsn" id="14$_tTxz_CG" role="3cpWs9">
+                  <property role="TrG5h" value="modelRepo" />
+                  <node concept="3uibUv" id="14$_tTxz_CH" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
+                  <node concept="2OqwBi" id="14$_tTxz_CI" role="33vP2m">
+                    <node concept="2JrnkZ" id="14$_tTxz_CJ" role="2Oq$k0">
+                      <node concept="2OqwBi" id="14$_tTxz_CK" role="2JrQYb">
+                        <node concept="37vLTw" id="14$_tTxz_CL" role="2Oq$k0">
+                          <ref role="3cqZAo" node="14$_tTxycE0" resolve="cls" />
+                        </node>
+                        <node concept="I4A8Y" id="14$_tTxz_CM" role="2OqNvi" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="14$_tTxz_CN" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    </node>
                   </node>
-                  <node concept="2W$R8B" id="3u5wJtbATt" role="2OqNvi" />
                 </node>
               </node>
-            </node>
-            <node concept="3vMLTj" id="3u5wJtbAXi" role="3cqZAp">
-              <node concept="37vLTw" id="3u5wJtbAXj" role="3tpDZB">
-                <ref role="3cqZAo" node="3u5wJtbznv" resolve="typeOfExpr" />
-              </node>
-              <node concept="37vLTw" id="3u5wJtbAXk" role="3tpDZA">
-                <ref role="3cqZAo" node="3u5wJtbATp" resolve="typeOfExpr2" />
-              </node>
-            </node>
-            <node concept="3clFbH" id="3u5wJtbAWB" role="3cqZAp" />
-          </node>
-          <node concept="3clFbS" id="3u5wJtbtkW" role="2GVbov">
-            <node concept="3clFbF" id="3u5wJtbv_Y" role="3cqZAp">
-              <node concept="2YIFZM" id="3u5wJtbv_Z" role="3clFbG">
-                <ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
-                <ref role="37wK5l" to="umch:2zU3cYqyg2V" resolve="dispose" />
-                <node concept="37vLTw" id="3u5wJtbvA0" role="37wK5m">
-                  <ref role="3cqZAo" node="3u5wJtbs7g" resolve="repository" />
+              <node concept="3clFbH" id="14$_tTxz_CO" role="3cqZAp" />
+              <node concept="3cpWs8" id="14$_tTxycE8" role="3cqZAp">
+                <node concept="3cpWsn" id="14$_tTxycE9" role="3cpWs9">
+                  <property role="TrG5h" value="varo" />
+                  <node concept="3Tqbb2" id="14$_tTxycEa" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:fzcpWvJ" resolve="LocalVariableDeclaration" />
+                  </node>
+                  <node concept="3fl2lp" id="14$_tTxycEb" role="33vP2m">
+                    <ref role="3fl3PK" to="tlxd:14$_tTxxemt" resolve="o" />
+                    <node concept="3fl2lp" id="14$_tTxycEc" role="3fl3PI">
+                      <ref role="3fl3PK" to="tlxd:6$7vuu2uaoc" resolve="bar" />
+                      <node concept="3B5_sB" id="14$_tTxycEd" role="3fl3PI">
+                        <ref role="3B5MYn" to="tlxd:6$7vuu2uamo" resolve="Foo" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1qefOq" id="6$7vuu2uamm" role="1SKRRt">
-      <node concept="312cEu" id="6$7vuu2uamo" role="1qenE9">
-        <property role="TrG5h" value="Foo" />
-        <node concept="3clFb_" id="6$7vuu2uaoc" role="jymVt">
-          <property role="TrG5h" value="bar" />
-          <node concept="37vLTG" id="6$7vuu2uaoM" role="3clF46">
-            <property role="TrG5h" value="str" />
-            <node concept="3uibUv" id="6$7vuu2uapo" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-            </node>
-          </node>
-          <node concept="3cqZAl" id="6$7vuu2uaoe" role="3clF45" />
-          <node concept="3Tm1VV" id="6$7vuu2uaof" role="1B3o_S" />
-          <node concept="3clFbS" id="6$7vuu2uaog" role="3clF47">
-            <node concept="3clFbF" id="6$7vuu2uasa" role="3cqZAp">
-              <node concept="1rXfSq" id="6$7vuu2uas9" role="3clFbG">
-                <ref role="37wK5l" node="6$7vuu2uaqf" resolve="bazz" />
-                <node concept="37vLTw" id="6$7vuu2woUY" role="37wK5m">
-                  <ref role="3cqZAo" node="6$7vuu2uaoM" resolve="str" />
-                  <node concept="3xLA65" id="6$7vuu2wqbE" role="lGtFl">
-                    <property role="TrG5h" value="expr" />
+              <node concept="2GUZhq" id="3u5wJtbtkT" role="3cqZAp">
+                <node concept="3clFbS" id="3u5wJtbtkV" role="2GV8ay">
+                  <node concept="3cpWs8" id="3u5wJtbznu" role="3cqZAp">
+                    <node concept="3cpWsn" id="3u5wJtbznv" role="3cpWs9">
+                      <property role="TrG5h" value="typeOfExpr" />
+                      <node concept="3Tqbb2" id="3u5wJtbznr" role="1tU5fm" />
+                      <node concept="2OqwBi" id="3u5wJtbznw" role="33vP2m">
+                        <node concept="2OqwBi" id="14$_tTxye4f" role="2Oq$k0">
+                          <node concept="37vLTw" id="14$_tTxydMC" role="2Oq$k0">
+                            <ref role="3cqZAo" node="14$_tTxycE9" resolve="varo" />
+                          </node>
+                          <node concept="3TrEf2" id="14$_tTxyfVz" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                          </node>
+                        </node>
+                        <node concept="2W$R8B" id="3u5wJtbzny" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3vwNmj" id="3u5wJtb$z3" role="3cqZAp">
+                    <node concept="2YFouu" id="3u5wJtb$z4" role="3vwVQn">
+                      <node concept="2c44tf" id="3u5wJtb$z5" role="3uHU7B">
+                        <node concept="3uibUv" id="3u5wJtb$z6" role="2c44tc">
+                          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="3u5wJtb$z7" role="3uHU7w">
+                        <ref role="3cqZAo" node="3u5wJtbznv" resolve="typeOfExpr" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="3u5wJtb$yQ" role="3cqZAp" />
+                  <node concept="3cpWs8" id="3u5wJtbATo" role="3cqZAp">
+                    <node concept="3cpWsn" id="3u5wJtbATp" role="3cpWs9">
+                      <property role="TrG5h" value="typeOfExpr2" />
+                      <node concept="3Tqbb2" id="3u5wJtbATq" role="1tU5fm" />
+                      <node concept="2OqwBi" id="3u5wJtbATr" role="33vP2m">
+                        <node concept="2OqwBi" id="14$_tTxygln" role="2Oq$k0">
+                          <node concept="37vLTw" id="14$_tTxyg4F" role="2Oq$k0">
+                            <ref role="3cqZAo" node="14$_tTxycE9" resolve="varo" />
+                          </node>
+                          <node concept="3TrEf2" id="14$_tTxyh9l" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                          </node>
+                        </node>
+                        <node concept="2W$R8B" id="3u5wJtbATt" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3vMLTj" id="3u5wJtbAXi" role="3cqZAp">
+                    <node concept="37vLTw" id="3u5wJtbAXj" role="3tpDZB">
+                      <ref role="3cqZAo" node="3u5wJtbznv" resolve="typeOfExpr" />
+                    </node>
+                    <node concept="37vLTw" id="3u5wJtbAXk" role="3tpDZA">
+                      <ref role="3cqZAo" node="3u5wJtbATp" resolve="typeOfExpr2" />
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="3u5wJtbAWB" role="3cqZAp" />
+                </node>
+                <node concept="3clFbS" id="3u5wJtbtkW" role="2GVbov">
+                  <node concept="3clFbF" id="14$_tTxAQ_B" role="3cqZAp">
+                    <node concept="2YIFZM" id="14$_tTxAQ_C" role="3clFbG">
+                      <ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="Typechecking" />
+                      <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="dispose" />
+                      <node concept="37vLTw" id="14$_tTxAQ_D" role="37wK5m">
+                        <ref role="3cqZAo" node="14$_tTxz_CG" resolve="modelRepo" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="3u5wJtbv_Y" role="3cqZAp">
+                    <node concept="2YIFZM" id="3u5wJtbv_Z" role="3clFbG">
+                      <ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
+                      <ref role="37wK5l" to="umch:2zU3cYqyg2V" resolve="dispose" />
+                      <node concept="37vLTw" id="14$_tTxzB2G" role="37wK5m">
+                        <ref role="3cqZAo" node="14$_tTxz_CG" resolve="modelRepo" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-        </node>
-        <node concept="3clFb_" id="6$7vuu2uaqf" role="jymVt">
-          <property role="TrG5h" value="bazz" />
-          <node concept="37vLTG" id="6$7vuu2uaqV" role="3clF46">
-            <property role="TrG5h" value="obj" />
-            <node concept="3uibUv" id="6$7vuu2uarh" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          <node concept="2OqwBi" id="14$_tTxy6$j" role="ukAjM">
+            <node concept="1jxXqW" id="14$_tTxy6oh" role="2Oq$k0" />
+            <node concept="liA8E" id="14$_tTxy86J" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </node>
           </node>
-          <node concept="3cqZAl" id="6$7vuu2uaqh" role="3clF45" />
-          <node concept="3Tm1VV" id="6$7vuu2uaqi" role="1B3o_S" />
-          <node concept="3clFbS" id="6$7vuu2uaqj" role="3clF47" />
-        </node>
-        <node concept="3Tm1VV" id="6$7vuu2uamp" role="1B3o_S" />
-        <node concept="3xLA65" id="6$7vuu2ubYm" role="lGtFl">
-          <property role="TrG5h" value="cls" />
         </node>
       </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>
+    <property role="3OwPAg" value="true" />
     <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="4BHjwwGTLX5" role="3cqZAp">
+          <node concept="3cpWsn" id="4BHjwwGTLX6" role="3cpWs9">
+            <property role="TrG5h" value="test" />
+            <node concept="3Tqbb2" id="4BHjwwGTLX4" role="1tU5fm">
+              <ref role="ehGHo" to="tpee:fz12cDA" resolve="ClassConcept" />
+            </node>
+          </node>
+        </node>
+        <node concept="1QHqEK" id="4BHjwwGTNou" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGTNow" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGTNoy" role="1bW5cS">
+              <node concept="3clFbF" id="4BHjwwGTMEi" role="3cqZAp">
+                <node concept="37vLTI" id="4BHjwwGTMEk" role="3clFbG">
+                  <node concept="1PxgMI" id="14$_tTxAWx6" role="37vLTx">
+                    <node concept="chp4Y" id="14$_tTxAWHD" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
+                    </node>
+                    <node concept="2OqwBi" id="14$_tTxAVKJ" role="1m5AlR">
+                      <node concept="1N_AGu" id="14$_tTxAVtV" role="2Oq$k0">
+                        <ref role="1N_AGt" to="tlxd:4nxCIBqyl_d" resolve="Test" />
+                      </node>
+                      <node concept="liA8E" id="14$_tTxAW0F" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <node concept="2OqwBi" id="14$_tTxAW4A" role="37wK5m">
+                          <node concept="1jxXqW" id="14$_tTxAW4B" role="2Oq$k0" />
+                          <node concept="liA8E" id="14$_tTxAW4C" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="4BHjwwGTMEo" role="37vLTJ">
+                    <ref role="3cqZAo" node="4BHjwwGTLX6" resolve="test" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="4BHjwwGTOgy" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGTO1x" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGTOPb" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4BHjwwGU7wu" role="3cqZAp" />
+        <node concept="3SKdUt" id="4BHjwwGU6Qg" role="3cqZAp">
+          <node concept="3SKdUq" id="4BHjwwGU6Qi" role="3SKWNk">
+            <property role="3SKdUp" value="this method throws exception and &quot;read action&quot; doesn't like that" />
+          </node>
+        </node>
         <node concept="3cpWs8" id="7y50OW6ZE44" role="3cqZAp">
           <node concept="3cpWsn" id="7y50OW6ZE45" role="3cpWs9">
             <property role="TrG5h" value="checkTypes" />
@@ -1235,241 +1290,96 @@
             <node concept="2YIFZM" id="6IQb_RxcBBB" role="33vP2m">
               <ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
               <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
-              <node concept="3xONca" id="7y50OW6ZE47" role="37wK5m">
-                <ref role="3xOPvv" node="4nxCIBqymjB" resolve="class" />
+              <node concept="37vLTw" id="4BHjwwGTLX8" role="37wK5m">
+                <ref role="3cqZAo" node="4BHjwwGTLX6" resolve="test" />
               </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="tj24: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="tj24: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="tj24: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 concept="1QHqEK" id="4BHjwwGTR8a" role="3cqZAp">
+          <node concept="1QHqEC" id="4BHjwwGTR8c" role="1QHqEI">
+            <node concept="3clFbS" id="4BHjwwGTR8e" role="1bW5cS">
+              <node concept="3cpWs8" id="7y50OW6ZH4l" role="3cqZAp">
+                <node concept="3cpWsn" id="7y50OW6ZH4m" role="3cpWs9">
+                  <property role="TrG5h" value="typeA" />
+                  <node concept="3Tqbb2" id="4BHjwwGqWQm" role="1tU5fm" />
+                  <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="tj24:7y50OW6XYoC" resolve="getType" />
+                      <node concept="3fl2lp" id="4BHjwwGF1pq" role="37wK5m">
+                        <ref role="3fl3PK" to="tlxd:4BHjwwGxjLz" resolve="varA" />
+                        <node concept="3fl2lp" id="4BHjwwGF14j" role="3fl3PI">
+                          <ref role="3fl3PK" to="tlxd:4BHjwwGxjBc" resolve="foo" />
+                          <node concept="3B5_sB" id="4BHjwwGF14k" role="3fl3PI">
+                            <ref role="3B5MYn" to="tlxd:4nxCIBqyl_d" resolve="Test" />
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
-                <node concept="37vLTw" id="4xTpErk1zEl" role="37vLTJ">
-                  <ref role="3cqZAo" node="4hh0cTRbUS7" resolve="typesAspect" />
+              </node>
+              <node concept="3cpWs8" id="7y50OW701J0" role="3cqZAp">
+                <node concept="3cpWsn" id="7y50OW701J1" role="3cpWs9">
+                  <property role="TrG5h" value="typeB" />
+                  <node concept="3Tqbb2" id="4BHjwwGqWVs" role="1tU5fm" />
+                  <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="tj24:7y50OW6XYoC" resolve="getType" />
+                      <node concept="3fl2lp" id="4BHjwwGF2US" role="37wK5m">
+                        <ref role="3fl3PK" to="tlxd:4BHjwwGxjN$" resolve="varB" />
+                        <node concept="3fl2lp" id="4BHjwwGF2UT" role="3fl3PI">
+                          <ref role="3fl3PK" to="tlxd:4BHjwwGxjBc" resolve="foo" />
+                          <node concept="3B5_sB" id="4BHjwwGF2UU" role="3fl3PI">
+                            <ref role="3B5MYn" to="tlxd:4nxCIBqyl_d" resolve="Test" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </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 concept="JA50E" id="4BHjwwGEOwL" role="3cqZAp">
+                <node concept="37vLTw" id="4BHjwwGEQGR" role="JAdkl">
+                  <ref role="3cqZAo" node="7y50OW6ZH4m" resolve="typeA" />
+                </node>
+                <node concept="2c44tf" id="4BHjwwGERqO" role="JA92f">
+                  <node concept="3uibUv" id="4BHjwwGESa4" role="2c44tc">
+                    <ref role="3uigEE" to="tlxd:4cKdPpqIRLR" resolve="Test.A" />
+                  </node>
+                </node>
               </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 concept="JA50E" id="4BHjwwGESbj" role="3cqZAp">
+                <node concept="37vLTw" id="4BHjwwGET3g" role="JAdkl">
+                  <ref role="3cqZAo" node="7y50OW701J1" resolve="typeB" />
+                </node>
+                <node concept="2c44tf" id="4BHjwwGESbl" role="JA92f">
+                  <node concept="3uibUv" id="4BHjwwGESgZ" role="2c44tc">
+                    <ref role="3uigEE" to="tlxd:7y50OW6ZXcE" resolve="Test.B" />
+                    <node concept="3uibUv" id="4BHjwwGET1S" role="11_B2D">
+                      <ref role="3uigEE" to="tlxd:4cKdPpqIRLR" resolve="Test.A" />
+                    </node>
+                  </node>
                 </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 concept="2OqwBi" id="4BHjwwGTS2C" role="ukAjM">
+            <node concept="1jxXqW" id="4BHjwwGTRMU" role="2Oq$k0" />
+            <node concept="liA8E" id="4BHjwwGTTbX" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
             </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 concept="3clFbH" id="4BHjwwGEMRI" role="3cqZAp" />
       </node>
     </node>
   </node>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking/models/typechecking.mps b/typechecking/solutions/jetbrains.mps.typechecking/models/typechecking.mps
index 3cd5f1e4..9596b302 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking/models/typechecking.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking/models/typechecking.mps
@@ -2,14 +2,14 @@
 <model ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)">
   <persistence version="9" />
   <languages>
-    <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="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
-    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
+    <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="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
+    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
   </languages>
   <imports>
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
@@ -403,6 +403,7 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
+      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
@@ -462,19 +463,27 @@
     <node concept="2tJIrI" id="4Z$O9mrQI$u" role="jymVt" />
     <node concept="Wx3nA" id="4Z$O9mrTGv9" role="jymVt">
       <property role="TrG5h" value="ourTypecheckings" />
-      <node concept="3Tm6S6" id="4Z$O9mrTGvb" role="1B3o_S" />
-      <node concept="_YKpA" id="4Z$O9mrTGQp" role="1tU5fm">
-        <node concept="3uibUv" id="4Z$O9mrTGQP" role="_ZDj9">
-          <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="Typechecking" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="4Z$O9mrTN7O" role="33vP2m">
-        <node concept="Tc6Ow" id="4Z$O9mrTN6Q" role="2ShVmc">
-          <node concept="3uibUv" id="4Z$O9mrTN6R" role="HW$YZ">
+      <node concept="2ShNRf" id="14$_tTxyNnx" role="33vP2m">
+        <node concept="1pGfFk" id="14$_tTxyY4T" role="2ShVmc">
+          <ref role="37wK5l" to="5zyv:~ConcurrentHashMap.&lt;init&gt;()" resolve="ConcurrentHashMap" />
+          <node concept="3uibUv" id="14$_tTxyZJn" role="1pMfVU">
+            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+          </node>
+          <node concept="3uibUv" id="14$_tTxz2a0" role="1pMfVU">
             <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="Typechecking" />
           </node>
         </node>
       </node>
+      <node concept="3uibUv" id="14$_tTxyC_t" role="1tU5fm">
+        <ref role="3uigEE" to="5zyv:~ConcurrentMap" resolve="ConcurrentMap" />
+        <node concept="3uibUv" id="14$_tTxyJCs" role="11_B2D">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+        <node concept="3uibUv" id="14$_tTxyL2L" role="11_B2D">
+          <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="Typechecking" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="4Z$O9mrTGvb" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="4Z$O9mrTG7X" role="jymVt" />
     <node concept="2YIFZL" id="4Z$O9mrQIG1" role="jymVt">
@@ -490,86 +499,39 @@
       </node>
       <node concept="3Tm1VV" id="4Z$O9mrQIG4" role="1B3o_S" />
       <node concept="3clFbS" id="4Z$O9mrQIG5" role="3clF47">
-        <node concept="3cpWs8" id="4Z$O9mrTJM7" role="3cqZAp">
-          <node concept="3cpWsn" id="4Z$O9mrTJM8" role="3cpWs9">
-            <property role="TrG5h" value="typechecking" />
-            <node concept="3uibUv" id="4Z$O9mrTJLY" role="1tU5fm">
-              <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="Typechecking" />
+        <node concept="3clFbF" id="14$_tTxz3bP" role="3cqZAp">
+          <node concept="2OqwBi" id="14$_tTxz3BI" role="3clFbG">
+            <node concept="37vLTw" id="14$_tTxz3bN" role="2Oq$k0">
+              <ref role="3cqZAo" node="4Z$O9mrTGv9" resolve="ourTypecheckings" />
             </node>
-            <node concept="2OqwBi" id="4Z$O9mrTJM9" role="33vP2m">
-              <node concept="37vLTw" id="4Z$O9mrTJMa" role="2Oq$k0">
-                <ref role="3cqZAo" node="4Z$O9mrTGv9" resolve="ourTypecheckings" />
+            <node concept="liA8E" id="14$_tTxz462" role="2OqNvi">
+              <ref role="37wK5l" to="5zyv:~ConcurrentMap.computeIfAbsent(java.lang.Object,java.util.function.Function):java.lang.Object" resolve="computeIfAbsent" />
+              <node concept="37vLTw" id="14$_tTxz4ZT" role="37wK5m">
+                <ref role="3cqZAo" node="4Z$O9mrQIH4" resolve="repository" />
               </node>
-              <node concept="1z4cxt" id="4Z$O9mrTJMb" role="2OqNvi">
-                <node concept="1bVj0M" id="4Z$O9mrTJMc" role="23t8la">
-                  <node concept="3clFbS" id="4Z$O9mrTJMd" role="1bW5cS">
-                    <node concept="3clFbF" id="4Z$O9mrTJMe" role="3cqZAp">
-                      <node concept="3clFbC" id="4Z$O9mrTJMf" role="3clFbG">
-                        <node concept="37vLTw" id="4Z$O9mrTJMg" role="3uHU7w">
-                          <ref role="3cqZAo" node="4Z$O9mrQIH4" resolve="repository" />
-                        </node>
-                        <node concept="2OqwBi" id="4Z$O9mrTJMh" role="3uHU7B">
-                          <node concept="37vLTw" id="4Z$O9mrTJMi" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4Z$O9mrTJMk" resolve="it" />
-                          </node>
-                          <node concept="2OwXpG" id="4Z$O9mrTJMj" role="2OqNvi">
-                            <ref role="2Oxat5" node="4Z$O9mrQIM1" resolve="repository" />
-                          </node>
+              <node concept="1bVj0M" id="14$_tTxz7wI" role="37wK5m">
+                <node concept="37vLTG" id="14$_tTxz81r" role="1bW2Oz">
+                  <property role="TrG5h" value="repo" />
+                  <node concept="3uibUv" id="14$_tTxz8ex" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="14$_tTxz7wK" role="1bW5cS">
+                  <node concept="3clFbF" id="14$_tTxz8zi" role="3cqZAp">
+                    <node concept="2ShNRf" id="14$_tTxz8zg" role="3clFbG">
+                      <node concept="1pGfFk" id="14$_tTxz9ny" role="2ShVmc">
+                        <ref role="37wK5l" node="4Z$O9mrQIJn" resolve="Typechecking" />
+                        <node concept="37vLTw" id="14$_tTxz9v6" role="37wK5m">
+                          <ref role="3cqZAo" node="14$_tTxz81r" resolve="repo" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="4Z$O9mrTJMk" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4Z$O9mrTJMl" role="1tU5fm" />
-                  </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="4Z$O9mrTJU8" role="3cqZAp">
-          <node concept="3clFbS" id="4Z$O9mrTJUa" role="3clFbx">
-            <node concept="3clFbF" id="4Z$O9mrTK8Z" role="3cqZAp">
-              <node concept="37vLTI" id="4Z$O9mrTKfv" role="3clFbG">
-                <node concept="2ShNRf" id="4Z$O9mrTKjl" role="37vLTx">
-                  <node concept="1pGfFk" id="4Z$O9mrTKh8" role="2ShVmc">
-                    <ref role="37wK5l" node="4Z$O9mrQIJn" resolve="Typechecking" />
-                    <node concept="37vLTw" id="4Z$O9mrTKnN" role="37wK5m">
-                      <ref role="3cqZAo" node="4Z$O9mrQIH4" resolve="repository" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="4Z$O9mrTK8X" role="37vLTJ">
-                  <ref role="3cqZAo" node="4Z$O9mrTJM8" resolve="typechecking" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4Z$O9mrTKqT" role="3cqZAp">
-              <node concept="2OqwBi" id="4Z$O9mrTMkk" role="3clFbG">
-                <node concept="37vLTw" id="4Z$O9mrTKqR" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4Z$O9mrTGv9" resolve="ourTypecheckings" />
-                </node>
-                <node concept="TSZUe" id="4Z$O9mrTMPv" role="2OqNvi">
-                  <node concept="37vLTw" id="4Z$O9mrTMVS" role="25WWJ7">
-                    <ref role="3cqZAo" node="4Z$O9mrTJM8" resolve="typechecking" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="4Z$O9mrTK4Z" role="3clFbw">
-            <node concept="10Nm6u" id="4Z$O9mrTK6B" role="3uHU7w" />
-            <node concept="37vLTw" id="4Z$O9mrTJWU" role="3uHU7B">
-              <ref role="3cqZAo" node="4Z$O9mrTJM8" resolve="typechecking" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4Z$O9mrTGUA" role="3cqZAp">
-          <node concept="37vLTw" id="4Z$O9mrTJMm" role="3clFbG">
-            <ref role="3cqZAo" node="4Z$O9mrTJM8" resolve="typechecking" />
-          </node>
-        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4Z$O9mrQI$H" role="jymVt" />
@@ -599,6 +561,112 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4Z$O9mrQJbQ" role="jymVt" />
+    <node concept="2YIFZL" id="14$_tTxAmT8" role="jymVt">
+      <property role="TrG5h" value="dispose" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="14$_tTxAhsw" role="3clF47">
+        <node concept="3clFbF" id="14$_tTx_izJ" role="3cqZAp">
+          <node concept="2OqwBi" id="14$_tTx_jZ8" role="3clFbG">
+            <node concept="liA8E" id="14$_tTx_l4B" role="2OqNvi">
+              <ref role="37wK5l" to="5zyv:~ConcurrentMap.computeIfPresent(java.lang.Object,java.util.function.BiFunction):java.lang.Object" resolve="computeIfPresent" />
+              <node concept="37vLTw" id="14$_tTxAmoL" role="37wK5m">
+                <ref role="3cqZAo" node="14$_tTxAlhx" resolve="repository" />
+              </node>
+              <node concept="1bVj0M" id="14$_tTx_mwp" role="37wK5m">
+                <node concept="3clFbS" id="14$_tTx_mwr" role="1bW5cS">
+                  <node concept="3clFbF" id="14$_tTx_t5f" role="3cqZAp">
+                    <node concept="2OqwBi" id="14$_tTx_tcO" role="3clFbG">
+                      <node concept="37vLTw" id="14$_tTx_t5d" role="2Oq$k0">
+                        <ref role="3cqZAo" node="14$_tTx_ojq" resolve="instance" />
+                      </node>
+                      <node concept="liA8E" id="14$_tTx_tt$" role="2OqNvi">
+                        <ref role="37wK5l" node="14$_tTxApBG" resolve="dispose" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3SKdUt" id="14$_tTx_t_0" role="3cqZAp">
+                    <node concept="3SKdUq" id="14$_tTx_t_2" role="3SKWNk">
+                      <property role="3SKdUp" value="remove the mapping" />
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="14$_tTx_sJy" role="3cqZAp">
+                    <node concept="10Nm6u" id="14$_tTx_sJw" role="3clFbG" />
+                  </node>
+                </node>
+                <node concept="37vLTG" id="14$_tTx_n3o" role="1bW2Oz">
+                  <property role="TrG5h" value="repos" />
+                  <node concept="3uibUv" id="14$_tTx_niR" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
+                </node>
+                <node concept="37vLTG" id="14$_tTx_ojq" role="1bW2Oz">
+                  <property role="TrG5h" value="instance" />
+                  <node concept="3uibUv" id="14$_tTxAl6h" role="1tU5fm">
+                    <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="Typechecking" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="14$_tTxAkVQ" role="2Oq$k0">
+              <ref role="3cqZAo" node="4Z$O9mrTGv9" resolve="ourTypecheckings" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="14$_tTxAlhx" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="14$_tTxAmhJ" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="14$_tTxAhsu" role="3clF45" />
+      <node concept="3Tm1VV" id="14$_tTxAhsv" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="14$_tTxAolu" role="jymVt" />
+    <node concept="3clFb_" id="14$_tTxApBG" role="jymVt">
+      <property role="TrG5h" value="dispose" />
+      <node concept="3cqZAl" id="14$_tTxApBI" role="3clF45" />
+      <node concept="3Tm1VV" id="14$_tTxApBJ" role="1B3o_S" />
+      <node concept="3clFbS" id="14$_tTxApBK" role="3clF47">
+        <node concept="3clFbF" id="14$_tTxAw1q" role="3cqZAp">
+          <node concept="2OqwBi" id="14$_tTxAx6R" role="3clFbG">
+            <node concept="2OqwBi" id="14$_tTxAwaW" role="2Oq$k0">
+              <node concept="Xjq3P" id="14$_tTxAw1p" role="2Oq$k0" />
+              <node concept="2OwXpG" id="14$_tTxAwgT" role="2OqNvi">
+                <ref role="2Oxat5" node="4Z$O9mrTa0z" resolve="cacheHolders" />
+              </node>
+            </node>
+            <node concept="2es0OD" id="14$_tTxAyh4" role="2OqNvi">
+              <node concept="1bVj0M" id="14$_tTxAyh6" role="23t8la">
+                <node concept="3clFbS" id="14$_tTxAyh7" role="1bW5cS">
+                  <node concept="3clFbF" id="14$_tTxAyAy" role="3cqZAp">
+                    <node concept="2OqwBi" id="14$_tTxAzyM" role="3clFbG">
+                      <node concept="2OqwBi" id="14$_tTxAyP1" role="2Oq$k0">
+                        <node concept="37vLTw" id="14$_tTxAyAx" role="2Oq$k0">
+                          <ref role="3cqZAo" node="14$_tTxAyh8" resolve="it" />
+                        </node>
+                        <node concept="2OwXpG" id="14$_tTxAz62" role="2OqNvi">
+                          <ref role="2Oxat5" node="4Z$O9mrQJ$h" resolve="cache" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="14$_tTxAzTU" role="2OqNvi">
+                        <ref role="37wK5l" node="6QH_LDtcxgE" resolve="clear" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="14$_tTxAyh8" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="14$_tTxAyh9" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="14$_tTxAgoB" role="jymVt" />
     <node concept="3clFb_" id="4Z$O9mrQJgp" role="jymVt">
       <property role="TrG5h" value="cachedTypes" />
       <node concept="37vLTG" id="4Z$O9mrQJle" role="3clF46">
@@ -4047,6 +4115,14 @@
           </node>
         </node>
         <node concept="3clFbJ" id="6kREIVkoi2H" role="3cqZAp">
+          <node concept="2OqwBi" id="6kREIVkECyL" role="3clFbw">
+            <node concept="Xjq3P" id="6kREIVkECyM" role="2Oq$k0">
+              <ref role="1HBi2w" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
+            </node>
+            <node concept="2OwXpG" id="6kREIVkECyN" role="2OqNvi">
+              <ref role="2Oxat5" node="6kREIVko7mk" resolve="accStatus" />
+            </node>
+          </node>
           <node concept="3clFbS" id="6kREIVkoi2J" role="3clFbx">
             <node concept="3clFbF" id="2mbQB8JmeFg" role="3cqZAp">
               <node concept="2OqwBi" id="2mbQB8JmeFh" role="3clFbG">
@@ -4090,14 +4166,6 @@
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="6kREIVkECyL" role="3clFbw">
-            <node concept="Xjq3P" id="6kREIVkECyM" role="2Oq$k0">
-              <ref role="1HBi2w" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-            </node>
-            <node concept="2OwXpG" id="6kREIVkECyN" role="2OqNvi">
-              <ref role="2Oxat5" node="6kREIVko7mk" resolve="accStatus" />
-            </node>
-          </node>
         </node>
       </node>
       <node concept="37vLTG" id="6kREIVkK4EL" role="3clF46">
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models/jetbrains/mps/lang/typesystem2/helper/plugin.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models/jetbrains/mps/lang/typesystem2/helper/plugin.mps
index 95183f87..6c3ef9eb 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models/jetbrains/mps/lang/typesystem2/helper/plugin.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models/jetbrains/mps/lang/typesystem2/helper/plugin.mps
@@ -20,6 +20,7 @@
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="4it6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.loading(MPS.Core/)" />
     <import index="w0gx" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project.structure.modules(MPS.Core/)" />
+    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
   </imports>
   <registry>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -39,7 +40,6 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
-      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
@@ -112,7 +112,6 @@
       <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
         <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
       </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>
@@ -143,7 +142,9 @@
         <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="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
+        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
+      </concept>
       <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" />
@@ -151,12 +152,8 @@
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
-      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
-        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
-        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
-      </concept>
-      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -180,7 +177,6 @@
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
         <child id="8465538089690331502" name="body" index="TZ5H$" />
       </concept>
-      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
       <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
         <child id="8970989240999019149" name="part" index="1dT_Ay" />
       </concept>
@@ -201,12 +197,6 @@
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
-        <child id="1204796294226" name="closure" index="23t8la" />
-      </concept>
-      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
-        <child id="540871147943773366" name="argument" index="25WWJ7" />
-      </concept>
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
@@ -214,11 +204,7 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
-      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
-      <concept id="1167380149909" name="jetbrains.mps.baseLanguage.collections.structure.RemoveElementOperation" flags="nn" index="3dhRuq" />
-      <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
   </registry>
   <node concept="2DaZZR" id="2zU3cYqx4HT" />
@@ -227,12 +213,12 @@
     <node concept="2uRRBT" id="2zU3cYqx4Pl" role="2uRRB$">
       <node concept="3clFbS" id="2zU3cYqx4Pm" role="2VODD2">
         <node concept="3clFbF" id="2zU3cYqyvdE" role="3cqZAp">
-          <node concept="2YIFZM" id="2zU3cYqyvud" role="3clFbG">
-            <ref role="37wK5l" node="2zU3cYqyaC9" resolve="init" />
+          <node concept="2YIFZM" id="14$_tTx_wXJ" role="3clFbG">
+            <ref role="37wK5l" node="2zU3cYqxb_u" resolve="get" />
             <ref role="1Pybhc" node="2zU3cYqxbbL" resolve="TypesModelManager" />
-            <node concept="2OqwBi" id="4Z$O9mrR9Ws" role="37wK5m">
-              <node concept="1KvdUw" id="2zU3cYqyvuE" role="2Oq$k0" />
-              <node concept="liA8E" id="4Z$O9mrRaYX" role="2OqNvi">
+            <node concept="2OqwBi" id="14$_tTx_wXK" role="37wK5m">
+              <node concept="1KvdUw" id="14$_tTx_wXL" role="2Oq$k0" />
+              <node concept="liA8E" id="14$_tTx_wXM" role="2OqNvi">
                 <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
               </node>
             </node>
@@ -263,14 +249,22 @@
     <node concept="Wx3nA" id="2zU3cYqxbiF" role="jymVt">
       <property role="TrG5h" value="ourInstances" />
       <node concept="3Tm6S6" id="2zU3cYqxbiH" role="1B3o_S" />
-      <node concept="_YKpA" id="2zU3cYqxblW" role="1tU5fm">
-        <node concept="3uibUv" id="2zU3cYqxbs4" role="_ZDj9">
+      <node concept="3uibUv" id="14$_tTxyC_t" role="1tU5fm">
+        <ref role="3uigEE" to="5zyv:~ConcurrentMap" resolve="ConcurrentMap" />
+        <node concept="3uibUv" id="14$_tTxyJCs" role="11_B2D">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+        <node concept="3uibUv" id="14$_tTx_4Jp" role="11_B2D">
           <ref role="3uigEE" node="2zU3cYqxbbL" resolve="TypesModelManager" />
         </node>
       </node>
-      <node concept="2ShNRf" id="2zU3cYqxbtJ" role="33vP2m">
-        <node concept="Tc6Ow" id="2zU3cYqxbtt" role="2ShVmc">
-          <node concept="3uibUv" id="2zU3cYqxbtu" role="HW$YZ">
+      <node concept="2ShNRf" id="14$_tTxyNnx" role="33vP2m">
+        <node concept="1pGfFk" id="14$_tTxyY4T" role="2ShVmc">
+          <ref role="37wK5l" to="5zyv:~ConcurrentHashMap.&lt;init&gt;()" resolve="ConcurrentHashMap" />
+          <node concept="3uibUv" id="14$_tTxyZJn" role="1pMfVU">
+            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+          </node>
+          <node concept="3uibUv" id="14$_tTx_2H$" role="1pMfVU">
             <ref role="3uigEE" node="2zU3cYqxbbL" resolve="TypesModelManager" />
           </node>
         </node>
@@ -284,34 +278,35 @@
       </node>
       <node concept="3Tm1VV" id="2zU3cYqxb_x" role="1B3o_S" />
       <node concept="3clFbS" id="2zU3cYqxb_y" role="3clF47">
-        <node concept="3clFbF" id="2zU3cYqyglL" role="3cqZAp">
-          <node concept="2OqwBi" id="2zU3cYqyhHU" role="3clFbG">
-            <node concept="37vLTw" id="2zU3cYqyglK" role="2Oq$k0">
+        <node concept="3clFbF" id="14$_tTx_7MT" role="3cqZAp">
+          <node concept="2OqwBi" id="14$_tTx_8aT" role="3clFbG">
+            <node concept="37vLTw" id="14$_tTx_7MR" role="2Oq$k0">
               <ref role="3cqZAo" node="2zU3cYqxbiF" resolve="ourInstances" />
             </node>
-            <node concept="1z4cxt" id="2zU3cYqyjeL" role="2OqNvi">
-              <node concept="1bVj0M" id="2zU3cYqyjeN" role="23t8la">
-                <node concept="3clFbS" id="2zU3cYqyjeO" role="1bW5cS">
-                  <node concept="3clFbF" id="2zU3cYqyjmD" role="3cqZAp">
-                    <node concept="3clFbC" id="2zU3cYqyk6M" role="3clFbG">
-                      <node concept="37vLTw" id="2zU3cYqykdZ" role="3uHU7w">
-                        <ref role="3cqZAo" node="2zU3cYqxbOL" resolve="repository" />
-                      </node>
-                      <node concept="2OqwBi" id="2zU3cYqyjwi" role="3uHU7B">
-                        <node concept="37vLTw" id="2zU3cYqyjmC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2zU3cYqyjeP" resolve="it" />
-                        </node>
-                        <node concept="2OwXpG" id="4Z$O9mrR2Gp" role="2OqNvi">
-                          <ref role="2Oxat5" node="4Z$O9mrQQ_h" resolve="repository" />
+            <node concept="liA8E" id="14$_tTx_9ik" role="2OqNvi">
+              <ref role="37wK5l" to="5zyv:~ConcurrentMap.computeIfAbsent(java.lang.Object,java.util.function.Function):java.lang.Object" resolve="computeIfAbsent" />
+              <node concept="37vLTw" id="14$_tTx_9Y9" role="37wK5m">
+                <ref role="3cqZAo" node="2zU3cYqxbOL" resolve="repository" />
+              </node>
+              <node concept="1bVj0M" id="14$_tTx_aIm" role="37wK5m">
+                <node concept="37vLTG" id="14$_tTx_bgO" role="1bW2Oz">
+                  <property role="TrG5h" value="repo" />
+                  <node concept="3uibUv" id="14$_tTx_bzJ" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="14$_tTx_aIo" role="1bW5cS">
+                  <node concept="3clFbF" id="14$_tTx_bWD" role="3cqZAp">
+                    <node concept="2ShNRf" id="14$_tTx_bWB" role="3clFbG">
+                      <node concept="1pGfFk" id="14$_tTx_gpG" role="2ShVmc">
+                        <ref role="37wK5l" node="2zU3cYqyeVe" resolve="TypesModelManager" />
+                        <node concept="37vLTw" id="14$_tTx_gvt" role="37wK5m">
+                          <ref role="3cqZAo" node="14$_tTx_bgO" resolve="repo" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="2zU3cYqyjeP" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="2zU3cYqyjeQ" role="1tU5fm" />
-                </node>
               </node>
             </node>
           </node>
@@ -325,44 +320,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="2zU3cYqxbuM" role="jymVt" />
-    <node concept="2YIFZL" id="2zU3cYqyaC9" role="jymVt">
-      <property role="TrG5h" value="init" />
-      <node concept="37vLTG" id="2zU3cYqyaDO" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="4Z$O9mrR0sF" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="2zU3cYqyg0Y" role="3clF45" />
-      <node concept="3Tm1VV" id="6$7vuu2xw$0" role="1B3o_S" />
-      <node concept="3clFbS" id="2zU3cYqyaCd" role="3clF47">
-        <node concept="3clFbF" id="2zU3cYqyaX5" role="3cqZAp">
-          <node concept="2OqwBi" id="2zU3cYqycW6" role="3clFbG">
-            <node concept="37vLTw" id="2zU3cYqyaX4" role="2Oq$k0">
-              <ref role="3cqZAo" node="2zU3cYqxbiF" resolve="ourInstances" />
-            </node>
-            <node concept="TSZUe" id="2zU3cYqyesI" role="2OqNvi">
-              <node concept="2ShNRf" id="2zU3cYqyevC" role="25WWJ7">
-                <node concept="1pGfFk" id="2zU3cYqyeYl" role="2ShVmc">
-                  <ref role="37wK5l" node="2zU3cYqyeVe" resolve="TypesModelManager" />
-                  <node concept="37vLTw" id="2zU3cYqyfIU" role="37wK5m">
-                    <ref role="3cqZAo" node="2zU3cYqyaDO" resolve="repository" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="6$7vuu2xyFT" role="lGtFl">
-        <node concept="TZ5HA" id="6$7vuu2xyFU" role="TZ5H$">
-          <node concept="1dT_AC" id="6$7vuu2xyFV" role="1dT_Ay">
-            <property role="1dT_AB" value="Made public only for tests." />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2zU3cYqyg8C" role="jymVt" />
     <node concept="2YIFZL" id="2zU3cYqyg2V" role="jymVt">
       <property role="TrG5h" value="dispose" />
       <node concept="37vLTG" id="2zU3cYqyg2W" role="3clF46">
@@ -374,58 +331,52 @@
       <node concept="3cqZAl" id="2zU3cYqyg2Y" role="3clF45" />
       <node concept="3Tm1VV" id="6$7vuu2xw$l" role="1B3o_S" />
       <node concept="3clFbS" id="2zU3cYqyg30" role="3clF47">
-        <node concept="3cpWs8" id="2zU3cYqykZ4" role="3cqZAp">
-          <node concept="3cpWsn" id="2zU3cYqykZ5" role="3cpWs9">
-            <property role="TrG5h" value="instance" />
-            <node concept="3uibUv" id="2zU3cYqykZ3" role="1tU5fm">
-              <ref role="3uigEE" node="2zU3cYqxbbL" resolve="TypesModelManager" />
+        <node concept="3clFbF" id="14$_tTx_izJ" role="3cqZAp">
+          <node concept="2OqwBi" id="14$_tTx_jZ8" role="3clFbG">
+            <node concept="37vLTw" id="14$_tTx_izH" role="2Oq$k0">
+              <ref role="3cqZAo" node="2zU3cYqxbiF" resolve="ourInstances" />
             </node>
-            <node concept="1rXfSq" id="2zU3cYqykZ6" role="33vP2m">
-              <ref role="37wK5l" node="2zU3cYqxb_u" resolve="get" />
-              <node concept="37vLTw" id="2zU3cYqykZ7" role="37wK5m">
+            <node concept="liA8E" id="14$_tTx_l4B" role="2OqNvi">
+              <ref role="37wK5l" to="5zyv:~ConcurrentMap.computeIfPresent(java.lang.Object,java.util.function.BiFunction):java.lang.Object" resolve="computeIfPresent" />
+              <node concept="37vLTw" id="14$_tTx_lG6" role="37wK5m">
                 <ref role="3cqZAo" node="2zU3cYqyg2W" resolve="repository" />
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="2zU3cYqyl4W" role="3cqZAp">
-          <node concept="3clFbS" id="2zU3cYqyl4Y" role="3clFbx">
-            <node concept="3clFbF" id="2zU3cYqylkA" role="3cqZAp">
-              <node concept="2OqwBi" id="2zU3cYqyq2M" role="3clFbG">
-                <node concept="37vLTw" id="2zU3cYqylk$" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2zU3cYqykZ5" resolve="instance" />
+              <node concept="1bVj0M" id="14$_tTx_mwp" role="37wK5m">
+                <node concept="3clFbS" id="14$_tTx_mwr" role="1bW5cS">
+                  <node concept="3clFbF" id="14$_tTx_t5f" role="3cqZAp">
+                    <node concept="2OqwBi" id="14$_tTx_tcO" role="3clFbG">
+                      <node concept="37vLTw" id="14$_tTx_t5d" role="2Oq$k0">
+                        <ref role="3cqZAo" node="14$_tTx_ojq" resolve="instance" />
+                      </node>
+                      <node concept="liA8E" id="14$_tTx_tt$" role="2OqNvi">
+                        <ref role="37wK5l" node="2zU3cYqyp0Z" resolve="dispose" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3SKdUt" id="14$_tTx_t_0" role="3cqZAp">
+                    <node concept="3SKdUq" id="14$_tTx_t_2" role="3SKWNk">
+                      <property role="3SKdUp" value="remove the mapping" />
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="14$_tTx_sJy" role="3cqZAp">
+                    <node concept="10Nm6u" id="14$_tTx_sJw" role="3clFbG" />
+                  </node>
                 </node>
-                <node concept="liA8E" id="2zU3cYqyqfQ" role="2OqNvi">
-                  <ref role="37wK5l" node="2zU3cYqyp0Z" resolve="dispose" />
+                <node concept="37vLTG" id="14$_tTx_n3o" role="1bW2Oz">
+                  <property role="TrG5h" value="repos" />
+                  <node concept="3uibUv" id="14$_tTx_niR" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
                 </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="2zU3cYqylxI" role="3cqZAp">
-              <node concept="2OqwBi" id="2zU3cYqym9K" role="3clFbG">
-                <node concept="37vLTw" id="2zU3cYqylxG" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2zU3cYqxbiF" resolve="ourInstances" />
-                </node>
-                <node concept="3dhRuq" id="2zU3cYqynEC" role="2OqNvi">
-                  <node concept="37vLTw" id="2zU3cYqynYJ" role="25WWJ7">
-                    <ref role="3cqZAo" node="2zU3cYqykZ5" resolve="instance" />
+                <node concept="37vLTG" id="14$_tTx_ojq" role="1bW2Oz">
+                  <property role="TrG5h" value="instance" />
+                  <node concept="3uibUv" id="14$_tTx_o$S" role="1tU5fm">
+                    <ref role="3uigEE" node="2zU3cYqxbbL" resolve="TypesModelManager" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3y3z36" id="2zU3cYqyldc" role="3clFbw">
-            <node concept="10Nm6u" id="2zU3cYqyldQ" role="3uHU7w" />
-            <node concept="37vLTw" id="2zU3cYqyl65" role="3uHU7B">
-              <ref role="3cqZAo" node="2zU3cYqykZ5" resolve="instance" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="6$7vuu2x$ze" role="lGtFl">
-        <node concept="TZ5HA" id="6$7vuu2x$zf" role="TZ5H$">
-          <node concept="1dT_AC" id="6$7vuu2x$zg" role="1dT_Ay">
-            <property role="1dT_AB" value="Made public only for tests." />
-          </node>
         </node>
       </node>
     </node>