diff --git a/languages/jetbrains.mps.jchr/languageModels/editor.mps b/languages/jetbrains.mps.jchr/languageModels/editor.mps
index 7b64c791..5d7e5ac7 100644
--- a/languages/jetbrains.mps.jchr/languageModels/editor.mps
+++ b/languages/jetbrains.mps.jchr/languageModels/editor.mps
@@ -112,6 +112,7 @@
       <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="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -136,6 +137,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -332,6 +334,33 @@
     <node concept="3EZMnI" id="pmDhvH7GFX" role="2wV5jI">
       <node concept="l2Vlx" id="5PpdwMfJK4x" role="2iSdaV" />
       <node concept="3EZMnI" id="5PpdwMfJUm6" role="3EZMnx">
+        <node concept="3EZMnI" id="6lpwCiZf5mH" role="3EZMnx">
+          <node concept="VPM3Z" id="6lpwCiZf5mJ" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="3F0A7n" id="6lpwCiZf5Sw" role="3EZMnx">
+            <ref role="1NtTu8" to="vgt0:pmDhvH6BuW" resolve="tag" />
+          </node>
+          <node concept="3F0ifn" id="6lpwCiZf5_M" role="3EZMnx">
+            <property role="3F0ifm" value="@" />
+          </node>
+          <node concept="l2Vlx" id="6lpwCiZf5mM" role="2iSdaV" />
+          <node concept="pkWqt" id="6lpwCiZf5Yu" role="pqm2j">
+            <node concept="3clFbS" id="6lpwCiZf5Yv" role="2VODD2">
+              <node concept="3clFbF" id="6lpwCiZf7lm" role="3cqZAp">
+                <node concept="3y3z36" id="6lpwCiZf9Wq" role="3clFbG">
+                  <node concept="10Nm6u" id="6lpwCiZfa9q" role="3uHU7w" />
+                  <node concept="2OqwBi" id="6lpwCiZf7pW" role="3uHU7B">
+                    <node concept="pncrf" id="6lpwCiZf7ll" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="6lpwCiZf7Jv" role="2OqNvi">
+                      <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3F1sOY" id="pmDhvH7KQs" role="3EZMnx">
           <ref role="1NtTu8" to="vgt0:pmDhvH7EB6" />
         </node>
@@ -428,6 +457,33 @@
     <ref role="1XX52x" to="vgt0:pmDhvH6Bv5" resolve="SimplificationRule" />
     <node concept="3EZMnI" id="pmDhvH7L62" role="2wV5jI">
       <node concept="3EZMnI" id="5PpdwMfIUi1" role="3EZMnx">
+        <node concept="3EZMnI" id="6lpwCiZfgn6" role="3EZMnx">
+          <node concept="VPM3Z" id="6lpwCiZfgn7" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="3F0A7n" id="6lpwCiZfgn8" role="3EZMnx">
+            <ref role="1NtTu8" to="vgt0:pmDhvH6BuW" resolve="tag" />
+          </node>
+          <node concept="3F0ifn" id="6lpwCiZfgn9" role="3EZMnx">
+            <property role="3F0ifm" value="@" />
+          </node>
+          <node concept="l2Vlx" id="6lpwCiZfgna" role="2iSdaV" />
+          <node concept="pkWqt" id="6lpwCiZfgnb" role="pqm2j">
+            <node concept="3clFbS" id="6lpwCiZfgnc" role="2VODD2">
+              <node concept="3clFbF" id="6lpwCiZfgnd" role="3cqZAp">
+                <node concept="3y3z36" id="6lpwCiZfgne" role="3clFbG">
+                  <node concept="10Nm6u" id="6lpwCiZfgnf" role="3uHU7w" />
+                  <node concept="2OqwBi" id="6lpwCiZfgng" role="3uHU7B">
+                    <node concept="pncrf" id="6lpwCiZfgnh" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="6lpwCiZfgni" role="2OqNvi">
+                      <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3F1sOY" id="pmDhvH7L63" role="3EZMnx">
           <ref role="1NtTu8" to="vgt0:pmDhvH7GEp" />
         </node>
@@ -539,11 +595,35 @@
           <property role="VOm3f" value="true" />
         </node>
       </node>
+      <node concept="3EZMnI" id="6lpwCiZfaSf" role="3EZMnx">
+        <node concept="VPM3Z" id="6lpwCiZfaSg" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F0A7n" id="6lpwCiZfaSh" role="3EZMnx">
+          <ref role="1NtTu8" to="vgt0:pmDhvH6BuW" resolve="tag" />
+        </node>
+        <node concept="3F0ifn" id="6lpwCiZfaSi" role="3EZMnx">
+          <property role="3F0ifm" value="@" />
+        </node>
+        <node concept="l2Vlx" id="6lpwCiZfaSj" role="2iSdaV" />
+        <node concept="pkWqt" id="6lpwCiZfaSk" role="pqm2j">
+          <node concept="3clFbS" id="6lpwCiZfaSl" role="2VODD2">
+            <node concept="3clFbF" id="6lpwCiZfaSm" role="3cqZAp">
+              <node concept="3y3z36" id="6lpwCiZfaSn" role="3clFbG">
+                <node concept="10Nm6u" id="6lpwCiZfaSo" role="3uHU7w" />
+                <node concept="2OqwBi" id="6lpwCiZfaSp" role="3uHU7B">
+                  <node concept="pncrf" id="6lpwCiZfaSq" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="6lpwCiZfaSr" role="2OqNvi">
+                    <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="3F1sOY" id="pmDhvH7Mt2" role="3EZMnx">
         <ref role="1NtTu8" to="vgt0:pmDhvH7GFo" />
-        <node concept="lj46D" id="2KVRGowZXuT" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
       </node>
       <node concept="3F0ifn" id="pmDhvH7LEF" role="3EZMnx">
         <property role="3F0ifm" value="&lt;=&gt;" />
