From 9064c6bbb8c011696cf8e12a2d3636a03299bb3d Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 30 Aug 2016 11:50:35 +0200
Subject: [PATCH] Minor fixes, code restructuring, fixing the dependencies,
 removing obsolete file.

---
 build.xml                                     |  13 +-
 ...mps.lang.typesystem2.sampleplugin.jchr.msd |   1 +
 .../jetbrains/mps/logic/builtin/predicate.mps |  90 ++++---
 .../jetbrains/mps/logic/builtin/solver.mps    |  92 +++++++
 .../jetbrains.mps.logic.reactor.msd           |   2 -
 test.xml                                      |  13 +-
 ...rains.mps.lang.typesystem2.sample.test.msd |   1 +
 .../lang/typesystem2/samplechecker/build.mps  |  36 +--
 ...typesystem2.samplechecker.handler.util.msd |   4 -
 .../lang/typesystem2/sampleplugin/plugin.mps  | 229 +++++++++++-------
 .../jetbrains.mps.lang.typesystem2.mpl        |   1 +
 ...jetbrains.mps.lang.typesystem2.runtime.msd |   2 +
 .../mps/lang/typesystem2/generation.mps       |  15 +-
 ...etbrains.mps.lang.typesystem2.template.msd |   1 +
 14 files changed, 326 insertions(+), 174 deletions(-)

diff --git a/build.xml b/build.xml
index 3e07e6ca..cae3545a 100644
--- a/build.xml
+++ b/build.xml
@@ -958,7 +958,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.java.modules.cycle.2" depends="java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.java.modules.cycle.2" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${build.tmp}/java.modules.cycle.2" />
     <javac destdir="${build.tmp}/java.modules.cycle.2" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
       <compilerarg value="-Xlint:none" />
@@ -1000,6 +1000,7 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
@@ -1007,7 +1008,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.template" depends="java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.template" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
     <mkdir dir="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1027,6 +1028,7 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
@@ -1057,7 +1059,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.2, fetchDependencies">
     <mkdir dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1077,6 +1079,7 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
@@ -1166,7 +1169,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" depends="java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1186,8 +1189,6 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
diff --git a/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/jetbrains.mps.lang.typesystem2.sampleplugin.jchr.msd b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/jetbrains.mps.lang.typesystem2.sampleplugin.jchr.msd
index 47aceb0f..66c62daa 100644
--- a/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/jetbrains.mps.lang.typesystem2.sampleplugin.jchr.msd
+++ b/jchr/solutions/jetbrains.mps.lang.typesystem2.sampleplugin.jchr/jetbrains.mps.lang.typesystem2.sampleplugin.jchr.msd
@@ -55,6 +55,7 @@
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
+    <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
     <module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)" version="0" />
     <module reference="b862404f-c80a-47af-9def-0ba8676f9fa5(jetbrains.mps.lang.typesystem2.sampleplugin.jchr)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
index f5af6e48..9700a836 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps
@@ -3,6 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
     <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
@@ -197,6 +198,12 @@
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
     </language>
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
+        <property id="1167245565795" name="severity" index="35gtTG" />
+        <child id="1167227463056" name="logExpression" index="34bqiv" />
+      </concept>
+    </language>
     <language id="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" />
@@ -1402,44 +1409,65 @@
           <node concept="3eNFk2" id="1ggxSI7qGPJ" role="3eNLev">
             <node concept="3clFbS" id="1ggxSI7qGPO" role="3eOfB_">
               <node concept="3clFbJ" id="1ggxSI7xGoB" role="3cqZAp">
