diff --git a/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index c889934f..095f3b59 100644
--- a/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -105,6 +105,7 @@
         <child id="1070534934092" name="expression" index="10QFUP" />
       </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
@@ -293,6 +294,7 @@
         <child id="1195158608805" name="conditionFunction" index="150hEN" />
         <child id="1195158637244" name="caseConsequence" index="150oIE" />
       </concept>
+      <concept id="1225228973247" name="jetbrains.mps.lang.generator.structure.MapSrcMacro_PostMapperFunction" flags="in" index="15lBmy" />
       <concept id="1087833241328" name="jetbrains.mps.lang.generator.structure.PropertyMacro" flags="ln" index="17Uvod">
         <child id="1167756362303" name="propertyValueFunction" index="3zH0cK" />
       </concept>
@@ -302,6 +304,7 @@
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
+      <concept id="1184690432998" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_outputNode" flags="nn" index="3l3mFP" />
       <concept id="1167514355419" name="jetbrains.mps.lang.generator.structure.Root_MappingRule" flags="lg" index="3lhOvk">
         <reference id="1167514355421" name="template" index="3lhOvi" />
       </concept>
@@ -309,6 +312,9 @@
         <property id="1169670173015" name="messageText" index="1lLB17" />
         <property id="1169670356567" name="messageType" index="1lMjX7" />
       </concept>
+      <concept id="1131073187192" name="jetbrains.mps.lang.generator.structure.MapSrcNodeMacro" flags="ln" index="1pdMLZ">
+        <child id="1225229330048" name="postMapperFunction" index="15mYut" />
+      </concept>
       <concept id="1195499912406" name="jetbrains.mps.lang.generator.structure.MappingScript" flags="lg" index="1pmfR0">
         <property id="1195595592106" name="scriptKind" index="1v3f2W" />
         <property id="1195595611951" name="modifiesModel" index="1v3jST" />
@@ -2476,6 +2482,7 @@
   <node concept="312cEu" id="4vbeH84zLYz">
     <property role="TrG5h" value="RuleTemplate" />
     <property role="3GE5qa" value="rule" />
+    <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="4vbeH84zMqV" role="jymVt" />
     <node concept="3clFbW" id="12yN8DyKLU_" role="jymVt">
       <node concept="3cqZAl" id="12yN8DyKLUB" role="3clF45" />
@@ -2970,6 +2977,25 @@
         </node>
       </node>
     </node>
+    <node concept="1pdMLZ" id="1zN1RIlGPyr" role="lGtFl">
+      <node concept="15lBmy" id="1zN1RIlGQ9P" role="15mYut">
+        <node concept="3clFbS" id="1zN1RIlGQ9Q" role="2VODD2">
+          <node concept="3clFbF" id="1zN1RIlGQLk" role="3cqZAp">
+            <node concept="37vLTI" id="1zN1RIlGThD" role="3clFbG">
+              <node concept="3clFbT" id="1zN1RIlGTic" role="37vLTx">
+                <property role="3clFbU" value="false" />
+              </node>
+              <node concept="2OqwBi" id="1zN1RIlGQSI" role="37vLTJ">
+                <node concept="3l3mFP" id="1zN1RIlGQLj" role="2Oq$k0" />
+                <node concept="3TrcHB" id="1zN1RIlGS5_" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpee:fDsVARU" resolve="abstractClass" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="1pmfR0" id="4vbeH84AvBw">
     <property role="TrG5h" value="init_tracking" />
@@ -3625,6 +3651,10 @@
   <node concept="312cEu" id="5MHpiylJzam">
     <property role="TrG5h" value="IteratingRuleTemplate" />
     <property role="3GE5qa" value="rule" />
+    <property role="1sVAO0" value="true" />
+    <node concept="16euLQ" id="tIwzd2f2vj" role="16eVyc">
+      <property role="TrG5h" value="T" />
+    </node>
     <node concept="2tJIrI" id="5MHpiylJzan" role="jymVt" />
     <node concept="3clFbW" id="5MHpiylJzao" role="jymVt">
       <node concept="3cqZAl" id="5MHpiylJzap" role="3clF45" />
@@ -3750,15 +3780,15 @@
                 <node concept="3clFbF" id="5MHpiylK0VZ" role="3cqZAp">
                   <node concept="2OqwBi" id="5MHpiylK3$6" role="3clFbG">
                     <node concept="2OqwBi" id="5MHpiylK2kw" role="2Oq$k0">
+                      <node concept="3TrEf2" id="tIwzd1DceW" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" />
+                      </node>
                       <node concept="2OqwBi" id="5MHpiylK0VU" role="2Oq$k0">
                         <node concept="3TrEf2" id="5MHpiylK1yu" role="2OqNvi">
                           <ref role="3Tt5mk" to="wq2x:5MHpiylGjt8" />
                         </node>
                         <node concept="30H73N" id="5MHpiylK0VY" role="2Oq$k0" />
                       </node>
-                      <node concept="3TrEf2" id="tIwzd1DceW" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" />
-                      </node>
                     </node>
                     <node concept="3Tsc0h" id="5MHpiylK4S4" role="2OqNvi">
                       <ref role="3TtcxE" to="tpee:fzcqZ_x" />
@@ -4335,8 +4365,24 @@
         </node>
       </node>
     </node>
-    <node concept="16euLQ" id="tIwzd2f2vj" role="16eVyc">
-      <property role="TrG5h" value="T" />
+    <node concept="1pdMLZ" id="1zN1RIlGC1A" role="lGtFl">
+      <node concept="15lBmy" id="1zN1RIlGEgE" role="15mYut">
+        <node concept="3clFbS" id="1zN1RIlGEgF" role="2VODD2">
+          <node concept="3clFbF" id="1zN1RIlGG5k" role="3cqZAp">
+            <node concept="37vLTI" id="1zN1RIlGIPn" role="3clFbG">
+              <node concept="3clFbT" id="1zN1RIlGIPY" role="37vLTx">
+                <property role="3clFbU" value="false" />
+              </node>
+              <node concept="2OqwBi" id="1zN1RIlGGcM" role="37vLTJ">
+                <node concept="3l3mFP" id="1zN1RIlGG5j" role="2Oq$k0" />
+                <node concept="3TrcHB" id="1zN1RIlGHpD" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpee:fDsVARU" resolve="abstractClass" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
   </node>
   <node concept="bUwia" id="6FQzrygS9cb">
@@ -5187,9 +5233,6 @@
                   </node>
                 </node>
                 <node concept="3cpWs3" id="7gr_roma7Pp" role="3uHU7B">
-                  <node concept="Xl_RD" id="7gr_roma8Wz" role="3uHU7w">
-                    <property role="Xl_RC" value="_" />
-                  </node>
                   <node concept="3cpWs3" id="tIwzd24RUX" role="3uHU7B">
                     <node concept="3cpWs3" id="7gr_rom9zaY" role="3uHU7B">
                       <node concept="Xl_RD" id="7gr_rom9zaZ" role="3uHU7B">
@@ -5268,6 +5311,9 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="Xl_RD" id="7gr_roma8Wz" role="3uHU7w">
+                    <property role="Xl_RC" value="_" />
+                  </node>
                 </node>
                 <node concept="raruj" id="7gr_rom9Fu2" role="lGtFl" />
                 <node concept="1W57fq" id="7gr_rom9Fu4" role="lGtFl">
@@ -7194,7 +7240,28 @@
     <ref role="3gUMe" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
     <node concept="312cEu" id="1zN1RIl3DtG" role="13RCb5">
       <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="RuleTemplate" />
+      <property role="TrG5h" value="RuleTemplateFragment" />
+      <property role="1sVAO0" value="true" />
+      <node concept="16euLQ" id="1zN1RIlDdi2" role="16eVyc">
+        <property role="TrG5h" value="S" />
+      </node>
+      <node concept="2tJIrI" id="1zN1RIlD2Zk" role="jymVt" />
+      <node concept="3clFbW" id="1zN1RIlD3HK" role="jymVt">
+        <node concept="3cqZAl" id="1zN1RIlD3HM" role="3clF45" />
+        <node concept="3Tm1VV" id="1zN1RIlD3HN" role="1B3o_S" />
+        <node concept="3clFbS" id="1zN1RIlD3HO" role="3clF47">
+          <node concept="XkiVB" id="1zN1RIlD4dI" role="3cqZAp">
+            <ref role="37wK5l" to="qiww:12yN8DyKFdd" resolve="AbstractRuleTemplate" />
+            <node concept="37vLTw" id="1zN1RIlDNQv" role="37wK5m">
+              <ref role="3cqZAo" node="1zN1RIlDNO4" resolve="name" />
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="1zN1RIlDNO4" role="3clF46">
+          <property role="TrG5h" value="name" />
+          <node concept="17QB3L" id="1zN1RIlDNO3" role="1tU5fm" />
+        </node>
+      </node>
       <node concept="2tJIrI" id="1zN1RIl3F0r" role="jymVt" />
       <node concept="3clFb_" id="1zN1RIl3FVD" role="jymVt">
         <property role="TrG5h" value="applicableConcept" />
@@ -7318,15 +7385,15 @@
                   <node concept="3clFbF" id="1zN1RIl3FW_" role="3cqZAp">
                     <node concept="2OqwBi" id="1zN1RIl3FWA" role="3clFbG">
                       <node concept="2OqwBi" id="1zN1RIl3FWB" role="2Oq$k0">
+                        <node concept="3TrEf2" id="tIwzd1FpsH" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" />
+                        </node>
                         <node concept="2OqwBi" id="1zN1RIl3FWC" role="2Oq$k0">
                           <node concept="30H73N" id="1zN1RIl3FWD" role="2Oq$k0" />
                           <node concept="3TrEf2" id="1zN1RIl3FWE" role="2OqNvi">
                             <ref role="3Tt5mk" to="wq2x:4laj_h9OavG" />
                           </node>
                         </node>
-                        <node concept="3TrEf2" id="tIwzd1FpsH" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" />
-                        </node>
                       </node>
                       <node concept="3Tsc0h" id="1zN1RIl3FWG" role="2OqNvi">
                         <ref role="3TtcxE" to="tpee:fzcqZ_x" />
@@ -7454,15 +7521,15 @@
                   <node concept="3clFbF" id="1zN1RIl3FXA" role="3cqZAp">
                     <node concept="2OqwBi" id="1zN1RIl3FXB" role="3clFbG">
                       <node concept="2OqwBi" id="1zN1RIl3FXC" role="2Oq$k0">