diff --git a/languages/jetbrains.mps.jchr/languageModels/intentions.mps b/languages/jetbrains.mps.jchr/languageModels/intentions.mps
new file mode 100644
index 00000000..7ca73476
--- /dev/null
+++ b/languages/jetbrains.mps.jchr/languageModels/intentions.mps
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:0032ed59-af46-4ce8-8951-fd874662f370(jetbrains.mps.jchr.intentions)">
+  <persistence version="9" />
+  <languages>
+    <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="-1" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports>
+    <import index="vgt0" ref="r:f36c95e5-e428-4945-91ae-1005e20c7971(jetbrains.mps.jchr.structure)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="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="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="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>
+    </language>
+    <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions">
+      <concept id="1192794744107" name="jetbrains.mps.lang.intentions.structure.IntentionDeclaration" flags="ig" index="2S6QgY" />
+      <concept id="1192794782375" name="jetbrains.mps.lang.intentions.structure.DescriptionBlock" flags="in" index="2S6ZIM" />
+      <concept id="1192795771125" name="jetbrains.mps.lang.intentions.structure.IsApplicableBlock" flags="in" index="2SaL7w" />
+      <concept id="1192795911897" name="jetbrains.mps.lang.intentions.structure.ExecuteBlock" flags="in" index="2Sbjvc" />
+      <concept id="1192796902958" name="jetbrains.mps.lang.intentions.structure.ConceptFunctionParameter_node" flags="nn" index="2Sf5sV" />
+      <concept id="2522969319638091381" name="jetbrains.mps.lang.intentions.structure.BaseIntentionDeclaration" flags="ig" index="2ZfUlf">
+        <reference id="2522969319638198290" name="forConcept" index="2ZfgGC" />
+        <child id="2522969319638198291" name="executeFunction" index="2ZfgGD" />
+        <child id="2522969319638093995" name="isApplicableFunction" index="2ZfVeh" />
+        <child id="2522969319638093993" name="descriptionFunction" index="2ZfVej" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="2S6QgY" id="6lpwCiZgBa_">
+    <property role="TrG5h" value="Rule_add_tag" />
+    <ref role="2ZfgGC" to="vgt0:pmDhvH6AYs" resolve="Rule" />
+    <node concept="2Sbjvc" id="6lpwCiZgBaA" role="2ZfgGD">
+      <node concept="3clFbS" id="6lpwCiZgBaB" role="2VODD2">
+        <node concept="3clFbF" id="6lpwCiZgDUM" role="3cqZAp">
+          <node concept="37vLTI" id="6lpwCiZgEip" role="3clFbG">
+            <node concept="Xl_RD" id="6lpwCiZgEiH" role="37vLTx">
+              <property role="Xl_RC" value="" />
+            </node>
+            <node concept="2OqwBi" id="6lpwCiZgDVZ" role="37vLTJ">
+              <node concept="2Sf5sV" id="6lpwCiZgDUL" role="2Oq$k0" />
+              <node concept="3TrcHB" id="6lpwCiZgE4y" role="2OqNvi">
+                <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2S6ZIM" id="6lpwCiZgBaC" role="2ZfVej">
+      <node concept="3clFbS" id="6lpwCiZgBaD" role="2VODD2">
+        <node concept="3clFbF" id="6lpwCiZgBJT" role="3cqZAp">
+          <node concept="Xl_RD" id="6lpwCiZgBJS" role="3clFbG">
+            <property role="Xl_RC" value="Specify tag" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2SaL7w" id="6lpwCiZgCCH" role="2ZfVeh">
+      <node concept="3clFbS" id="6lpwCiZgCCI" role="2VODD2">
+        <node concept="3clFbF" id="6lpwCiZgCSY" role="3cqZAp">
+          <node concept="3clFbC" id="6lpwCiZgDBT" role="3clFbG">
+            <node concept="10Nm6u" id="6lpwCiZgDHY" role="3uHU7w" />
+            <node concept="2OqwBi" id="6lpwCiZgCX9" role="3uHU7B">
+              <node concept="2Sf5sV" id="6lpwCiZgCSX" role="2Oq$k0" />
+              <node concept="3TrcHB" id="6lpwCiZgDfW" role="2OqNvi">
+                <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/languages/jetbrains.mps.jchr/languageModels/textGen.mps b/languages/jetbrains.mps.jchr/languageModels/textGen.mps
index 05db5a68..6a90bb10 100644
--- a/languages/jetbrains.mps.jchr/languageModels/textGen.mps
+++ b/languages/jetbrains.mps.jchr/languageModels/textGen.mps
@@ -41,6 +41,7 @@
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -80,6 +81,11 @@
       <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="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
     </language>
     <language id="b83431fe-5c8f-40bc-8a36-65e25f4dd253" name="jetbrains.mps.lang.textGen">
       <concept id="8931911391946696733" name="jetbrains.mps.lang.textGen.structure.ExtensionDeclaration" flags="in" index="9MYSb" />
@@ -453,6 +459,33 @@
       <node concept="3clFbS" id="1kcpyXxEaJW" role="2VODD2">
         <node concept="1bpajm" id="1kcpyXxEHK7" role="3cqZAp" />
         <node concept="3clFbH" id="1kcpyXxEHNu" role="3cqZAp" />
+        <node concept="3clFbJ" id="6lpwCiZlOI$" role="3cqZAp">
+          <node concept="3clFbS" id="6lpwCiZlOIA" role="3clFbx">
+            <node concept="lc7rE" id="6lpwCiZlPm8" role="3cqZAp">
+              <node concept="l9hG8" id="6lpwCiZlP$B" role="lcghm">
+                <node concept="2OqwBi" id="6lpwCiZlPCL" role="lb14g">
+                  <node concept="117lpO" id="6lpwCiZlPAL" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="6lpwCiZlPMD" role="2OqNvi">
+                    <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+                  </node>
+                </node>
+              </node>
+              <node concept="la8eA" id="6lpwCiZlPR2" role="lcghm">
+                <property role="lacIc" value=" @ " />
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="6lpwCiZlPj2" role="3clFbw">
+            <node concept="10Nm6u" id="6lpwCiZlPkH" role="3uHU7w" />
+            <node concept="2OqwBi" id="6lpwCiZlOOW" role="3uHU7B">
+              <node concept="117lpO" id="6lpwCiZlOMY" role="2Oq$k0" />
+              <node concept="3TrcHB" id="6lpwCiZlOYs" role="2OqNvi">
+                <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6lpwCiZlNbX" role="3cqZAp" />
         <node concept="lc7rE" id="1kcpyXxEXKE" role="3cqZAp">
           <node concept="l9S2W" id="1kcpyXxEXQa" role="lcghm">
             <property role="XA4eZ" value="true" />