-                <node concept="3clFbS" id="1ggxSI7xGoD" role="3clFbx">
-                  <node concept="YS8fn" id="1ggxSI7xGvh" role="3cqZAp">
-                    <node concept="2ShNRf" id="1ggxSI7xGwU" role="YScLw">
-                      <node concept="1pGfFk" id="1ggxSI7xGLe" role="2ShVmc">
-                        <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-                        <node concept="Xl_RD" id="1ggxSI7xGM3" role="37wK5m">
-                          <property role="Xl_RC" value="no java expression solver" />
+                <node concept="3y3z36" id="4psy6tqsyWz" role="3clFbw">
+                  <node concept="37vLTw" id="3F6vMxqoq$n" role="3uHU7B">
+                    <ref role="3cqZAo" node="3F6vMxqo1jQ" resolve="myJavaExpressionSolver" />
+                  </node>
+                  <node concept="10Nm6u" id="1ggxSI7xGtI" role="3uHU7w" />
+                </node>
+                <node concept="3clFbS" id="4psy6tqsyWC" role="3clFbx">
+                  <node concept="3clFbF" id="1ggxSI7qGPP" role="3cqZAp">
+                    <node concept="2OqwBi" id="1ggxSI7qGPQ" role="3clFbG">
+                      <node concept="Xjq3P" id="1ggxSI7qGPR" role="2Oq$k0" />
+                      <node concept="liA8E" id="1ggxSI7qGPS" role="2OqNvi">
+                        <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                        <node concept="10QFUN" id="1ggxSI7qGPT" role="37wK5m">
+                          <node concept="3uibUv" id="1ggxSI7qGPU" role="10QFUM">
+                            <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                          </node>
+                          <node concept="37vLTw" id="1ggxSI7qGPV" role="10QFUP">
+                            <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                          </node>
+                        </node>
+                        <node concept="2ShNRf" id="1ggxSI7qGPW" role="37wK5m">
+                          <node concept="1pGfFk" id="1ggxSI7xcbQ" role="2ShVmc">
+                            <ref role="37wK5l" to="omn0:6MYr6Jx1c2W" resolve="JavaSolver" />
+                            <node concept="37vLTw" id="3F6vMxqosAS" role="37wK5m">
+                              <ref role="3cqZAo" node="3F6vMxqo1jQ" resolve="myJavaExpressionSolver" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFbH" id="4psy6tqsz7l" role="3cqZAp" />
                 </node>
-                <node concept="3clFbC" id="1ggxSI7xGsE" role="3clFbw">
-                  <node concept="10Nm6u" id="1ggxSI7xGtI" role="3uHU7w" />
-                  <node concept="37vLTw" id="3F6vMxqoq$n" role="3uHU7B">
-                    <ref role="3cqZAo" node="3F6vMxqo1jQ" resolve="myJavaExpressionSolver" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="1ggxSI7xGPS" role="3cqZAp" />
-              <node concept="3clFbF" id="1ggxSI7qGPP" role="3cqZAp">
-                <node concept="2OqwBi" id="1ggxSI7qGPQ" role="3clFbG">
-                  <node concept="Xjq3P" id="1ggxSI7qGPR" role="2Oq$k0" />
-                  <node concept="liA8E" id="1ggxSI7qGPS" role="2OqNvi">
-                    <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
-                    <node concept="10QFUN" id="1ggxSI7qGPT" role="37wK5m">
-                      <node concept="3uibUv" id="1ggxSI7qGPU" role="10QFUM">
-                        <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
-                      </node>
-                      <node concept="37vLTw" id="1ggxSI7qGPV" role="10QFUP">
-                        <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                <node concept="9aQIb" id="4psy6tqsyWA" role="9aQIa">
+                  <node concept="3clFbS" id="1ggxSI7xGoD" role="9aQI4">
+                    <node concept="34ab3g" id="4psy6tqszIR" role="3cqZAp">
+                      <property role="35gtTG" value="warn" />
+                      <node concept="Xl_RD" id="4psy6tqszKo" role="34bqiv">
+                        <property role="Xl_RC" value="no java expression solver" />
                       </node>
                     </node>
-                    <node concept="2ShNRf" id="1ggxSI7qGPW" role="37wK5m">
-                      <node concept="1pGfFk" id="1ggxSI7xcbQ" role="2ShVmc">
-                        <ref role="37wK5l" to="omn0:6MYr6Jx1c2W" resolve="JavaSolver" />
-                        <node concept="37vLTw" id="3F6vMxqosAS" role="37wK5m">
-                          <ref role="3cqZAo" node="3F6vMxqo1jQ" resolve="myJavaExpressionSolver" />
+                    <node concept="3clFbF" id="4psy6tqszLW" role="3cqZAp">
+                      <node concept="2OqwBi" id="4psy6tqszLX" role="3clFbG">
+                        <node concept="Xjq3P" id="4psy6tqszLY" role="2Oq$k0" />
+                        <node concept="liA8E" id="4psy6tqszLZ" role="2OqNvi">
+                          <ref role="37wK5l" to="qrld:6Kcfpq7B2LV" resolve="registerSolver" />
+                          <node concept="10QFUN" id="4psy6tqszM0" role="37wK5m">
+                            <node concept="3uibUv" id="4psy6tqszM1" role="10QFUM">
+                              <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+                            </node>
+                            <node concept="37vLTw" id="4psy6tqszM2" role="10QFUP">
+                              <ref role="3cqZAo" node="3F6vMxqo28U" resolve="symbol" />
+                            </node>
+                          </node>
+                          <node concept="2ShNRf" id="4psy6tqszM3" role="37wK5m">
+                            <node concept="HV5vD" id="4psy6tqs$qr" role="2ShVmc">
+                              <ref role="HV5vE" to="omn0:4psy6tqstt4" resolve="NoSolver" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
index f803b413..c92fba8f 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps
@@ -5492,5 +5492,97 @@
     </node>
     <node concept="2tJIrI" id="6MYr6JwBO6F" role="jymVt" />
   </node>
