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 8682003e..d7ad9033 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
@@ -524,8 +524,14 @@
       <concept id="238586457668550951" name="jetbrains.mps.logic.structure.Splice" flags="ng" index="22Ky0T">
         <child id="238586457668550958" name="expression" index="22Ky0K" />
       </concept>
+      <concept id="8456919074574710634" name="jetbrains.mps.logic.structure.ExpressionItem" flags="ng" index="37jhX">
+        <child id="8456919074574710741" name="code" index="37jj2" />
+      </concept>
       <concept id="2784663291567294648" name="jetbrains.mps.logic.structure.Wildcard" flags="ng" index="2IllgU" />
       <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM" />
+      <concept id="4780620083400582599" name="jetbrains.mps.logic.structure.LogicalItemExpression" flags="ng" index="1nq8_$">
+        <child id="4780620083400582654" name="logical" index="1nq8_t" />
+      </concept>
       <concept id="7571593955706120730" name="jetbrains.mps.logic.structure.DataNodeExpression" flags="ng" index="1oi1Uc">
         <child id="7571593955706125526" name="root" index="1oi0x0" />
       </concept>
@@ -15872,18 +15878,6 @@
                                 <node concept="10Nm6u" id="5hSMZ_ljA63" role="3clFbG">
                                   <node concept="1sPUBX" id="5hSMZ_ljA64" role="lGtFl">
                                     <ref role="v9R2y" node="3kjrYXAPkJB" resolve="term_feature_override" />
-                                    <node concept="2OqwBi" id="5hSMZ_ljA65" role="v9R3O">
-                                      <node concept="30H73N" id="5hSMZ_ljA66" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="JOGAOsGOYN" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
-                                      </node>
-                                    </node>
-                                    <node concept="2OqwBi" id="3kjrYXAPA7p" role="v9R3O">
-                                      <node concept="30H73N" id="3kjrYXAP_DE" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="JOGAOsGPng" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="wq2x:JOGAOsxTDo" resolve="feature" />
-                                      </node>
-                                    </node>
                                   </node>
                                 </node>
                               </node>
@@ -16623,8 +16617,11 @@
         <node concept="3clFbS" id="3kjrYXAPmw$" role="2VODD2">
           <node concept="3clFbF" id="3kjrYXAPmBH" role="3cqZAp">
             <node concept="2OqwBi" id="3kjrYXAPmPt" role="3clFbG">
-              <node concept="v3LJS" id="3kjrYXAPmBG" role="2Oq$k0">
-                <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
+              <node concept="2OqwBi" id="ZNYugt4N1B" role="2Oq$k0">
+                <node concept="30H73N" id="ZNYugt4MEE" role="2Oq$k0" />
+                <node concept="3TrEf2" id="ZNYugt4Nc6" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:JOGAOsxTDo" resolve="feature" />
+                </node>
               </node>
               <node concept="1mIQ4w" id="3kjrYXAPndi" role="2OqNvi">
                 <node concept="chp4Y" id="JOGAOsGIOM" role="cj9EA">
@@ -16635,36 +16632,184 @@
           </node>
         </node>
       </node>
-      <node concept="gft3U" id="3kjrYXAPnzY" role="1lVwrX">
-        <node concept="1oi5Wm" id="3kjrYXAPnzZ" role="gfFT$">
-          <property role="TrG5h" value="name" />
-          <node concept="17Uvod" id="3kjrYXAPn$0" role="lGtFl">
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <property role="2qtEX9" value="name" />
-            <node concept="3zFVjK" id="3kjrYXAPn$1" role="3zH0cK">
-              <node concept="3clFbS" id="3kjrYXAPn$2" role="2VODD2">
-                <node concept="3clFbF" id="3kjrYXAPn$3" role="3cqZAp">
-                  <node concept="2OqwBi" id="3kjrYXAPn$4" role="3clFbG">
-                    <node concept="3TrcHB" id="3kjrYXAPn$5" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+      <node concept="14YyZ8" id="ZNYugt4P2v" role="1lVwrX">
+        <node concept="14ZrTv" id="ZNYugt4P6p" role="14ZwWg">
+          <node concept="30G5F_" id="ZNYugt4P6q" role="150hEN">
+            <node concept="3clFbS" id="ZNYugt4P6r" role="2VODD2">
+              <node concept="3clFbF" id="ZNYugt4P6Q" role="3cqZAp">
+                <node concept="2OqwBi" id="ZNYugt4Ri3" role="3clFbG">
+                  <node concept="2OqwBi" id="ZNYugt4Pju" role="2Oq$k0">
+                    <node concept="30H73N" id="ZNYugt4P6P" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="ZNYugt4PqQ" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
                     </node>