@@ -547,6 +580,33 @@
       <node concept="3clFbS" id="1kcpyXxEzKY" role="2VODD2">
         <node concept="1bpajm" id="1kcpyXxF3nj" role="3cqZAp" />
         <node concept="3clFbH" id="1kcpyXxF3nk" role="3cqZAp" />
+        <node concept="3clFbJ" id="6lpwCiZlQnq" role="3cqZAp">
+          <node concept="3clFbS" id="6lpwCiZlQnr" role="3clFbx">
+            <node concept="lc7rE" id="6lpwCiZlQns" role="3cqZAp">
+              <node concept="l9hG8" id="6lpwCiZlQnt" role="lcghm">
+                <node concept="2OqwBi" id="6lpwCiZlQnu" role="lb14g">
+                  <node concept="117lpO" id="6lpwCiZlQnv" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="6lpwCiZlQnw" role="2OqNvi">
+                    <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+                  </node>
+                </node>
+              </node>
+              <node concept="la8eA" id="6lpwCiZlQnx" role="lcghm">
+                <property role="lacIc" value=" @ " />
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="6lpwCiZlQny" role="3clFbw">
+            <node concept="10Nm6u" id="6lpwCiZlQnz" role="3uHU7w" />
+            <node concept="2OqwBi" id="6lpwCiZlQn$" role="3uHU7B">
+              <node concept="117lpO" id="6lpwCiZlQn_" role="2Oq$k0" />
+              <node concept="3TrcHB" id="6lpwCiZlQnA" role="2OqNvi">
+                <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6lpwCiZlQkC" role="3cqZAp" />
         <node concept="lc7rE" id="1kcpyXxF3nl" role="3cqZAp">
           <node concept="l9S2W" id="1kcpyXxF3nm" role="lcghm">
             <property role="XA4eZ" value="true" />
@@ -665,6 +725,33 @@
       <node concept="3clFbS" id="1kcpyXxE_aS" role="2VODD2">
         <node concept="1bpajm" id="1kcpyXxF4ch" role="3cqZAp" />
         <node concept="3clFbH" id="1kcpyXxF4ci" role="3cqZAp" />
+        <node concept="3clFbJ" id="6lpwCiZlQJS" role="3cqZAp">
+          <node concept="3clFbS" id="6lpwCiZlQJT" role="3clFbx">
+            <node concept="lc7rE" id="6lpwCiZlQJU" role="3cqZAp">
+              <node concept="l9hG8" id="6lpwCiZlQJV" role="lcghm">
+                <node concept="2OqwBi" id="6lpwCiZlQJW" role="lb14g">
+                  <node concept="117lpO" id="6lpwCiZlQJX" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="6lpwCiZlQJY" role="2OqNvi">
+                    <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+                  </node>
+                </node>
+              </node>
+              <node concept="la8eA" id="6lpwCiZlQJZ" role="lcghm">
+                <property role="lacIc" value=" @ " />
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="6lpwCiZlQK0" role="3clFbw">
+            <node concept="10Nm6u" id="6lpwCiZlQK1" role="3uHU7w" />
+            <node concept="2OqwBi" id="6lpwCiZlQK2" role="3uHU7B">
+              <node concept="117lpO" id="6lpwCiZlQK3" role="2Oq$k0" />
+              <node concept="3TrcHB" id="6lpwCiZlQK4" role="2OqNvi">
+                <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6lpwCiZlQId" role="3cqZAp" />
         <node concept="lc7rE" id="1kcpyXxF4cj" role="3cqZAp">
           <node concept="l9S2W" id="1kcpyXxF4ck" role="lcghm">
             <property role="XA4eZ" value="true" />
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 97a96e15..c4f44bd9 100644
--- a/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -21,6 +21,7 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
+    <import index="ec5l" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/f:java_stub#8865b7a8-5271-43d3-884c-6fd1d9cfdd34#org.jetbrains.mps.openapi.model(MPS.OpenAPI/org.jetbrains.mps.openapi.model@java_stub)" implicit="true" />
   </imports>
   <registry>
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
@@ -368,6 +369,9 @@
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
       <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
         <reference id="1171323947160" name="concept" index="2SmgA8" />
       </concept>
@@ -2305,7 +2309,7 @@
                                     <node concept="3clFbF" id="6FQzrygXVuA" role="3cqZAp">
                                       <node concept="3clFbC" id="6FQzrygXVuB" role="3clFbG">
                                         <node concept="3B5_sB" id="6FQzrygXVuC" role="3uHU7w">
-                                          <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleMethod" />
+                                          <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleTemplateMethod" />
                                         </node>
                                         <node concept="2OqwBi" id="6FQzrygXVuD" role="3uHU7B">
                                           <node concept="37vLTw" id="6FQzrygXVuE" role="2Oq$k0">
@@ -2355,7 +2359,7 @@
                           <node concept="2c44tf" id="6FQzrygYhQz" role="2Oq$k0">
                             <node concept="Rm8GO" id="6FQzrygYjzE" role="2c44tc">
                               <ref role="Rm8GQ" to="qiww:77AxcO56PM5" resolve="HEAD_KEPT" />
-                              <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleMehodKind" />
+                              <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleTemplateMehodKind" />
                             </node>
                           </node>
                           <node concept="3TrEf2" id="6FQzrygYhQ_" role="2OqNvi">
@@ -2453,7 +2457,7 @@
                                     <node concept="3clFbF" id="6FQzrygYjWX" role="3cqZAp">
                                       <node concept="3clFbC" id="6FQzrygYjWY" role="3clFbG">
                                         <node concept="3B5_sB" id="6FQzrygYjWZ" role="3uHU7w">