+  <node concept="312cEu" id="4psy6tqstt4">
+    <property role="TrG5h" value="NoSolver" />
+    <node concept="2tJIrI" id="4psy6tqstCz" role="jymVt" />
+    <node concept="3clFb_" id="4psy6tqstCO" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="ask" />
+      <node concept="37vLTG" id="4psy6tqstCP" role="3clF46">
+        <property role="TrG5h" value="invocation" />
+        <node concept="3uibUv" id="4psy6tqstCQ" role="1tU5fm">
+          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+        </node>
+      </node>
+      <node concept="10P_77" id="4psy6tqstCR" role="3clF45" />
+      <node concept="3Tm1VV" id="4psy6tqstCS" role="1B3o_S" />
+      <node concept="3clFbS" id="4psy6tqstCW" role="3clF47">
+        <node concept="YS8fn" id="4psy6tqsvx0" role="3cqZAp">
+          <node concept="2ShNRf" id="4psy6tqsvy2" role="YScLw">
+            <node concept="1pGfFk" id="4psy6tqswHd" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4psy6tqstCX" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4psy6tqsvc2" role="jymVt" />
+    <node concept="3clFb_" id="4psy6tqstDg" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="tell" />
+      <node concept="3cqZAl" id="4psy6tqstDh" role="3clF45" />
+      <node concept="3Tm1VV" id="4psy6tqstDi" role="1B3o_S" />
+      <node concept="37vLTG" id="4psy6tqstDk" role="3clF46">
+        <property role="TrG5h" value="invocation" />
+        <node concept="3uibUv" id="4psy6tqstDl" role="1tU5fm">
+          <ref role="3uigEE" to="qrld:49L2l3FhtS6" resolve="PredicateInvocation" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="4psy6tqstDp" role="3clF47">
+        <node concept="YS8fn" id="4psy6tqswKP" role="3cqZAp">
+          <node concept="2ShNRf" id="4psy6tqswKQ" role="YScLw">
+            <node concept="1pGfFk" id="4psy6tqswKR" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4psy6tqstDq" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4psy6tqsuX1" role="jymVt" />
+    <node concept="3clFb_" id="4psy6tqstD0" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="predicate" />
+      <node concept="37vLTG" id="4psy6tqstD1" role="3clF46">
+        <property role="TrG5h" value="predicateSymbol" />
+        <node concept="3uibUv" id="4psy6tqstD2" role="1tU5fm">
+          <ref role="3uigEE" to="rchb:5uFPQ7B$$3f" resolve="PredicateSymbol" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4psy6tqstD3" role="3clF46">
+        <property role="TrG5h" value="args" />
+        <node concept="8X2XB" id="4psy6tqstD4" role="1tU5fm">
+          <node concept="3uibUv" id="4psy6tqstD5" role="8Xvag">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="4psy6tqstD6" role="3clF45">
+        <ref role="3uigEE" to="rchb:6Kcfpq7Bj7q" resolve="Predicate" />
+      </node>
+      <node concept="3Tm1VV" id="4psy6tqstD7" role="1B3o_S" />
+      <node concept="3clFbS" id="4psy6tqstDc" role="3clF47">
+        <node concept="YS8fn" id="4psy6tqswOD" role="3cqZAp">
+          <node concept="2ShNRf" id="4psy6tqswOE" role="YScLw">
+            <node concept="1pGfFk" id="4psy6tqswOF" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4psy6tqstDd" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="4psy6tqstt5" role="1B3o_S" />
+    <node concept="3uibUv" id="4psy6tqstwo" role="EKbjA">
+      <ref role="3uigEE" to="qrld:6H279bUODvp" resolve="Solver" />
+    </node>
+  </node>
 </model>
 
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd b/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
index 9254f3a6..1b222f6a 100644
--- a/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
+++ b/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
@@ -20,7 +20,6 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
-    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
   </dependencies>
   <languageVersions>
@@ -39,7 +38,6 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
-    <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/test.xml b/test.xml
index 53b4af85..e3cf2a4e 100644
--- a/test.xml
+++ b/test.xml
@@ -1273,7 +1273,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.java.modules.cycle.3" depends="java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.java.modules.cycle.3" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${build.tmp}/java.modules.cycle.3" />
     <javac destdir="${build.tmp}/java.modules.cycle.3" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
       <compilerarg value="-Xlint:none" />
