diff --git a/build.xml b/build.xml
index 705761d4..1b72df0f 100644
--- a/build.xml
+++ b/build.xml
@@ -114,6 +114,7 @@
           <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
+          <module ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
@@ -2240,6 +2241,7 @@
           <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
           <module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
+          <module ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" kind="cl" />
           <module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
         </dependencies>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 1d7527d8..404b3e49 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -12678,8 +12678,8 @@
                                     <node concept="2OqwBi" id="1HWyn8iTlBf" role="3clFbG">
                                       <node concept="2OqwBi" id="1HWyn8iTlBg" role="2Oq$k0">
                                         <node concept="30H73N" id="1HWyn8iTlBh" role="2Oq$k0" />
-                                        <node concept="2qgKlT" id="1HWyn8iTlBi" role="2OqNvi">
-                                          <ref role="37wK5l" to="x5bw:1HWyn8iLEDG" resolve="logicalItems" />
+                                        <node concept="2qgKlT" id="7zIaasjAFD_" role="2OqNvi">
+                                          <ref role="37wK5l" to="ha02:1HWyn8iLEDG" resolve="logicalItems" />
                                         </node>
                                       </node>
                                       <node concept="3QWeyG" id="1HWyn8iTlBj" role="2OqNvi">
@@ -12827,8 +12827,8 @@
                               <node concept="2OqwBi" id="1HWyn8iTlCd" role="3clFbG">
                                 <node concept="2OqwBi" id="1HWyn8iTlCe" role="2Oq$k0">
                                   <node concept="30H73N" id="1HWyn8iTlCf" role="2Oq$k0" />
-                                  <node concept="2qgKlT" id="1HWyn8iTlCg" role="2OqNvi">
-                                    <ref role="37wK5l" to="x5bw:1HWyn8iLEDG" resolve="logicalItems" />
+                                  <node concept="2qgKlT" id="7zIaasjAJ39" role="2OqNvi">
+                                    <ref role="37wK5l" to="ha02:1HWyn8iLEDG" resolve="logicalItems" />
                                   </node>
                                 </node>
                                 <node concept="3QWeyG" id="1HWyn8iTlCh" role="2OqNvi">
@@ -12874,8 +12874,8 @@
                                         <node concept="37vLTw" id="1HWyn8iTlCB" role="2Oq$k0">
                                           <ref role="3cqZAo" node="1HWyn8iTlCr" resolve="copy" />
                                         </node>
-                                        <node concept="2qgKlT" id="1HWyn8iTlCC" role="2OqNvi">
-                                          <ref role="37wK5l" to="x5bw:1HWyn8iLEDG" resolve="logicalItems" />
+                                        <node concept="2qgKlT" id="7zIaasjAJKM" role="2OqNvi">
+                                          <ref role="37wK5l" to="ha02:1HWyn8iLEDG" resolve="logicalItems" />
                                         </node>
                                       </node>
                                       <node concept="3QWeyG" id="1HWyn8iTlCD" role="2OqNvi">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index ed60a695..ac7c550e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -829,15 +829,11 @@
   </node>
   <node concept="13h7C7" id="1HWyn8iLEBM">
     <ref role="13h7C2" to="wq2x:1HWyn8iLEBo" resolve="LateParameter" />
-    <node concept="13i0hz" id="1HWyn8iLEDG" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="true" />
+    <node concept="13i0hz" id="7zIaasjACJ4" role="13h7CS">
       <property role="TrG5h" value="logicalItems" />
-      <node concept="3Tm1VV" id="1HWyn8iLEDH" role="1B3o_S" />
-      <node concept="2I9FWS" id="1HWyn8iLEG5" role="3clF45">
-        <ref role="2I9WkF" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
-      </node>
-      <node concept="3clFbS" id="1HWyn8iLEDJ" role="3clF47">
+      <ref role="13i0hy" to="ha02:1HWyn8iLEDG" resolve="logicalItems" />
+      <node concept="3Tm1VV" id="7zIaasjACJ5" role="1B3o_S" />
+      <node concept="3clFbS" id="7zIaasjACJ8" role="3clF47">
         <node concept="3clFbF" id="1HWyn8iLEWw" role="3cqZAp">
           <node concept="2OqwBi" id="1HWyn8iLEWx" role="3clFbG">
             <node concept="BsUDl" id="1HWyn8iQo08" role="2Oq$k0">
@@ -858,6 +854,9 @@
           </node>
         </node>
       </node>
+      <node concept="2I9FWS" id="7zIaasjACJ9" role="3clF45">
+        <ref role="2I9WkF" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+      </node>
     </node>
     <node concept="13i0hz" id="1HWyn8iLEO1" role="13h7CS">
       <property role="13i0iv" value="false" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 2e48838f..300ce9ce 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -939,6 +939,9 @@
   <node concept="PlHQZ" id="1HWyn8iLEBo">
     <property role="EcuMT" value="1980609059170462168" />
     <property role="TrG5h" value="LateParameter" />
+    <node concept="PrWs8" id="7zIaasjACIn" role="PrDN$">
+      <ref role="PrY4T" to="5j4j:7zIaasjACyh" resolve="EvaluationSubject" />
+    </node>
   </node>
   <node concept="1TIwiD" id="3pMFS1zdeji">
     <property role="EcuMT" value="3923391191348208850" />
diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index add167f7..95248658 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -590,6 +590,52 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="7zIaasjByem" role="3acgRq">
+      <ref role="30HIoZ" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
+      <node concept="1Koe21" id="7zIaasjB$wc" role="1lVwrX">
+        <node concept="3clFbS" id="7zIaasjB$wd" role="1Koe22">
+          <node concept="3cpWs8" id="7zIaasjB$we" role="3cqZAp">
+            <node concept="3cpWsn" id="7zIaasjB$wf" role="3cpWs9">
+              <property role="TrG5h" value="logical" />
+              <node concept="3uibUv" id="7zIaasjB$wg" role="1tU5fm">
+                <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7zIaasjB$wh" role="3cqZAp">
+            <node concept="2OqwBi" id="7zIaasjB$wi" role="3clFbG">
+              <node concept="2OqwBi" id="7zIaasjB$wj" role="2Oq$k0">
+                <node concept="liA8E" id="7zIaasjB$wk" role="2OqNvi">
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
+                </node>
+                <node concept="37vLTw" id="7zIaasjB$wl" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7zIaasjB$wf" resolve="logical" />
+                  <node concept="29HgVG" id="7zIaasjB$wm" role="lGtFl">
+                    <node concept="3NFfHV" id="7zIaasjB$wn" role="3NFExx">
+                      <node concept="3clFbS" id="7zIaasjB$wo" role="2VODD2">
+                        <node concept="3clFbF" id="7zIaasjB$wp" role="3cqZAp">
+                          <node concept="2OqwBi" id="7zIaasjB$wq" role="3clFbG">
+                            <node concept="30H73N" id="7zIaasjB$wr" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="7zIaasjB$ws" role="2OqNvi">
+                              <ref role="3Tt5mk" to="5j4j:7zIaasjAKqg" resolve="logical" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="7zIaasjB$wt" role="2OqNvi">
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
+              </node>
+              <node concept="raruj" id="7zIaasjB$wu" role="lGtFl" />
+            </node>
+          </node>
+          <node concept="3clFbH" id="7zIaasjB$wv" role="3cqZAp" />
+        </node>
+      </node>
+    </node>
     <node concept="3aamgX" id="5WBVN_MJ51w" role="3acgRq">
       <ref role="30HIoZ" to="5j4j:5WBVN_MJ50y" resolve="ListLiteral" />
       <node concept="gft3U" id="5WBVN_MJ8nE" role="1lVwrX">
diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index df3d0a0a..e54a965c 100644
--- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.logic" uuid="35320f26-77cb-4c55-be9f-a97a27770af1" languageVersion="5" moduleVersion="0">
+<language namespace="jetbrains.mps.logic" uuid="35320f26-77cb-4c55-be9f-a97a27770af1" languageVersion="6" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
@@ -98,6 +98,7 @@
     <dependency reexport="false">e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
+    <dependency reexport="false">528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="9" />
@@ -162,6 +163,7 @@
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
+    <module reference="528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
index 9536215c..737381ae 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -132,6 +132,9 @@
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
+        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
+      </concept>
       <concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
@@ -853,5 +856,22 @@
       <node concept="3clFbS" id="JOGAOsxlgZ" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="7zIaasjACz8">
+    <property role="3GE5qa" value="logical.item.expression" />
+    <ref role="13h7C2" to="5j4j:7zIaasjACyh" resolve="EvaluationSubject" />
+    <node concept="13i0hz" id="1HWyn8iLEDG" role="13h7CS">
+      <property role="13i0iv" value="true" />
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="logicalItems" />
+      <node concept="3Tm1VV" id="1HWyn8iLEDH" role="1B3o_S" />
+      <node concept="2I9FWS" id="1HWyn8iLEG5" role="3clF45">
+        <ref role="2I9WkF" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+      </node>
+      <node concept="3clFbS" id="1HWyn8iLEDJ" role="3clF47" />
+    </node>
+    <node concept="13hLZK" id="7zIaasjACz9" role="13h7CW">
+      <node concept="3clFbS" id="7zIaasjACza" role="2VODD2" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
index 44a6f787..23271a58 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -214,6 +214,7 @@
       <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="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
@@ -1102,5 +1103,53 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="7zIaasjUSKd">
+    <property role="3GE5qa" value="logical.item.expression" />
+    <ref role="1M2myG" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
+    <node concept="9S07l" id="7zIaasjUSKe" role="9Vyp8">
+      <node concept="3clFbS" id="7zIaasjUSKf" role="2VODD2">
+        <node concept="3clFbF" id="7zIaasjUTe5" role="3cqZAp">
+          <node concept="2OqwBi" id="7zIaasjAU$I" role="3clFbG">
+            <node concept="2OqwBi" id="7zIaasjAUaw" role="2Oq$k0">
+              <node concept="nLn13" id="7zIaasjUTn$" role="2Oq$k0" />
+              <node concept="2Xjw5R" id="7zIaasjAUlG" role="2OqNvi">
+                <node concept="1xMEDy" id="7zIaasjAUlI" role="1xVPHs">
+                  <node concept="chp4Y" id="7zIaasjAUpy" role="ri$Ld">
+                    <ref role="cht4Q" to="5j4j:7zIaasjACyh" resolve="EvaluationSubject" />
+                  </node>
+                </node>
+                <node concept="1xIGOp" id="7zIaasjAUUX" role="1xVPHs" />
+              </node>
+            </node>
+            <node concept="3x8VRR" id="7zIaasjAUMx" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="1M2fIO" id="7zIaasjUTwi">
+    <property role="3GE5qa" value="logical.item.expression" />
+    <ref role="1M2myG" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
+    <node concept="9S07l" id="7zIaasjUTwj" role="9Vyp8">
+      <node concept="3clFbS" id="7zIaasjUTwk" role="2VODD2">
+        <node concept="3clFbF" id="7zIaasjUT$r" role="3cqZAp">
+          <node concept="2OqwBi" id="7zIaasjUT$t" role="3clFbG">
+            <node concept="2OqwBi" id="7zIaasjUT$u" role="2Oq$k0">
+              <node concept="nLn13" id="7zIaasjUTHq" role="2Oq$k0" />
+              <node concept="2Xjw5R" id="7zIaasjUT$v" role="2OqNvi">
+                <node concept="1xMEDy" id="7zIaasjUT$w" role="1xVPHs">
+                  <node concept="chp4Y" id="7zIaasjUT$x" role="ri$Ld">
+                    <ref role="cht4Q" to="5j4j:7zIaasjACyh" resolve="EvaluationSubject" />
+                  </node>
+                </node>
+                <node concept="1xIGOp" id="7zIaasjUT$y" role="1xVPHs" />
+              </node>
+            </node>
+            <node concept="3w_OXm" id="7zIaasjUTMP" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index cb15a4a8..a74f7879 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -183,6 +183,11 @@
       <concept id="7342352913006985483" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Action" flags="ng" index="3eGOop">
         <child id="8612453216082699922" name="substituteHandler" index="3aKz83" />
       </concept>
+      <concept id="414384289274418283" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Group" flags="ng" index="3ft6gV">
+        <child id="414384289274424750" name="condition" index="3ft5RY" />
+        <child id="414384289274424751" name="parts" index="3ft5RZ" />
+      </concept>
+      <concept id="414384289274418284" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_Condition" flags="ig" index="3ft6gW" />
       <concept id="1139535219966" name="jetbrains.mps.lang.editor.structure.CellActionMapDeclaration" flags="ig" index="1h_SRR">
         <reference id="1139535219968" name="applicableConcept" index="1h_SK9" />
         <child id="1139535219969" name="item" index="1h_SK8" />
@@ -432,6 +437,7 @@
       <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
         <reference id="1139877738879" name="concept" index="1A0vxQ" />
       </concept>
+      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
         <reference id="3562215692195600259" name="link" index="13MTZf" />
       </concept>
@@ -455,6 +461,10 @@
       <concept id="6870613620390542976" name="jetbrains.mps.lang.smodel.structure.ConceptAliasOperation" flags="ng" index="3n3YKJ" />
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
@@ -4281,48 +4291,69 @@
   <node concept="3p36aQ" id="49obaclcHw$">
     <property role="3GE5qa" value="logical.item.expression" />
     <ref role="aqKnT" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
-    <node concept="3N5dw7" id="7XmdqtdNMLp" role="3ft7WO">
-      <node concept="3N5aqt" id="7XmdqtdNMLq" role="3Na0zg">
-        <node concept="3clFbS" id="7XmdqtdNMLr" role="2VODD2">
-          <node concept="3cpWs8" id="7XmdqtdNSAC" role="3cqZAp">
-            <node concept="3cpWsn" id="7XmdqtdNSAD" role="3cpWs9">
-              <property role="TrG5h" value="le" />
-              <node concept="3Tqbb2" id="7XmdqtdNSAB" role="1tU5fm">
-                <ref role="ehGHo" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
-              </node>
-              <node concept="2ShNRf" id="7XmdqtdNSAE" role="33vP2m">
-                <node concept="3zrR0B" id="7XmdqtdNSAF" role="2ShVmc">
-                  <node concept="3Tqbb2" id="7XmdqtdNSAG" role="3zrR0E">
-                    <ref role="ehGHo" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
+    <node concept="3ft6gV" id="7zIaasjS8RU" role="3ft7WO">
+      <node concept="3N5dw7" id="7XmdqtdNMLp" role="3ft5RZ">
+        <node concept="3N5aqt" id="7XmdqtdNMLq" role="3Na0zg">
+          <node concept="3clFbS" id="7XmdqtdNMLr" role="2VODD2">
+            <node concept="3cpWs8" id="7XmdqtdNSAC" role="3cqZAp">
+              <node concept="3cpWsn" id="7XmdqtdNSAD" role="3cpWs9">
+                <property role="TrG5h" value="le" />
+                <node concept="3Tqbb2" id="7XmdqtdNSAB" role="1tU5fm">
+                  <ref role="ehGHo" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
+                </node>
+                <node concept="2ShNRf" id="7XmdqtdNSAE" role="33vP2m">
+                  <node concept="3zrR0B" id="7XmdqtdNSAF" role="2ShVmc">
+                    <node concept="3Tqbb2" id="7XmdqtdNSAG" role="3zrR0E">
+                      <ref role="ehGHo" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
-          </node>
-          <node concept="3clFbF" id="7XmdqtdNMWX" role="3cqZAp">
-            <node concept="2OqwBi" id="7XmdqtdNTZn" role="3clFbG">
-              <node concept="2OqwBi" id="7XmdqtdNTtp" role="2Oq$k0">
-                <node concept="37vLTw" id="7XmdqtdNSAH" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7XmdqtdNSAD" resolve="le" />
+            <node concept="3clFbF" id="7XmdqtdNMWX" role="3cqZAp">
+              <node concept="2OqwBi" id="7XmdqtdNTZn" role="3clFbG">
+                <node concept="2OqwBi" id="7XmdqtdNTtp" role="2Oq$k0">
+                  <node concept="37vLTw" id="7XmdqtdNSAH" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7XmdqtdNSAD" resolve="le" />
+                  </node>
+                  <node concept="3TrEf2" id="49obaclkKMn" role="2OqNvi">
+                    <ref role="3Tt5mk" to="5j4j:49obaclcanY" resolve="logical" />
+                  </node>
                 </node>