-                                          <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleMethod" />
+                                          <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleTemplateMethod" />
                                         </node>
                                         <node concept="2OqwBi" id="6FQzrygYjX0" role="3uHU7B">
                                           <node concept="37vLTw" id="6FQzrygYjX1" role="2Oq$k0">
@@ -2503,7 +2507,7 @@
                           <node concept="2c44tf" id="6FQzrygYjXg" role="2Oq$k0">
                             <node concept="Rm8GO" id="6FQzrygYkWU" role="2c44tc">
                               <ref role="Rm8GQ" to="qiww:77AxcO56PM6" resolve="HEAD_REPLACED" />
-                              <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleMehodKind" />
+                              <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleTemplateMehodKind" />
                             </node>
                           </node>
                           <node concept="3TrEf2" id="6FQzrygYjXh" role="2OqNvi">
@@ -2601,7 +2605,7 @@
                                     <node concept="3clFbF" id="6FQzrygYluz" role="3cqZAp">
                                       <node concept="3clFbC" id="6FQzrygYlu$" role="3clFbG">
                                         <node concept="3B5_sB" id="6FQzrygYlu_" role="3uHU7w">
-                                          <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleMethod" />
+                                          <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleTemplateMethod" />
                                         </node>
                                         <node concept="2OqwBi" id="6FQzrygYluA" role="3uHU7B">
                                           <node concept="37vLTw" id="6FQzrygYluB" role="2Oq$k0">
@@ -2651,7 +2655,7 @@
                           <node concept="2c44tf" id="6FQzrygYluQ" role="2Oq$k0">
                             <node concept="Rm8GO" id="6FQzrygYmr4" role="2c44tc">
                               <ref role="Rm8GQ" to="qiww:77AxcO56PM7" resolve="GUARD" />
-                              <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleMehodKind" />
+                              <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleTemplateMehodKind" />
                             </node>
                           </node>
                           <node concept="3TrEf2" id="6FQzrygYluR" role="2OqNvi">
@@ -2749,7 +2753,7 @@
                                     <node concept="3clFbF" id="6FQzrygYmVm" role="3cqZAp">
                                       <node concept="3clFbC" id="6FQzrygYmVn" role="3clFbG">
                                         <node concept="3B5_sB" id="6FQzrygYmVo" role="3uHU7w">
-                                          <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleMethod" />
+                                          <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleTemplateMethod" />
                                         </node>
                                         <node concept="2OqwBi" id="6FQzrygYmVp" role="3uHU7B">
                                           <node concept="37vLTw" id="6FQzrygYmVq" role="2Oq$k0">
@@ -2798,7 +2802,7 @@
                         <node concept="2OqwBi" id="6FQzrygYmVC" role="3uHU7w">
                           <node concept="2c44tf" id="6FQzrygYmVD" role="2Oq$k0">
                             <node concept="Rm8GO" id="6FQzrygYhQ$" role="2c44tc">
-                              <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleMehodKind" />
+                              <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleTemplateMehodKind" />
                               <ref role="Rm8GQ" to="qiww:77AxcO56PM8" resolve="BODY" />
                             </node>
                           </node>
@@ -3143,7 +3147,90 @@
             </node>
             <node concept="2ShNRf" id="5MHpiylARdz" role="33vP2m">
               <node concept="1pGfFk" id="5MHpiylARcG" role="2ShVmc">
-                <ref role="37wK5l" to="nc4n:7eGEHDlc$ar" resolve="RuleBuilder" />
+                <ref role="37wK5l" to="nc4n:6lpwCiZjdph" resolve="RuleBuilder" />
+                <node concept="3cpWs3" id="6lpwCiZmEmG" role="37wK5m">
+                  <node concept="2OqwBi" id="6lpwCiZmGTd" role="3uHU7w">
+                    <node concept="2JrnkZ" id="6lpwCiZmGxI" role="2Oq$k0">
+                      <node concept="37vLTw" id="6lpwCiZmFka" role="2JrQYb">
+                        <ref role="3cqZAo" node="4vbeH84zMs5" resolve="input" />
+                        <node concept="1ZhdrF" id="6lpwCiZmJzK" role="lGtFl">
+                          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                          <property role="2qtEX8" value="variableDeclaration" />
+                          <node concept="3$xsQk" id="6lpwCiZmJzL" role="3$ytzL">
+                            <node concept="3clFbS" id="6lpwCiZmJzM" role="2VODD2">
+                              <node concept="3clFbF" id="6lpwCiZmK61" role="3cqZAp">
+                                <node concept="2OqwBi" id="6lpwCiZmKaI" role="3clFbG">
+                                  <node concept="1iwH7S" id="6lpwCiZmK60" role="2Oq$k0" />
+                                  <node concept="1iwH70" id="6lpwCiZmKgZ" role="2OqNvi">
+                                    <ref role="1iwH77" node="4vbeH84CYdF" resolve="apply_input_parameter" />
+                                    <node concept="2OqwBi" id="6lpwCiZmLiA" role="1iwH7V">
+                                      <node concept="2OqwBi" id="6lpwCiZmKIS" role="2Oq$k0">
+                                        <node concept="30H73N" id="6lpwCiZmKqF" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="6lpwCiZmL52" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="wq2x:5NuEpF1iiJF" />
+                                        </node>
+                                      </node>
+                                      <node concept="3TrEf2" id="6lpwCiZmLAs" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:5NuEpF1ihrB" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="6lpwCiZmHyU" role="2OqNvi">
+                      <ref role="37wK5l" to="ec5l:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                    </node>
+                    <node concept="1W57fq" id="6lpwCiZnGOd" role="lGtFl">
+                      <node concept="3IZrLx" id="6lpwCiZnGOf" role="3IZSJc">
+                        <node concept="3clFbS" id="6lpwCiZnGOh" role="2VODD2">
+                          <node concept="3clFbF" id="6lpwCiZnHZQ" role="3cqZAp">
+                            <node concept="2OqwBi" id="6lpwCiZnIN0" role="3clFbG">
+                              <node concept="2OqwBi" id="6lpwCiZnI4$" role="2Oq$k0">
+                                <node concept="30H73N" id="6lpwCiZnHZO" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="6lpwCiZnIxu" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:5NuEpF1iiJF" />
+                                </node>
+                              </node>
+                              <node concept="3x8VRR" id="6lpwCiZnJ7m" role="2OqNvi" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="gft3U" id="6lpwCiZnJA_" role="UU_$l">
+                        <node concept="Xl_RD" id="6lpwCiZnJSJ" role="gfFT$" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs3" id="6lpwCiZmDkM" role="3uHU7B">
+                    <node concept="Xl_RD" id="6lpwCiZkehp" role="3uHU7B">
+                      <property role="Xl_RC" value="" />
+                      <node concept="17Uvod" id="6lpwCiZkejC" role="lGtFl">
+                        <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                        <property role="2qtEX9" value="value" />
+                        <node concept="3zFVjK" id="6lpwCiZkejD" role="3zH0cK">
+                          <node concept="3clFbS" id="6lpwCiZkejE" role="2VODD2">
+                            <node concept="3clFbF" id="6lpwCiZkewA" role="3cqZAp">
+                              <node concept="2OqwBi" id="6lpwCiZke_n" role="3clFbG">
+                                <node concept="30H73N" id="6lpwCiZkew_" role="2Oq$k0" />
+                                <node concept="3TrcHB" id="6lpwCiZkeUm" role="2OqNvi">
+                                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Xl_RD" id="6lpwCiZmD$9" role="3uHU7w">
+                      <property role="Xl_RC" value="_" />
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="2ZBi8u" id="5MHpiylARAd" role="lGtFl">
@@ -4340,7 +4427,131 @@
             </node>
             <node concept="2ShNRf" id="5MHpiylJzbU" role="33vP2m">
               <node concept="1pGfFk" id="5MHpiylJzbV" role="2ShVmc">