-                    <node concept="v3LJS" id="3kjrYXAPotq" role="2Oq$k0">
-                      <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
+                  </node>
+                  <node concept="3x8VRR" id="ZNYugt4RrI" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="3kjrYXAPnzY" role="150oIE">
+            <node concept="1oi5Wm" id="3kjrYXAPnzZ" role="gfFT$">
+              <property role="TrG5h" value="name" />
+              <node concept="17Uvod" id="3kjrYXAPn$0" role="lGtFl">
+                <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                <property role="2qtEX9" value="name" />
+                <node concept="3zFVjK" id="3kjrYXAPn$1" role="3zH0cK">
+                  <node concept="3clFbS" id="3kjrYXAPn$2" role="2VODD2">
+                    <node concept="3clFbF" id="3kjrYXAPn$3" role="3cqZAp">
+                      <node concept="2OqwBi" id="3kjrYXAPn$4" role="3clFbG">
+                        <node concept="3TrcHB" id="ZNYugt4Ogs" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                        <node concept="2OqwBi" id="ZNYugt4NJ8" role="2Oq$k0">
+                          <node concept="30H73N" id="ZNYugt4NpL" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="ZNYugt4O3$" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:JOGAOsxTDo" resolve="feature" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1oi5XN" id="3kjrYXAPn$7" role="1oi5zu">
+                <node concept="22Ky0T" id="3kjrYXAPn$8" role="lGtFl">
+                  <node concept="10Nm6u" id="3kjrYXAPn$9" role="22Ky0K">
+                    <node concept="29HgVG" id="3kjrYXAPn$a" role="lGtFl">
+                      <node concept="3NFfHV" id="3kjrYXAPn$b" role="3NFExx">
+                        <node concept="3clFbS" id="3kjrYXAPn$c" role="2VODD2">
+                          <node concept="3clFbF" id="ZNYugt4Oot" role="3cqZAp">
+                            <node concept="2OqwBi" id="ZNYugt4OxT" role="3clFbG">
+                              <node concept="30H73N" id="ZNYugt4Oos" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="ZNYugt4OFw" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1oi5XN" id="3kjrYXAPn$7" role="1oi5zu">
-            <node concept="22Ky0T" id="3kjrYXAPn$8" role="lGtFl">
-              <node concept="10Nm6u" id="3kjrYXAPn$9" role="22Ky0K">
-                <node concept="29HgVG" id="3kjrYXAPn$a" role="lGtFl">
-                  <node concept="3NFfHV" id="3kjrYXAPn$b" role="3NFExx">
-                    <node concept="3clFbS" id="3kjrYXAPn$c" role="2VODD2">
-                      <node concept="3clFbF" id="3kjrYXAPn$d" role="3cqZAp">
-                        <node concept="v3LJS" id="3kjrYXAPn$e" role="3clFbG">
-                          <ref role="v3LJV" node="3kjrYXAPkK6" resolve="getter" />
+        </node>
+        <node concept="14ZrTv" id="ZNYugtyU6L" role="14ZwWg">
+          <node concept="30G5F_" id="ZNYugtyU6M" role="150hEN">
+            <node concept="3clFbS" id="ZNYugtyU6N" role="2VODD2">
+              <node concept="3clFbF" id="ZNYugtyUob" role="3cqZAp">
+                <node concept="2OqwBi" id="ZNYugtyUSv" role="3clFbG">
+                  <node concept="2OqwBi" id="ZNYugtyU$N" role="2Oq$k0">
+                    <node concept="30H73N" id="ZNYugtyUoa" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="ZNYugtyUGa" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:ZNYugt4PuX" resolve="item" />
+                    </node>
+                  </node>
+                  <node concept="1mIQ4w" id="ZNYugtyV7w" role="2OqNvi">
+                    <node concept="chp4Y" id="ZNYugtyVdI" role="cj9EA">
+                      <ref role="cht4Q" to="5j4j:7lt0LtQg3tE" resolve="ExpressionItem" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="ZNYugtyVkG" role="150oIE">
+            <node concept="1oi5Wm" id="ZNYugtyVkH" role="gfFT$">
+              <property role="TrG5h" value="name" />
+              <node concept="17Uvod" id="ZNYugtyVkI" role="lGtFl">
+                <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                <property role="2qtEX9" value="name" />
+                <node concept="3zFVjK" id="ZNYugtyVkJ" role="3zH0cK">
+                  <node concept="3clFbS" id="ZNYugtyVkK" role="2VODD2">
+                    <node concept="3clFbF" id="ZNYugtyVkL" role="3cqZAp">
+                      <node concept="2OqwBi" id="ZNYugtyVkM" role="3clFbG">
+                        <node concept="3TrcHB" id="ZNYugtyVkN" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                        <node concept="2OqwBi" id="ZNYugtyVkO" role="2Oq$k0">
+                          <node concept="30H73N" id="ZNYugtyVkP" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="ZNYugtyVkQ" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:JOGAOsxTDo" resolve="feature" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1oi5XN" id="ZNYugtyVkR" role="1oi5zu">
+                <node concept="22Ky0T" id="ZNYugtyVkS" role="lGtFl">
+                  <node concept="10Nm6u" id="ZNYugtyVkT" role="22Ky0K">
+                    <node concept="29HgVG" id="ZNYugtyVkU" role="lGtFl">
+                      <node concept="3NFfHV" id="ZNYugtyVkV" role="3NFExx">
+                        <node concept="3clFbS" id="ZNYugtyVkW" role="2VODD2">
+                          <node concept="3clFbF" id="ZNYugtyVkY" role="3cqZAp">
+                            <node concept="2OqwBi" id="ZNYugtyVkZ" role="3clFbG">
+                              <node concept="1PxgMI" id="ZNYugtyVl0" role="2Oq$k0">
+                                <node concept="chp4Y" id="ZNYugtyVl1" role="3oSUPX">
+                                  <ref role="cht4Q" to="5j4j:7lt0LtQg3tE" resolve="ExpressionItem" />
+                                </node>
+                                <node concept="2OqwBi" id="ZNYugtyVl2" role="1m5AlR">
+                                  <node concept="30H73N" id="ZNYugtyVl3" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="ZNYugtyVl4" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="wq2x:ZNYugt4PuX" resolve="item" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3TrEf2" id="ZNYugtyVl5" role="2OqNvi">
+                                <ref role="3Tt5mk" to="5j4j:7lt0LtQg3vl" resolve="code" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="gft3U" id="ZNYugt4RZI" role="14YRTM">
+          <node concept="1oi5Wm" id="ZNYugt4RZJ" role="gfFT$">
+            <property role="TrG5h" value="name" />
+            <node concept="17Uvod" id="ZNYugt4RZK" role="lGtFl">
+              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+              <property role="2qtEX9" value="name" />
+              <node concept="3zFVjK" id="ZNYugt4RZL" role="3zH0cK">
+                <node concept="3clFbS" id="ZNYugt4RZM" role="2VODD2">
+                  <node concept="3clFbF" id="ZNYugt4RZN" role="3cqZAp">
+                    <node concept="2OqwBi" id="ZNYugt4RZO" role="3clFbG">
+                      <node concept="3TrcHB" id="ZNYugt4RZP" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                      <node concept="2OqwBi" id="ZNYugt4RZQ" role="2Oq$k0">
+                        <node concept="30H73N" id="ZNYugt4RZR" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="ZNYugt4RZS" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:JOGAOsxTDo" resolve="feature" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1oi5XN" id="ZNYugt4RZT" role="1oi5zu">
+              <node concept="22Ky0T" id="ZNYugt4RZU" role="lGtFl">
+                <node concept="10Nm6u" id="ZNYugt4RZV" role="22Ky0K">
+                  <node concept="29HgVG" id="ZNYugt4RZW" role="lGtFl">
+                    <node concept="3NFfHV" id="ZNYugt4RZX" role="3NFExx">
+                      <node concept="3clFbS" id="ZNYugt4RZY" role="2VODD2">
+                        <node concept="3clFbF" id="ZNYugtyWyy" role="3cqZAp">
+                          <node concept="2OqwBi" id="ZNYugtyWFI" role="3clFbG">
+                            <node concept="30H73N" id="ZNYugtyWyx" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="ZNYugtyWMR" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:ZNYugt4PuX" resolve="item" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -16683,8 +16828,11 @@
         <node concept="3clFbS" id="3kjrYXAPsCL" role="2VODD2">
           <node concept="3clFbF" id="3kjrYXAPsCM" role="3cqZAp">
             <node concept="2OqwBi" id="3kjrYXAPsCN" role="3clFbG">