+                        <node concept="3TrEf2" id="tIwzd1DdQU" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" />
+                        </node>
                         <node concept="2OqwBi" id="1zN1RIl3FXD" role="2Oq$k0">
                           <node concept="30H73N" id="1zN1RIl3FXE" role="2Oq$k0" />
                           <node concept="3TrEf2" id="1zN1RIl3FXF" role="2OqNvi">
                             <ref role="3Tt5mk" to="wq2x:1zN1RIkQKTu" />
                           </node>
                         </node>
-                        <node concept="3TrEf2" id="tIwzd1DdQU" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" />
-                        </node>
                       </node>
                       <node concept="3Tsc0h" id="1zN1RIl3FXH" role="2OqNvi">
                         <ref role="3TtcxE" to="tpee:fzcqZ_x" />
@@ -7527,8 +7594,8 @@
       <node concept="3Tm1VV" id="1zN1RIl3DtH" role="1B3o_S" />
       <node concept="3uibUv" id="1zN1RIl3Ef3" role="1zkMxy">
         <ref role="3uigEE" to="qiww:5k_shARMpxh" resolve="AbstractRuleTemplate" />
-        <node concept="3uibUv" id="1zN1RIl3Ef8" role="11_B2D">
-          <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
+        <node concept="16syzq" id="1zN1RIlDdJ3" role="11_B2D">
+          <ref role="16sUi3" node="1zN1RIlDdi2" resolve="S" />
         </node>
       </node>
     </node>
diff --git a/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index e4a84c9c..aee398df 100644
--- a/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -60,11 +60,12 @@
   </generators>
   <sourcePath />
   <dependencies>
-    <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
-    <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
+    <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
+    <dependency reexport="false">c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.typesystem2)</dependency>
+    <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
   </dependencies>
   <usedLanguages>
     <usedLanguage>daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)</usedLanguage>
@@ -112,9 +113,9 @@
   </runtime>
   <extendedLanguages>
     <extendedLanguage>7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</extendedLanguage>
-    <extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
     <extendedLanguage>83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)</extendedLanguage>
     <extendedLanguage>35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</extendedLanguage>
+    <extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
   </extendedLanguages>
 </language>
 
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps b/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
index 4a6eebe2..5279b128 100644
--- a/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
@@ -6,19 +6,89 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="nc4n" ref="r:2a1eb048-898c-47a3-863b-36b04c4b9f7c(jetbrains.mps.lang.typesystem2.runtime.rule)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="qiww" ref="r:7e0616dc-e55e-4c35-beca-da14b0c8f8bd(jetbrains.mps.lang.typesystem2.runtime.template)" />
+    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)" implicit="true" />
+    <import index="e2lb" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
+        <child id="1082485599096" name="statements" index="9aQI4" />
+      </concept>
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
+      <concept id="1083260308424" name="jetbrains.mps.baseLanguage.structure.EnumConstantReference" flags="nn" index="Rm8GO">
+        <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
+        <reference id="1144432896254" name="enumClass" index="1Px2BO" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="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="1082485599094" name="ifFalseStatement" index="9aQIa" />
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+        <child id="1206060520071" name="elsifClauses" index="3eNLev" />
+      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" 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="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="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
+        <child id="1206060619838" name="condition" index="3eO9$A" />
+        <child id="1206060644605" name="statementList" index="3eOfB_" />
+      </concept>
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <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="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
@@ -33,9 +103,16 @@
       <concept id="1185788614172" name="jetbrains.mps.lang.typesystem.structure.NormalTypeClause" flags="ng" index="mw_s8">
         <child id="1185788644032" name="normalType" index="mwGJk" />
       </concept>
+      <concept id="1175517767210" name="jetbrains.mps.lang.typesystem.structure.ReportErrorStatement" flags="nn" index="2MkqsV">
+        <child id="1175517851849" name="errorString" index="2MkJ7o" />
+      </concept>
+      <concept id="1227096774658" name="jetbrains.mps.lang.typesystem.structure.MessageStatement" flags="ng" index="2OEH$v">
+        <child id="1227096802790" name="nodeToReport" index="2OEOjV" />
+      </concept>
       <concept id="1195213580585" name="jetbrains.mps.lang.typesystem.structure.AbstractCheckingRule" flags="ig" index="18hYwZ">
         <child id="1195213635060" name="body" index="18ibNy" />
       </concept>
+      <concept id="1195214364922" name="jetbrains.mps.lang.typesystem.structure.NonTypesystemRule" flags="ig" index="18kY7G" />
       <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
         <reference id="1174642800329" name="concept" index="1YaFvo" />
       </concept>
@@ -56,7 +133,27 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
+        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      </concept>
+      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
+        <child id="1154546920563" name="concept" index="3gmYPZ" />
+      </concept>
+      <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
+        <reference id="1154546997487" name="concept" index="3gnhBz" />
+      </concept>
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
+      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
+      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <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="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
         <reference id="1140138128738" name="concept" index="1PxNhF" />
@@ -65,9 +162,15 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -82,6 +185,13 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </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="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
+    </language>
   </registry>
   <node concept="1YbPZF" id="6p0DfM0iLb2">
     <property role="TrG5h" value="typeof_RuleInputDeclaration" />
@@ -219,5 +329,538 @@
       <ref role="1YaFvo" to="wq2x:5MHpiylEsuT" resolve="RuleParameterDeclaration" />
     </node>
   </node>