-                <node concept="3TrEf2" id="49obaclkKMn" role="2OqNvi">
-                  <ref role="3Tt5mk" to="5j4j:49obaclcanY" resolve="logical" />
+                <node concept="2oxUTD" id="7XmdqtdNUmX" role="2OqNvi">
+                  <node concept="3N4pyC" id="7XmdqtdNUwC" role="2oxUTC" />
                 </node>
               </node>
-              <node concept="2oxUTD" id="7XmdqtdNUmX" role="2OqNvi">
-                <node concept="3N4pyC" id="7XmdqtdNUwC" role="2oxUTC" />
-              </node>
             </node>
-          </node>
-          <node concept="3clFbF" id="7XmdqtdNUKS" role="3cqZAp">
-            <node concept="37vLTw" id="7XmdqtdNUKQ" role="3clFbG">
-              <ref role="3cqZAo" node="7XmdqtdNSAD" resolve="le" />
+            <node concept="3clFbF" id="7XmdqtdNUKS" role="3cqZAp">
+              <node concept="37vLTw" id="7XmdqtdNUKQ" role="3clFbG">
+                <ref role="3cqZAo" node="7XmdqtdNSAD" resolve="le" />
+              </node>
             </node>
           </node>
         </node>
+        <node concept="2kknPJ" id="7XmdqtdNMPi" role="2klrvf">
+          <ref role="2ZyFGn" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+        </node>
       </node>
-      <node concept="2kknPJ" id="7XmdqtdNMPi" role="2klrvf">
-        <ref role="2ZyFGn" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+      <node concept="3ft6gW" id="7zIaasjS918" role="3ft5RY">
+        <node concept="3clFbS" id="7zIaasjS919" role="2VODD2">
+          <node concept="3clFbF" id="7zIaasjS9a4" role="3cqZAp">
+            <node concept="2OqwBi" id="7zIaasjS9a5" role="3clFbG">
+              <node concept="2OqwBi" id="7zIaasjS9a6" role="2Oq$k0">
+                <node concept="3bvxqY" id="7zIaasjS9a7" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="7zIaasjS9a8" role="2OqNvi">
+                  <node concept="1xMEDy" id="7zIaasjS9a9" role="1xVPHs">
+                    <node concept="chp4Y" id="7zIaasjS9aa" role="ri$Ld">
+                      <ref role="cht4Q" to="5j4j:7zIaasjACyh" resolve="EvaluationSubject" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3w_OXm" id="7zIaasjS9kS" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
   </node>
@@ -4441,5 +4472,90 @@
       <node concept="l2Vlx" id="24ciDNzqIwn" role="2iSdaV" />
     </node>
   </node>
+  <node concept="24kQdi" id="7zIaasjAKs0">
+    <property role="3GE5qa" value="logical.item.expression" />
+    <ref role="1XX52x" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
+    <node concept="3EZMnI" id="7zIaasjAKs2" role="2wV5jI">
+      <node concept="3F1sOY" id="7zIaasjAKs3" role="3EZMnx">
+        <ref role="1NtTu8" to="5j4j:7zIaasjAKqg" resolve="logical" />
+      </node>
+      <node concept="l2Vlx" id="7zIaasjAKs4" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="3p36aQ" id="7zIaasjAP8D">
+    <property role="3GE5qa" value="logical.item.expression" />
+    <ref role="aqKnT" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
+    <node concept="3ft6gV" id="7zIaasjAP8E" role="3ft7WO">
+      <node concept="3ft6gW" id="7zIaasjAP8J" role="3ft5RY">
+        <node concept="3clFbS" id="7zIaasjAP8K" role="2VODD2">
+          <node concept="3clFbF" id="7zIaasjATYl" role="3cqZAp">
+            <node concept="2OqwBi" id="7zIaasjAU$I" role="3clFbG">
+              <node concept="2OqwBi" id="7zIaasjAUaw" role="2Oq$k0">
+                <node concept="3bvxqY" id="7zIaasjATYk" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="7zIaasjAUlG" role="2OqNvi">
+                  <node concept="1xMEDy" id="7zIaasjAUlI" role="1xVPHs">
+                    <node concept="chp4Y" id="7zIaasjAUpy" role="ri$Ld">
+                      <ref role="cht4Q" to="5j4j:7zIaasjACyh" resolve="EvaluationSubject" />
+                    </node>
+                  </node>
+                  <node concept="1xIGOp" id="7zIaasjAUUX" role="1xVPHs" />
+                </node>
+              </node>
+              <node concept="3x8VRR" id="7zIaasjAUMx" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3N5dw7" id="7zIaasjAUVJ" role="3ft5RZ">
+        <node concept="3N5aqt" id="7zIaasjAUVK" role="3Na0zg">
+          <node concept="3clFbS" id="7zIaasjAUVL" role="2VODD2">
+            <node concept="3cpWs8" id="7zIaasjBiCQ" role="3cqZAp">
+              <node concept="3cpWsn" id="7zIaasjBiCR" role="3cpWs9">
+                <property role="TrG5h" value="live" />
+                <node concept="3Tqbb2" id="7zIaasjBiCB" role="1tU5fm">
+                  <ref role="ehGHo" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
+                </node>
+                <node concept="2ShNRf" id="7zIaasjBiCS" role="33vP2m">
+                  <node concept="3zrR0B" id="7zIaasjBiCT" role="2ShVmc">
+                    <node concept="3Tqbb2" id="7zIaasjBiCU" role="3zrR0E">
+                      <ref role="ehGHo" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7zIaasjAUYO" role="3cqZAp">
+              <node concept="2OqwBi" id="7zIaasjBj9q" role="3clFbG">
+                <node concept="2OqwBi" id="7zIaasjBiN8" role="2Oq$k0">
+                  <node concept="37vLTw" id="7zIaasjBiCV" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7zIaasjBiCR" resolve="live" />
+                  </node>
+                  <node concept="3TrEf2" id="7zIaasjBiXH" role="2OqNvi">
+                    <ref role="3Tt5mk" to="5j4j:7zIaasjAKqg" resolve="logical" />
+                  </node>
+                </node>
+                <node concept="2oxUTD" id="7zIaasjBjmd" role="2OqNvi">
+                  <node concept="3N4pyC" id="7zIaasjBjte" role="2oxUTC" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7zIaasjBjvE" role="3cqZAp">
+              <node concept="37vLTw" id="7zIaasjBjvC" role="3clFbG">
+                <ref role="3cqZAo" node="7zIaasjBiCR" resolve="live" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2kknPJ" id="7zIaasjAUY4" role="2klrvf">
+          <ref role="2ZyFGn" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+        </node>
+      </node>
+    </node>
+    <node concept="3VyMlK" id="7zIaasjAP8G" role="3ft7WO" />
+  </node>
+  <node concept="3p36aQ" id="7zIaasjVjl3">
+    <property role="3GE5qa" value="logical" />
+    <ref role="aqKnT" to="5j4j:28ktUhrjnwn" resolve="ValueOfExpression" />
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
index c68d6ae6..1a4641aa 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps
@@ -7,6 +7,7 @@
     <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -19,6 +20,7 @@
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="slm6" ref="90746344-04fd-4286-97d5-b46ae6a81709/r:52a3d974-bd4f-4651-ba6e-a2de5e336d95(jetbrains.mps.lang.migration/jetbrains.mps.lang.migration.methods)" />
+    <import index="6f4m" ref="528ff3b9-5fc4-40dd-931f-c6ce3650640e/r:f69c3fa1-0e30-4980-84e2-190ae44e4c3d(jetbrains.mps.lang.migration.runtime/jetbrains.mps.lang.migration.runtime.base)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -80,6 +82,11 @@
       </concept>
       <concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