-                <ref role="37wK5l" to="nc4n:7eGEHDlc$ar" resolve="RuleBuilder" />
+                <ref role="37wK5l" to="nc4n:6lpwCiZjdph" resolve="RuleBuilder" />
+                <node concept="3cpWs3" id="6lpwCiZkpbY" role="37wK5m">
+                  <node concept="2YIFZM" id="6lpwCiZqwIR" role="3uHU7w">
+                    <ref role="37wK5l" to="e2lb:~System.identityHashCode(java.lang.Object):int" resolve="identityHashCode" />
+                    <ref role="1Pybhc" to="e2lb:~System" resolve="System" />
+                    <node concept="37vLTw" id="6lpwCiZqwIS" role="37wK5m">
+                      <ref role="3cqZAo" node="5MHpiylKftJ" resolve="param" />
+                      <node concept="1ZhdrF" id="6lpwCiZqwIT" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                        <property role="2qtEX8" value="variableDeclaration" />
+                        <node concept="3$xsQk" id="6lpwCiZqwIU" role="3$ytzL">
+                          <node concept="3clFbS" id="6lpwCiZqwIV" role="2VODD2">
+                            <node concept="3clFbF" id="6lpwCiZqwIW" role="3cqZAp">
+                              <node concept="2OqwBi" id="6lpwCiZqwIX" role="3clFbG">
+                                <node concept="1iwH7S" id="6lpwCiZqwIY" role="2Oq$k0" />
+                                <node concept="1iwH70" id="6lpwCiZqwIZ" role="2OqNvi">
+                                  <ref role="1iwH77" node="5MHpiylK7iY" resolve="apply_parameter_parameter" />
+                                  <node concept="2OqwBi" id="6lpwCiZqwJ0" role="1iwH7V">
+                                    <node concept="2OqwBi" id="6lpwCiZqwJ1" role="2Oq$k0">
+                                      <node concept="30H73N" id="6lpwCiZqwJ2" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="6lpwCiZqwJ3" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="wq2x:5MHpiylGjt8" />
+                                      </node>
+                                    </node>
+                                    <node concept="3TrEf2" id="6lpwCiZqwJ4" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:5MHpiylFI5Z" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs3" id="6lpwCiZmWyC" role="3uHU7B">
+                    <node concept="Xl_RD" id="6lpwCiZmWzg" role="3uHU7w">
+                      <property role="Xl_RC" value="_" />
+                    </node>
+                    <node concept="3cpWs3" id="6lpwCiZmPOi" role="3uHU7B">
+                      <node concept="3cpWs3" id="6lpwCiZmOxy" role="3uHU7B">
+                        <node concept="Xl_RD" id="6lpwCiZknqy" role="3uHU7B">
+                          <property role="Xl_RC" value="" />
+                          <node concept="17Uvod" id="6lpwCiZknxU" role="lGtFl">
+                            <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                            <property role="2qtEX9" value="value" />
+                            <node concept="3zFVjK" id="6lpwCiZknxV" role="3zH0cK">
+                              <node concept="3clFbS" id="6lpwCiZknxW" role="2VODD2">
+                                <node concept="3clFbF" id="6lpwCiZknIc" role="3cqZAp">
+                                  <node concept="2OqwBi" id="6lpwCiZknMX" role="3clFbG">
+                                    <node concept="30H73N" id="6lpwCiZknIb" role="2Oq$k0" />
+                                    <node concept="3TrcHB" id="6lpwCiZko2I" role="2OqNvi">
+                                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="Xl_RD" id="6lpwCiZmOMr" role="3uHU7w">
+                          <property role="Xl_RC" value="_" />
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="6lpwCiZmSEE" role="3uHU7w">
+                        <node concept="2JrnkZ" id="6lpwCiZmRZQ" role="2Oq$k0">
+                          <node concept="37vLTw" id="6lpwCiZmQjt" role="2JrQYb">
+                            <ref role="3cqZAo" node="5MHpiylJzbE" resolve="input" />
+                            <node concept="1ZhdrF" id="6lpwCiZmU5E" role="lGtFl">
+                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                              <property role="2qtEX8" value="variableDeclaration" />
+                              <node concept="3$xsQk" id="6lpwCiZmU5F" role="3$ytzL">
+                                <node concept="3clFbS" id="6lpwCiZmU5G" role="2VODD2">
+                                  <node concept="3clFbF" id="6lpwCiZmU$b" role="3cqZAp">
+                                    <node concept="2OqwBi" id="6lpwCiZmUAW" role="3clFbG">
+                                      <node concept="1iwH7S" id="6lpwCiZmU$a" role="2Oq$k0" />
+                                      <node concept="1iwH70" id="6lpwCiZmUKO" role="2OqNvi">
+                                        <ref role="1iwH77" node="4vbeH84CYdF" resolve="apply_input_parameter" />
+                                        <node concept="2OqwBi" id="6lpwCiZmVyy" role="1iwH7V">
+                                          <node concept="2OqwBi" id="6lpwCiZmUYO" role="2Oq$k0">
+                                            <node concept="30H73N" id="6lpwCiZmUV$" role="2Oq$k0" />
+                                            <node concept="3TrEf2" id="6lpwCiZmVkY" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="wq2x:5NuEpF1iiJF" />
+                                            </node>
+                                          </node>
+                                          <node concept="3TrEf2" id="6lpwCiZmVQo" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="wq2x:5NuEpF1ihrB" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="6lpwCiZmT$a" role="2OqNvi">
+                          <ref role="37wK5l" to="ec5l:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                        </node>
+                        <node concept="1W57fq" id="6lpwCiZnP0A" role="lGtFl">
+                          <node concept="3IZrLx" id="6lpwCiZnP0C" role="3IZSJc">
+                            <node concept="3clFbS" id="6lpwCiZnP0E" role="2VODD2">
+                              <node concept="3clFbF" id="6lpwCiZnPw_" role="3cqZAp">
+                                <node concept="2OqwBi" id="6lpwCiZnQjJ" role="3clFbG">
+                                  <node concept="2OqwBi" id="6lpwCiZnP_j" role="2Oq$k0">
+                                    <node concept="30H73N" id="6lpwCiZnPw$" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="6lpwCiZnQ33" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:5NuEpF1iiJF" />
+                                    </node>
+                                  </node>
+                                  <node concept="3x8VRR" id="6lpwCiZnQCV" role="2OqNvi" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="gft3U" id="6lpwCiZnR7k" role="UU_$l">
+                            <node concept="Xl_RD" id="6lpwCiZnRnM" role="gfFT$" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="2ZBi8u" id="5MHpiylJzbW" role="lGtFl">
@@ -4584,7 +4795,7 @@
                 </node>
                 <node concept="3JPx81" id="6FQzrygSGSA" role="2OqNvi">
                   <node concept="3B5_sB" id="6FQzrygSGSB" role="25WWJ7">