+  <node concept="18kY7G" id="1zN1RIlrgwT">
+    <property role="TrG5h" value="check_RuleTempleMethod_call" />
+    <node concept="3clFbS" id="1zN1RIlrgwU" role="18ibNy">
+      <node concept="3cpWs8" id="1zN1RIlro2M" role="3cqZAp">
+        <node concept="3cpWsn" id="1zN1RIlro2N" role="3cpWs9">
+          <property role="TrG5h" value="annInst" />
+          <node concept="3Tqbb2" id="1zN1RIlro2A" role="1tU5fm">
+            <ref role="ehGHo" to="tpee:hiAHcMF" resolve="AnnotationInstance" />
+          </node>
+          <node concept="2OqwBi" id="1zN1RIlro2O" role="33vP2m">
+            <node concept="2OqwBi" id="1zN1RIlro2P" role="2Oq$k0">
+              <node concept="2OqwBi" id="1zN1RIlro2Q" role="2Oq$k0">
+                <node concept="1YBJjd" id="1zN1RIlro2R" role="2Oq$k0">
+                  <ref role="1YBMHb" node="1zN1RIlrgxK" resolve="baseMethodCall" />
+                </node>
+                <node concept="3TrEf2" id="1zN1RIlsNTU" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:fz7wK6H" />
+                </node>
+              </node>
+              <node concept="3Tsc0h" id="1zN1RIlro2T" role="2OqNvi">
+                <ref role="3TtcxE" to="tpee:hiAJF2X" />
+              </node>
+            </node>
+            <node concept="1z4cxt" id="1zN1RIlro2U" role="2OqNvi">
+              <node concept="1bVj0M" id="1zN1RIlro2V" role="23t8la">
+                <node concept="3clFbS" id="1zN1RIlro2W" role="1bW5cS">
+                  <node concept="3clFbF" id="1zN1RIlro2X" role="3cqZAp">
+                    <node concept="3clFbC" id="1zN1RIlro2Y" role="3clFbG">
+                      <node concept="3B5_sB" id="1zN1RIlro2Z" role="3uHU7w">
+                        <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleTemplateMethod" />
+                      </node>
+                      <node concept="2OqwBi" id="1zN1RIlro30" role="3uHU7B">
+                        <node concept="37vLTw" id="1zN1RIlro31" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1zN1RIlro33" resolve="annInst" />
+                        </node>
+                        <node concept="3TrEf2" id="1zN1RIlro32" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tpee:hiAI5P0" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="1zN1RIlro33" role="1bW2Oz">
+                  <property role="TrG5h" value="annInst" />
+                  <node concept="2jxLKc" id="1zN1RIlro34" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbH" id="1zN1RIlseLZ" role="3cqZAp" />
+      <node concept="3clFbJ" id="1zN1RIlro4v" role="3cqZAp">
+        <node concept="3clFbS" id="1zN1RIlro4x" role="3clFbx">
+          <node concept="3cpWs8" id="1zN1RIls0zw" role="3cqZAp">
+            <node concept="3cpWsn" id="1zN1RIls0zx" role="3cpWs9">
+              <property role="TrG5h" value="methKind" />
+              <node concept="3Tqbb2" id="1zN1RIls0zs" role="1tU5fm">
+                <ref role="ehGHo" to="tpee:fKQsSyN" resolve="EnumConstantDeclaration" />
+              </node>
+              <node concept="2OqwBi" id="1zN1RIls0zy" role="33vP2m">
+                <node concept="1PxgMI" id="1zN1RIls0zz" role="2Oq$k0">
+                  <ref role="1PxNhF" to="tpee:fKRm8J8" resolve="EnumConstantReference" />
+                  <node concept="2OqwBi" id="1zN1RIls0z$" role="1PxMeX">
+                    <node concept="2OqwBi" id="1zN1RIls0z_" role="2Oq$k0">
+                      <node concept="2OqwBi" id="1zN1RIls0zA" role="2Oq$k0">
+                        <node concept="37vLTw" id="1zN1RIls0zB" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1zN1RIlro2N" resolve="annInst" />
+                        </node>
+                        <node concept="3Tsc0h" id="1zN1RIls0zC" role="2OqNvi">
+                          <ref role="3TtcxE" to="tpee:hiB76_Z" />
+                        </node>
+                      </node>
+                      <node concept="1z4cxt" id="1zN1RIls0zD" role="2OqNvi">
+                        <node concept="1bVj0M" id="1zN1RIls0zE" role="23t8la">
+                          <node concept="3clFbS" id="1zN1RIls0zF" role="1bW5cS">
+                            <node concept="3clFbF" id="1zN1RIls0zG" role="3cqZAp">
+                              <node concept="2OqwBi" id="1zN1RIls0zH" role="3clFbG">
+                                <node concept="2OqwBi" id="1zN1RIls0zI" role="2Oq$k0">
+                                  <node concept="37vLTw" id="1zN1RIls0zJ" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="1zN1RIls0zN" resolve="val" />
+                                  </node>
+                                  <node concept="3TrEf2" id="1zN1RIls0zK" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="tpee:hiB70Z4" />
+                                  </node>
+                                </node>
+                                <node concept="1mIQ4w" id="1zN1RIls0zL" role="2OqNvi">
+                                  <node concept="chp4Y" id="1zN1RIls0zM" role="cj9EA">
+                                    <ref role="cht4Q" to="tpee:fKRm8J8" resolve="EnumConstantReference" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="Rh6nW" id="1zN1RIls0zN" role="1bW2Oz">
+                            <property role="TrG5h" value="val" />
+                            <node concept="2jxLKc" id="1zN1RIls0zO" role="1tU5fm" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3TrEf2" id="1zN1RIls0zP" role="2OqNvi">
+                      <ref role="3Tt5mk" to="tpee:hiB70Z4" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3TrEf2" id="1zN1RIls0zQ" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:fKRm8Ja" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="1zN1RIls30X" role="3cqZAp">
+            <node concept="3cpWsn" id="1zN1RIls30Y" role="3cpWs9">
+              <property role="TrG5h" value="context" />
+              <node concept="3Tqbb2" id="1zN1RIls30W" role="1tU5fm" />
+              <node concept="2OqwBi" id="1zN1RIls30Z" role="33vP2m">
+                <node concept="1YBJjd" id="1zN1RIls310" role="2Oq$k0">
+                  <ref role="1YBMHb" node="1zN1RIlrgxK" resolve="baseMethodCall" />
+                </node>
+                <node concept="2Xjw5R" id="1zN1RIls311" role="2OqNvi">
+                  <node concept="3gmYPX" id="1zN1RIls3uE" role="1xVPHs">
+                    <node concept="3gn64h" id="1zN1RIls3uK" role="3gmYPZ">
+                      <ref role="3gnhBz" to="wq2x:6p0DfM0a3d3" resolve="RulePart" />
+                    </node>
+                    <node concept="3gn64h" id="1zN1RIls3uQ" role="3gmYPZ">
+                      <ref role="3gnhBz" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="1zN1RIls3X0" role="3cqZAp" />
+          <node concept="3clFbJ" id="1zN1RIls3_s" role="3cqZAp">
+            <node concept="3clFbS" id="1zN1RIls3_u" role="3clFbx">
+              <node concept="3cpWs8" id="1zN1RIlsblM" role="3cqZAp">
+                <node concept="3cpWsn" id="1zN1RIlsblN" role="3cpWs9">
+                  <property role="TrG5h" value="thatAnnInst" />
+                  <node concept="3Tqbb2" id="1zN1RIlsblH" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:hiAHcMF" resolve="AnnotationInstance" />
+                  </node>
+                  <node concept="2OqwBi" id="1zN1RIlsblO" role="33vP2m">
+                    <node concept="2OqwBi" id="1zN1RIlsblP" role="2Oq$k0">
+                      <node concept="1PxgMI" id="1zN1RIlsblQ" role="2Oq$k0">
+                        <ref role="1PxNhF" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
+                        <node concept="37vLTw" id="1zN1RIlsblR" role="1PxMeX">
+                          <ref role="3cqZAo" node="1zN1RIls30Y" resolve="context" />
+                        </node>
+                      </node>
+                      <node concept="3Tsc0h" id="1zN1RIlsblS" role="2OqNvi">
+                        <ref role="3TtcxE" to="tpee:hiAJF2X" />
+                      </node>
+                    </node>
+                    <node concept="1z4cxt" id="1zN1RIlsblT" role="2OqNvi">
+                      <node concept="1bVj0M" id="1zN1RIlsblU" role="23t8la">
+                        <node concept="3clFbS" id="1zN1RIlsblV" role="1bW5cS">
+                          <node concept="3clFbF" id="1zN1RIlsblW" role="3cqZAp">
+                            <node concept="3clFbC" id="1zN1RIlsblX" role="3clFbG">
+                              <node concept="2OqwBi" id="1zN1RIlsblY" role="3uHU7B">
+                                <node concept="37vLTw" id="1zN1RIlsblZ" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="1zN1RIlsbm2" resolve="ai" />
+                                </node>
+                                <node concept="3TrEf2" id="1zN1RIlsbm0" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:hiAI5P0" />
+                                </node>
+                              </node>
+                              <node concept="3B5_sB" id="1zN1RIlsbm1" role="3uHU7w">
+                                <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleTemplateMethod" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="Rh6nW" id="1zN1RIlsbm2" role="1bW2Oz">
+                          <property role="TrG5h" value="ai" />
+                          <node concept="2jxLKc" id="1zN1RIlsbm3" role="1tU5fm" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="1zN1RIlsbIr" role="3cqZAp">
+                <node concept="3cpWsn" id="1zN1RIlsbIs" role="3cpWs9">
+                  <property role="TrG5h" value="thatMethKind" />
+                  <node concept="3Tqbb2" id="1zN1RIlsbHW" role="1tU5fm">
+                    <ref role="ehGHo" to="tpee:fKQsSyN" resolve="EnumConstantDeclaration" />
+                  </node>
+                  <node concept="2OqwBi" id="1zN1RIlsbIt" role="33vP2m">
+                    <node concept="1PxgMI" id="1zN1RIlsbIu" role="2Oq$k0">
+                      <ref role="1PxNhF" to="tpee:fKRm8J8" resolve="EnumConstantReference" />
+                      <node concept="2OqwBi" id="1zN1RIlsbIv" role="1PxMeX">
+                        <node concept="2OqwBi" id="1zN1RIlsbIw" role="2Oq$k0">
+                          <node concept="2OqwBi" id="1zN1RIlsbIx" role="2Oq$k0">
+                            <node concept="37vLTw" id="1zN1RIlsbIy" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1zN1RIlsblN" resolve="thatAnnInst" />
+                            </node>
+                            <node concept="3Tsc0h" id="1zN1RIlsbIz" role="2OqNvi">
+                              <ref role="3TtcxE" to="tpee:hiB76_Z" />
+                            </node>
+                          </node>
+                          <node concept="1z4cxt" id="1zN1RIlsbI$" role="2OqNvi">
+                            <node concept="1bVj0M" id="1zN1RIlsbI_" role="23t8la">
+                              <node concept="3clFbS" id="1zN1RIlsbIA" role="1bW5cS">
+                                <node concept="3clFbF" id="1zN1RIlsbIB" role="3cqZAp">
+                                  <node concept="2OqwBi" id="1zN1RIlsbIC" role="3clFbG">
+                                    <node concept="2OqwBi" id="1zN1RIlsbID" role="2Oq$k0">
+                                      <node concept="37vLTw" id="1zN1RIlsbIE" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="1zN1RIlsbII" resolve="val" />
+                                      </node>
+                                      <node concept="3TrEf2" id="1zN1RIlsbIF" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="tpee:hiB70Z4" />
+                                      </node>
+                                    </node>
+                                    <node concept="1mIQ4w" id="1zN1RIlsbIG" role="2OqNvi">
+                                      <node concept="chp4Y" id="1zN1RIlsbIH" role="cj9EA">
+                                        <ref role="cht4Q" to="tpee:fKRm8J8" resolve="EnumConstantReference" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="Rh6nW" id="1zN1RIlsbII" role="1bW2Oz">
+                                <property role="TrG5h" value="val" />
+                                <node concept="2jxLKc" id="1zN1RIlsbIJ" role="1tU5fm" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3TrEf2" id="1zN1RIlsbIK" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tpee:hiB70Z4" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3TrEf2" id="1zN1RIlsbIL" role="2OqNvi">
+                      <ref role="3Tt5mk" to="tpee:fKRm8Ja" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbJ" id="1zN1RIlsbR9" role="3cqZAp">
+                <node concept="3clFbS" id="1zN1RIlsbRb" role="3clFbx">
+                  <node concept="2MkqsV" id="1zN1RIlsbZ0" role="3cqZAp">
+                    <node concept="Xl_RD" id="1zN1RIlsbZ9" role="2MkJ7o">
+                      <property role="Xl_RC" value="incompatible called method kind" />
+                    </node>
+                    <node concept="1YBJjd" id="1zN1RIlsbZb" role="2OEOjV">
+                      <ref role="1YBMHb" node="1zN1RIlrgxK" resolve="baseMethodCall" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3y3z36" id="1zN1RIlsbYQ" role="3clFbw">
+                  <node concept="37vLTw" id="1zN1RIlsbYX" role="3uHU7w">
+                    <ref role="3cqZAo" node="1zN1RIlsbIs" resolve="thatMethKind" />
+                  </node>
+                  <node concept="37vLTw" id="1zN1RIlsbRX" role="3uHU7B">
+                    <ref role="3cqZAo" node="1zN1RIls0zx" resolve="methKind" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="1zN1RIls3Jd" role="3clFbw">
+              <node concept="37vLTw" id="1zN1RIls3A$" role="2Oq$k0">
+                <ref role="3cqZAo" node="1zN1RIls30Y" resolve="context" />
+              </node>
+              <node concept="1mIQ4w" id="1zN1RIls3Ux" role="2OqNvi">
+                <node concept="chp4Y" id="1zN1RIls3UA" role="cj9EA">
+                  <ref role="cht4Q" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
+                </node>
+              </node>
+            </node>
+            <node concept="9aQIb" id="1zN1RIlsc2q" role="9aQIa">
+              <node concept="3clFbS" id="1zN1RIlsc2r" role="9aQI4">
+                <node concept="3cpWs8" id="1zN1RIlsc5M" role="3cqZAp">
+                  <node concept="3cpWsn" id="1zN1RIlsc5P" role="3cpWs9">
+                    <property role="TrG5h" value="ok" />
+                    <node concept="10P_77" id="1zN1RIlsc5K" role="1tU5fm" />
+                    <node concept="3clFbT" id="1zN1RIlsc6q" role="33vP2m">
+                      <property role="3clFbU" value="true" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="1zN1RIlsklN" role="3cqZAp">
+                  <node concept="3clFbS" id="1zN1RIlsklP" role="3clFbx">
+                    <node concept="3clFbF" id="1zN1RIlsdDw" role="3cqZAp">
+                      <node concept="37vLTI" id="1zN1RIlsdDx" role="3clFbG">
+                        <node concept="1Wc70l" id="1zN1RIlsdDy" role="37vLTx">
+                          <node concept="2OqwBi" id="1zN1RIlsdDz" role="3uHU7w">
+                            <node concept="1PxgMI" id="1zN1RIlsdD$" role="2Oq$k0">
+                              <ref role="1PxNhF" to="wq2x:6p0DfM0a3gA" resolve="Head" />
+                              <node concept="37vLTw" id="1zN1RIlsdD_" role="1PxMeX">
+                                <ref role="3cqZAo" node="1zN1RIls30Y" resolve="context" />
+                              </node>
+                            </node>
+                            <node concept="3TrcHB" id="1zN1RIlsdDA" role="2OqNvi">
+                              <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="1zN1RIlsdDB" role="3uHU7B">
+                            <node concept="37vLTw" id="1zN1RIlsdDC" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1zN1RIls30Y" resolve="context" />
+                            </node>
+                            <node concept="1mIQ4w" id="1zN1RIlsdDD" role="2OqNvi">
+                              <node concept="chp4Y" id="1zN1RIlsdDE" role="cj9EA">
+                                <ref role="cht4Q" to="wq2x:6p0DfM0a3gA" resolve="Head" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="1zN1RIlsdDF" role="37vLTJ">
+                          <ref role="3cqZAo" node="1zN1RIlsc5P" resolve="ok" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="1zN1RIlsklO" role="3cqZAp" />
+                  </node>
+                  <node concept="2OqwBi" id="1zN1RIlskwm" role="3clFbw">
+                    <node concept="2OqwBi" id="1zN1RIlskpr" role="2Oq$k0">
+                      <node concept="Rm8GO" id="1zN1RIlskps" role="2Oq$k0">
+                        <ref role="Rm8GQ" to="qiww:77AxcO56PM5" resolve="HEAD_KEPT" />
+                        <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleTemplateMehodKind" />
+                      </node>
+                      <node concept="liA8E" id="1zN1RIlskpt" role="2OqNvi">
+                        <ref role="37wK5l" to="e2lb:~Enum.name():java.lang.String" resolve="name" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="1zN1RIlsm1c" role="2OqNvi">
+                      <ref role="37wK5l" to="e2lb:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                      <node concept="2OqwBi" id="1zN1RIlsmbm" role="37wK5m">
+                        <node concept="37vLTw" id="1zN1RIlsm31" role="2Oq$k0">
+                          <ref role="3cqZAo" node="1zN1RIls0zx" resolve="methKind" />
+                        </node>
+                        <node concept="3TrcHB" id="1zN1RIlsn86" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3eNFk2" id="1zN1RIlsnf$" role="3eNLev">
+                    <node concept="3clFbS" id="1zN1RIlsnfA" role="3eOfB_">
+                      <node concept="3clFbF" id="1zN1RIlse3x" role="3cqZAp">
+                        <node concept="37vLTI" id="1zN1RIlse3y" role="3clFbG">
+                          <node concept="1Wc70l" id="1zN1RIlse3z" role="37vLTx">
+                            <node concept="3fqX7Q" id="1zN1RIlse3$" role="3uHU7w">
+                              <node concept="2OqwBi" id="1zN1RIlse3_" role="3fr31v">
+                                <node concept="1PxgMI" id="1zN1RIlse3A" role="2Oq$k0">
+                                  <ref role="1PxNhF" to="wq2x:6p0DfM0a3gA" resolve="Head" />
+                                  <node concept="37vLTw" id="1zN1RIlse3B" role="1PxMeX">
+                                    <ref role="3cqZAo" node="1zN1RIls30Y" resolve="context" />
+                                  </node>
+                                </node>
+                                <node concept="3TrcHB" id="1zN1RIlse3C" role="2OqNvi">
+                                  <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="2OqwBi" id="1zN1RIlse3D" role="3uHU7B">
+                              <node concept="37vLTw" id="1zN1RIlse3E" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1zN1RIls30Y" resolve="context" />
+                              </node>
+                              <node concept="1mIQ4w" id="1zN1RIlse3F" role="2OqNvi">
+                                <node concept="chp4Y" id="1zN1RIlse3G" role="cj9EA">
+                                  <ref role="cht4Q" to="wq2x:6p0DfM0a3gA" resolve="Head" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="1zN1RIlse3H" role="37vLTJ">
+                            <ref role="3cqZAo" node="1zN1RIlsc5P" resolve="ok" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="1zN1RIlsoQ_" role="3cqZAp" />
+                    </node>
+                    <node concept="2OqwBi" id="1zN1RIlsnks" role="3eO9$A">
+                      <node concept="2OqwBi" id="1zN1RIlsnkt" role="2Oq$k0">
+                        <node concept="Rm8GO" id="1zN1RIlsnoS" role="2Oq$k0">
+                          <ref role="Rm8GQ" to="qiww:77AxcO56PM6" resolve="HEAD_REPLACED" />
+                          <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleTemplateMehodKind" />
+                        </node>
+                        <node concept="liA8E" id="1zN1RIlsnkv" role="2OqNvi">
+                          <ref role="37wK5l" to="e2lb:~Enum.name():java.lang.String" resolve="name" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="1zN1RIlsnkw" role="2OqNvi">
+                        <ref role="37wK5l" to="e2lb:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                        <node concept="2OqwBi" id="1zN1RIlsnkx" role="37wK5m">
+                          <node concept="37vLTw" id="1zN1RIlsnky" role="2Oq$k0">
+                            <ref role="3cqZAo" node="1zN1RIls0zx" resolve="methKind" />
+                          </node>
+                          <node concept="3TrcHB" id="1zN1RIlsnkz" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3eNFk2" id="1zN1RIlsntC" role="3eNLev">
+                    <node concept="3clFbS" id="1zN1RIlsntD" role="3eOfB_">
+                      <node concept="3clFbF" id="1zN1RIlsecQ" role="3cqZAp">
+                        <node concept="37vLTI" id="1zN1RIlsecR" role="3clFbG">
+                          <node concept="2OqwBi" id="1zN1RIlsecS" role="37vLTx">
+                            <node concept="37vLTw" id="1zN1RIlsecT" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1zN1RIls30Y" resolve="context" />
+                            </node>
+                            <node concept="1mIQ4w" id="1zN1RIlsecU" role="2OqNvi">
+                              <node concept="chp4Y" id="1zN1RIlsecV" role="cj9EA">
+                                <ref role="cht4Q" to="wq2x:6p0DfM0a3Qe" resolve="Guard" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="1zN1RIlsecW" role="37vLTJ">
+                            <ref role="3cqZAo" node="1zN1RIlsc5P" resolve="ok" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="1zN1RIlspcb" role="3cqZAp" />
+                    </node>
+                    <node concept="2OqwBi" id="1zN1RIlsntE" role="3eO9$A">
+                      <node concept="2OqwBi" id="1zN1RIlsntF" role="2Oq$k0">
+                        <node concept="Rm8GO" id="1zN1RIlsn$x" role="2Oq$k0">
+                          <ref role="Rm8GQ" to="qiww:77AxcO56PM7" resolve="GUARD" />
+                          <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleTemplateMehodKind" />
+                        </node>
+                        <node concept="liA8E" id="1zN1RIlsntH" role="2OqNvi">
+                          <ref role="37wK5l" to="e2lb:~Enum.name():java.lang.String" resolve="name" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="1zN1RIlsntI" role="2OqNvi">
+                        <ref role="37wK5l" to="e2lb:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                        <node concept="2OqwBi" id="1zN1RIlsntJ" role="37wK5m">
+                          <node concept="37vLTw" id="1zN1RIlsntK" role="2Oq$k0">
+                            <ref role="3cqZAo" node="1zN1RIls0zx" resolve="methKind" />
+                          </node>
+                          <node concept="3TrcHB" id="1zN1RIlsntL" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3eNFk2" id="1zN1RIlsnBe" role="3eNLev">
+                    <node concept="3clFbS" id="1zN1RIlsnBf" role="3eOfB_">
+                      <node concept="3clFbF" id="1zN1RIlsc6t" role="3cqZAp">
+                        <node concept="37vLTI" id="1zN1RIlsc$O" role="3clFbG">
+                          <node concept="2OqwBi" id="1zN1RIlscCt" role="37vLTx">
+                            <node concept="37vLTw" id="1zN1RIlscBp" role="2Oq$k0">
+                              <ref role="3cqZAo" node="1zN1RIls30Y" resolve="context" />
+                            </node>
+                            <node concept="1mIQ4w" id="1zN1RIlscNN" role="2OqNvi">
+                              <node concept="chp4Y" id="1zN1RIlsehu" role="cj9EA">
+                                <ref role="cht4Q" to="wq2x:6p0DfM0a3TO" resolve="Body" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="37vLTw" id="1zN1RIlsc6s" role="37vLTJ">
+                            <ref role="3cqZAo" node="1zN1RIlsc5P" resolve="ok" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="1zN1RIlsptK" role="3cqZAp" />
+                    </node>
+                    <node concept="2OqwBi" id="1zN1RIlsnBg" role="3eO9$A">
+                      <node concept="2OqwBi" id="1zN1RIlsnBh" role="2Oq$k0">
+                        <node concept="Rm8GO" id="1zN1RIlsnJ2" role="2Oq$k0">
+                          <ref role="Rm8GQ" to="qiww:77AxcO56PM8" resolve="BODY" />
+                          <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleTemplateMehodKind" />
+                        </node>
+                        <node concept="liA8E" id="1zN1RIlsnBj" role="2OqNvi">
+                          <ref role="37wK5l" to="e2lb:~Enum.name():java.lang.String" resolve="name" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="1zN1RIlsnBk" role="2OqNvi">
+                        <ref role="37wK5l" to="e2lb:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                        <node concept="2OqwBi" id="1zN1RIlsnBl" role="37wK5m">
+                          <node concept="37vLTw" id="1zN1RIlsnBm" role="2Oq$k0">
+                            <ref role="3cqZAo" node="1zN1RIls0zx" resolve="methKind" />
+                          </node>
+                          <node concept="3TrcHB" id="1zN1RIlsnBn" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="9aQIb" id="1zN1RIlspuf" role="9aQIa">
+                    <node concept="3clFbS" id="1zN1RIlspug" role="9aQI4">
+                      <node concept="2MkqsV" id="1zN1RIls2j1" role="3cqZAp">
+                        <node concept="Xl_RD" id="1zN1RIls2ja" role="2MkJ7o">
+                          <property role="Xl_RC" value="unexpected enum value" />
+                        </node>
+                        <node concept="1YBJjd" id="1zN1RIls2jc" role="2OEOjV">
+                          <ref role="1YBMHb" node="1zN1RIlrgxK" resolve="baseMethodCall" />
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="1zN1RIlsqvV" role="3cqZAp" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="1zN1RIlsepM" role="3cqZAp">
+                  <node concept="3clFbS" id="1zN1RIlsepO" role="3clFbx">
+                    <node concept="2MkqsV" id="1zN1RIlserd" role="3cqZAp">
+                      <node concept="Xl_RD" id="1zN1RIlsere" role="2MkJ7o">
+                        <property role="Xl_RC" value="incompatible called method kind" />
+                      </node>
+                      <node concept="1YBJjd" id="1zN1RIlserf" role="2OEOjV">
+                        <ref role="1YBMHb" node="1zN1RIlrgxK" resolve="baseMethodCall" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3fqX7Q" id="1zN1RIlser6" role="3clFbw">
+                    <node concept="37vLTw" id="1zN1RIlsera" role="3fr31v">
+                      <ref role="3cqZAo" node="1zN1RIlsc5P" resolve="ok" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2OqwBi" id="1zN1RIlro8P" role="3clFbw">
+          <node concept="37vLTw" id="1zN1RIlro4X" role="2Oq$k0">
+            <ref role="3cqZAo" node="1zN1RIlro2N" resolve="annInst" />
+          </node>
+          <node concept="3x8VRR" id="1zN1RIlrotH" role="2OqNvi" />
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="1zN1RIlrgxK" role="1YuTPh">
+      <property role="TrG5h" value="baseMethodCall" />
+      <ref role="1YaFvo" to="tpee:fz7wK6G" resolve="BaseMethodCall" />
+    </node>
+  </node>
 </model>
 
diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps
index ee83b1ee..afe7aaec 100644
--- a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/rule.mps
@@ -3134,9 +3134,53 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3SKdUt" id="aFQeb4j6w3" role="3cqZAp">
-                    <node concept="3SKdUq" id="aFQeb4j6GH" role="3SKWNk">
-                      <property role="3SKdUp" value="FIXME: test the argument types!" />
+                  <node concept="3clFbH" id="1zN1RIln3l9" role="3cqZAp" />
+                  <node concept="3clFbJ" id="1zN1RIlmYBW" role="3cqZAp">
+                    <node concept="3clFbS" id="1zN1RIlmYBY" role="3clFbx">
+                      <node concept="YS8fn" id="1zN1RIln3iC" role="3cqZAp">
+                        <node concept="2ShNRf" id="1zN1RIln3iD" role="YScLw">
+                          <node concept="1pGfFk" id="1zN1RIln3iE" role="2ShVmc">
+                            <ref role="37wK5l" node="7Oc59RSHJEw" resolve="InvalidConstraintException" />
+                            <node concept="3cpWs3" id="1zN1RIln3iF" role="37wK5m">
+                              <node concept="2YIFZM" id="1zN1RIln3iG" role="3uHU7w">
+                                <ref role="1Pybhc" to="e2lb:~String" resolve="String" />
+                                <ref role="37wK5l" to="e2lb:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                <node concept="2OqwBi" id="1zN1RIln3iH" role="37wK5m">
+                                  <node concept="37vLTw" id="1zN1RIln3iI" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="7eGEHDldphF" resolve="cst" />
+                                  </node>
+                                  <node concept="liA8E" id="1zN1RIln3iJ" role="2OqNvi">
+                                    <ref role="37wK5l" node="7eGEHDlc$8G" resolve="symbol" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="Xl_RD" id="1zN1RIln3iK" role="3uHU7B">
+                                <property role="Xl_RC" value="argument type mismatch for " />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3fqX7Q" id="1zN1RIlmYCN" role="3clFbw">
+                      <node concept="2YIFZM" id="1zN1RIln273" role="3fr31v">
+                        <ref role="37wK5l" to="k7g3:~Arrays.equals(java.lang.Object[],java.lang.Object[]):boolean" resolve="equals" />
+                        <ref role="1Pybhc" to="k7g3:~Arrays" resolve="Arrays" />
+                        <node concept="1rXfSq" id="1zN1RIln284" role="37wK5m">
+                          <ref role="37wK5l" node="1zN1RIlmL7q" resolve="argType" />
+                          <node concept="37vLTw" id="1zN1RIln28n" role="37wK5m">
+                            <ref role="3cqZAo" node="7eGEHDldphF" resolve="cst" />
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="1zN1RIln2IP" role="37wK5m">
+                          <node concept="37vLTw" id="1zN1RIln28O" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7eGEHDleN7f" resolve="prototype" />
+                          </node>
+                          <node concept="liA8E" id="1zN1RIln2O1" role="2OqNvi">
+                            <ref role="37wK5l" node="aFQeb4cm4X" resolve="argType" />
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -3444,89 +3488,6 @@
               <ref role="1Px2BO" node="2q_78a8w76g" resolve="ConstraintKind" />
             </node>
             <node concept="3clFbS" id="2q_78a8wgD7" role="3Kbo56">