@@ -1315,6 +1315,7 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
@@ -1322,7 +1323,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.template" depends="java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.3, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.template" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.3, fetchDependencies">
     <mkdir dir="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1342,6 +1343,7 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
@@ -1372,7 +1374,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.3, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.3, fetchDependencies">
     <mkdir dir="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1392,6 +1394,7 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
@@ -1535,7 +1538,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" depends="java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1555,8 +1558,6 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
index 7b3503c6..93e30201 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd
@@ -51,6 +51,7 @@
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
     <module reference="3ddddf69-9ff0-426b-9365-51ae7356fb82(jetbrains.mps.lang.typesystem2.sample)" version="0" />
     <module reference="1b65dfe8-24ff-41c3-9a3e-70f102942455(jetbrains.mps.lang.typesystem2.sample.test)" version="0" />
+    <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
     <module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
index 1e83c1a4..3863ef73 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.build/models/jetbrains/mps/lang/typesystem2/samplechecker/build.mps
@@ -960,6 +960,12 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
+        <node concept="1SiIV0" id="159_25MoE_0" role="3bR37C">
+          <node concept="3bR9La" id="159_25MoE_1" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" node="7Ant4Wk$48A" resolve="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="65DJywFj0uW" role="3989C9">
@@ -1105,12 +1111,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4Wk$4po" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4Wk$4pp" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.typesystem2.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4Wk$4pq" role="3bR37C">
           <node concept="3bR9La" id="7Ant4Wk$4pr" role="1SiIV1">
             <property role="3bR36h" value="false" />
@@ -1129,12 +1129,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4Wk$4pw" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4Wk$4px" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.typesystem2.template" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4Wk$4py" role="3bR37C">
           <node concept="3bR9La" id="7Ant4Wk$4pz" role="1SiIV1">
             <property role="3bR36h" value="false" />
@@ -2077,6 +2071,12 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
+        <node concept="1SiIV0" id="159_25MoEEI" role="3bR37C">
+          <node concept="3bR9La" id="159_25MoEEJ" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" node="7Ant4WkHLsm" resolve="jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7Ant4WkHLrs" role="3989C9">
@@ -2276,12 +2276,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLss" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLst" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLr9" resolve="jetbrains.mps.lang.typesystem2.runtime" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4WkHLsu" role="3bR37C">
           <node concept="3bR9La" id="7Ant4WkHLsv" role="1SiIV1">
             <property role="3bR36h" value="false" />
@@ -2300,12 +2294,6 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7Ant4WkHLs$" role="3bR37C">
-          <node concept="3bR9La" id="7Ant4WkHLs_" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="7Ant4WkHLqN" resolve="jetbrains.mps.lang.typesystem2.template" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7Ant4WkHLsA" role="3bR37C">
           <node concept="3bR9La" id="7Ant4WkHLsB" role="1SiIV1">
             <property role="3bR36h" value="false" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
index 973b0e36..92ea21ac 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/jetbrains.mps.lang.typesystem2.samplechecker.handler.util.msd
@@ -10,8 +10,6 @@
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
-    <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
   </dependencies>
@@ -45,9 +43,7 @@
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
-    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
     <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
-    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
index 30a084e2..72000e06 100644
--- a/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
@@ -587,7 +587,9 @@
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <property id="1238684351431" name="asCast" index="1BlNFB" />
+      </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
@@ -6901,7 +6903,8 @@
                             <node concept="17QB3L" id="78CwJJcTyWL" role="1tU5fm" />
                             <node concept="2OqwBi" id="1pPth$l_Zf7" role="33vP2m">
                               <node concept="1PxgMI" id="1pPth$l_Zf8" role="2Oq$k0">
-                                <ref role="1m5ApE" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+                                <property role="1BlNFB" value="true" />
+                                <ref role="1m5ApE" to="tpck:h0TrEE$" resolve="INamedConcept" />
                                 <node concept="37vLTw" id="1pPth$l_Zf9" role="1m5AlR">
                                   <ref role="3cqZAo" node="1pPth$l_ZeY" resolve="containingRoot" />
                                 </node>