-              <node concept="v3LJS" id="3kjrYXAPsCO" role="2Oq$k0">
-                <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
+              <node concept="2OqwBi" id="ZNYugt4U3U" role="2Oq$k0">
+                <node concept="30H73N" id="ZNYugt4TF6" role="2Oq$k0" />
+                <node concept="3TrEf2" id="ZNYugt4Uu0" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:JOGAOsxTDo" resolve="feature" />
+                </node>
               </node>
               <node concept="1mIQ4w" id="3kjrYXAPsCP" role="2OqNvi">
                 <node concept="chp4Y" id="JOGAOsGJpk" role="cj9EA">
@@ -16695,18 +16843,61 @@
           </node>
         </node>
       </node>
-      <node concept="gft3U" id="3kjrYXAPulY" role="1lVwrX">
-        <node concept="1oi5ST" id="3kjrYXAPulZ" role="gfFT$">
-          <property role="TrG5h" value="name" />
-          <node concept="1oi5UN" id="3kjrYXAPum0" role="1oi5TL">
-            <node concept="22Ky0T" id="3kjrYXAPum1" role="lGtFl">
-              <node concept="10Nm6u" id="3kjrYXAPum2" role="22Ky0K">
-                <node concept="29HgVG" id="3kjrYXAPum3" role="lGtFl">
-                  <node concept="3NFfHV" id="3kjrYXAPum4" role="3NFExx">
-                    <node concept="3clFbS" id="3kjrYXAPum5" role="2VODD2">
-                      <node concept="3clFbF" id="3kjrYXAPum6" role="3cqZAp">
-                        <node concept="v3LJS" id="3kjrYXAPum7" role="3clFbG">
-                          <ref role="v3LJV" node="3kjrYXAPkK6" resolve="getter" />
+      <node concept="14YyZ8" id="ZNYugt4Yur" role="1lVwrX">
+        <node concept="14ZrTv" id="ZNYugt4YxB" role="14ZwWg">
+          <node concept="30G5F_" id="ZNYugt4YxC" role="150hEN">
+            <node concept="3clFbS" id="ZNYugt4YxD" role="2VODD2">
+              <node concept="3clFbF" id="ZNYugt4YOW" role="3cqZAp">
+                <node concept="2OqwBi" id="ZNYugt4Zms" role="3clFbG">
+                  <node concept="2OqwBi" id="ZNYugt4Z1$" role="2Oq$k0">
+                    <node concept="30H73N" id="ZNYugt4YOV" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="ZNYugt4Zcu" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="ZNYugt4ZvR" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="gft3U" id="3kjrYXAPulY" role="150oIE">
+            <node concept="1oi5ST" id="3kjrYXAPulZ" role="gfFT$">
+              <property role="TrG5h" value="name" />
+              <node concept="1oi5UN" id="3kjrYXAPum0" role="1oi5TL">
+                <node concept="22Ky0T" id="3kjrYXAPum1" role="lGtFl">
+                  <node concept="10Nm6u" id="3kjrYXAPum2" role="22Ky0K">
+                    <node concept="29HgVG" id="3kjrYXAPum3" role="lGtFl">
+                      <node concept="3NFfHV" id="3kjrYXAPum4" role="3NFExx">
+                        <node concept="3clFbS" id="3kjrYXAPum5" role="2VODD2">
+                          <node concept="3clFbF" id="ZNYugt4XM9" role="3cqZAp">
+                            <node concept="2OqwBi" id="ZNYugt4XVt" role="3clFbG">
+                              <node concept="30H73N" id="ZNYugt4XM8" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="ZNYugt4Y2I" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="17Uvod" id="3kjrYXAPum8" role="lGtFl">
+                <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                <property role="2qtEX9" value="name" />
+                <node concept="3zFVjK" id="3kjrYXAPum9" role="3zH0cK">
+                  <node concept="3clFbS" id="3kjrYXAPuma" role="2VODD2">
+                    <node concept="3clFbF" id="3kjrYXAPumb" role="3cqZAp">
+                      <node concept="2OqwBi" id="3kjrYXAPumc" role="3clFbG">
+                        <node concept="3TrcHB" id="ZNYugt4XCg" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                        <node concept="2OqwBi" id="ZNYugt4X7a" role="2Oq$k0">
+                          <node concept="30H73N" id="ZNYugt4WVx" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="ZNYugt4Xro" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:JOGAOsxTDo" resolve="feature" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -16715,18 +16906,49 @@
               </node>
             </node>
           </node>
-          <node concept="17Uvod" id="3kjrYXAPum8" role="lGtFl">
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <property role="2qtEX9" value="name" />
-            <node concept="3zFVjK" id="3kjrYXAPum9" role="3zH0cK">
-              <node concept="3clFbS" id="3kjrYXAPuma" role="2VODD2">
-                <node concept="3clFbF" id="3kjrYXAPumb" role="3cqZAp">
-                  <node concept="2OqwBi" id="3kjrYXAPumc" role="3clFbG">
-                    <node concept="3TrcHB" id="3kjrYXAPumd" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+        </node>
+        <node concept="gft3U" id="ZNYugt4Z_Z" role="14YRTM">
+          <node concept="1oi5ST" id="ZNYugt4ZA0" role="gfFT$">
+            <property role="TrG5h" value="name" />
+            <node concept="1oi5UN" id="ZNYugt4ZA1" role="1oi5TL">
+              <node concept="22Ky0T" id="ZNYugt4ZA2" role="lGtFl">
+                <node concept="1nq8_$" id="2q9s7foUPmo" role="22Ky0K">
+                  <node concept="37jhX" id="ZNYugt50uN" role="1nq8_t">
+                    <node concept="10Nm6u" id="ZNYugt50uM" role="37jj2" />
+                    <node concept="29HgVG" id="ZNYugt515x" role="lGtFl">
+                      <node concept="3NFfHV" id="ZNYugt515M" role="3NFExx">
+                        <node concept="3clFbS" id="ZNYugt515N" role="2VODD2">
+                          <node concept="3clFbF" id="ZNYugt518t" role="3cqZAp">
+                            <node concept="2OqwBi" id="ZNYugt51hF" role="3clFbG">
+                              <node concept="30H73N" id="ZNYugt518s" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="ZNYugt51tI" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:ZNYugt4PuX" resolve="item" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
-                    <node concept="v3LJS" id="3kjrYXAPuXF" role="2Oq$k0">
-                      <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="17Uvod" id="ZNYugt4ZAb" role="lGtFl">
+              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+              <property role="2qtEX9" value="name" />
+              <node concept="3zFVjK" id="ZNYugt4ZAc" role="3zH0cK">
+                <node concept="3clFbS" id="ZNYugt4ZAd" role="2VODD2">
+                  <node concept="3clFbF" id="ZNYugt4ZAe" role="3cqZAp">
+                    <node concept="2OqwBi" id="ZNYugt4ZAf" role="3clFbG">
+                      <node concept="3TrcHB" id="ZNYugt4ZAg" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                      <node concept="2OqwBi" id="ZNYugt4ZAh" role="2Oq$k0">
+                        <node concept="30H73N" id="ZNYugt4ZAi" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="ZNYugt4ZAj" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:JOGAOsxTDo" resolve="feature" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -16743,8 +16965,11 @@
         <node concept="3clFbS" id="1fvYCPA6Ndw" role="2VODD2">
           <node concept="3clFbF" id="1fvYCPA6Ndx" role="3cqZAp">
             <node concept="2OqwBi" id="1fvYCPA6Ndy" role="3clFbG">