-                    <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleMethod" />
+                    <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleTemplateMethod" />
                   </node>
                 </node>
               </node>
@@ -4648,7 +4859,7 @@
                 </node>
                 <node concept="3JPx81" id="6FQzrygTEuk" role="2OqNvi">
                   <node concept="3B5_sB" id="6FQzrygTERb" role="25WWJ7">
-                    <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleMethod" />
+                    <ref role="3B5MYn" to="qiww:77AxcO56PMa" resolve="RuleTemplateMethod" />
                   </node>
                 </node>
               </node>
@@ -4752,12 +4963,12 @@
           </node>
         </node>
         <node concept="2AHcQZ" id="6FQzrygTpZ5" role="2AJF6D">
-          <ref role="2AI5Lk" to="qiww:77AxcO56PMa" resolve="RuleMethod" />
+          <ref role="2AI5Lk" to="qiww:77AxcO56PMa" resolve="RuleTemplateMethod" />
           <node concept="1SXeKx" id="6FQzrygTq_t" role="2B76xF">
             <ref role="2B6OnR" to="qiww:77AxcO56PMb" resolve="value" />
             <node concept="Rm8GO" id="6FQzrygTrRC" role="2B70Vg">
               <ref role="Rm8GQ" to="qiww:77AxcO56PM5" resolve="HEAD_KEPT" />
-              <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleMehodKind" />
+              <ref role="1Px2BO" to="qiww:77AxcO56PM4" resolve="RuleTemplateMehodKind" />
             </node>
           </node>
           <node concept="2b32R4" id="6FQzrygTr5Q" role="lGtFl">
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 4b6f9761..b6e62540 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
@@ -694,7 +694,15 @@
       <node concept="3Tm1VV" id="7eGEHDlc$9A" role="1B3o_S" />
       <node concept="3clFbS" id="7eGEHDlc$9B" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="7eGEHDlc$9C" role="jymVt" />
+    <node concept="2tJIrI" id="6lpwCiZj$A4" role="jymVt" />
+    <node concept="3clFb_" id="6lpwCiZj$RR" role="jymVt">
+      <property role="TrG5h" value="tag" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="17QB3L" id="6lpwCiZj$UX" role="3clF45" />
+      <node concept="3Tm1VV" id="6lpwCiZj$RU" role="1B3o_S" />
+      <node concept="3clFbS" id="6lpwCiZj$RV" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="6lpwCiZj$Ij" role="jymVt" />
     <node concept="3clFb_" id="7eGEHDlc$9D" role="jymVt">
       <property role="TrG5h" value="headKept" />
       <property role="1EzhhJ" value="true" />
@@ -788,6 +796,30 @@
       <node concept="3Tm1VV" id="7eGEHDlc$at" role="1B3o_S" />
       <node concept="3clFbS" id="7eGEHDlc$au" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="6lpwCiZjgvw" role="jymVt" />