@@ -6912,7 +6915,38 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbH" id="4xTpErk0b4k" role="3cqZAp" />
+                        <node concept="3clFbJ" id="1fBcxRyfETm" role="3cqZAp">
+                          <node concept="3clFbS" id="1fBcxRyfETo" role="3clFbx">
+                            <node concept="3clFbF" id="1fBcxRyfRf7" role="3cqZAp">
+                              <node concept="37vLTI" id="1fBcxRyfYAA" role="3clFbG">
+                                <node concept="37vLTw" id="1fBcxRyfRf5" role="37vLTJ">
+                                  <ref role="3cqZAo" node="78CwJJcTyWt" resolve="nameHint" />
+                                </node>
+                                <node concept="2YIFZM" id="1fBcxRygA7u" role="37vLTx">
+                                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                  <node concept="2OqwBi" id="1fBcxRyggAW" role="37wK5m">
+                                    <node concept="2JrnkZ" id="1fBcxRygeq3" role="2Oq$k0">
+                                      <node concept="37vLTw" id="1fBcxRyg7em" role="2JrQYb">
+                                        <ref role="3cqZAo" node="1pPth$l_ZeY" resolve="containingRoot" />
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="1fBcxRygiDm" role="2OqNvi">
+                                      <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbC" id="1fBcxRyfMtv" role="3clFbw">
+                            <node concept="10Nm6u" id="1fBcxRyfOsB" role="3uHU7w" />
+                            <node concept="37vLTw" id="1fBcxRyfJW8" role="3uHU7B">
+                              <ref role="3cqZAo" node="78CwJJcTyWt" resolve="nameHint" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="1fBcxRyfCzm" role="3cqZAp" />
                         <node concept="3cpWs8" id="4hh0cTRbUS6" role="3cqZAp">
                           <node concept="3cpWsn" id="4hh0cTRbUS7" role="3cpWs9">
                             <property role="TrG5h" value="typesAspect" />
@@ -7002,7 +7036,6 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbH" id="4JJCDIn4SGG" role="3cqZAp" />
                             <node concept="3cpWs8" id="4JJCDIn5aJ9" role="3cqZAp">
                               <node concept="3cpWsn" id="4JJCDIn5aJa" role="3cpWs9">
                                 <property role="TrG5h" value="typeManifest" />
@@ -7020,102 +7053,120 @@
                               </node>
                             </node>
                             <node concept="3clFbH" id="4JJCDIn5exj" role="3cqZAp" />
-                            <node concept="3clFbF" id="3F6vMxqm2AB" role="3cqZAp">
-                              <node concept="2OqwBi" id="3F6vMxqm9QE" role="3clFbG">
-                                <node concept="2OqwBi" id="3F6vMxqm4Iw" role="2Oq$k0">
-                                  <node concept="Xjq3P" id="3F6vMxqm2A_" role="2Oq$k0" />
-                                  <node concept="2OwXpG" id="3F6vMxqm754" role="2OqNvi">
-                                    <ref role="2Oxat5" node="3F6vMxqlTiX" resolve="expressionSolvers" />
+                            <node concept="3clFbJ" id="159_25Mng6t" role="3cqZAp">
+                              <node concept="3clFbS" id="159_25Mng6v" role="3clFbx">
+                                <node concept="3clFbF" id="3F6vMxqm2AB" role="3cqZAp">
+                                  <node concept="2OqwBi" id="3F6vMxqm9QE" role="3clFbG">
+                                    <node concept="2OqwBi" id="3F6vMxqm4Iw" role="2Oq$k0">
+                                      <node concept="Xjq3P" id="3F6vMxqm2A_" role="2Oq$k0" />
+                                      <node concept="2OwXpG" id="3F6vMxqm754" role="2OqNvi">
+                                        <ref role="2Oxat5" node="3F6vMxqlTiX" resolve="expressionSolvers" />
+                                      </node>
+                                    </node>
+                                    <node concept="TSZUe" id="3F6vMxqmcFJ" role="2OqNvi">
+                                      <node concept="2OqwBi" id="3F6vMxqmeIj" role="25WWJ7">
+                                        <node concept="37vLTw" id="3F6vMxqmeIk" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="3Qp4N06byjA" resolve="ruleManifest" />
+                                        </node>
+                                        <node concept="liA8E" id="3F6vMxqmeIl" role="2OqNvi">
+                                          <ref role="37wK5l" to="i348:1ggxSI7z1S5" resolve="javaExpressionSolver" />
+                                        </node>
+                                      </node>
+                                    </node>
                                   </node>
                                 </node>
-                                <node concept="TSZUe" id="3F6vMxqmcFJ" role="2OqNvi">
-                                  <node concept="2OqwBi" id="3F6vMxqmeIj" role="25WWJ7">
-                                    <node concept="37vLTw" id="3F6vMxqmeIk" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3Qp4N06byjA" resolve="ruleManifest" />
+                                <node concept="3clFbH" id="6X5F0Ngi7oR" role="3cqZAp" />
+                                <node concept="3cpWs8" id="5rhZO$U04lo" role="3cqZAp">
+                                  <node concept="3cpWsn" id="5rhZO$U04lp" role="3cpWs9">
+                                    <property role="TrG5h" value="programBuilder" />
+                                    <node concept="3uibUv" id="5rhZO$U04lq" role="1tU5fm">
+                                      <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
                                     </node>