-              <node concept="v3LJS" id="1fvYCPA6Ndz" role="2Oq$k0">
-                <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
+              <node concept="2OqwBi" id="ZNYugt53Ws" role="2Oq$k0">
+                <node concept="30H73N" id="ZNYugt53xL" role="2Oq$k0" />
+                <node concept="3TrEf2" id="ZNYugt54ob" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:JOGAOsxTDo" resolve="feature" />
+                </node>
               </node>
               <node concept="1mIQ4w" id="1fvYCPA6Nd$" role="2OqNvi">
                 <node concept="chp4Y" id="1fvYCPA6Nd_" role="cj9EA">
@@ -16755,36 +16980,110 @@
           </node>
         </node>
       </node>
-      <node concept="gft3U" id="1fvYCPA6NJ5" role="1lVwrX">
-        <node concept="1oi5ST" id="1fvYCPA6NJb" role="gfFT$">
-          <property role="TrG5h" value="name" />
-          <node concept="17Uvod" id="1fvYCPA6NJd" role="lGtFl">
-            <property role="2qtEX9" value="name" />
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <node concept="3zFVjK" id="1fvYCPA6NJe" role="3zH0cK">
-              <node concept="3clFbS" id="1fvYCPA6NJf" role="2VODD2">
-                <node concept="3clFbF" id="1fvYCPA6O3o" role="3cqZAp">
-                  <node concept="2OqwBi" id="1fvYCPA6Occ" role="3clFbG">
-                    <node concept="v3LJS" id="1fvYCPA6O3n" role="2Oq$k0">
-                      <ref role="v3LJV" node="3kjrYXAPl_p" resolve="feature" />
-                    </node>
-                    <node concept="3TrcHB" id="1fvYCPA6Os5" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+      <node concept="14YyZ8" id="ZNYugt56ty" role="1lVwrX">
+        <node concept="14ZrTv" id="ZNYugt56vW" role="14ZwWg">
+          <node concept="30G5F_" id="ZNYugt56vX" role="150hEN">
+            <node concept="3clFbS" id="ZNYugt56vY" role="2VODD2">
+              <node concept="3clFbF" id="ZNYugt56Fm" role="3cqZAp">
+                <node concept="2OqwBi" id="ZNYugt57jt" role="3clFbG">
+                  <node concept="2OqwBi" id="ZNYugt56RY" role="2Oq$k0">
+                    <node concept="30H73N" id="ZNYugt56Fl" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="ZNYugt56Z7" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
                     </node>
                   </node>
+                  <node concept="3x8VRR" id="ZNYugt57t8" role="2OqNvi" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="KCUsM" id="1fvYCPA6OQk" role="1oi5TL">
-            <node concept="22Ky0T" id="1fvYCPA6OVj" role="lGtFl">
-              <node concept="10Nm6u" id="1fvYCPA6OVl" role="22Ky0K">
-                <node concept="29HgVG" id="1fvYCPA6OVF" role="lGtFl">
-                  <node concept="3NFfHV" id="1fvYCPA6OVK" role="3NFExx">
-                    <node concept="3clFbS" id="1fvYCPA6OVL" role="2VODD2">
-                      <node concept="3clFbF" id="1fvYCPA6OXV" role="3cqZAp">
-                        <node concept="v3LJS" id="1fvYCPA6OXU" role="3clFbG">
-                          <ref role="v3LJV" node="3kjrYXAPkK6" resolve="getter" />
+          <node concept="gft3U" id="1fvYCPA6NJ5" role="150oIE">
+            <node concept="1oi5ST" id="1fvYCPA6NJb" role="gfFT$">
+              <property role="TrG5h" value="name" />
+              <node concept="17Uvod" id="1fvYCPA6NJd" role="lGtFl">
+                <property role="2qtEX9" value="name" />
+                <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                <node concept="3zFVjK" id="1fvYCPA6NJe" role="3zH0cK">
+                  <node concept="3clFbS" id="1fvYCPA6NJf" role="2VODD2">
+                    <node concept="3clFbF" id="1fvYCPA6O3o" role="3cqZAp">
+                      <node concept="2OqwBi" id="1fvYCPA6Occ" role="3clFbG">
+                        <node concept="2OqwBi" id="ZNYugt54Y6" role="2Oq$k0">
+                          <node concept="30H73N" id="ZNYugt54_1" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="ZNYugt55i6" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:JOGAOsxTDo" resolve="feature" />
+                          </node>
+                        </node>
+                        <node concept="3TrcHB" id="1fvYCPA6Os5" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="KCUsM" id="1fvYCPA6OQk" role="1oi5TL">
+                <node concept="22Ky0T" id="1fvYCPA6OVj" role="lGtFl">
+                  <node concept="10Nm6u" id="1fvYCPA6OVl" role="22Ky0K">
+                    <node concept="29HgVG" id="1fvYCPA6OVF" role="lGtFl">
+                      <node concept="3NFfHV" id="1fvYCPA6OVK" role="3NFExx">
+                        <node concept="3clFbS" id="1fvYCPA6OVL" role="2VODD2">
+                          <node concept="3clFbF" id="ZNYugt55Qp" role="3cqZAp">
+                            <node concept="2OqwBi" id="ZNYugt55S_" role="3clFbG">
+                              <node concept="30H73N" id="ZNYugt55Qo" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="ZNYugt563$" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="gft3U" id="ZNYugt57zf" role="14YRTM">
+          <node concept="1oi5ST" id="ZNYugt57zg" role="gfFT$">
+            <property role="TrG5h" value="name" />
+            <node concept="17Uvod" id="ZNYugt57zh" role="lGtFl">
+              <property role="2qtEX9" value="name" />
+              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+              <node concept="3zFVjK" id="ZNYugt57zi" role="3zH0cK">
+                <node concept="3clFbS" id="ZNYugt57zj" role="2VODD2">
+                  <node concept="3clFbF" id="ZNYugt57zk" role="3cqZAp">
+                    <node concept="2OqwBi" id="ZNYugt57zl" role="3clFbG">
+                      <node concept="2OqwBi" id="ZNYugt57zm" role="2Oq$k0">
+                        <node concept="30H73N" id="ZNYugt57zn" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="ZNYugt57zo" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:JOGAOsxTDo" resolve="feature" />
+                        </node>
+                      </node>
+                      <node concept="3TrcHB" id="ZNYugt57zp" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="KCUsM" id="ZNYugt57zq" role="1oi5TL">
+              <node concept="22Ky0T" id="ZNYugt57zr" role="lGtFl">
+                <node concept="1nq8_$" id="ZNYugt57TX" role="22Ky0K">
+                  <node concept="37jhX" id="ZNYugt57TY" role="1nq8_t">
+                    <node concept="10Nm6u" id="ZNYugt57TZ" role="37jj2" />
+                    <node concept="29HgVG" id="ZNYugt57U0" role="lGtFl">
+                      <node concept="3NFfHV" id="ZNYugt57U1" role="3NFExx">
+                        <node concept="3clFbS" id="ZNYugt57U2" role="2VODD2">
+                          <node concept="3clFbF" id="ZNYugt57U3" role="3cqZAp">
+                            <node concept="2OqwBi" id="ZNYugt57U4" role="3clFbG">
+                              <node concept="30H73N" id="ZNYugt57U5" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="ZNYugt57U6" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:ZNYugt4PuX" resolve="item" />
+                              </node>
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -16794,18 +17093,6 @@
             </node>
           </node>
         </node>