+    <node concept="3clFbW" id="6lpwCiZjdph" role="jymVt">
+      <node concept="37vLTG" id="6lpwCiZjj_H" role="3clF46">
+        <property role="TrG5h" value="tag" />
+        <node concept="17QB3L" id="6lpwCiZjjBa" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="6lpwCiZjdpi" role="3clF45" />
+      <node concept="3Tm1VV" id="6lpwCiZjdpj" role="1B3o_S" />
+      <node concept="3clFbS" id="6lpwCiZjdpk" role="3clF47">
+        <node concept="3clFbF" id="6lpwCiZjjEq" role="3cqZAp">
+          <node concept="37vLTI" id="6lpwCiZjjEs" role="3clFbG">
+            <node concept="2OqwBi" id="6lpwCiZjjEw" role="37vLTJ">
+              <node concept="Xjq3P" id="6lpwCiZjjEz" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6lpwCiZjjEv" role="2OqNvi">
+                <ref role="2Oxat5" node="6lpwCiZjjEm" resolve="tag" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="6lpwCiZjjE$" role="37vLTx">
+              <ref role="3cqZAo" node="6lpwCiZjj_H" resolve="tag" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="7eGEHDlc$av" role="jymVt" />
     <node concept="3clFb_" id="7eGEHDlc$aw" role="jymVt">
       <property role="TrG5h" value="appendBody" />
@@ -1398,6 +1430,9 @@
               <node concept="37vLTw" id="7eGEHDlc$dB" role="37wK5m">
                 <ref role="3cqZAo" node="7eGEHDlc$cp" resolve="kind" />
               </node>
+              <node concept="37vLTw" id="6lpwCiZjuK$" role="37wK5m">
+                <ref role="3cqZAo" node="6lpwCiZjjEm" resolve="tag" />
+              </node>
             </node>
           </node>
         </node>
@@ -1428,6 +1463,19 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="6lpwCiZjvin" role="3cqZAp">
+            <node concept="37vLTI" id="6lpwCiZjvip" role="3clFbG">
+              <node concept="2OqwBi" id="6lpwCiZjvit" role="37vLTJ">
+                <node concept="Xjq3P" id="6lpwCiZjviw" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6lpwCiZjvis" role="2OqNvi">
+                  <ref role="2Oxat5" node="6lpwCiZjvij" resolve="tag" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="6lpwCiZjvix" role="37vLTx">
+                <ref role="3cqZAo" node="6lpwCiZjuQ8" resolve="tag" />
+              </node>
+            </node>
+          </node>
         </node>
         <node concept="37vLTG" id="7eGEHDlc$dP" role="3clF46">
           <property role="TrG5h" value="kind" />
@@ -1435,6 +1483,10 @@
             <ref role="3uigEE" node="7eGEHDlc$a2" resolve="ConstraintRule.Kind" />
           </node>
         </node>
+        <node concept="37vLTG" id="6lpwCiZjuQ8" role="3clF46">
+          <property role="TrG5h" value="tag" />
+          <node concept="17QB3L" id="6lpwCiZjv0K" role="1tU5fm" />
+        </node>
       </node>
       <node concept="2tJIrI" id="7eGEHDlc$dR" role="jymVt" />
       <node concept="3clFb_" id="7eGEHDlc$dS" role="jymVt">
@@ -1453,6 +1505,23 @@
         </node>
       </node>
       <node concept="2tJIrI" id="7eGEHDlc$dY" role="jymVt" />
+      <node concept="3clFb_" id="6lpwCiZjCun" role="jymVt">
+        <property role="TrG5h" value="tag" />
+        <property role="1EzhhJ" value="false" />
+        <node concept="17QB3L" id="6lpwCiZjCuo" role="3clF45" />
+        <node concept="3Tm1VV" id="6lpwCiZjCup" role="1B3o_S" />
+        <node concept="3clFbS" id="6lpwCiZjCur" role="3clF47">
+          <node concept="3clFbF" id="6lpwCiZjHnM" role="3cqZAp">
+            <node concept="37vLTw" id="6lpwCiZjHnL" role="3clFbG">
+              <ref role="3cqZAo" node="6lpwCiZjvij" resolve="tag" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="6lpwCiZjEWh" role="2AJF6D">
+          <ref role="2AI5Lk" to="e2lb:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6lpwCiZjDH9" role="jymVt" />
       <node concept="3Tm1VV" id="7eGEHDlc$dZ" role="1B3o_S" />
       <node concept="3uibUv" id="7eGEHDlc$e0" role="1zkMxy">
         <ref role="3uigEE" node="7eGEHDlc$9y" resolve="ConstraintRule" />
@@ -1587,8 +1656,18 @@
           <ref role="3uigEE" node="7eGEHDlc$a2" resolve="ConstraintRule.Kind" />
         </node>
       </node>
+      <node concept="312cEg" id="6lpwCiZjvij" role="jymVt">
+        <property role="TrG5h" value="tag" />
+        <node concept="3Tm6S6" id="6lpwCiZjvik" role="1B3o_S" />
+        <node concept="17QB3L" id="6lpwCiZjvim" role="1tU5fm" />
+      </node>
     </node>
     <node concept="2tJIrI" id="7eGEHDlc$e$" role="jymVt" />
+    <node concept="312cEg" id="6lpwCiZjjEm" role="jymVt">
+      <property role="TrG5h" value="tag" />
+      <node concept="3Tm6S6" id="6lpwCiZjjEn" role="1B3o_S" />
+      <node concept="17QB3L" id="6lpwCiZjjEp" role="1tU5fm" />
+    </node>
     <node concept="312cEg" id="7eGEHDlc$e_" role="jymVt">
       <property role="TrG5h" value="headKept" />
       <node concept="3Tm6S6" id="7eGEHDlc$eA" role="1B3o_S" />
@@ -1673,7 +1752,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7eGEHDlc$f5" role="jymVt" />
     <node concept="3Tm1VV" id="7eGEHDlc$f6" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="7eGEHDlc$f7">
diff --git a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/template.mps b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/template.mps
index edc7ec81..868646d6 100644
--- a/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/template.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/runtime/template.mps
@@ -253,6 +253,19 @@
       </node>
     </node>
     <node concept="2tJIrI" id="12yN8DyKFcw" role="jymVt" />