-              <node concept="3cpWs8" id="aFQeb4cekY" role="3cqZAp">
-                <node concept="3cpWsn" id="aFQeb4cekZ" role="3cpWs9">
-                  <property role="TrG5h" value="argType" />
-                  <node concept="10Q1$e" id="aFQeb4ceJb" role="1tU5fm">
-                    <node concept="3uibUv" id="aFQeb4cekW" role="10Q1$1">
-                      <ref role="3uigEE" to="e2lb:~Class" resolve="Class" />
-                      <node concept="3qTvmN" id="aFQeb4cezv" role="11_B2D" />
-                    </node>
-                  </node>
-                  <node concept="2ShNRf" id="aFQeb4ceSj" role="33vP2m">
-                    <node concept="3$_iS1" id="aFQeb4ceSc" role="2ShVmc">
-                      <node concept="3$GHV9" id="aFQeb4ceYw" role="3$GQph">
-                        <node concept="2OqwBi" id="aFQeb4cfkK" role="3$I4v7">
-                          <node concept="2OqwBi" id="aFQeb4cf2E" role="2Oq$k0">
-                            <node concept="37vLTw" id="aFQeb4cf12" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7eGEHDleg3E" resolve="cst" />
-                            </node>
-                            <node concept="liA8E" id="aFQeb4cf6T" role="2OqNvi">
-                              <ref role="37wK5l" node="7eGEHDlc$91" resolve="arguments" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="aFQeb4cfwP" role="2OqNvi">
-                            <ref role="37wK5l" to="k7g3:~List.size():int" resolve="size" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3uibUv" id="aFQeb4ceSd" role="3$_nBY">
-                        <ref role="3uigEE" to="e2lb:~Class" resolve="Class" />
-                        <node concept="3qTvmN" id="aFQeb4ceSe" role="11_B2D" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="aFQeb4cgf8" role="3cqZAp">
-                <node concept="3cpWsn" id="aFQeb4cgfb" role="3cpWs9">
-                  <property role="TrG5h" value="i" />
-                  <node concept="10Oyi0" id="aFQeb4cgf6" role="1tU5fm" />
-                  <node concept="3cmrfG" id="aFQeb4cg$h" role="33vP2m">
-                    <property role="3cmrfH" value="0" />
-                  </node>
-                </node>
-              </node>
-              <node concept="1DcWWT" id="aFQeb4cdFu" role="3cqZAp">
-                <node concept="3clFbS" id="aFQeb4cdFv" role="2LFqv$">
-                  <node concept="3clFbF" id="aFQeb4cf_J" role="3cqZAp">
-                    <node concept="37vLTI" id="aFQeb4cgZE" role="3clFbG">
-                      <node concept="2OqwBi" id="aFQeb4chaS" role="37vLTx">
-                        <node concept="37vLTw" id="aFQeb4ch7G" role="2Oq$k0">
-                          <ref role="3cqZAo" node="aFQeb4cdFy" resolve="arg" />
-                        </node>
-                        <node concept="liA8E" id="aFQeb4chi3" role="2OqNvi">
-                          <ref role="37wK5l" to="e2lb:~Object.getClass():java.lang.Class" resolve="getClass" />
-                        </node>
-                      </node>
-                      <node concept="AH0OO" id="aFQeb4cfQ_" role="37vLTJ">
-                        <node concept="3uNrnE" id="aFQeb4cgPZ" role="AHEQo">
-                          <node concept="37vLTw" id="aFQeb4cgQ1" role="2$L3a6">
-                            <ref role="3cqZAo" node="aFQeb4cgfb" resolve="i" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="aFQeb4cf_I" role="AHHXb">
-                          <ref role="3cqZAo" node="aFQeb4cekZ" resolve="argType" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWsn" id="aFQeb4cdFy" role="1Duv9x">
-                  <property role="TrG5h" value="arg" />
-                  <node concept="3uibUv" id="aFQeb4cdFA" role="1tU5fm">
-                    <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="aFQeb4cdFB" role="1DdaDG">
-                  <node concept="37vLTw" id="aFQeb4cdFC" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7eGEHDleg3E" resolve="cst" />
-                  </node>
-                  <node concept="liA8E" id="aFQeb4cdFD" role="2OqNvi">
-                    <ref role="37wK5l" node="7eGEHDlc$91" resolve="arguments" />
-                  </node>
-                </node>
-              </node>
               <node concept="3clFbF" id="7eGEHDleQCQ" role="3cqZAp">
                 <node concept="2OqwBi" id="7eGEHDleQIf" role="3clFbG">
                   <node concept="37vLTw" id="7eGEHDleQCP" role="2Oq$k0">
@@ -3564,8 +3525,11 @@
                         <node concept="3clFbT" id="2q_78a8wnky" role="37wK5m">
                           <property role="3clFbU" value="true" />
                         </node>
-                        <node concept="37vLTw" id="aFQeb4chwj" role="37wK5m">
-                          <ref role="3cqZAo" node="aFQeb4cekZ" resolve="argType" />
+                        <node concept="1rXfSq" id="1zN1RIlmYAF" role="37wK5m">
+                          <ref role="37wK5l" node="1zN1RIlmL7q" resolve="argType" />
+                          <node concept="37vLTw" id="1zN1RIlmYAG" role="37wK5m">
+                            <ref role="3cqZAo" node="7eGEHDleg3E" resolve="cst" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -3679,6 +3643,113 @@
         <ref role="3uigEE" node="7Oc59RSHJnv" resolve="InvalidConstraintException" />
       </node>
     </node>
+    <node concept="2tJIrI" id="1zN1RIlmLd2" role="jymVt" />
+    <node concept="3clFb_" id="1zN1RIlmL7q" role="jymVt">
+      <property role="TrG5h" value="argType" />
+      <node concept="3Tm6S6" id="1zN1RIlmL7r" role="1B3o_S" />
+      <node concept="10Q1$e" id="1zN1RIlmL7s" role="3clF45">
+        <node concept="3uibUv" id="1zN1RIlmL7t" role="10Q1$1">
+          <ref role="3uigEE" to="e2lb:~Class" resolve="Class" />
+          <node concept="3qTvmN" id="1zN1RIlmL7u" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1zN1RIlmL7g" role="3clF46">
+        <property role="TrG5h" value="cst" />
+        <node concept="3uibUv" id="1zN1RIlmL7h" role="1tU5fm">
+          <ref role="3uigEE" node="7eGEHDlc$8k" resolve="AbstractConstraint" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="1zN1RIlmL6C" role="3clF47">
+        <node concept="3cpWs8" id="1zN1RIlmL6F" role="3cqZAp">
+          <node concept="3cpWsn" id="1zN1RIlmL6G" role="3cpWs9">
+            <property role="TrG5h" value="argType" />
+            <node concept="10Q1$e" id="1zN1RIlmL6H" role="1tU5fm">
+              <node concept="3uibUv" id="1zN1RIlmL6I" role="10Q1$1">
+                <ref role="3uigEE" to="e2lb:~Class" resolve="Class" />
+                <node concept="3qTvmN" id="1zN1RIlmL6J" role="11_B2D" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="1zN1RIlmL6K" role="33vP2m">
+              <node concept="3$_iS1" id="1zN1RIlmL6L" role="2ShVmc">
+                <node concept="3$GHV9" id="1zN1RIlmL6M" role="3$GQph">
+                  <node concept="2OqwBi" id="1zN1RIlmL6N" role="3$I4v7">
+                    <node concept="2OqwBi" id="1zN1RIlmL6O" role="2Oq$k0">
+                      <node concept="37vLTw" id="1zN1RIlmL7j" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1zN1RIlmL7g" resolve="cst" />
+                      </node>
+                      <node concept="liA8E" id="1zN1RIlmL6Q" role="2OqNvi">
+                        <ref role="37wK5l" node="7eGEHDlc$91" resolve="arguments" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="1zN1RIlmL6R" role="2OqNvi">
+                      <ref role="37wK5l" to="k7g3:~List.size():int" resolve="size" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3uibUv" id="1zN1RIlmL6S" role="3$_nBY">
+                  <ref role="3uigEE" to="e2lb:~Class" resolve="Class" />
+                  <node concept="3qTvmN" id="1zN1RIlmL6T" role="11_B2D" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="1zN1RIlmL6U" role="3cqZAp">
+          <node concept="3cpWsn" id="1zN1RIlmL6V" role="3cpWs9">
+            <property role="TrG5h" value="i" />
+            <node concept="10Oyi0" id="1zN1RIlmL6W" role="1tU5fm" />
+            <node concept="3cmrfG" id="1zN1RIlmL6X" role="33vP2m">
+              <property role="3cmrfH" value="0" />
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="1zN1RIlmL6Y" role="3cqZAp">
+          <node concept="3clFbS" id="1zN1RIlmL6Z" role="2LFqv$">
+            <node concept="3clFbF" id="1zN1RIlmL70" role="3cqZAp">
+              <node concept="37vLTI" id="1zN1RIlmL71" role="3clFbG">
+                <node concept="2OqwBi" id="1zN1RIlmL72" role="37vLTx">
+                  <node concept="37vLTw" id="1zN1RIlmL73" role="2Oq$k0">
+                    <ref role="3cqZAo" node="1zN1RIlmL79" resolve="arg" />
+                  </node>
+                  <node concept="liA8E" id="1zN1RIlmL74" role="2OqNvi">
+                    <ref role="37wK5l" to="e2lb:~Object.getClass():java.lang.Class" resolve="getClass" />
+                  </node>
+                </node>
+                <node concept="AH0OO" id="1zN1RIlmL75" role="37vLTJ">
+                  <node concept="3uNrnE" id="1zN1RIlmL76" role="AHEQo">
+                    <node concept="37vLTw" id="1zN1RIlmL77" role="2$L3a6">
+                      <ref role="3cqZAo" node="1zN1RIlmL6V" resolve="i" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="1zN1RIlmL78" role="AHHXb">
+                    <ref role="3cqZAo" node="1zN1RIlmL6G" resolve="argType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="1zN1RIlmL79" role="1Duv9x">
+            <property role="TrG5h" value="arg" />
+            <node concept="3uibUv" id="1zN1RIlmL7a" role="1tU5fm">
+              <ref role="3uigEE" to="e2lb:~Object" resolve="Object" />
+            </node>
+          </node>
+          <node concept="2OqwBi" id="1zN1RIlmL7b" role="1DdaDG">
+            <node concept="37vLTw" id="1zN1RIlmL7i" role="2Oq$k0">
+              <ref role="3cqZAo" node="1zN1RIlmL7g" resolve="cst" />
+            </node>
+            <node concept="liA8E" id="1zN1RIlmL7d" role="2OqNvi">
+              <ref role="37wK5l" node="7eGEHDlc$91" resolve="arguments" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="1zN1RIlmL7e" role="3cqZAp">
+          <node concept="37vLTw" id="1zN1RIlmL7f" role="3cqZAk">
+            <ref role="3cqZAo" node="1zN1RIlmL6G" resolve="argType" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="2pvEdquu$2W" role="jymVt" />
     <node concept="312cEg" id="2pvEdquuIeg" role="jymVt">
       <property role="TrG5h" value="symbols" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
index 868b4ac6..a86025b7 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/jetbrains.mps.lang.typesystem2.samplechecker.runner.msd
@@ -11,6 +11,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+    <dependency reexport="false">3ddddf69-9ff0-426b-9365-51ae7356fb82(jetbrains.mps.lang.typesystem2.sample)</dependency>
     <dependency reexport="false">7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.unification.tree)</dependency>
     <dependency reexport="false">b984ee52-f34d-4b6d-8812-866c1d3eae31(jetbrains.mps.jchr.runtime)</dependency>
   </dependencies>
@@ -19,13 +20,17 @@
     <usedLanguage>894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)</usedLanguage>
     <usedLanguage>35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</usedLanguage>
     <usedLanguage>760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging)</usedLanguage>
+    <usedLanguage>7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</usedLanguage>
   </usedLanguages>
   <languageVersions>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="1" />
     <language id="ed6d7656-532c-4bc2-81d1-af945aeb8280" fqName="jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="894463aa-8754-49c0-bf4b-6a32af66b376" fqName="jetbrains.mps.jchr" version="0" />
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" fqName="jetbrains.mps.lang.smodel" version="0" />
     <language id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" fqName="jetbrains.mps.lang.traceable" version="0" />
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" fqName="jetbrains.mps.logic" version="0" />
   </languageVersions>
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
index 1daf97f4..5032564b 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.runner/models/jetbrains/mps/lang/typesystem2/samplechecker/runner.mps
@@ -6,6 +6,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="1" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="-1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="0" />
   </languages>
   <imports>
     <import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
@@ -17,7 +18,6 @@
     <import index="k7g3" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.util(JDK/java.util@java_stub)" />
     <import index="jo0n" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/f:java_stub#b984ee52-f34d-4b6d-8812-866c1d3eae31#runtime.debug.graphical(jetbrains.mps.jchr.runtime/runtime.debug.graphical@java_stub)" />
     <import index="5t0y" ref="b984ee52-f34d-4b6d-8812-866c1d3eae31/f:java_stub#b984ee52-f34d-4b6d-8812-866c1d3eae31#runtime.debug(jetbrains.mps.jchr.runtime/runtime.debug@java_stub)" />
-    <import index="7y3b" ref="r:6aac3fb5-0350-444e-8204-fb71b0589bdd(jetbrains.mps.lang.typesystem2.samplechecker.chr)" />
     <import index="xqpa" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang.reflect(JDK/java.lang.reflect@java_stub)" />
     <import index="ajxo" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/f:java_stub#6ed54515-acc8-4d1e-a16c-9fd6cfe951ea#org.apache.log4j(MPS.Core/org.apache.log4j@java_stub)" />
   </imports>
@@ -273,9 +273,6 @@
         <node concept="3cpWs8" id="41ox5VnewK8" role="3cqZAp">
           <node concept="3cpWsn" id="41ox5VnewK9" role="3cpWs9">
             <property role="TrG5h" value="sample" />
-            <node concept="3uibUv" id="41ox5VnewK7" role="1tU5fm">
-              <ref role="3uigEE" to="ie8e:2xQ7eRABXh4" resolve="Tree" />
-            </node>
             <node concept="1oi1Uc" id="41ox5VnewKa" role="33vP2m">
               <node concept="1oi5UN" id="41ox5VnewKb" role="1oi0x0">
                 <node concept="1oi5Wm" id="41ox5VnewKc" role="1ojpOf">
@@ -287,17 +284,20 @@
                 <node concept="1oi5Wm" id="41ox5VnewKe" role="1ojpOf">
                   <property role="TrG5h" value="name" />
                   <node concept="1oi5XN" id="41ox5VnewKf" role="1oi5zu">
-                    <property role="1oi5yK" value="Sample" />
+                    <property role="1oi5yK" value="HelloWorld" />
                   </node>
                 </node>
                 <node concept="1oi5Wm" id="41ox5VnewKg" role="1ojpOf">
                   <property role="TrG5h" value="id" />
                   <node concept="1oi5XN" id="41ox5VnewKh" role="1oi5zu">
-                    <property role="1oi5yK" value="6270176708469746366" />
+                    <property role="1oi5yK" value="4438600004733396337" />
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="3uibUv" id="41ox5VnewK7" role="1tU5fm">
+              <ref role="3uigEE" to="ie8e:2xQ7eRABXh4" resolve="Tree" />
+            </node>
           </node>
         </node>
         <node concept="3clFbH" id="41ox5VnijEW" role="3cqZAp" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
index 2ebb94a3..f8a4340a 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
@@ -1669,10 +1669,51 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="1zN1RIlfDRX" role="3cqZAp">
+          <node concept="3cpWsn" id="1zN1RIlfDS0" role="3cpWs9">
+            <property role="TrG5h" value="ok" />
+            <node concept="10P_77" id="1zN1RIlfDRV" role="1tU5fm" />
+            <node concept="3clFbT" id="1zN1RIlfDTq" role="33vP2m">
+              <property role="3clFbU" value="true" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1zN1RIlfDTs" role="3cqZAp" />
         <node concept="1QHqEK" id="12TFIqWw7JD" role="3cqZAp">
           <node concept="1QHqEC" id="12TFIqWw7JF" role="1QHqEI">
             <node concept="3clFbS" id="12TFIqWw7JH" role="1bW5cS">
               <node concept="SfApY" id="41ox5VnkNls" role="3cqZAp">
+                <node concept="TDmWw" id="1zN1RIlfccd" role="TEbGg">
+                  <node concept="3cpWsn" id="1zN1RIlfcce" role="TDEfY">
+                    <property role="TrG5h" value="fail" />
+                    <node concept="3uibUv" id="1zN1RIlfcHz" role="1tU5fm">
+                      <ref role="3uigEE" to="w2rx:~FailureException" resolve="FailureException" />
+                    </node>
+                  </node>
+                  <node concept="3clFbS" id="1zN1RIlfccg" role="TDEfX">
+                    <node concept="34ab3g" id="1zN1RIlfcHM" role="3cqZAp">
+                      <property role="35gtTG" value="warn" />
+                      <property role="34fQS0" value="true" />
+                      <node concept="Xl_RD" id="1zN1RIlfcHN" role="34bqiv">
+                        <property role="Xl_RC" value="failure during evaluation" />
+                      </node>
+                      <node concept="37vLTw" id="1zN1RIlfi0O" role="34bMjA">
+                        <ref role="3cqZAo" node="1zN1RIlfcce" resolve="fail" />
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="1zN1RIlfFkh" role="3cqZAp">
+                      <node concept="37vLTI" id="1zN1RIlfF_G" role="3clFbG">
+                        <node concept="3clFbT" id="1zN1RIlfFK7" role="37vLTx">
+                          <property role="3clFbU" value="false" />
+                        </node>
+                        <node concept="37vLTw" id="1zN1RIlfFkf" role="37vLTJ">
+                          <ref role="3cqZAo" node="1zN1RIlfDS0" resolve="ok" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="1zN1RIlfFWA" role="3cqZAp" />
+                  </node>
+                </node>
                 <node concept="3clFbS" id="41ox5VnkNlu" role="SfCbr">
                   <node concept="3clFbF" id="41ox5Vnrj9Q" role="3cqZAp">
                     <node concept="37vLTI" id="41ox5Vnrj9S" role="3clFbG">
@@ -1716,25 +1757,45 @@
                         <ref role="3cqZAo" node="41ox5VnkNlx" resolve="e" />
                       </node>
                     </node>
-                    <node concept="3clFbF" id="41ox5VnkTaS" role="3cqZAp">
-                      <node concept="2YIFZM" id="41ox5VnkTaT" role="3clFbG">
-                        <ref role="37wK5l" to="810:~Messages.showWarningDialog(java.lang.String,java.lang.String):void" resolve="showWarningDialog" />
-                        <ref role="1Pybhc" to="810:~Messages" resolve="Messages" />
-                        <node concept="Xl_RD" id="41ox5VnkTaU" role="37wK5m">
-                          <property role="Xl_RC" value="Encountered errors" />
+                    <node concept="3clFbF" id="1zN1RIlfEFG" role="3cqZAp">
+                      <node concept="37vLTI" id="1zN1RIlfF5j" role="3clFbG">
+                        <node concept="3clFbT" id="1zN1RIlfFg4" role="37vLTx">
+                          <property role="3clFbU" value="false" />
                         </node>
-                        <node concept="Xl_RD" id="41ox5VnkTaV" role="37wK5m">
-                          <property role="Xl_RC" value="Launch Rules" />
+                        <node concept="37vLTw" id="1zN1RIlfEFE" role="37vLTJ">
+                          <ref role="3cqZAo" node="1zN1RIlfDS0" resolve="ok" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3cpWs6" id="41ox5VnkTaW" role="3cqZAp" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="1zN1RIlfEAi" role="3cqZAp" />
+        <node concept="3clFbJ" id="1zN1RIlfE25" role="3cqZAp">
+          <node concept="3clFbS" id="1zN1RIlfE27" role="3clFbx">
+            <node concept="3clFbF" id="41ox5VnkTaS" role="3cqZAp">
+              <node concept="2YIFZM" id="41ox5VnkTaT" role="3clFbG">
+                <ref role="37wK5l" to="810:~Messages.showWarningDialog(java.lang.String,java.lang.String):void" resolve="showWarningDialog" />
+                <ref role="1Pybhc" to="810:~Messages" resolve="Messages" />
+                <node concept="Xl_RD" id="41ox5VnkTaU" role="37wK5m">
+                  <property role="Xl_RC" value="Encountered errors" />
+                </node>
+                <node concept="Xl_RD" id="41ox5VnkTaV" role="37wK5m">
+                  <property role="Xl_RC" value="Launch Rules" />
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs6" id="41ox5VnkTaW" role="3cqZAp" />
+          </node>
+          <node concept="3fqX7Q" id="1zN1RIlfE3$" role="3clFbw">
+            <node concept="37vLTw" id="1zN1RIlfE3Q" role="3fr31v">
+              <ref role="3cqZAo" node="1zN1RIlfDS0" resolve="ok" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="41ox5VnrklW" role="3cqZAp" />
         <node concept="3cpWs8" id="41ox5VncHNq" role="3cqZAp">
           <node concept="3cpWsn" id="41ox5VncHNr" role="3cpWs9">
@@ -2739,44 +2800,6 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbH" id="3gJBs5sBhtq" role="3cqZAp" />
-                <node concept="34ab3g" id="3gJBs5sBhId" role="3cqZAp">
-                  <property role="35gtTG" value="info" />
-                  <node concept="3cpWs3" id="3gJBs5sBiFS" role="34bqiv">
-                    <node concept="3cpWs3" id="3gJBs5sBinG" role="3uHU7B">
-                      <node concept="3cpWs3" id="3gJBs5sBi89" role="3uHU7B">
-                        <node concept="Xl_RD" id="3gJBs5sBhIf" role="3uHU7B">
-                          <property role="Xl_RC" value="varname&gt; " />
-                        </node>
-                        <node concept="2OqwBi" id="3gJBs5sBib_" role="3uHU7w">
-                          <node concept="2OqwBi" id="3gJBs5sBibA" role="2Oq$k0">
-                            <node concept="37vLTw" id="3gJBs5sBibB" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3gJBs5syUmY" resolve="typeLogical" />
-                            </node>
-                            <node concept="liA8E" id="3gJBs5sBibC" role="2OqNvi">
-                              <ref role="37wK5l" to="oy3s:dfChU1gcsX" resolve="findRoot" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="3gJBs5sBibD" role="2OqNvi">
-                            <ref role="37wK5l" to="oy3s:3HJTsBmCy5P" resolve="name" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Xl_RD" id="3gJBs5sBinV" role="3uHU7w">
-                        <property role="Xl_RC" value=" " />
-                      </node>
-                    </node>
-                    <node concept="AH0OO" id="3gJBs5sBiLF" role="3uHU7w">
-                      <node concept="3cmrfG" id="3gJBs5sBiLG" role="AHEQo">
-                        <property role="3cmrfH" value="1" />
-                      </node>
-                      <node concept="37vLTw" id="3gJBs5sBiLH" role="AHHXb">
-                        <ref role="3cqZAo" node="3gJBs5syUmR" resolve="args" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="3gJBs5sBhOL" role="3cqZAp" />
               </node>
               <node concept="2OqwBi" id="3gJBs5syUni" role="3clFbw">
                 <node concept="Xl_RD" id="3gJBs5syUnj" role="2Oq$k0">
@@ -3541,8 +3564,13 @@
             <node concept="3clFbS" id="41ox5Vnee8M" role="TDEfX">
               <node concept="3clFbF" id="41ox5VneSFr" role="3cqZAp">
                 <node concept="37vLTI" id="41ox5VneSFt" role="3clFbG">
-                  <node concept="37vLTw" id="41ox5VneSgD" role="37vLTx">
-                    <ref role="3cqZAo" node="41ox5Vnee8N" resolve="e" />
+                  <node concept="2OqwBi" id="1zN1RIlg3Ft" role="37vLTx">
+                    <node concept="37vLTw" id="41ox5VneSgD" role="2Oq$k0">
+                      <ref role="3cqZAo" node="41ox5Vnee8N" resolve="e" />
+                    </node>
+                    <node concept="liA8E" id="1zN1RIlg40a" role="2OqNvi">
+                      <ref role="37wK5l" to="xqpa:~InvocationTargetException.getCause():java.lang.Throwable" resolve="getCause" />
+                    </node>
                   </node>
                   <node concept="37vLTw" id="41ox5VneSFx" role="37vLTJ">
                     <ref role="3cqZAo" node="41ox5VneSgC" resolve="exception" />
@@ -3618,6 +3646,28 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbJ" id="1zN1RIlg4ZW" role="3cqZAp">
+          <node concept="3clFbS" id="1zN1RIlg4ZY" role="3clFbx">
+            <node concept="YS8fn" id="1zN1RIlg5pb" role="3cqZAp">
+              <node concept="10QFUN" id="1zN1RIlgapt" role="YScLw">
+                <node concept="37vLTw" id="1zN1RIlgaps" role="10QFUP">
+                  <ref role="3cqZAo" node="41ox5VneSgC" resolve="exception" />
+                </node>
+                <node concept="3uibUv" id="1zN1RIlgaxg" role="10QFUM">
+                  <ref role="3uigEE" to="e2lb:~RuntimeException" resolve="RuntimeException" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2ZW3vV" id="1zN1RIlg5d9" role="3clFbw">
+            <node concept="3uibUv" id="1zN1RIlg5l0" role="2ZW6by">
+              <ref role="3uigEE" to="e2lb:~RuntimeException" resolve="RuntimeException" />
+            </node>
+            <node concept="37vLTw" id="1zN1RIlg51O" role="2ZW6bz">
+              <ref role="3cqZAo" node="41ox5VneSgC" resolve="exception" />
+            </node>
+          </node>
+        </node>
         <node concept="YS8fn" id="41ox5Vnmt_x" role="3cqZAp">
           <node concept="2ShNRf" id="41ox5VnmtWl" role="YScLw">
             <node concept="1pGfFk" id="41ox5Vnmv6s" role="2ShVmc">
diff --git a/languages/jetbrains.mps.logic/languageModels/constraints.mps b/languages/jetbrains.mps.logic/languageModels/constraints.mps
index 922d5801..6d7bf7ea 100644
--- a/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -11,13 +11,14 @@
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
     <import index="fnmy" ref="r:89c0fb70-0977-4113-a076-5906f9d8630f(jetbrains.mps.baseLanguage.scopes)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
-    <import index="e2lb" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" implicit="true" />
     <import index="tpfp" ref="r:00000000-0000-4000-0000-011c89590519(jetbrains.mps.baseLanguage.regexp.jetbrains.mps.regexp.accessory)" implicit="true" />