-      </node>
-    </node>
-    <node concept="1N15co" id="3kjrYXAPkK6" role="1s_3oS">
-      <property role="TrG5h" value="getter" />
-      <node concept="3Tqbb2" id="3kjrYXAPkK7" role="1N15GL">
-        <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
-      </node>
-    </node>
-    <node concept="1N15co" id="3kjrYXAPl_p" role="1s_3oS">
-      <property role="TrG5h" value="feature" />
-      <node concept="3Tqbb2" id="3kjrYXAPlNR" role="1N15GL">
-        <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
       </node>
     </node>
     <node concept="j$LIH" id="3kjrYXAPkLh" role="jxRDz">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
index d3894954..7f793ee9 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
+++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.lang.coderules" uuid="c4803b19-6d89-4a3b-bf82-390769514add" languageVersion="21" moduleVersion="0">
+<language namespace="jetbrains.mps.lang.coderules" uuid="c4803b19-6d89-4a3b-bf82-390769514add" languageVersion="22" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 701fa368..2843f8fc 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -385,6 +385,7 @@
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
@@ -4185,8 +4186,32 @@
           <property role="VOm3f" value="true" />
         </node>
       </node>
-      <node concept="3F1sOY" id="1L74NXFMBX2" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:JOGAOsxTDm" resolve="getter" />
+      <node concept="3EZMnI" id="ZNYugt4Pv1" role="3EZMnx">
+        <node concept="l2Vlx" id="ZNYugt4Pv2" role="2iSdaV" />
+        <node concept="3F1sOY" id="1L74NXFMBX2" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:JOGAOsxTDm" resolve="getter" />
+          <node concept="pkWqt" id="ZNYugt4Pvg" role="pqm2j">
+            <node concept="3clFbS" id="ZNYugt4Pvh" role="2VODD2">
+              <node concept="3clFbF" id="ZNYugt4Pzf" role="3cqZAp">
+                <node concept="3y3z36" id="ZNYugt4Q6M" role="3clFbG">
+                  <node concept="10Nm6u" id="ZNYugt4QcH" role="3uHU7w" />
+                  <node concept="2OqwBi" id="ZNYugt4PJR" role="3uHU7B">
+                    <node concept="pncrf" id="ZNYugt4Pze" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="ZNYugt4PWE" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3nxI2P" id="ZNYugt4QnK" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="3F1sOY" id="ZNYugt4Qpr" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:ZNYugt4PuX" resolve="item" />
       </node>
       <node concept="l2Vlx" id="1L74NXFMBU8" role="2iSdaV" />
     </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
index 77fdadcb..e700fed9 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
@@ -36,6 +36,10 @@
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
@@ -49,9 +53,13 @@
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -64,9 +72,14 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
@@ -126,6 +139,9 @@
         <reference id="5455284157993910961" name="concept" index="2pJxaS" />
         <child id="5455284157993911099" name="values" index="2pJxcM" />
       </concept>
+      <concept id="8182547171709752110" name="jetbrains.mps.lang.quotation.structure.NodeBuilderExpression" flags="nn" index="36biLy">
+        <child id="8182547171709752112" name="expression" index="36biLW" />
+      </concept>
       <concept id="8182547171709614739" name="jetbrains.mps.lang.quotation.structure.NodeBuilderRef" flags="nn" index="36bGnv">
         <reference id="8182547171709614741" name="target" index="36bGnp" />
       </concept>
@@ -140,13 +156,25 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
+        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
+      </concept>
       <concept id="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
+      <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="1139867745658" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithNewOperation" flags="nn" index="1_qnLN">
         <reference id="1139867957129" name="concept" index="1_rbq0" />
       </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
+      <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
@@ -1535,5 +1563,275 @@
       <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
     </node>
   </node>