+    <node concept="3clFb_" id="6lpwCiZiZav" role="jymVt">
+      <property role="TrG5h" value="name" />
+      <node concept="17QB3L" id="6lpwCiZiZvn" role="3clF45" />
+      <node concept="3Tm1VV" id="6lpwCiZiZay" role="1B3o_S" />
+      <node concept="3clFbS" id="6lpwCiZiZaz" role="3clF47">
+        <node concept="3clFbF" id="6lpwCiZj0V4" role="3cqZAp">
+          <node concept="37vLTw" id="6lpwCiZj0V3" role="3clFbG">
+            <ref role="3cqZAo" node="12yN8DyKFsm" resolve="name" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6lpwCiZiYSu" role="jymVt" />
     <node concept="3clFb_" id="5k_shARMCYi" role="jymVt">
       <property role="TrG5h" value="applicableConcept" />
       <property role="1EzhhJ" value="true" />
diff --git a/solutions/jetbrains.mps.typechecking.handling/models/jetbrains/mps/typechecking/handler/producer.mps b/solutions/jetbrains.mps.typechecking.handling/models/jetbrains/mps/typechecking/handler/producer.mps
index 9849d819..369a1f98 100644
--- a/solutions/jetbrains.mps.typechecking.handling/models/jetbrains/mps/typechecking/handler/producer.mps
+++ b/solutions/jetbrains.mps.typechecking.handling/models/jetbrains/mps/typechecking/handler/producer.mps
@@ -1662,6 +1662,26 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="6lpwCiZiBbu" role="3cqZAp">
+          <node concept="37vLTI" id="6lpwCiZiC4w" role="3clFbG">
+            <node concept="2OqwBi" id="6lpwCiZiCo0" role="37vLTx">
+              <node concept="37vLTw" id="6lpwCiZiCmU" role="2Oq$k0">
+                <ref role="3cqZAo" node="ZqZbw4R6WI" resolve="rule" />
+              </node>
+              <node concept="liA8E" id="6lpwCiZjVTV" role="2OqNvi">
+                <ref role="37wK5l" to="nc4n:6lpwCiZj$RR" resolve="tag" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6lpwCiZiBo6" role="37vLTJ">
+              <node concept="37vLTw" id="6lpwCiZiBbs" role="2Oq$k0">
+                <ref role="3cqZAo" node="ZqZbw4RnVB" resolve="ruleNode" />
+              </node>
+              <node concept="3TrcHB" id="6lpwCiZiBDh" role="2OqNvi">
+                <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="4sVJFklJw7p" role="3cqZAp">
           <node concept="3cpWsn" id="4sVJFklJw7q" role="3cpWs9">
             <property role="TrG5h" value="keptHeadNode" />
@@ -1819,6 +1839,26 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="6lpwCiZjWyI" role="3cqZAp">
+          <node concept="37vLTI" id="6lpwCiZjWyJ" role="3clFbG">
+            <node concept="2OqwBi" id="6lpwCiZjWyK" role="37vLTx">
+              <node concept="37vLTw" id="6lpwCiZjWyL" role="2Oq$k0">
+                <ref role="3cqZAo" node="ZqZbw4R6yu" resolve="rule" />
+              </node>
+              <node concept="liA8E" id="6lpwCiZjWyM" role="2OqNvi">
+                <ref role="37wK5l" to="nc4n:6lpwCiZj$RR" resolve="tag" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6lpwCiZjWyN" role="37vLTJ">
+              <node concept="37vLTw" id="6lpwCiZjWyO" role="2Oq$k0">
+                <ref role="3cqZAo" node="ZqZbw4Ro2z" resolve="ruleNode" />
+              </node>
+              <node concept="3TrcHB" id="6lpwCiZjWyP" role="2OqNvi">
+                <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="4sVJFklUQkc" role="3cqZAp">
           <node concept="3cpWsn" id="4sVJFklUQkd" role="3cpWs9">
             <property role="TrG5h" value="hreplacedHeadNode" />
@@ -1924,6 +1964,26 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="6lpwCiZjXoI" role="3cqZAp">
+          <node concept="37vLTI" id="6lpwCiZjXoJ" role="3clFbG">
+            <node concept="2OqwBi" id="6lpwCiZjXoK" role="37vLTx">
+              <node concept="37vLTw" id="6lpwCiZjXoL" role="2Oq$k0">
+                <ref role="3cqZAo" node="ZqZbw4R6BG" resolve="rule" />
+              </node>
+              <node concept="liA8E" id="6lpwCiZjXoM" role="2OqNvi">
+                <ref role="37wK5l" to="nc4n:6lpwCiZj$RR" resolve="tag" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6lpwCiZjXoN" role="37vLTJ">
+              <node concept="37vLTw" id="6lpwCiZjXoO" role="2Oq$k0">
+                <ref role="3cqZAo" node="ZqZbw4Ro97" resolve="ruleNode" />
+              </node>
+              <node concept="3TrcHB" id="6lpwCiZjXoP" role="2OqNvi">
+                <ref role="3TsBF5" to="vgt0:pmDhvH6BuW" resolve="tag" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="4sVJFklUYX0" role="3cqZAp">
           <node concept="3cpWsn" id="4sVJFklUYX1" role="3cpWs9">
             <property role="TrG5h" value="keptHeadNode" />
@@ -3785,7 +3845,7 @@
                         </node>
                       </node>
                       <node concept="2DeJg1" id="2q_78a90g2_" role="2OqNvi">
-                        <ref role="1A0vxQ" to="5j4j:2q_78a8W4yS" resolve="WildcardVariable" />
+                        <ref role="1A0vxQ" to="5j4j:2q_78a8W4yS" resolve="WildcardTreeVariable" />
                       </node>
                     </node>
                   </node>
@@ -3962,7 +4022,7 @@
                         </node>
                       </node>
                       <node concept="2DeJg1" id="2q_78a90t$G" role="2OqNvi">
-                        <ref role="1A0vxQ" to="5j4j:2q_78a8W4yS" resolve="WildcardVariable" />
+                        <ref role="1A0vxQ" to="5j4j:2q_78a8W4yS" resolve="WildcardTreeVariable" />
                       </node>
                     </node>
                   </node>