-                                    <node concept="liA8E" id="3F6vMxqmeIl" role="2OqNvi">
-                                      <ref role="37wK5l" to="i348:1ggxSI7z1S5" resolve="javaExpressionSolver" />
+                                    <node concept="2ShNRf" id="5rhZO$U064C" role="33vP2m">
+                                      <node concept="1pGfFk" id="5rhZO$U062B" role="2ShVmc">
+                                        <ref role="37wK5l" to="7n8k:5rhZO$TZ9Ji" resolve="ChrProgramBuilder" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbH" id="5rhZO$U02Ba" role="3cqZAp" />
+                                <node concept="3clFbF" id="1pPth$l_Zfc" role="3cqZAp">
+                                  <node concept="d57v9" id="1pPth$lGttZ" role="3clFbG">
+                                    <node concept="37vLTw" id="1pPth$lGtu7" role="37vLTJ">
+                                      <ref role="3cqZAo" node="1pPth$l_ZeL" resolve="errors" />
+                                    </node>
+                                    <node concept="2YIFZM" id="1pPth$lGtu1" role="37vLTx">
+                                      <ref role="1Pybhc" node="3Qp4N06byjn" resolve="CollectRuleTemplates" />
+                                      <ref role="37wK5l" node="3Qp4N06byjp" resolve="collect" />
+                                      <node concept="37vLTw" id="1ggxSI7$FCx" role="37wK5m">
+                                        <ref role="3cqZAo" node="3Qp4N06byjA" resolve="ruleManifest" />
+                                      </node>
+                                      <node concept="37vLTw" id="4JJCDIn5l2A" role="37wK5m">
+                                        <ref role="3cqZAo" node="4JJCDIn5aJa" resolve="typeManifest" />
+                                      </node>
+                                      <node concept="37vLTw" id="1pPth$lGtu5" role="37wK5m">
+                                        <ref role="3cqZAo" node="1pPth$l_ZeY" resolve="containingRoot" />
+                                      </node>
+                                      <node concept="37vLTw" id="5rhZO$U0lWd" role="37wK5m">
+                                        <ref role="3cqZAo" node="5rhZO$U04lp" resolve="programBuilder" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbH" id="5rhZO$U0np3" role="3cqZAp" />
+                                <node concept="3cpWs8" id="506k$zeU3HR" role="3cqZAp">
+                                  <node concept="3cpWsn" id="506k$zeU3HS" role="3cpWs9">
+                                    <property role="TrG5h" value="program" />
+                                    <node concept="3uibUv" id="5rhZO$U0kPD" role="1tU5fm">
+                                      <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
+                                    </node>
+                                    <node concept="2OqwBi" id="5rhZO$U0dGH" role="33vP2m">
+                                      <node concept="37vLTw" id="5rhZO$U0d7C" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="5rhZO$U04lp" resolve="programBuilder" />
+                                      </node>
+                                      <node concept="liA8E" id="5rhZO$U0eev" role="2OqNvi">
+                                        <ref role="37wK5l" to="7n8k:5rhZO$TZiL1" resolve="program" />
+                                        <node concept="3cpWs3" id="7nPD14NXeXG" role="37wK5m">
+                                          <node concept="37vLTw" id="6RFuZEC0ym8" role="3uHU7w">
+                                            <ref role="3cqZAo" node="78CwJJcTyWt" resolve="nameHint" />
+                                          </node>
+                                          <node concept="Xl_RD" id="7nPD14NXfCi" role="3uHU7B">
+                                            <property role="Xl_RC" value="types_" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbH" id="506k$zeTAV$" role="3cqZAp" />
+                                <node concept="3clFbF" id="1pPth$lGzsJ" role="3cqZAp">
+                                  <node concept="2OqwBi" id="1pPth$lG$rZ" role="3clFbG">
+                                    <node concept="2OqwBi" id="3F6vMxqnFll" role="2Oq$k0">
+                                      <node concept="Xjq3P" id="3F6vMxqnHek" role="2Oq$k0" />
+                                      <node concept="2OwXpG" id="3F6vMxqnFlo" role="2OqNvi">
+                                        <ref role="2Oxat5" node="1pPth$lE8Xs" resolve="programs" />
+                                      </node>
+                                    </node>
+                                    <node concept="TSZUe" id="1pPth$lGArx" role="2OqNvi">
+                                      <node concept="37vLTw" id="1pPth$lGBka" role="25WWJ7">
+                                        <ref role="3cqZAo" node="506k$zeU3HS" resolve="program" />
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                            </node>
-                            <node concept="3clFbH" id="6X5F0Ngi7oR" role="3cqZAp" />
-                            <node concept="3cpWs8" id="5rhZO$U04lo" role="3cqZAp">
-                              <node concept="3cpWsn" id="5rhZO$U04lp" role="3cpWs9">
-                                <property role="TrG5h" value="programBuilder" />
-                                <node concept="3uibUv" id="5rhZO$U04lq" role="1tU5fm">
-                                  <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
-                                </node>
-                                <node concept="2ShNRf" id="5rhZO$U064C" role="33vP2m">
-                                  <node concept="1pGfFk" id="5rhZO$U062B" role="2ShVmc">
-                                    <ref role="37wK5l" to="7n8k:5rhZO$TZ9Ji" resolve="ChrProgramBuilder" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbH" id="5rhZO$U02Ba" role="3cqZAp" />
-                            <node concept="3clFbF" id="1pPth$l_Zfc" role="3cqZAp">
-                              <node concept="d57v9" id="1pPth$lGttZ" role="3clFbG">
-                                <node concept="37vLTw" id="1pPth$lGtu7" role="37vLTJ">
-                                  <ref role="3cqZAo" node="1pPth$l_ZeL" resolve="errors" />
-                                </node>
-                                <node concept="2YIFZM" id="1pPth$lGtu1" role="37vLTx">
-                                  <ref role="1Pybhc" node="3Qp4N06byjn" resolve="CollectRuleTemplates" />
-                                  <ref role="37wK5l" node="3Qp4N06byjp" resolve="collect" />
-                                  <node concept="37vLTw" id="1ggxSI7$FCx" role="37wK5m">
-                                    <ref role="3cqZAo" node="3Qp4N06byjA" resolve="ruleManifest" />
-                                  </node>
-                                  <node concept="37vLTw" id="4JJCDIn5l2A" role="37wK5m">
+                              <node concept="1Wc70l" id="159_25Mnnqz" role="3clFbw">
+                                <node concept="3y3z36" id="159_25MnsdU" role="3uHU7w">
+                                  <node concept="10Nm6u" id="159_25MnstJ" role="3uHU7w" />
+                                  <node concept="37vLTw" id="159_25Mnq0q" role="3uHU7B">
                                     <ref role="3cqZAo" node="4JJCDIn5aJa" resolve="typeManifest" />
                                   </node>