+  <node concept="3SyAh_" id="ZNYugtmReE">
+    <property role="qMTe8" value="21" />
+    <property role="TrG5h" value="Migrate_TermFeatureOverride_to_LogicalItem" />
+    <node concept="3Tm1VV" id="ZNYugtmReF" role="1B3o_S" />
+    <node concept="3tTeZs" id="ZNYugtmReG" 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="ZNYugtmReH" 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="ZNYugtmReI" 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="ZNYugtmReJ" role="jymVt" />
+    <node concept="3tYpMH" id="ZNYugtmReK" role="jymVt">
+      <property role="TrG5h" value="isRerunnable" />
+      <property role="3tYpME" value="true" />
+      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
+      <node concept="3Tm1VV" id="ZNYugtmReL" role="1B3o_S" />
+      <node concept="10P_77" id="ZNYugtmReM" role="1tU5fm" />
+    </node>
+    <node concept="3tYpXE" id="ZNYugtnFlP" role="jymVt">
+      <property role="TrG5h" value="description" />
+      <property role="3tYpXF" value="Replace getter with item in TermFeatureOverride" />
+      <ref role="25KYV2" to="slm6:1_lSsE3RFpE" resolve="description" />
+      <node concept="3Tm1VV" id="ZNYugtnFlR" role="1B3o_S" />
+      <node concept="17QB3L" id="ZNYugtnFlS" role="1tU5fm" />
+    </node>
+    <node concept="q3mfD" id="ZNYugtmReO" role="jymVt">
+      <property role="TrG5h" value="execute" />
+      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
+      <node concept="3Tm1VV" id="ZNYugtmReQ" role="1B3o_S" />
+      <node concept="3clFbS" id="ZNYugtmReS" role="3clF47">
+        <node concept="L3pyB" id="ZNYugtmSnv" role="3cqZAp">
+          <node concept="3clFbS" id="ZNYugtmSnw" role="L3pyw">
+            <node concept="3clFbF" id="ZNYugtmSwr" role="3cqZAp">
+              <node concept="2OqwBi" id="ZNYugtnFeZ" role="3clFbG">
+                <node concept="2OqwBi" id="ZNYugtnCNw" role="2Oq$k0">
+                  <node concept="qVDSY" id="ZNYugtmSwp" role="2Oq$k0">
+                    <node concept="chp4Y" id="ZNYugtmSzI" role="qVDSX">
+                      <ref role="cht4Q" to="wq2x:JOGAOsxTDl" resolve="TermFeatureOverride" />
+                    </node>
+                    <node concept="1dO9Bo" id="ZNYugtmSy6" role="1dOa5D" />
+                  </node>
+                  <node concept="3zZkjj" id="ZNYugtnDpp" role="2OqNvi">
+                    <node concept="1bVj0M" id="ZNYugtnDpr" role="23t8la">
+                      <node concept="3clFbS" id="ZNYugtnDps" role="1bW5cS">
+                        <node concept="3clFbF" id="ZNYugtnDxN" role="3cqZAp">
+                          <node concept="2OqwBi" id="ZNYugtnE_L" role="3clFbG">
+                            <node concept="2OqwBi" id="ZNYugtnDKq" role="2Oq$k0">
+                              <node concept="37vLTw" id="ZNYugtnDxM" role="2Oq$k0">
+                                <ref role="3cqZAo" node="ZNYugtnDpt" resolve="it" />
+                              </node>
+                              <node concept="3TrEf2" id="ZNYugtnE5m" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
+                              </node>
+                            </node>
+                            <node concept="1mIQ4w" id="ZNYugtnJHj" role="2OqNvi">
+                              <node concept="chp4Y" id="ZNYugtnJUS" role="cj9EA">
+                                <ref role="cht4Q" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="ZNYugtnDpt" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="ZNYugtnDpu" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2es0OD" id="ZNYugtnFVq" role="2OqNvi">
+                  <node concept="1bVj0M" id="ZNYugtnFVs" role="23t8la">
+                    <node concept="3clFbS" id="ZNYugtnFVt" role="1bW5cS">
+                      <node concept="3cpWs8" id="ZNYugtnJ0P" role="3cqZAp">
+                        <node concept="3cpWsn" id="ZNYugtnJ0Q" role="3cpWs9">
+                          <property role="TrG5h" value="getter" />
+                          <node concept="3Tqbb2" id="ZNYugtnJ0c" role="1tU5fm">
+                            <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+                          </node>
+                          <node concept="2OqwBi" id="ZNYugtnMuG" role="33vP2m">
+                            <node concept="2OqwBi" id="ZNYugtnJ0R" role="2Oq$k0">
+                              <node concept="37vLTw" id="ZNYugtnJ0S" role="2Oq$k0">
+                                <ref role="3cqZAo" node="ZNYugtnFVu" resolve="tfo" />
+                              </node>
+                              <node concept="3TrEf2" id="ZNYugtnJ0T" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
+                              </node>
+                            </node>
+                            <node concept="3YRAZt" id="ZNYugtnMSs" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="ZNYugtnGqu" role="3cqZAp">
+                        <node concept="37vLTI" id="ZNYugtnHt0" role="3clFbG">
+                          <node concept="2OqwBi" id="ZNYugtnLsw" role="37vLTx">
+                            <node concept="2OqwBi" id="ZNYugtnJpd" role="2Oq$k0">
+                              <node concept="1PxgMI" id="ZNYugtnKbg" role="2Oq$k0">
+                                <node concept="chp4Y" id="ZNYugtnKhQ" role="3oSUPX">
+                                  <ref role="cht4Q" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
+                                </node>
+                                <node concept="37vLTw" id="ZNYugtnJhx" role="1m5AlR">
+                                  <ref role="3cqZAo" node="ZNYugtnJ0Q" resolve="getter" />
+                                </node>
+                              </node>
+                              <node concept="3TrEf2" id="ZNYugtnLbD" role="2OqNvi">
+                                <ref role="3Tt5mk" to="5j4j:49obaclcanY" resolve="logical" />
+                              </node>
+                            </node>
+                            <node concept="3YRAZt" id="ZNYugtnLN9" role="2OqNvi" />
+                          </node>
+                          <node concept="2OqwBi" id="ZNYugtnGHI" role="37vLTJ">
+                            <node concept="37vLTw" id="ZNYugtnGqs" role="2Oq$k0">
+                              <ref role="3cqZAo" node="ZNYugtnFVu" resolve="tfo" />
+                            </node>
+                            <node concept="3TrEf2" id="ZNYugtnH5y" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:ZNYugt4PuX" resolve="item" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="ZNYugtnG90" role="3cqZAp" />
+                    </node>
+                    <node concept="Rh6nW" id="ZNYugtnFVu" role="1bW2Oz">
+                      <property role="TrG5h" value="tfo" />
+                      <node concept="2jxLKc" id="ZNYugtnFVv" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="ZNYugtnFJ9" role="3cqZAp" />
+            <node concept="3clFbF" id="ZNYugtnN0N" role="3cqZAp">
+              <node concept="2OqwBi" id="ZNYugtnN0O" role="3clFbG">
+                <node concept="2OqwBi" id="ZNYugtnN0P" role="2Oq$k0">
+                  <node concept="qVDSY" id="ZNYugtnN0Q" role="2Oq$k0">
+                    <node concept="chp4Y" id="ZNYugtnN0R" role="qVDSX">
+                      <ref role="cht4Q" to="wq2x:JOGAOsxTDl" resolve="TermFeatureOverride" />
+                    </node>
+                    <node concept="1dO9Bo" id="ZNYugtnN0S" role="1dOa5D" />
+                  </node>
+                  <node concept="3zZkjj" id="ZNYugtnN0T" role="2OqNvi">
+                    <node concept="1bVj0M" id="ZNYugtnN0U" role="23t8la">
+                      <node concept="3clFbS" id="ZNYugtnN0V" role="1bW5cS">
+                        <node concept="3clFbF" id="ZNYugtnN0W" role="3cqZAp">
+                          <node concept="2OqwBi" id="ZNYugtnN0X" role="3clFbG">
+                            <node concept="2OqwBi" id="ZNYugtnN0Y" role="2Oq$k0">
+                              <node concept="37vLTw" id="ZNYugtnN0Z" role="2Oq$k0">
+                                <ref role="3cqZAo" node="ZNYugtnN13" resolve="it" />
+                              </node>
+                              <node concept="3TrEf2" id="ZNYugtnN10" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
+                              </node>
+                            </node>
+                            <node concept="1mIQ4w" id="ZNYugtnN11" role="2OqNvi">
+                              <node concept="chp4Y" id="ZNYugtnNmM" role="cj9EA">
+                                <ref role="cht4Q" to="5j4j:6$jH9oLmUCq" resolve="DataNodeExpression" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="ZNYugtnN13" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="ZNYugtnN14" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2es0OD" id="ZNYugtnN15" role="2OqNvi">
+                  <node concept="1bVj0M" id="ZNYugtnN16" role="23t8la">
+                    <node concept="3clFbS" id="ZNYugtnN17" role="1bW5cS">
+                      <node concept="3cpWs8" id="ZNYugtnN18" role="3cqZAp">
+                        <node concept="3cpWsn" id="ZNYugtnN19" role="3cpWs9">
+                          <property role="TrG5h" value="getter" />
+                          <node concept="3Tqbb2" id="ZNYugtnN1a" role="1tU5fm">
+                            <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+                          </node>
+                          <node concept="2OqwBi" id="ZNYugtnN1b" role="33vP2m">
+                            <node concept="2OqwBi" id="ZNYugtnN1c" role="2Oq$k0">
+                              <node concept="37vLTw" id="ZNYugtnN1d" role="2Oq$k0">
+                                <ref role="3cqZAo" node="ZNYugtnN1t" resolve="tfo" />
+                              </node>
+                              <node concept="3TrEf2" id="ZNYugtnN1e" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:JOGAOsxTDm" resolve="getter" />
+                              </node>
+                            </node>
+                            <node concept="3YRAZt" id="ZNYugtnN1f" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="ZNYugtnOFb" role="3cqZAp">
+                        <node concept="37vLTI" id="ZNYugtnPFW" role="3clFbG">
+                          <node concept="2pJPEk" id="ZNYugtnS62" role="37vLTx">
+                            <node concept="2pJPED" id="ZNYugtnSeM" role="2pJPEn">
+                              <ref role="2pJxaS" to="5j4j:5WBVN_MESCN" resolve="DataNodeLiteral" />
+                              <node concept="2pIpSj" id="ZNYugtnSlT" role="2pJxcM">
+                                <ref role="2pIpSl" to="5j4j:5WBVN_MESCO" resolve="root" />
+                                <node concept="36biLy" id="ZNYugtnSuL" role="28nt2d">
+                                  <node concept="2OqwBi" id="ZNYugtnSKK" role="36biLW">
+                                    <node concept="2OqwBi" id="ZNYugtnSKL" role="2Oq$k0">
+                                      <node concept="1PxgMI" id="ZNYugtnSKM" role="2Oq$k0">
+                                        <node concept="chp4Y" id="ZNYugtnSKN" role="3oSUPX">
+                                          <ref role="cht4Q" to="5j4j:6$jH9oLmUCq" resolve="DataNodeExpression" />
+                                        </node>
+                                        <node concept="37vLTw" id="ZNYugtnSKO" role="1m5AlR">
+                                          <ref role="3cqZAo" node="ZNYugtnN19" resolve="getter" />
+                                        </node>
+                                      </node>
+                                      <node concept="3TrEf2" id="ZNYugtnSKP" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="5j4j:6$jH9oLmVNm" resolve="root" />
+                                      </node>
+                                    </node>
+                                    <node concept="3YRAZt" id="ZNYugtnSKQ" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="ZNYugtnOWj" role="37vLTJ">
+                            <node concept="37vLTw" id="ZNYugtnOF9" role="2Oq$k0">
+                              <ref role="3cqZAo" node="ZNYugtnN1t" resolve="tfo" />
+                            </node>
+                            <node concept="3TrEf2" id="ZNYugtnPld" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:ZNYugt4PuX" resolve="item" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="ZNYugtnN1t" role="1bW2Oz">
+                      <property role="TrG5h" value="tfo" />
+                      <node concept="2jxLKc" id="ZNYugtnN1u" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="ZNYugtnN0M" role="3cqZAp" />
+            <node concept="3clFbH" id="ZNYugtnFJK" role="3cqZAp" />
+          </node>
+          <node concept="37vLTw" id="ZNYugtmSop" role="L3pyr">
+            <ref role="3cqZAo" node="ZNYugtmReU" resolve="m" />
+          </node>
+        </node>
+      </node>
+      <node concept="ffn8J" id="ZNYugtmReU" role="3clF46">
+        <property role="TrG5h" value="m" />
+        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
+        <node concept="3uibUv" id="ZNYugtmReT" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+      </node>
+      <node concept="q3mfm" id="ZNYugtmReV" role="3clF45">
+        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
+        <ref role="1QQUv3" node="ZNYugtmReO" resolve="execute" />
+      </node>
+    </node>
+    <node concept="3tTeZs" id="ZNYugtmReW" role="jymVt">
+      <property role="3tTeZt" value="&lt;no result checking&gt;" />
+      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
+    </node>
+    <node concept="3uibUv" id="ZNYugtmReX" role="1zkMxy">
+      <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 64cc6528..34cd1221 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -28,6 +28,7 @@
       <concept id="6491077959632463275" name="jetbrains.mps.lang.structure.structure.EnumPropertyMigrationInfo" flags="ng" index="3l_iC">
         <child id="6491077959632463286" name="oldProperty" index="3l_iP" />
       </concept>
+      <concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9" />
       <concept id="7862711839422615209" name="jetbrains.mps.lang.structure.structure.DocumentedNodeAnnotation" flags="ng" index="t5JxF">
         <property id="7862711839422615217" name="text" index="t5JxN" />
         <child id="7862711839422615224" name="seeAlso" index="t5JxU" />
@@ -1414,8 +1415,14 @@
       <property role="IQ2ns" value="861509610434435670" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
       <property role="20kJfa" value="getter" />
-      <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+      <node concept="asaX9" id="ZNYugt4Qqr" role="lGtFl" />
+    </node>
+    <node concept="1TJgyj" id="ZNYugt4PuX" role="1TKVEi">
+      <property role="IQ2ns" value="1149537088045275069" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="item" />
+      <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
     <node concept="t5JxF" id="3MfP0fwg5uI" role="lGtFl">
       <property role="t5JxN" value="Allows to override default feature value in term constructor" />
@@ -1659,5 +1666,11 @@
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
+  <node concept="1TIwiD" id="ZNYugt1SnT">
+    <property role="EcuMT" value="1149537088044500473" />
+    <property role="3GE5qa" value="term.feature" />
+    <property role="TrG5h" value="NodeRefFeature" />
+    <ref role="1TJDcQ" node="JOGAOsxiL_" resolve="TermFeature" />
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
index 932cc76b..ca9e710a 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -864,35 +864,19 @@
                 </node>
               </node>
             </node>
-            <node concept="1Wc70l" id="hYA4RDOcb6" role="3uHU7B">
-              <node concept="2OqwBi" id="7zIaasjS9a5" role="3uHU7B">
-                <node concept="2OqwBi" id="7zIaasjS9a6" role="2Oq$k0">
-                  <node concept="nLn13" id="hYA4RDOoLF" 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 concept="2OqwBi" id="7zIaasjS9a5" role="3uHU7B">
+              <node concept="2OqwBi" id="7zIaasjS9a6" role="2Oq$k0">
+                <node concept="nLn13" id="hYA4RDOoLF" 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 concept="1xIGOp" id="hYA4RDOmVp" role="1xVPHs" />
                   </node>
+                  <node concept="1xIGOp" id="hYA4RDOmVp" role="1xVPHs" />
                 </node>
-                <node concept="3w_OXm" id="7zIaasjS9kS" role="2OqNvi" />
-              </node>
-              <node concept="2OqwBi" id="hYA4RDOnBC" role="3uHU7w">
-                <node concept="2OqwBi" id="hYA4RDOnc7" role="2Oq$k0">
-                  <node concept="nLn13" id="hYA4RDOoQc" role="2Oq$k0" />
-                  <node concept="2Xjw5R" id="hYA4RDOnnE" role="2OqNvi">
-                    <node concept="1xMEDy" id="hYA4REcaxF" role="1xVPHs">
-                      <node concept="chp4Y" id="hYA4REcaAm" role="ri$Ld">
-                        <ref role="cht4Q" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
-                      </node>
-                    </node>
-                    <node concept="1xIGOp" id="hYA4RDOobn" role="1xVPHs" />
-                  </node>
-                </node>
-                <node concept="3x8VRR" id="hYA4RDOnOm" role="2OqNvi" />
               </node>
+              <node concept="3w_OXm" id="7zIaasjS9kS" role="2OqNvi" />
             </node>
           </node>
         </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index 09e42ae0..82af2f7f 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -373,9 +373,6 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
@@ -408,7 +405,6 @@
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
-      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
       <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
@@ -3646,123 +3642,6 @@
   <node concept="22mcaB" id="49obaclcHw$">
     <ref role="aqKnT" to="5j4j:49obaclcan7" resolve="LogicalItemExpression" />
     <node concept="22hDWj" id="2TBKtozZDV$" role="22hAXT" />
-    <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 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="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>
-            </node>
-          </node>
-        </node>
-        <node concept="2kknPJ" id="7XmdqtdNMPi" role="2klrvf">
-          <ref role="2ZyFGn" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
-        </node>
-        <node concept="16NL3D" id="7LI_gNN91iz" role="upBLP">
-          <node concept="16Na2f" id="7LI_gNN91i$" role="16NL3A">
-            <node concept="3clFbS" id="7LI_gNN91i_" role="2VODD2">
-              <node concept="3clFbF" id="7LI_gNN91rR" role="3cqZAp">
-                <node concept="3fqX7Q" id="7LI_gNN92IL" role="3clFbG">
-                  <node concept="2OqwBi" id="7LI_gNN92IN" role="3fr31v">
-                    <node concept="2OqwBi" id="7LI_gNN92IO" role="2Oq$k0">
-                      <node concept="3jrdc4" id="7LI_gNN92IP" role="2Oq$k0" />
-                      <node concept="3j5asz" id="7LI_gNN92IQ" role="2OqNvi" />
-                    </node>
-                    <node concept="2Zo12i" id="7LI_gNN92IR" role="2OqNvi">
-                      <node concept="chp4Y" id="7LI_gNN92IS" role="2Zo12j">
-                        <ref role="cht4Q" to="5j4j:7lt0LtQg3tE" resolve="ExpressionItem" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3ft6gW" id="7zIaasjS918" role="3ft5RY">
-        <node concept="3clFbS" id="7zIaasjS919" role="2VODD2">
-          <node concept="3clFbF" id="7zIaasjS9a4" role="3cqZAp">
-            <node concept="1Wc70l" id="51ek2rSfA$S" role="3clFbG">
-              <node concept="1Wc70l" id="hYA4RDOcb6" role="3uHU7B">
-                <node concept="2OqwBi" id="7zIaasjS9a5" role="3uHU7B">
-                  <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 concept="1xIGOp" id="hYA4RDOmVp" role="1xVPHs" />
-                    </node>
-                  </node>
-                  <node concept="3w_OXm" id="7zIaasjS9kS" role="2OqNvi" />
-                </node>
-                <node concept="2OqwBi" id="hYA4RDOnBC" role="3uHU7w">
-                  <node concept="2OqwBi" id="hYA4RDOnc7" role="2Oq$k0">
-                    <node concept="3bvxqY" id="hYA4RDOmWl" role="2Oq$k0" />
-                    <node concept="2Xjw5R" id="hYA4RDOnnE" role="2OqNvi">
-                      <node concept="1xMEDy" id="hYA4RDOnnG" role="1xVPHs">
-                        <node concept="chp4Y" id="hYA4RDOntK" role="ri$Ld">
-                          <ref role="cht4Q" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
-                        </node>
-                      </node>
-                      <node concept="1xIGOp" id="hYA4RDOobn" role="1xVPHs" />
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="hYA4RDOnOm" role="2OqNvi" />
-                </node>
-              </node>
-              <node concept="3fqX7Q" id="51ek2rSfwES" role="3uHU7w">
-                <node concept="1eOMI4" id="51ek2rSfwEU" role="3fr31v">
-                  <node concept="2OqwBi" id="51ek2rSfwT5" role="1eOMHV">
-                    <node concept="3bvxqY" id="51ek2rSfDtP" role="2Oq$k0" />
-                    <node concept="1mIQ4w" id="51ek2rSfx3j" role="2OqNvi">
-                      <node concept="chp4Y" id="51ek2rSfx9L" role="cj9EA">
-                        <ref role="cht4Q" to="5j4j:7lt0LtQg3tE" resolve="ExpressionItem" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3VyMlK" id="hYA4RDImMH" role="3ft7WO" />
   </node>
   <node concept="22mcaB" id="59P$gGg7gYN">