-    <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" implicit="true" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" implicit="true" />
+    <import index="e2lb" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/f:java_stub#6354ebe7-c22a-4a0f-ac54-50b52ab9b065#java.lang(JDK/java.lang@java_stub)" implicit="true" />
+    <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -87,6 +88,9 @@
         <child id="1206060619838" name="condition" index="3eO9$A" />
         <child id="1206060644605" name="statementList" index="3eOfB_" />
       </concept>
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -99,6 +103,10 @@
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -250,20 +258,78 @@
       <node concept="QB0g5" id="3qvzBqWDzrG" role="QCWH9">
         <node concept="3clFbS" id="3qvzBqWDzrH" role="2VODD2">
           <node concept="3clFbF" id="3qvzBqWDBAT" role="3cqZAp">
-            <node concept="2OqwBi" id="3qvzBqWDBWc" role="3clFbG">
-              <node concept="1Wqviy" id="3qvzBqWDBAS" role="2Oq$k0" />
-              <node concept="2kpEY9" id="3qvzBqWDCTo" role="2OqNvi">
-                <node concept="1Qi9sc" id="3qvzBqWDCTq" role="1YN4dH">
-                  <node concept="1OClNT" id="3qvzBqWDEI7" role="1QigWp">
-                    <node concept="1SSJmt" id="3qvzBqWDD4e" role="1OLDsb">
-                      <node concept="1Tadzz" id="3qvzBqWDD$2" role="1T5LoC">
-                        <ref role="1Takfv" to="tpfp:h5SVbIa" resolve="\p{Alnum}" />
+            <node concept="22lmx$" id="1zN1RIlQ6e8" role="3clFbG">
+              <node concept="1eOMI4" id="1zN1RIlQ6jZ" role="3uHU7B">
+                <node concept="2OqwBi" id="1zN1RIlQ6qd" role="1eOMHV">
+                  <node concept="1Wqviy" id="1zN1RIlQ6qe" role="2Oq$k0" />
+                  <node concept="2kpEY9" id="1zN1RIlQ6qf" role="2OqNvi">
+                    <node concept="1Qi9sc" id="1zN1RIlQ6qg" role="1YN4dH">
+                      <node concept="1OJ37Q" id="1zN1RIlQ6qh" role="1QigWp">
+                        <node concept="1OC9wW" id="1zN1RIlQ6qi" role="1OLpdg">
+                          <property role="1OCb_u" value="~" />
+                        </node>
+                        <node concept="1OClNT" id="1zN1RIlQ6qj" role="1OLqdY">
+                          <node concept="1SSJmt" id="1zN1RIlQ6qk" role="1OLDsb">
+                            <node concept="1Tadzz" id="1zN1RIlQ6ql" role="1T5LoC">
+                              <ref role="1Takfv" to="tpfp:h5SVbIa" resolve="\p{Alnum}" />
+                            </node>
+                            <node concept="1T6I$Y" id="1zN1RIlQ6qm" role="1T5LoC">
+                              <property role="1T6KD9" value="." />
+                            </node>
+                            <node concept="1T6I$Y" id="tIwzd22NRI" role="1T5LoC">
+                              <property role="1T6KD9" value="," />
+                            </node>
+                            <node concept="1T6I$Y" id="1zN1RIlSAtk" role="1T5LoC">
+                              <property role="1T6KD9" value="(" />
+                            </node>
+                            <node concept="1T6I$Y" id="1zN1RIlSAHB" role="1T5LoC">
+                              <property role="1T6KD9" value=")" />
+                            </node>
+                            <node concept="1T6I$Y" id="tIwzd2tlp0" role="1T5LoC">
+                              <property role="1T6KD9" value="[" />
+                            </node>
+                            <node concept="1T6I$Y" id="tIwzd2tl$A" role="1T5LoC">
+                              <property role="1T6KD9" value="]" />
+                            </node>
+                            <node concept="1T6I$Y" id="tIwzd22JIg" role="1T5LoC">
+                              <property role="1T6KD9" value="&lt;" />
+                            </node>
+                            <node concept="1T6I$Y" id="tIwzd22JYC" role="1T5LoC">
+                              <property role="1T6KD9" value="&gt;" />
+                            </node>
+                            <node concept="1T6I$Y" id="1zN1RIlSB8V" role="1T5LoC">
+                              <property role="1T6KD9" value=":" />
+                            </node>
+                            <node concept="1T6I$Y" id="1zN1RIlQ6qn" role="1T5LoC">
+                              <property role="1T6KD9" value="_" />
+                            </node>
+                            <node concept="1T6I$Y" id="1zN1RIlQ6qo" role="1T5LoC">
+                              <property role="1T6KD9" value="$" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
-                      <node concept="1T6I$Y" id="3qvzBqWDDTd" role="1T5LoC">
-                        <property role="1T6KD9" value="_" />
-                      </node>
-                      <node concept="1T6I$Y" id="3qvzBqWDEoV" role="1T5LoC">
-                        <property role="1T6KD9" value="$" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1eOMI4" id="1zN1RIlQ68u" role="3uHU7w">
+                <node concept="2OqwBi" id="1zN1RIlQ68v" role="1eOMHV">
+                  <node concept="1Wqviy" id="1zN1RIlQ68w" role="2Oq$k0" />
+                  <node concept="2kpEY9" id="1zN1RIlQ68x" role="2OqNvi">
+                    <node concept="1Qi9sc" id="1zN1RIlQ68y" role="1YN4dH">
+                      <node concept="1OClNT" id="1zN1RIlQ68z" role="1QigWp">
+                        <node concept="1SSJmt" id="1zN1RIlQ68$" role="1OLDsb">
+                          <node concept="1Tadzz" id="1zN1RIlQ68_" role="1T5LoC">
+                            <ref role="1Takfv" to="tpfp:h5SVbIa" resolve="\p{Alnum}" />
+                          </node>
+                          <node concept="1T6I$Y" id="1zN1RIlQ68A" role="1T5LoC">
+                            <property role="1T6KD9" value="_" />
+                          </node>
+                          <node concept="1T6I$Y" id="1zN1RIlQ68B" role="1T5LoC">
+                            <property role="1T6KD9" value="$" />
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
diff --git a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
index 692bf578..26bbc9f9 100644
--- a/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
+++ b/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/unification.mps
@@ -4392,12 +4392,11 @@
         <node concept="3cpWs8" id="5NuEpF1z8oh" role="3cqZAp">
           <node concept="3cpWsn" id="5NuEpF1z8oi" role="3cpWs9">
             <property role="TrG5h" value="repr" />
-            <node concept="3uibUv" id="5NuEpF1z8od" role="1tU5fm">
-              <ref role="3uigEE" to="w2rx:~Logical" resolve="Logical" />
-              <node concept="17QB3L" id="77AxcO5bvNo" role="11_B2D" />
+            <node concept="3uibUv" id="1zN1RIlpfOL" role="1tU5fm">
+              <ref role="3uigEE" node="1H8E3iB85PX" resolve="StringLogical" />
             </node>
             <node concept="1rXfSq" id="5NuEpF1z8oj" role="33vP2m">
-              <ref role="37wK5l" to="w2rx:~Logical.find():runtime.Logical" resolve="find" />
+              <ref role="37wK5l" node="dfChU1gi$L" resolve="findRoot" />
             </node>
           </node>
         </node>
@@ -4411,12 +4410,12 @@
                       <ref role="3cqZAo" node="5NuEpF1z8oi" resolve="repr" />
                     </node>
                     <node concept="liA8E" id="5NuEpF1zeJV" role="2OqNvi">
-                      <ref role="37wK5l" to="w2rx:~Logical.getName():java.lang.String" resolve="getName" />
+                      <ref role="37wK5l" node="3HJTsBmCy5P" resolve="name" />
                     </node>
                   </node>
                   <node concept="3cpWs3" id="5NuEpF1zcWy" role="3uHU7B">
                     <node concept="1rXfSq" id="5NuEpF1zc_Z" role="3uHU7B">
-                      <ref role="37wK5l" to="w2rx:~Logical.getName():java.lang.String" resolve="getName" />
+                      <ref role="37wK5l" node="3HJTsBmCy5P" resolve="name" />
                     </node>
                     <node concept="Xl_RD" id="5NuEpF1zcXi" role="3uHU7w">
                       <property role="Xl_RC" value=":" />
@@ -4424,7 +4423,7 @@
                   </node>
                 </node>
                 <node concept="1rXfSq" id="5NuEpF1zcvb" role="3K4E3e">
-                  <ref role="37wK5l" to="w2rx:~Logical.getName():java.lang.String" resolve="getName" />
+                  <ref role="37wK5l" node="3HJTsBmCy5P" resolve="name" />
                 </node>
                 <node concept="3clFbC" id="5NuEpF1zciC" role="3K4Cdx">
                   <node concept="37vLTw" id="5NuEpF1zckA" role="3uHU7w">
@@ -4436,7 +4435,7 @@
             </node>
             <node concept="2OqwBi" id="5NuEpF1zb3a" role="3K4E3e">
               <node concept="1rXfSq" id="5NuEpF1zaU6" role="2Oq$k0">
-                <ref role="37wK5l" to="w2rx:~Logical.getValue():java.lang.Object" resolve="getValue" />
+                <ref role="37wK5l" node="3HJTsBmBZ0h" resolve="value" />
               </node>
               <node concept="liA8E" id="5NuEpF1zbX_" role="2OqNvi">
                 <ref role="37wK5l" to="e2lb:~String.toString():java.lang.String" resolve="toString" />
@@ -4449,7 +4448,7 @@
                   <ref role="3cqZAo" node="5NuEpF1z8oi" resolve="repr" />
                 </node>
                 <node concept="liA8E" id="5NuEpF1zae5" role="2OqNvi">
-                  <ref role="37wK5l" to="w2rx:~Logical.getValue():java.lang.Object" resolve="getValue" />
+                  <ref role="37wK5l" node="3HJTsBmBZ0h" resolve="value" />
                 </node>
               </node>
             </node>
diff --git a/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/generator.mps b/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/generator.mps
index 75eb698b..0ccbe458 100644
--- a/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/generator.mps
+++ b/solutions/jetbrains.mps.typechecking.rules/models/jetbrains/mps/typechecking/rule/generator.mps
@@ -1179,7 +1179,7 @@
                 <property role="TrG5h" value="builder" />
               </node>
             </node>
-            <node concept="3clFbH" id="tIwzd1I3Xc" role="3cqZAp" />
+            <node concept="3clFbH" id="tIwzd2q_BT" role="3cqZAp" />
             <node concept="3clFbF" id="tIwzd1IckP" role="3cqZAp">
               <node concept="2OqwBi" id="tIwzd1IcEc" role="3clFbG">
                 <node concept="37vLTw" id="tIwzd1IckN" role="2Oq$k0">