-                                  <node concept="37vLTw" id="1pPth$lGtu5" role="37wK5m">
-                                    <ref role="3cqZAo" node="1pPth$l_ZeY" resolve="containingRoot" />
-                                  </node>
-                                  <node concept="37vLTw" id="5rhZO$U0lWd" role="37wK5m">
-                                    <ref role="3cqZAo" node="5rhZO$U04lp" resolve="programBuilder" />
-                                  </node>
                                 </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbH" id="5rhZO$U0np3" role="3cqZAp" />
-                            <node concept="3cpWs8" id="506k$zeU3HR" role="3cqZAp">
-                              <node concept="3cpWsn" id="506k$zeU3HS" role="3cpWs9">
-                                <property role="TrG5h" value="program" />
-                                <node concept="3uibUv" id="5rhZO$U0kPD" role="1tU5fm">
-                                  <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="Program" />
-                                </node>
-                                <node concept="2OqwBi" id="5rhZO$U0dGH" role="33vP2m">
-                                  <node concept="37vLTw" id="5rhZO$U0d7C" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5rhZO$U04lp" resolve="programBuilder" />
-                                  </node>
-                                  <node concept="liA8E" id="5rhZO$U0eev" role="2OqNvi">
-                                    <ref role="37wK5l" to="7n8k:5rhZO$TZiL1" resolve="program" />
-                                    <node concept="3cpWs3" id="7nPD14NXeXG" role="37wK5m">
-                                      <node concept="37vLTw" id="6RFuZEC0ym8" role="3uHU7w">
-                                        <ref role="3cqZAo" node="78CwJJcTyWt" resolve="nameHint" />
-                                      </node>
-                                      <node concept="Xl_RD" id="7nPD14NXfCi" role="3uHU7B">
-                                        <property role="Xl_RC" value="types_" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbH" id="506k$zeTAV$" role="3cqZAp" />
-                            <node concept="3clFbF" id="1pPth$lGzsJ" role="3cqZAp">
-                              <node concept="2OqwBi" id="1pPth$lG$rZ" role="3clFbG">
-                                <node concept="2OqwBi" id="3F6vMxqnFll" role="2Oq$k0">
-                                  <node concept="Xjq3P" id="3F6vMxqnHek" role="2Oq$k0" />
-                                  <node concept="2OwXpG" id="3F6vMxqnFlo" role="2OqNvi">
-                                    <ref role="2Oxat5" node="1pPth$lE8Xs" resolve="programs" />
-                                  </node>
-                                </node>
-                                <node concept="TSZUe" id="1pPth$lGArx" role="2OqNvi">
-                                  <node concept="37vLTw" id="1pPth$lGBka" role="25WWJ7">
-                                    <ref role="3cqZAo" node="506k$zeU3HS" resolve="program" />
+                                <node concept="3y3z36" id="159_25Mnl7t" role="3uHU7B">
+                                  <node concept="37vLTw" id="159_25MniGz" role="3uHU7B">
+                                    <ref role="3cqZAo" node="3Qp4N06byjA" resolve="ruleManifest" />
                                   </node>