@@ -143,6 +150,9 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
+      <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
+        <child id="1140725362529" name="linkTarget" index="2oxUTC" />
+      </concept>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC">
         <reference id="1139880128956" name="concept" index="1A9B2P" />
@@ -224,10 +234,18 @@
         <child id="1172664372046" name="elementsToTake" index="8f$Dv" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
@@ -1041,5 +1059,255 @@
       <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
     </node>
   </node>
+  <node concept="3SyAh_" id="7zIaasjUe64">
+    <property role="qMTe8" value="5" />
+    <property role="TrG5h" value="ReplaceValueOfExpression" />
+    <node concept="3Tm1VV" id="7zIaasjUe65" role="1B3o_S" />
+    <node concept="3tTeZs" id="7zIaasjUe66" role="jymVt">
+      <property role="3tTeZt" value="&lt;no execute after&gt;" />
+      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
+    </node>
+    <node concept="3tTeZs" id="7zIaasjUe67" role="jymVt">
+      <property role="3tTeZt" value="&lt;no required data&gt;" />
+      <ref role="3tTeZr" to="slm6:5TUCQr2FPTh" resolve="requires annotation data" />
+    </node>
+    <node concept="3tTeZs" id="7zIaasjUe68" role="jymVt">
+      <property role="3tTeZt" value="&lt;no produced data&gt;" />
+      <ref role="3tTeZr" to="slm6:5TUCQr2C271" resolve="produces annotation data" />
+    </node>
+    <node concept="2tJIrI" id="7zIaasjUe69" role="jymVt" />
+    <node concept="3tYpMH" id="7zIaasjUe6a" role="jymVt">
+      <property role="TrG5h" value="isRerunnable" />
+      <property role="3tYpME" value="true" />
+      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
+      <node concept="3Tm1VV" id="7zIaasjUe6b" role="1B3o_S" />
+      <node concept="10P_77" id="7zIaasjUe6c" role="1tU5fm" />
+    </node>
+    <node concept="3tYpXE" id="7zIaasjUeTc" role="jymVt">
+      <property role="TrG5h" value="description" />
+      <property role="3tYpXF" value="Replace ValueOfExpression with LogicalItemValueExpression" />
+      <ref role="25KYV2" to="slm6:1_lSsE3RFpE" resolve="description" />
+      <node concept="3Tm1VV" id="7zIaasjUeTe" role="1B3o_S" />
+      <node concept="17QB3L" id="7zIaasjUeTf" role="1tU5fm" />
+    </node>
+    <node concept="q3mfD" id="7zIaasjUe6e" role="jymVt">
+      <property role="TrG5h" value="execute" />
+      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
+      <node concept="3Tm1VV" id="7zIaasjUe6g" role="1B3o_S" />
+      <node concept="3clFbS" id="7zIaasjUe6i" role="3clF47">
+        <node concept="L3pyB" id="7zIaasjUf9g" role="3cqZAp">
+          <node concept="3clFbS" id="7zIaasjUf9h" role="L3pyw">
+            <node concept="3clFbF" id="7zIaasjUf9i" role="3cqZAp">
+              <node concept="2OqwBi" id="7zIaasjUf9j" role="3clFbG">
+                <node concept="qVDSY" id="7zIaasjUf9k" role="2Oq$k0">
+                  <node concept="chp4Y" id="7zIaasjUf$n" role="qVDSX">
+                    <ref role="cht4Q" to="5j4j:28ktUhrjnwn" resolve="ValueOfExpression" />
+                  </node>
+                  <node concept="1dO9Bo" id="7zIaasjUf9m" role="1dOa5D" />
+                </node>
+                <node concept="2es0OD" id="7zIaasjUf9n" role="2OqNvi">
+                  <node concept="1bVj0M" id="7zIaasjUf9o" role="23t8la">
+                    <property role="3yWfEV" value="true" />
+                    <node concept="3clFbS" id="7zIaasjUf9p" role="1bW5cS">
+                      <node concept="3clFbJ" id="7zIaasjUg6d" role="3cqZAp">
+                        <node concept="2OqwBi" id="7zIaasjUhdt" role="3clFbw">
+                          <node concept="2OqwBi" id="7zIaasjUgoq" role="2Oq$k0">
+                            <node concept="37vLTw" id="7zIaasjUgaz" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7zIaasjUf9B" resolve="voe" />
+                            </node>
+                            <node concept="3TrEf2" id="7zIaasjUgHe" role="2OqNvi">
+                              <ref role="3Tt5mk" to="5j4j:28ktUhrjrp0" resolve="logical" />
+                            </node>
+                          </node>
+                          <node concept="1mIQ4w" id="7zIaasjUhyl" role="2OqNvi">
+                            <node concept="chp4Y" id="7zIaasjUhCy" role="cj9EA">
+                              <ref role="cht4Q" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbS" id="7zIaasjUg6f" role="3clFbx">
+                          <node concept="3cpWs8" id="7zIaasjUk0Z" role="3cqZAp">
+                            <node concept="3cpWsn" id="7zIaasjUk10" role="3cpWs9">
+                              <property role="TrG5h" value="logical" />
+                              <node concept="3Tqbb2" id="7zIaasjUjVf" role="1tU5fm">
+                                <ref role="ehGHo" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+                              </node>
+                              <node concept="2OqwBi" id="7zIaasjUke2" role="33vP2m">
+                                <node concept="2OqwBi" id="7zIaasjUk11" role="2Oq$k0">
+                                  <node concept="1PxgMI" id="7zIaasjUk12" role="2Oq$k0">
+                                    <property role="1BlNFB" value="true" />
+                                    <node concept="chp4Y" id="7zIaasjUk13" role="3oSUPX">
+                                      <ref role="cht4Q" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
+                                    </node>
+                                    <node concept="2OqwBi" id="7zIaasjUk14" role="1m5AlR">
+                                      <node concept="37vLTw" id="7zIaasjUk15" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="7zIaasjUf9B" resolve="voe" />
+                                      </node>
+                                      <node concept="3TrEf2" id="7zIaasjUk16" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="5j4j:28ktUhrjrp0" resolve="logical" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="7zIaasjUk17" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="5j4j:49obaclcanY" resolve="logical" />
+                                  </node>
+                                </node>
+                                <node concept="3YRAZt" id="7zIaasjUk$v" role="2OqNvi" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3cpWs8" id="7zIaasjUlO2" role="3cqZAp">
+                            <node concept="3cpWsn" id="7zIaasjUlO3" role="3cpWs9">
+                              <property role="TrG5h" value="live" />
+                              <node concept="3Tqbb2" id="7zIaasjUlLg" role="1tU5fm">
+                                <ref role="ehGHo" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
+                              </node>
+                              <node concept="2OqwBi" id="7zIaasjUlO4" role="33vP2m">
+                                <node concept="37vLTw" id="7zIaasjUlO5" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="7zIaasjUf9B" resolve="voe" />
+                                </node>
+                                <node concept="1_qnLN" id="7zIaasjUlO6" role="2OqNvi">
+                                  <ref role="1_rbq0" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbF" id="7zIaasjUhMH" role="3cqZAp">
+                            <node concept="2OqwBi" id="7zIaasjUmCI" role="3clFbG">
+                              <node concept="2OqwBi" id="7zIaasjUm6U" role="2Oq$k0">
+                                <node concept="37vLTw" id="7zIaasjUlO7" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="7zIaasjUlO3" resolve="live" />
+                                </node>
+                                <node concept="3TrEf2" id="7zIaasjUmqa" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="5j4j:7zIaasjAKqg" resolve="logical" />
+                                </node>
+                              </node>
+                              <node concept="2oxUTD" id="7zIaasjUmYW" role="2OqNvi">
+                                <node concept="37vLTw" id="7zIaasjUnhF" role="2oxUTC">
+                                  <ref role="3cqZAo" node="7zIaasjUk10" resolve="logical" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="7zIaasjUf9B" role="1bW2Oz">
+                      <property role="TrG5h" value="voe" />
+                      <node concept="2jxLKc" id="7zIaasjUf9C" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="7zIaasjUf9D" role="L3pyr">
+            <ref role="3cqZAo" node="7zIaasjUe6k" resolve="m" />
+          </node>
+        </node>
+      </node>
+      <node concept="ffn8J" id="7zIaasjUe6k" role="3clF46">
+        <property role="TrG5h" value="m" />
+        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
+        <node concept="3uibUv" id="7zIaasjUe6j" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+      </node>
+      <node concept="q3mfm" id="7zIaasjUe6l" role="3clF45">
+        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
+        <ref role="1QQUv3" node="7zIaasjUe6e" resolve="execute" />
+      </node>
+    </node>
+    <node concept="q3mfD" id="7zIaasjUnnt" role="jymVt">
+      <property role="TrG5h" value="check" />
+      <ref role="2VtyIY" to="slm6:1JWcQ2VeXpD" resolve="check" />
+      <node concept="3Tm1VV" id="7zIaasjUnnv" role="1B3o_S" />
+      <node concept="3clFbS" id="7zIaasjUnnx" role="3clF47">
+        <node concept="3cpWs8" id="7zIaasjUAeY" role="3cqZAp">
+          <node concept="3cpWsn" id="7zIaasjUAeZ" role="3cpWs9">
+            <property role="TrG5h" value="problems" />
+            <node concept="_YKpA" id="7zIaasjU_iN" role="1tU5fm">
+              <node concept="3uibUv" id="7zIaasjU_iQ" role="_ZDj9">
+                <ref role="3uigEE" to="6f4m:3n7MNzO_IjP" resolve="Problem" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="7zIaasjUAf0" role="33vP2m">
+              <node concept="Tc6Ow" id="7zIaasjUAf1" role="2ShVmc">
+                <node concept="3uibUv" id="7zIaasjUAf2" role="HW$YZ">
+                  <ref role="3uigEE" to="6f4m:3n7MNzO_IjP" resolve="Problem" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="L3pyB" id="7zIaasjUAs6" role="3cqZAp">
+          <node concept="3clFbS" id="7zIaasjUAs8" role="L3pyw">
+            <node concept="3clFbF" id="7zIaasjUA$O" role="3cqZAp">
+              <node concept="2OqwBi" id="7zIaasjUB4$" role="3clFbG">
+                <node concept="qVDSY" id="7zIaasjUA$M" role="2Oq$k0">
+                  <node concept="chp4Y" id="7zIaasjUAAs" role="qVDSX">
+                    <ref role="cht4Q" to="5j4j:28ktUhrjnwn" resolve="ValueOfExpression" />
+                  </node>
+                </node>
+                <node concept="2es0OD" id="7zIaasjUBHc" role="2OqNvi">
+                  <node concept="1bVj0M" id="7zIaasjUBHe" role="23t8la">
+                    <node concept="3clFbS" id="7zIaasjUBHf" role="1bW5cS">
+                      <node concept="3clFbF" id="7zIaasjUDV8" role="3cqZAp">
+                        <node concept="2OqwBi" id="7zIaasjUECx" role="3clFbG">
+                          <node concept="37vLTw" id="7zIaasjUDV6" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7zIaasjUAeZ" resolve="problems" />
+                          </node>
+                          <node concept="TSZUe" id="7zIaasjUFN5" role="2OqNvi">
+                            <node concept="2ShNRf" id="7zIaasjUC01" role="25WWJ7">
+                              <node concept="1pGfFk" id="7zIaasjUCkf" role="2ShVmc">
+                                <ref role="37wK5l" to="6f4m:1lWwAy3eOun" resolve="MigrateManually" />
+                                <node concept="Xl_RD" id="7zIaasjUDzh" role="37wK5m">
+                                  <property role="Xl_RC" value="not migrated" />
+                                </node>
+                                <node concept="37vLTw" id="7zIaasjUDhP" role="37wK5m">
+                                  <ref role="3cqZAo" node="7zIaasjUBHg" resolve="voe" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="7zIaasjUBHg" role="1bW2Oz">
+                      <property role="TrG5h" value="voe" />
+                      <node concept="2jxLKc" id="7zIaasjUBHh" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="7zIaasjUAt3" role="L3pyr">
+            <ref role="3cqZAo" node="7zIaasjUnnz" resolve="m" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="7zIaasjUnsF" role="3cqZAp">
+          <node concept="37vLTw" id="7zIaasjUAf3" role="3clFbG">
+            <ref role="3cqZAo" node="7zIaasjUAeZ" resolve="problems" />
+          </node>
+        </node>
+      </node>
+      <node concept="ffn8J" id="7zIaasjUnnz" role="3clF46">
+        <property role="TrG5h" value="m" />
+        <ref role="ffrpq" to="slm6:1JWcQ2VeXI5" resolve="m" />
+        <node concept="3uibUv" id="7zIaasjUnny" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+      </node>
+      <node concept="A3Dl8" id="7zIaasjUnn$" role="3clF45">
+        <node concept="3uibUv" id="7zIaasjUnn_" role="A3Ik2">
+          <ref role="3uigEE" to="6f4m:3n7MNzO_IjP" resolve="Problem" />
+        </node>
+      </node>
+    </node>
+    <node concept="3uibUv" id="7zIaasjUe6n" role="1zkMxy">
+      <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index f7ee2dcb..ae2bad91 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -403,6 +403,7 @@
       <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
+    <node concept="asaX9" id="7zIaasjAAuv" role="lGtFl" />
   </node>
   <node concept="1TIwiD" id="49obaclcan7">
     <property role="EcuMT" value="4780620083400582599" />
@@ -690,5 +691,22 @@
     <property role="34LRSv" value="term" />
     <ref role="1TJDcQ" to="tpee:fz3vP1H" resolve="Type" />
   </node>
+  <node concept="1TIwiD" id="7zIaasjAAux">
+    <property role="EcuMT" value="8713947027062024097" />
+    <property role="3GE5qa" value="logical.item.expression" />
+    <property role="TrG5h" value="LogicalItemValueExpression" />
+    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
+    <node concept="1TJgyj" id="7zIaasjAKqg" role="1TKVEi">
+      <property role="IQ2ns" value="8713947027062064784" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="logical" />
+      <ref role="20lvS9" node="7E86$tKsl45" resolve="LogicalItem" />
+    </node>
+  </node>
+  <node concept="PlHQZ" id="7zIaasjACyh">
+    <property role="EcuMT" value="8713947027062032529" />
+    <property role="3GE5qa" value="logical.item.expression" />
+    <property role="TrG5h" value="EvaluationSubject" />
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index 0ee556ec..2c0ecafb 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -1415,5 +1415,116 @@
       <ref role="1YaFvo" to="5j4j:24ciDNzqIuw" resolve="TermType" />
     </node>
   </node>
+  <node concept="1YbPZF" id="7zIaasjBj$L">
+    <property role="TrG5h" value="typeof_LogicalItemValueExpression" />
+    <property role="3GE5qa" value="logical.item.expression" />
+    <node concept="3clFbS" id="7zIaasjBj$M" role="18ibNy">
+      <node concept="1ZxtTE" id="7zIaasjBjHE" role="3cqZAp">
+        <property role="TrG5h" value="DT" />
+      </node>
+      <node concept="nvevp" id="7zIaasjBjHF" role="3cqZAp">
+        <node concept="3clFbS" id="7zIaasjBjHG" role="nvhr_">
+          <node concept="1Z5TYs" id="7zIaasjBjHH" role="3cqZAp">
+            <node concept="mw_s8" id="7zIaasjBjHI" role="1ZfhK$">
+              <node concept="1Z2H0r" id="7zIaasjBjHJ" role="mwGJk">
+                <node concept="2OqwBi" id="7zIaasjBjHK" role="1Z2MuG">
+                  <node concept="1YBJjd" id="7zIaasjBk0g" role="2Oq$k0">
+                    <ref role="1YBMHb" node="7zIaasjBj$O" resolve="live" />
+                  </node>
+                  <node concept="3TrEf2" id="7zIaasjBkcz" role="2OqNvi">
+                    <ref role="3Tt5mk" to="5j4j:7zIaasjAKqg" resolve="logical" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="mw_s8" id="7zIaasjBjHN" role="1ZfhKB">
+              <node concept="2pJPEk" id="7zIaasjBjHO" role="mwGJk">
+                <node concept="2pJPED" id="7zIaasjBjHP" role="2pJPEn">
+                  <ref role="2pJxaS" to="5j4j:1mP5b6jNC0S" resolve="LogicalType" />
+                  <node concept="2pIpSj" id="7zIaasjBjHQ" role="2pJxcM">
+                    <ref role="2pIpSl" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
+                    <node concept="36biLy" id="7zIaasjBjHR" role="28nt2d">
+                      <node concept="1PxgMI" id="7zIaasjBjHS" role="36biLW">
+                        <property role="1BlNFB" value="true" />
+                        <node concept="chp4Y" id="7zIaasjBjHT" role="3oSUPX">
+                          <ref role="cht4Q" to="tpee:fz3vP1H" resolve="Type" />
+                        </node>
+                        <node concept="1Z$b5t" id="7zIaasjBjHU" role="1m5AlR">
+                          <ref role="1Z$eMM" node="7zIaasjBjHE" resolve="DT" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="7zIaasjBjHV" role="3cqZAp">
+            <node concept="3clFbS" id="7zIaasjBjHW" role="3clFbx">
+              <node concept="1Z5TYs" id="7zIaasjBjHX" role="3cqZAp">
+                <node concept="mw_s8" id="7zIaasjBjHY" role="1ZfhK$">
+                  <node concept="1Z2H0r" id="7zIaasjBjHZ" role="mwGJk">
+                    <node concept="1YBJjd" id="7zIaasjBjSS" role="1Z2MuG">
+                      <ref role="1YBMHb" node="7zIaasjBj$O" resolve="live" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="mw_s8" id="7zIaasjBjI1" role="1ZfhKB">
+                  <node concept="1Z$b5t" id="7zIaasjBjI2" role="mwGJk">
+                    <ref role="1Z$eMM" node="7zIaasjBjHE" resolve="DT" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="7zIaasjBjI3" role="3cqZAp" />
+            </node>
+            <node concept="2OqwBi" id="7zIaasjBjI4" role="3clFbw">
+              <node concept="1Z$b5t" id="7zIaasjBjI5" role="2Oq$k0">
+                <ref role="1Z$eMM" node="7zIaasjBjHE" resolve="DT" />
+              </node>
+              <node concept="3x8VRR" id="7zIaasjBjI6" role="2OqNvi" />
+            </node>
+            <node concept="9aQIb" id="7zIaasjBjI7" role="9aQIa">
+              <node concept="3clFbS" id="7zIaasjBjI8" role="9aQI4">
+                <node concept="1Z5TYs" id="7zIaasjBjI9" role="3cqZAp">
+                  <node concept="mw_s8" id="7zIaasjBjIa" role="1ZfhKB">
+                    <node concept="2c44tf" id="7zIaasjBjIb" role="mwGJk">
+                      <node concept="3uibUv" id="7zIaasjBjIc" role="2c44tc">
+                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="mw_s8" id="7zIaasjBjId" role="1ZfhK$">
+                    <node concept="1Z2H0r" id="7zIaasjBjIe" role="mwGJk">
+                      <node concept="1YBJjd" id="7zIaasjBjYj" role="1Z2MuG">
+                        <ref role="1YBMHb" node="7zIaasjBj$O" resolve="live" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1Z2H0r" id="7zIaasjBjIg" role="nvjzm">
+          <node concept="2OqwBi" id="7zIaasjBjIh" role="1Z2MuG">
+            <node concept="1YBJjd" id="7zIaasjBjNz" role="2Oq$k0">
+              <ref role="1YBMHb" node="7zIaasjBj$O" resolve="live" />
+            </node>
+            <node concept="3TrEf2" id="7zIaasjBjIj" role="2OqNvi">
+              <ref role="3Tt5mk" to="5j4j:7zIaasjAKqg" resolve="logical" />
+            </node>
+          </node>
+        </node>
+        <node concept="2X1qdy" id="7zIaasjBjIk" role="2X0Ygz">
+          <property role="TrG5h" value="T" />
+          <node concept="2jxLKc" id="7zIaasjBjIl" role="1tU5fm" />
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="7zIaasjBj$O" role="1YuTPh">
+      <property role="TrG5h" value="live" />
+      <ref role="1YaFvo" to="5j4j:7zIaasjAAux" resolve="LogicalItemValueExpression" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index 3a42cabb..55034a46 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -147,6 +147,12 @@
         <property id="4356762679305675654" name="packagedLocation" index="3yLZsk" />
         <child id="4356762679305675653" name="path" index="3yLZsn" />
       </concept>
+      <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
+        <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
+        <property id="8137134783396676838" name="extracted" index="1HemKv" />
+        <property id="2889113830911481881" name="deployFolderName" index="3ZfqAx" />
+        <child id="8137134783396676835" name="location" index="1HemKq" />
+      </concept>
       <concept id="4278635856200826393" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyJar" flags="ng" index="1BurEX">
         <child id="4278635856200826394" name="path" index="1BurEY" />
       </concept>
@@ -262,6 +268,31 @@
         <node concept="3bR9La" id="7axPyNkluAe" role="3bR37C">
           <ref role="3bR37D" to="ffeo:1WGJoq9Wd0d" resolve="jetbrains.mps.build.workflow.preset" />
         </node>
+        <node concept="1BupzO" id="7zIaasjWoOA" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoOB" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoOs" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoOt" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoOu" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoOv" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.build" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoOw" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoOC" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7BVjoXzUxju" role="3989C9">
@@ -447,6 +478,34 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoPp" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoPq" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoPd" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoPe" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoPf" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoPg" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoPh" role="2Ry0An">
+                      <property role="2Ry0Am" value="runtime" />
+                      <node concept="2Ry0Ak" id="7zIaasjWoPi" role="2Ry0An">
+                        <property role="2Ry0Am" value="models" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoPr" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7BVjoXzUxkQ" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -537,6 +596,34 @@
               <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
             </node>
           </node>
+          <node concept="1BupzO" id="7zIaasjWoPR" role="3bR31x">
+            <property role="3ZfqAx" value="generator/template" />
+            <property role="1Hdu6h" value="true" />
+            <property role="1HemKv" value="true" />
+            <node concept="3LXTmp" id="7zIaasjWoPS" role="1HemKq">
+              <node concept="398BVA" id="7zIaasjWoPF" role="3LXTmr">
+                <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                <node concept="2Ry0Ak" id="7zIaasjWoPG" role="iGT6I">
+                  <property role="2Ry0Am" value="coderules" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoPH" role="2Ry0An">
+                    <property role="2Ry0Am" value="languages" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoPI" role="2Ry0An">
+                      <property role="2Ry0Am" value="jetbrains.mps.logic" />
+                      <node concept="2Ry0Ak" id="7zIaasjWoPJ" role="2Ry0An">
+                        <property role="2Ry0Am" value="generator" />
+                        <node concept="2Ry0Ak" id="7zIaasjWoPK" role="2Ry0An">
+                          <property role="2Ry0Am" value="template" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3qWCbU" id="7zIaasjWoPT" role="3LXTna">
+                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+              </node>
+            </node>
+          </node>
         </node>
         <node concept="3rtmxn" id="3Z6zOnxMpzt" role="3bR31x">
           <node concept="3LXTmp" id="3Z6zOnxMpzu" role="3rtmxm">
@@ -556,6 +643,36 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="7zIaasjWoPs" role="3bR37C">
+          <node concept="3bR9La" id="7zIaasjWoPt" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:5cCcm$KATVz" resolve="jetbrains.mps.lang.migration.runtime" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="7zIaasjWoPC" role="3bR31x">
+          <property role="3ZfqAx" value="languageModels" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoPD" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoPu" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoPv" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoPw" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoPx" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoPy" role="2Ry0An">
+                      <property role="2Ry0Am" value="languageModels" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoPE" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7Ant4WkHLpc" role="3989C9">
@@ -657,6 +774,31 @@
             <ref role="3bR37D" to="ffeo:1xb0AuwN7WS" resolve="JUnit" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoQs" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoQt" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoQi" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoQj" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoQk" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoQl" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.logic.test" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoQm" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoQu" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="65DJywFj0uW" role="3989C9">
@@ -690,6 +832,31 @@
             <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoQD" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoQE" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoQv" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoQw" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoQx" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoQy" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.typechecking.runtime" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoQz" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoQF" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="NKt6ynvPIP" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -773,6 +940,34 @@
               <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.coderules.typechecking" />
             </node>
           </node>
+          <node concept="1BupzO" id="7zIaasjWoR5" role="3bR31x">
+            <property role="3ZfqAx" value="generator/template" />
+            <property role="1Hdu6h" value="true" />
+            <property role="1HemKv" value="true" />
+            <node concept="3LXTmp" id="7zIaasjWoR6" role="1HemKq">
+              <node concept="398BVA" id="7zIaasjWoQT" role="3LXTmr">
+                <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                <node concept="2Ry0Ak" id="7zIaasjWoQU" role="iGT6I">
+                  <property role="2Ry0Am" value="coderules" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoQV" role="2Ry0An">
+                    <property role="2Ry0Am" value="languages" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoQW" role="2Ry0An">
+                      <property role="2Ry0Am" value="jetbrains.mps.lang.typechecking" />
+                      <node concept="2Ry0Ak" id="7zIaasjWoQX" role="2Ry0An">
+                        <property role="2Ry0Am" value="generator" />
+                        <node concept="2Ry0Ak" id="7zIaasjWoQY" role="2Ry0An">
+                          <property role="2Ry0Am" value="template" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3qWCbU" id="7zIaasjWoR7" role="3LXTna">
+                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+              </node>
+            </node>
+          </node>
         </node>
         <node concept="1SiIV0" id="NKt6ynF2pv" role="3bR37C">
           <node concept="1Busua" id="NKt6ynF2pw" role="1SiIV1">
@@ -782,6 +977,31 @@
         <node concept="1E0d5M" id="NKt6yos4if" role="1E1XAP">
           <ref role="1E0d5P" node="NKt6yomVLS" resolve="jetbrains.mps.lang.typechecking.runtime" />
         </node>
+        <node concept="1BupzO" id="7zIaasjWoQQ" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoQR" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoQG" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoQH" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoQI" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoQJ" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.typechecking" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoQK" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoQS" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="65DJywFj0Fi" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -888,6 +1108,31 @@
             <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoRi" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoRj" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoR8" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoR9" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoRa" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoRb" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.typechecking" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoRc" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoRk" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="55Q$YFtvwQY" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1003,6 +1248,31 @@
             <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoRv" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoRw" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoRl" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoRm" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoRn" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoRo" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.typechecking.ui" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoRp" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoRx" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="46o4wsH5PJF" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1050,6 +1320,31 @@
             </node>
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoRG" role="3bR31x">
+          <property role="3ZfqAx" value="languageModels" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoRH" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoRy" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoRz" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoR$" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoR_" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.typechecking.annotation" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoRA" role="2Ry0An">
+                      <property role="2Ry0Am" value="languageModels" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoRI" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="5pz4PwHqqGu" role="3989C9">
@@ -1085,6 +1380,34 @@
         <node concept="1yeLz9" id="7mB3viLupM8" role="1TViLv">
           <property role="TrG5h" value="jetbrains.mps.typechecking.testlang#3575255234175341581" />
           <property role="3LESm3" value="1f130d77-1d29-44cb-bef3-bde05978c2c7" />
+          <node concept="1BupzO" id="7zIaasjWoS8" role="3bR31x">
+            <property role="3ZfqAx" value="generator/template" />
+            <property role="1Hdu6h" value="true" />
+            <property role="1HemKv" value="true" />
+            <node concept="3LXTmp" id="7zIaasjWoS9" role="1HemKq">
+              <node concept="398BVA" id="7zIaasjWoRW" role="3LXTmr">
+                <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                <node concept="2Ry0Ak" id="7zIaasjWoRX" role="iGT6I">
+                  <property role="2Ry0Am" value="coderules" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoRY" role="2Ry0An">
+                    <property role="2Ry0Am" value="languages" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoRZ" role="2Ry0An">
+                      <property role="2Ry0Am" value="jetbrains.mps.typechecking.testlang" />
+                      <node concept="2Ry0Ak" id="7zIaasjWoS0" role="2Ry0An">
+                        <property role="2Ry0Am" value="generator" />
+                        <node concept="2Ry0Ak" id="7zIaasjWoS1" role="2Ry0An">
+                          <property role="2Ry0Am" value="template" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3qWCbU" id="7zIaasjWoSa" role="3LXTna">
+                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+              </node>
+            </node>
+          </node>
         </node>
         <node concept="1SiIV0" id="7mB3viLurcE" role="3bR37C">
           <node concept="3bR9La" id="7mB3viLurcF" role="1SiIV1">
@@ -1096,6 +1419,31 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoRT" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoRU" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoRJ" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoRK" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoRL" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoRM" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.typechecking.testlang" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoRN" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoRV" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7mB3viLuq51" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1115,6 +1463,31 @@
             </node>
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoSl" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoSm" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoSb" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoSc" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoSd" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoSe" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.typechecking.testlang.sandbox" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoSf" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoSn" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7mB3viLwG3m" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1201,6 +1574,31 @@
             <ref role="3bR37D" node="7BVjoXzUx6U" resolve="jetbrains.mps.lang.coderules" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoSy" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoSz" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoSo" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoSp" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoSq" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoSr" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.typechecking.test" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoSs" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoS$" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="78H58oeeFzd" role="3989C9">
@@ -1244,6 +1642,31 @@
             <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.coderules.template" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoSJ" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoSK" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoS_" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoSA" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoSB" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoSC" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.controlflow.runtime" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoSD" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoSL" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="78H58oeeJaR" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1298,6 +1721,34 @@
               <ref role="3bR37D" to="ffeo:6zkSwmUIjUj" resolve="jetbrains.mps.lang.aspect#3274906159125927726" />
             </node>
           </node>
+          <node concept="1BupzO" id="7zIaasjWoTb" role="3bR31x">
+            <property role="3ZfqAx" value="generator/template" />
+            <property role="1Hdu6h" value="true" />
+            <property role="1HemKv" value="true" />
+            <node concept="3LXTmp" id="7zIaasjWoTc" role="1HemKq">
+              <node concept="398BVA" id="7zIaasjWoSZ" role="3LXTmr">
+                <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                <node concept="2Ry0Ak" id="7zIaasjWoT0" role="iGT6I">
+                  <property role="2Ry0Am" value="coderules" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoT1" role="2Ry0An">
+                    <property role="2Ry0Am" value="languages" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoT2" role="2Ry0An">
+                      <property role="2Ry0Am" value="jetbrains.mps.lang.controlflow" />
+                      <node concept="2Ry0Ak" id="7zIaasjWoT3" role="2Ry0An">
+                        <property role="2Ry0Am" value="generator" />
+                        <node concept="2Ry0Ak" id="7zIaasjWoT4" role="2Ry0An">
+                          <property role="2Ry0Am" value="template" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3qWCbU" id="7zIaasjWoTd" role="3LXTna">
+                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+              </node>
+            </node>
+          </node>
         </node>
         <node concept="1E0d5M" id="78H58oewGXf" role="1E1XAP">
           <ref role="1E0d5P" node="78H58oeeH$3" resolve="jetbrains.mps.lang.controlflow.runtime" />
@@ -1307,6 +1758,31 @@
             <ref role="1Busuk" to="ffeo:7Kfy9QB6L68" resolve="jetbrains.mps.lang.descriptor" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoSW" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoSX" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoSM" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoSN" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoSO" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoSP" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.controlflow" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoSQ" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoSY" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="78H58oeeGcw" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1342,6 +1818,31 @@
             <ref role="3bR37D" node="NKt6yn9_8p" resolve="jetbrains.mps.coderules" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoTo" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoTp" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoTe" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoTf" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoTg" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoTh" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.controlflow" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoTi" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoTq" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="78H58oeeI52" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1412,6 +1913,31 @@
             <ref role="3bR37D" node="6Yb9hAqy9L2" resolve="jetbrains.mps.coderules.ui" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoT_" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoTA" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoTr" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoTs" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoTt" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoTu" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.controlflow.ui" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoTv" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoTB" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7BVjoXzUx6$" role="3989C9">
@@ -1556,6 +2082,34 @@
               <ref role="3bR37D" to="ffeo:7Kfy9QB6Lg8" resolve="jetbrains.mps.runtime" />
             </node>
           </node>
+          <node concept="1BupzO" id="7zIaasjWoU1" role="3bR31x">
+            <property role="3ZfqAx" value="generator/template" />
+            <property role="1Hdu6h" value="true" />
+            <property role="1HemKv" value="true" />
+            <node concept="3LXTmp" id="7zIaasjWoU2" role="1HemKq">
+              <node concept="398BVA" id="7zIaasjWoTP" role="3LXTmr">
+                <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                <node concept="2Ry0Ak" id="7zIaasjWoTQ" role="iGT6I">
+                  <property role="2Ry0Am" value="coderules" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoTR" role="2Ry0An">
+                    <property role="2Ry0Am" value="languages" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoTS" role="2Ry0An">
+                      <property role="2Ry0Am" value="jetbrains.mps.lang.coderules" />
+                      <node concept="2Ry0Ak" id="7zIaasjWoTT" role="2Ry0An">
+                        <property role="2Ry0Am" value="generator" />
+                        <node concept="2Ry0Ak" id="7zIaasjWoTU" role="2Ry0An">
+                          <property role="2Ry0Am" value="template" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3qWCbU" id="7zIaasjWoU3" role="3LXTna">
+                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+              </node>
+            </node>
+          </node>
         </node>
         <node concept="1SiIV0" id="wfREvqj2G8" role="3bR37C">
           <node concept="3bR9La" id="wfREvqj2G9" role="1SiIV1">
@@ -1605,6 +2159,31 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoTM" role="3bR31x">
+          <property role="3ZfqAx" value="languageModels" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoTN" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoTC" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoTD" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoTE" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoTF" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.coderules" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoTG" role="2Ry0An">
+                      <property role="2Ry0Am" value="languageModels" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoTO" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUx9d" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1680,6 +2259,31 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6Lg8" resolve="jetbrains.mps.runtime" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoUe" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoUf" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoU4" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoU5" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoU6" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoU7" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.coderules.template" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoU8" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoUg" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUxee" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1755,6 +2359,34 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoUt" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoUu" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoUh" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoUi" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoUj" role="2Ry0An">
+                  <property role="2Ry0Am" value="languages" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoUk" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.lang.coderules" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoUl" role="2Ry0An">
+                      <property role="2Ry0Am" value="runtime" />
+                      <node concept="2Ry0Ak" id="7zIaasjWoUm" role="2Ry0An">
+                        <property role="2Ry0Am" value="models" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoUv" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="NKt6yn9_8p" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1871,6 +2503,31 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoVe" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoVf" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoV4" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoV5" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoV6" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoV7" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoV8" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoVg" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6Yb9hAqy9L2" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1935,6 +2592,31 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoVr" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoVs" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoVh" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoVi" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoVj" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoVk" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.ui" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoVl" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoVt" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="1Lr58WFO8Mc" role="3989C9">
@@ -1994,6 +2676,31 @@
             <ref role="3bR37D" node="NKt6yn9_8p" resolve="jetbrains.mps.coderules" />
           </node>
         </node>
+        <node concept="1BupzO" id="7zIaasjWoVC" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="7zIaasjWoVD" role="1HemKq">
+            <node concept="398BVA" id="7zIaasjWoVu" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+              <node concept="2Ry0Ak" id="7zIaasjWoVv" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="7zIaasjWoVw" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="7zIaasjWoVx" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.test" />
+                    <node concept="2Ry0Ak" id="7zIaasjWoVy" role="2Ry0An">
+                      <property role="2Ry0Am" value="models" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="7zIaasjWoVE" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2sgV4H" id="7Ant4WkHLmd" role="1l3spa">