+                                  <node concept="10Nm6u" id="159_25Mnlni" role="3uHU7w" />
                                 </node>
                               </node>
                             </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index 186e551f..c24633cb 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -171,6 +171,7 @@
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.typesystem2)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
+    <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
index 20f3ba1f..e4a66193 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
@@ -13,6 +13,7 @@
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
+    <dependency reexport="true">9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)</dependency>
   </dependencies>
   <usedDevKits>
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -42,6 +43,7 @@
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
+    <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/generation.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/generation.mps
index f5dad23c..f4ced965 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/generation.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/generation.mps
@@ -3903,7 +3903,7 @@
                                 </node>
                                 <node concept="1BlSNk" id="3g$8GQCjqI4" role="2OqNvi">
                                   <ref role="1BmUXE" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                  <ref role="1Bn3mz" to="tpck:4uZwTti3__2" />
+                                  <ref role="1Bn3mz" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
                                 </node>
                               </node>
                             </node>
@@ -4899,9 +4899,6 @@
         <node concept="3clFbF" id="1hX44vNnpfY" role="3cqZAp">
           <node concept="1rXfSq" id="1hX44vNnpfX" role="3clFbG">
             <ref role="37wK5l" node="1hX44vNnpfT" resolve="collectTypes" />
-            <node concept="37vLTw" id="1hX44vNnpfW" role="37wK5m">
-              <ref role="3cqZAo" node="1hX44vNlSPE" resolve="typeManifest" />
-            </node>
           </node>
         </node>
       </node>
@@ -4934,12 +4931,6 @@
       <property role="TrG5h" value="collectTypes" />
       <node concept="3Tm6S6" id="1hX44vNnpfU" role="1B3o_S" />
       <node concept="3cqZAl" id="1hX44vNnpfV" role="3clF45" />
-      <node concept="37vLTG" id="1hX44vNnpfO" role="3clF46">
-        <property role="TrG5h" value="typeManifest" />
-        <node concept="3uibUv" id="1hX44vNnpfP" role="1tU5fm">
-          <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractTypeManifest" />
-        </node>
-      </node>
       <node concept="3clFbS" id="1hX44vNnpfH" role="3clF47">
         <node concept="3SKdUt" id="1hX44vNnqZn" role="3cqZAp">
           <node concept="3SKdUq" id="1hX44vNnqZp" role="3SKWNk">
@@ -4948,8 +4939,8 @@
         </node>
         <node concept="3clFbF" id="1hX44vNnpfI" role="3cqZAp">
           <node concept="2OqwBi" id="1hX44vNnpfJ" role="3clFbG">
-            <node concept="37vLTw" id="1hX44vNnpfQ" role="2Oq$k0">
-              <ref role="3cqZAo" node="1hX44vNnpfO" resolve="typeManifest" />
+            <node concept="37vLTw" id="159_25Mmht6" role="2Oq$k0">
+              <ref role="3cqZAo" node="1hX44vNniCj" resolve="typeManifest" />
             </node>
             <node concept="liA8E" id="1hX44vNnpfL" role="2OqNvi">
               <ref role="37wK5l" to="psr6:1pPth$m7IW6" resolve="collectTypeTables" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
index 23d8cb8b..16e8982c 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
@@ -40,6 +40,7 @@
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
+    <module reference="9c4ae21e-62e0-4110-95b7-191b357a42d2(jetbrains.mps.lang.typesystem2.samplechecker.handler.util)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.logic.atom)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />