From c797b5d2ad6ca54888f904d90a565bee6dd853e1 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 25 Oct 2019 17:04:28 +0200
Subject: [PATCH] Breaking change: logical vars must be declared by constraint
 rule that uses them.

Stronger rules for logical variables scope: constraint rule can't reference logical variable defined in another constraint rule. Logical variable definitions are localized to ConstraintRule template.
Simplify/cleanup the logic of searching for available logical variables.
---
 .../generator/template/main@generator.mps     | 408 +++++++++++++-----
 .../languageModels/behavior.mps               | 356 ++++-----------
 .../languageModels/structure.mps              |   3 +
 .../languageModels/behavior.mps               |  16 -
 .../languageModels/constraints.mps            | 324 +++++++-------
 .../languageModels/structure.mps              |   7 +-
 6 files changed, 543 insertions(+), 571 deletions(-)

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 99a654e2..aeebecee 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
@@ -589,6 +589,9 @@
       </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1171500988903" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenOperation" flags="nn" index="32TBzR" />
+      <concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
+        <reference id="3562215692195600259" name="link" index="13MTZf" />
+      </concept>
       <concept id="2644386474301421077" name="jetbrains.mps.lang.smodel.structure.LinkIdRefExpression" flags="nn" index="359W_D">
         <reference id="2644386474301421078" name="conceptDeclaration" index="359W_E" />
         <reference id="2644386474301421079" name="linkDeclaration" index="359W_F" />
@@ -808,6 +811,16 @@
       <ref role="2rTdP9" to="wq2x:6OXbTDyHcuD" resolve="Template" />
       <ref role="2rZz_L" to="tpee:fzclF8t" resolve="InstanceMethodDeclaration" />
     </node>
+    <node concept="2rT7sh" id="2J$kxDHVt6s" role="2rTMjI">
+      <property role="TrG5h" value="constraintRule_class" />
+      <ref role="2rTdP9" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+      <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
+    </node>
+    <node concept="2rT7sh" id="2J$kxDHV1tw" role="2rTMjI">
+      <property role="TrG5h" value="constraintRule_this" />
+      <ref role="2rTdP9" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+      <ref role="2rZz_L" to="tpee:6LFqxSRBTg8" resolve="MethodDeclaration" />
+    </node>
     <node concept="2rT7sh" id="429xoypVg6q" role="2rTMjI">
       <property role="TrG5h" value="apply_session_parameter" />
       <ref role="2rTdP9" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
@@ -1194,7 +1207,7 @@
     <node concept="3aamgX" id="36tQV5ADREQ" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
       <node concept="j$656" id="36tQV5ADTW9" role="1lVwrX">
-        <ref role="v9R2y" node="36tQV5AxhJb" resolve="constraintRule_class" />
+        <ref role="v9R2y" node="36tQV5AxhJb" resolve="ConstraintRule_creator" />
       </node>
     </node>
     <node concept="3aamgX" id="36tQV5AIKwY" role="3acgRq">
@@ -9630,7 +9643,7 @@
           <property role="TrG5h" value="Context" />
           <node concept="312cEu" id="36tQV5AufcV" role="jymVt">
             <property role="2bfB8j" value="false" />
-            <property role="TrG5h" value="Token" />
+            <property role="TrG5h" value="ConstraintRule" />
             <node concept="312cEg" id="36tQV5AufcW" role="jymVt">
               <property role="TrG5h" value="multiLogical" />
               <node concept="3Tm1VV" id="36tQV5AufcX" role="1B3o_S" />
@@ -9645,9 +9658,9 @@
           </node>
           <node concept="2tJIrI" id="36tQV5Awc8D" role="jymVt" />
           <node concept="3clFb_" id="36tQV5Awbvj" role="jymVt">
-            <property role="TrG5h" value="token" />
+            <property role="TrG5h" value="rule" />
             <node concept="3uibUv" id="36tQV5AwcrE" role="3clF45">
-              <ref role="3uigEE" node="36tQV5AufcV" resolve="Context.Token" />
+              <ref role="3uigEE" node="36tQV5AufcV" resolve="Context.ConstraintRule" />
             </node>
             <node concept="3Tm6S6" id="36tQV5Awbvl" role="1B3o_S" />
             <node concept="3clFbS" id="36tQV5Awbvm" role="3clF47">
@@ -9666,7 +9679,7 @@
             <node concept="3clFbS" id="36tQV5Awbvt" role="3clF47">
               <node concept="3clFbF" id="36tQV5Awbvu" role="3cqZAp">
                 <node concept="1rXfSq" id="36tQV5Awbvv" role="3clFbG">
-                  <ref role="37wK5l" node="36tQV5Awbvj" resolve="token" />
+                  <ref role="37wK5l" node="36tQV5Awbvj" resolve="rule" />
                   <node concept="1ZhdrF" id="36tQV5Awbvw" role="lGtFl">
                     <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
                     <property role="2qtEX8" value="baseMethodDeclaration" />
@@ -9678,15 +9691,15 @@
                               <node concept="2OqwBi" id="36tQV5AwdtY" role="3cqZAk">
                                 <node concept="1iwH7S" id="36tQV5AwdtZ" role="2Oq$k0" />
                                 <node concept="1iwH70" id="36tQV5Awdu0" role="2OqNvi">
-                                  <ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
+                                  <ref role="1iwH77" node="2J$kxDHV1tw" resolve="constraintRule_this" />
                                   <node concept="2OqwBi" id="36tQV5Awdu1" role="1iwH7V">
                                     <node concept="v3LJS" id="36tQV5Awdu2" role="2Oq$k0">
                                       <ref role="v3LJV" node="5wZaC7XJCJi" resolve="logicalVar" />
                                     </node>
                                     <node concept="2Xjw5R" id="36tQV5Awdu3" role="2OqNvi">
                                       <node concept="1xMEDy" id="36tQV5Awdu4" role="1xVPHs">
-                                        <node concept="chp4Y" id="6OXbTDyRi5i" role="ri$Ld">
-                                          <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
+                                        <node concept="chp4Y" id="2J$kxDHVRo6" role="ri$Ld">
+                                          <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
                                         </node>
                                       </node>
                                     </node>
@@ -9703,7 +9716,7 @@
                                   <node concept="1iwH7S" id="36tQV5Awdub" role="2Oq$k0" />
                                   <node concept="2k5nB$" id="36tQV5Awduc" role="2OqNvi">
                                     <node concept="Xl_RD" id="36tQV5Awdud" role="2k5Stb">
-                                      <property role="Xl_RC" value="not supported" />
+                                      <property role="Xl_RC" value="logical variable declaration out of scope" />
                                     </node>
                                   </node>
                                 </node>
@@ -9718,8 +9731,8 @@
                               <node concept="30H73N" id="36tQV5Awdui" role="2Oq$k0" />
                               <node concept="2Xjw5R" id="36tQV5Awduj" role="2OqNvi">
                                 <node concept="1xMEDy" id="36tQV5Awduk" role="1xVPHs">
-                                  <node concept="chp4Y" id="6OXbTDyUyS5" role="ri$Ld">
-                                    <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
+                                  <node concept="chp4Y" id="2J$kxDHVRec" role="ri$Ld">
+                                    <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
                                   </node>
                                 </node>
                               </node>
@@ -9730,8 +9743,8 @@
                               </node>
                               <node concept="2Xjw5R" id="36tQV5Awduo" role="2OqNvi">
                                 <node concept="1xMEDy" id="36tQV5Awdup" role="1xVPHs">
-                                  <node concept="chp4Y" id="6OXbTDyRi1L" role="ri$Ld">
-                                    <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
+                                  <node concept="chp4Y" id="2J$kxDHVRhZ" role="ri$Ld">
+                                    <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
                                   </node>
                                 </node>
                               </node>
@@ -10395,8 +10408,8 @@
                               <ref role="3Tt5mk" to="wq2x:7IysFe_ZQc2" resolve="body" />
                             </node>
                           </node>
-                          <node concept="2qgKlT" id="1GNw78$ri7T" role="2OqNvi">
-                            <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
+                          <node concept="2qgKlT" id="2J$kxDI0SNz" role="2OqNvi">
+                            <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                           </node>
                         </node>
                       </node>
@@ -10606,8 +10619,8 @@
                         </node>
                         <node concept="30H73N" id="4KRwoemkpfo" role="2Oq$k0" />
                       </node>
-                      <node concept="2qgKlT" id="4KRwoemkpfp" role="2OqNvi">
-                        <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
+                      <node concept="2qgKlT" id="2J$kxDI4jHC" role="2OqNvi">
+                        <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                       </node>
                     </node>
                   </node>
@@ -11160,24 +11173,6 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3uibUv" id="12QmIo_3_hX" role="3PaCim">
-                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        <node concept="1sPUBX" id="12QmIo_3_hY" role="lGtFl">
-                          <ref role="v9R2y" node="49L2l3F7WoC" resolve="variable_type" />
-                          <node concept="30H73N" id="12QmIo_3_hZ" role="v9R3O" />
-                          <node concept="3NFfHV" id="12QmIo_3_i0" role="1sPUBK">
-                            <node concept="3clFbS" id="12QmIo_3_i1" role="2VODD2">
-                              <node concept="3clFbF" id="12QmIo_3_i2" role="3cqZAp">
-                                <node concept="2c44tf" id="12QmIo_3_i3" role="3clFbG">
-                                  <node concept="3uibUv" id="12QmIo_3_i4" role="2c44tc">
-                                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
                     </node>
                     <node concept="37vLTw" id="12QmIo_3A3j" role="37vLTJ">
                       <ref role="3cqZAo" node="12QmIo_3tmf" resolve="logical" />
@@ -13458,7 +13453,7 @@
         <node concept="3uibUv" id="6i42QSs8miP" role="3clF45">
           <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
         </node>
-        <node concept="3Tm1VV" id="6i42QSs8m5e" role="1B3o_S" />
+        <node concept="3Tmbuc" id="2J$kxDHVxkD" role="1B3o_S" />
         <node concept="3clFbS" id="6i42QSs8m5f" role="3clF47">
           <node concept="3clFbF" id="6OXbTDyZfHw" role="3cqZAp">
             <node concept="37vLTw" id="6OXbTDyZfHv" role="3clFbG">
@@ -13470,6 +13465,37 @@
           <ref role="2rW$FS" node="6OXbTDyZfMT" resolve="template_ref" />
         </node>
       </node>
+      <node concept="2tJIrI" id="2J$kxDHVzkJ" role="jymVt" />
+      <node concept="312cEu" id="2J$kxDHV_XQ" role="jymVt">
+        <property role="TrG5h" value="ConstraintRule" />
+        <node concept="3Tm1VV" id="2J$kxDHV_XR" role="1B3o_S" />
+        <node concept="1WS0z7" id="2J$kxDHVBLQ" role="lGtFl">
+          <node concept="3JmXsc" id="2J$kxDHVBLR" role="3Jn$fo">
+            <node concept="3clFbS" id="2J$kxDHVBLS" role="2VODD2">
+              <node concept="3clFbF" id="2J$kxDHVIEa" role="3cqZAp">
+                <node concept="2OqwBi" id="7lt0LtPICAE" role="3clFbG">
+                  <node concept="2OqwBi" id="7lt0LtPICAF" role="2Oq$k0">
+                    <node concept="2Rf3mk" id="7lt0LtPICAJ" role="2OqNvi">
+                      <node concept="1xMEDy" id="7lt0LtPICAK" role="1xVPHs">
+                        <node concept="chp4Y" id="7lt0LtPICAL" role="ri$Ld">
+                          <ref role="cht4Q" to="wq2x:36tQV5AmIt0" resolve="ConstraintRuleStatement" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="30H73N" id="2J$kxDHVIUj" role="2Oq$k0" />
+                  </node>
+                  <node concept="13MTOL" id="7lt0LtPICAM" role="2OqNvi">
+                    <ref role="13MTZf" to="wq2x:36tQV5AmIt1" resolve="rule" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="5jKBG" id="2J$kxDHVM4K" role="lGtFl">
+          <ref role="v9R2y" node="2J$kxDHVnXC" resolve="ConstraintRule_class" />
+        </node>
+      </node>
       <node concept="2tJIrI" id="6OXbTDyYYWe" role="jymVt" />
       <node concept="312cEg" id="36tQV5AoEVr" role="jymVt">
         <property role="TrG5h" value="input" />
@@ -13520,30 +13546,6 @@
           </node>
         </node>
       </node>
-      <node concept="312cEg" id="36tQV5AoEWu" role="jymVt">
-        <property role="TrG5h" value="logical" />
-        <node concept="3uibUv" id="36tQV5AoEWv" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-        </node>
-        <node concept="3Tm1VV" id="36tQV5AoEWw" role="1B3o_S" />
-        <node concept="1WS0z7" id="36tQV5AoEWx" role="lGtFl">
-          <node concept="3JmXsc" id="36tQV5AoEWy" role="3Jn$fo">
-            <node concept="3clFbS" id="36tQV5AoEWz" role="2VODD2">
-              <node concept="3clFbF" id="36tQV5AoEW$" role="3cqZAp">
-                <node concept="2OqwBi" id="36tQV5AoEW_" role="3clFbG">
-                  <node concept="30H73N" id="36tQV5AoEWA" role="2Oq$k0" />
-                  <node concept="2qgKlT" id="36tQV5AoEWB" role="2OqNvi">
-                    <ref role="37wK5l" to="x5bw:36tQV5ArwpJ" resolve="localContextNames" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1sPUBX" id="36tQV5AoEWC" role="lGtFl">
-          <ref role="v9R2y" node="452KZTbxEFE" resolve="contextName_field_declaration" />
-        </node>
-      </node>
       <node concept="312cEg" id="36tQV5AwvNF" role="jymVt">
         <property role="TrG5h" value="required" />
         <node concept="3Tmbuc" id="36tQV5AxyYN" role="1B3o_S" />
@@ -14152,7 +14154,7 @@
   </node>
   <node concept="13MO4I" id="36tQV5AxhJb">
     <property role="3GE5qa" value="rule" />
-    <property role="TrG5h" value="constraintRule_class" />
+    <property role="TrG5h" value="ConstraintRule_creator" />
     <ref role="3gUMe" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
     <node concept="312cEu" id="36tQV5AxhJd" role="13RCb5">
       <property role="TrG5h" value="Token" />
@@ -14179,8 +14181,8 @@
               <node concept="YeOm9" id="36tQV5AxJxD" role="2ShVmc">
                 <node concept="1Y3b0j" id="36tQV5AxJxG" role="YeSDq">
                   <property role="2bfB8j" value="true" />
-                  <ref role="1Y3XeK" to="i348:36tQV5AurZW" resolve="ConstraintRuleTemplate" />
                   <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                  <ref role="1Y3XeK" node="2J$kxDHVq4U" resolve="Token.ConstraintRule" />
                   <node concept="3Tm1VV" id="36tQV5AxJxH" role="1B3o_S" />
                   <node concept="3clFb_" id="36tQV5AxhPU" role="jymVt">
                     <property role="1EzhhJ" value="false" />
@@ -14200,8 +14202,8 @@
                       <node concept="3clFbF" id="12QmIo_1boW" role="3cqZAp">
                         <node concept="37vLTI" id="12QmIo_1boX" role="3clFbG">
                           <node concept="10Nm6u" id="12QmIo_1boY" role="37vLTx" />
-                          <node concept="37vLTw" id="12QmIo_1boZ" role="37vLTJ">
-                            <ref role="3cqZAo" node="36tQV5AoEWu" resolve="logical" />
+                          <node concept="37vLTw" id="2J$kxDHWdwf" role="37vLTJ">
+                            <ref role="3cqZAo" node="2J$kxDHW1_A" resolve="logical" />
                           </node>
                         </node>
                         <node concept="1WS0z7" id="12QmIo_1bp0" role="lGtFl">
@@ -14210,8 +14212,8 @@
                               <node concept="3clFbF" id="12QmIo_1bp3" role="3cqZAp">
                                 <node concept="2OqwBi" id="12QmIo_1bp4" role="3clFbG">
                                   <node concept="30H73N" id="12QmIo_1bp5" role="2Oq$k0" />
-                                  <node concept="2qgKlT" id="12QmIo_1en9" role="2OqNvi">
-                                    <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
+                                  <node concept="2qgKlT" id="2J$kxDI0Mbl" role="2OqNvi">
+                                    <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                   </node>
                                 </node>
                               </node>
@@ -14504,6 +14506,23 @@
                     </node>
                   </node>
                   <node concept="2tJIrI" id="36tQV5AxhOo" role="jymVt" />
+                  <node concept="1ZhdrF" id="2J$kxDHVPdb" role="lGtFl">
+                    <property role="2qtEX8" value="classifier" />
+                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1170345865475/1170346070688" />
+                    <node concept="3$xsQk" id="2J$kxDHVPdc" role="3$ytzL">
+                      <node concept="3clFbS" id="2J$kxDHVPdd" role="2VODD2">
+                        <node concept="3clFbF" id="2J$kxDHVPAe" role="3cqZAp">
+                          <node concept="2OqwBi" id="2J$kxDHVPQo" role="3clFbG">
+                            <node concept="1iwH7S" id="2J$kxDHVPAd" role="2Oq$k0" />
+                            <node concept="1iwH70" id="2J$kxDHVPWM" role="2OqNvi">
+                              <ref role="1iwH77" node="2J$kxDHVt6s" resolve="constraintRule_class" />
+                              <node concept="30H73N" id="2J$kxDHVQ9b" role="1iwH7V" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
               <node concept="raruj" id="36tQV5AxJIJ" role="lGtFl" />
@@ -15318,31 +15337,6 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="6tPOoeT3Z2q" role="3cqZAp">
-            <node concept="37vLTI" id="6tPOoeT3Z2r" role="3clFbG">
-              <node concept="10Nm6u" id="6tPOoeT3Z2s" role="37vLTx" />
-              <node concept="37vLTw" id="6tPOoeT3Z2t" role="37vLTJ">
-                <ref role="3cqZAo" node="6tPOoeT3Z3Q" resolve="logical" />
-              </node>
-            </node>
-            <node concept="1WS0z7" id="6tPOoeT3Z2u" role="lGtFl">
-              <node concept="3JmXsc" id="6tPOoeT3Z2v" role="3Jn$fo">
-                <node concept="3clFbS" id="6tPOoeT3Z2w" role="2VODD2">
-                  <node concept="3clFbF" id="6tPOoeT3Z2x" role="3cqZAp">
-                    <node concept="2OqwBi" id="6tPOoeT3Z2y" role="3clFbG">
-                      <node concept="30H73N" id="6tPOoeT3Z2z" role="2Oq$k0" />
-                      <node concept="2qgKlT" id="6tPOoeT3Z2$" role="2OqNvi">
-                        <ref role="37wK5l" to="x5bw:6OXbTDz3CDo" resolve="localContextNames" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1sPUBX" id="6tPOoeT3Z2_" role="lGtFl">
-              <ref role="v9R2y" node="4KRwoemr_Es" resolve="contextName_variable_init" />
-            </node>
-          </node>
           <node concept="3clFbF" id="6tPOoeT3Z2A" role="3cqZAp">
             <node concept="37vLTI" id="6tPOoeT3Z2B" role="3clFbG">
               <node concept="2ShNRf" id="6tPOoeT3Z2C" role="37vLTx">
@@ -15444,7 +15438,7 @@
         <node concept="3uibUv" id="6tPOoeT3Z3i" role="3clF45">
           <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
         </node>
-        <node concept="3Tm1VV" id="6tPOoeT3Z3j" role="1B3o_S" />
+        <node concept="3Tmbuc" id="2J$kxDHYvF1" role="1B3o_S" />
         <node concept="3clFbS" id="6tPOoeT3Z3k" role="3clF47">
           <node concept="3clFbF" id="6tPOoeT3Z3l" role="3cqZAp">
             <node concept="37vLTw" id="6tPOoeT3Z3m" role="3clFbG">
@@ -15457,6 +15451,37 @@
         </node>
       </node>
       <node concept="2tJIrI" id="6tPOoeT3Z3o" role="jymVt" />
+      <node concept="312cEu" id="2J$kxDHYub7" role="jymVt">
+        <property role="TrG5h" value="ConstraintRule" />
+        <node concept="3Tm1VV" id="2J$kxDHYub8" role="1B3o_S" />
+        <node concept="1WS0z7" id="2J$kxDHYub9" role="lGtFl">
+          <node concept="3JmXsc" id="2J$kxDHYuba" role="3Jn$fo">
+            <node concept="3clFbS" id="2J$kxDHYubb" role="2VODD2">
+              <node concept="3clFbF" id="2J$kxDHYubc" role="3cqZAp">
+                <node concept="2OqwBi" id="2J$kxDHYubd" role="3clFbG">
+                  <node concept="2OqwBi" id="2J$kxDHYube" role="2Oq$k0">
+                    <node concept="2Rf3mk" id="2J$kxDHYubf" role="2OqNvi">
+                      <node concept="1xMEDy" id="2J$kxDHYubg" role="1xVPHs">
+                        <node concept="chp4Y" id="2J$kxDHYubh" role="ri$Ld">
+                          <ref role="cht4Q" to="wq2x:36tQV5AmIt0" resolve="ConstraintRuleStatement" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="30H73N" id="2J$kxDHYubi" role="2Oq$k0" />
+                  </node>
+                  <node concept="13MTOL" id="2J$kxDHYubj" role="2OqNvi">
+                    <ref role="13MTZf" to="wq2x:36tQV5AmIt1" resolve="rule" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="5jKBG" id="2J$kxDHYubk" role="lGtFl">
+          <ref role="v9R2y" node="2J$kxDHVnXC" resolve="ConstraintRule_class" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2J$kxDHYsCN" role="jymVt" />
       <node concept="2tJIrI" id="6tPOoeT3Z3p" role="jymVt" />
       <node concept="312cEg" id="6tPOoeT3Z3q" role="jymVt">
         <property role="TrG5h" value="parameter" />
@@ -15519,30 +15544,6 @@
           </node>
         </node>
       </node>
-      <node concept="312cEg" id="6tPOoeT3Z3Q" role="jymVt">
-        <property role="TrG5h" value="logical" />
-        <node concept="3uibUv" id="6tPOoeT3Z3R" role="1tU5fm">
-          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-        </node>
-        <node concept="3Tm1VV" id="6tPOoeT3Z3S" role="1B3o_S" />
-        <node concept="1WS0z7" id="6tPOoeT3Z3T" role="lGtFl">
-          <node concept="3JmXsc" id="6tPOoeT3Z3U" role="3Jn$fo">
-            <node concept="3clFbS" id="6tPOoeT3Z3V" role="2VODD2">
-              <node concept="3clFbF" id="6tPOoeT3Z3W" role="3cqZAp">
-                <node concept="2OqwBi" id="6tPOoeT3Z3X" role="3clFbG">
-                  <node concept="30H73N" id="6tPOoeT3Z3Y" role="2Oq$k0" />
-                  <node concept="2qgKlT" id="6tPOoeT3Z3Z" role="2OqNvi">
-                    <ref role="37wK5l" to="x5bw:6OXbTDz3CDo" resolve="localContextNames" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1sPUBX" id="6tPOoeT3Z40" role="lGtFl">
-          <ref role="v9R2y" node="452KZTbxEFE" resolve="contextName_field_declaration" />
-        </node>
-      </node>
       <node concept="312cEg" id="6tPOoeT3Z41" role="jymVt">
         <property role="TrG5h" value="ruleBuilder" />
         <node concept="3Tmbuc" id="6tPOoeT3Z42" role="1B3o_S" />
@@ -16668,5 +16669,180 @@
       <node concept="10Nm6u" id="1laj_RSpt99" role="gfFT$" />
     </node>
   </node>
+  <node concept="13MO4I" id="2J$kxDHVnXC">
+    <property role="3GE5qa" value="rule" />
+    <property role="TrG5h" value="ConstraintRule_class" />
+    <ref role="3gUMe" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+    <node concept="312cEu" id="2J$kxDHVpw_" role="13RCb5">
+      <property role="TrG5h" value="Token" />
+      <node concept="2tJIrI" id="2J$kxDHVpKf" role="jymVt" />
+      <node concept="3clFbW" id="2J$kxDHVpOm" role="jymVt">
+        <node concept="3cqZAl" id="2J$kxDHVpOo" role="3clF45" />
+        <node concept="3Tm1VV" id="2J$kxDHVpOp" role="1B3o_S" />
+        <node concept="3clFbS" id="2J$kxDHVpOq" role="3clF47">
+          <node concept="XkiVB" id="2J$kxDHVpYu" role="3cqZAp">
+            <ref role="37wK5l" node="36tQV5AoEKL" resolve="RuleTemplateImpl.Token" />
+            <node concept="10Nm6u" id="2J$kxDHVpZG" role="37wK5m" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2J$kxDHVq3o" role="jymVt" />
+      <node concept="312cEu" id="2J$kxDHVq4U" role="jymVt">
+        <property role="TrG5h" value="ConstraintRule" />
+        <property role="1sVAO0" value="true" />
+        <node concept="2tJIrI" id="2J$kxDHVqu$" role="jymVt" />
+        <node concept="3clFb_" id="2J$kxDHVqPZ" role="jymVt">
+          <property role="TrG5h" value="rule" />
+          <node concept="3uibUv" id="2J$kxDHVqSM" role="3clF45">
+            <ref role="3uigEE" node="2J$kxDHVq4U" resolve="Token.ConstraintRule" />
+          </node>
+          <node concept="3Tmbuc" id="2J$kxDHVqRn" role="1B3o_S" />
+          <node concept="3clFbS" id="2J$kxDHVqQ3" role="3clF47">
+            <node concept="3clFbF" id="2J$kxDHVqWK" role="3cqZAp">
+              <node concept="Xjq3P" id="2J$kxDHVqWJ" role="3clFbG" />
+            </node>
+          </node>
+          <node concept="2ZBi8u" id="2J$kxDHVt4u" role="lGtFl">
+            <ref role="2rW$FS" node="2J$kxDHV1tw" resolve="constraintRule_this" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="2J$kxDHVq4V" role="1B3o_S" />
+        <node concept="3uibUv" id="2J$kxDHVqq9" role="EKbjA">
+          <ref role="3uigEE" to="i348:36tQV5AurZW" resolve="ConstraintRuleTemplate" />
+        </node>
+        <node concept="2tJIrI" id="2J$kxDHVqCo" role="jymVt" />
+        <node concept="312cEg" id="2J$kxDHW1_A" role="jymVt">
+          <property role="TrG5h" value="logical" />
+          <node concept="3uibUv" id="2J$kxDHW1_B" role="1tU5fm">
+            <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+          </node>
+          <node concept="3Tm1VV" id="2J$kxDHW1_C" role="1B3o_S" />
+          <node concept="1WS0z7" id="2J$kxDHW1_D" role="lGtFl">
+            <node concept="3JmXsc" id="2J$kxDHW1_E" role="3Jn$fo">
+              <node concept="3clFbS" id="2J$kxDHW1_F" role="2VODD2">
+                <node concept="3clFbF" id="2J$kxDHW1_G" role="3cqZAp">
+                  <node concept="2OqwBi" id="2J$kxDHW1_H" role="3clFbG">
+                    <node concept="30H73N" id="2J$kxDHW1_I" role="2Oq$k0" />
+                    <node concept="2qgKlT" id="2J$kxDHW77U" role="2OqNvi">
+                      <ref role="37wK5l" to="x5bw:2J$kxDHW6DA" resolve="localContextNames" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1sPUBX" id="2J$kxDHW1_K" role="lGtFl">
+            <ref role="v9R2y" node="452KZTbxEFE" resolve="contextName_field_declaration" />
+          </node>
+        </node>
+        <node concept="2tJIrI" id="2J$kxDHW3V9" role="jymVt" />
+        <node concept="raruj" id="2J$kxDHVqFh" role="lGtFl" />
+        <node concept="2ZBi8u" id="2J$kxDHVuyC" role="lGtFl">
+          <ref role="2rW$FS" node="2J$kxDHVt6s" resolve="constraintRule_class" />
+        </node>
+        <node concept="17Uvod" id="2J$kxDHVMrf" role="lGtFl">
+          <property role="2qtEX9" value="name" />
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <node concept="3zFVjK" id="2J$kxDHVMrg" role="3zH0cK">
+            <node concept="3clFbS" id="2J$kxDHVMrh" role="2VODD2">
+              <node concept="3cpWs8" id="2J$kxDHVOgB" role="3cqZAp">
+                <node concept="3cpWsn" id="2J$kxDHVOgC" role="3cpWs9">
+                  <property role="TrG5h" value="tpl" />
+                  <node concept="3Tqbb2" id="2J$kxDHVOgD" role="1tU5fm">
+                    <ref role="ehGHo" to="wq2x:6OXbTDyHcuD" resolve="Template" />
+                  </node>
+                  <node concept="2OqwBi" id="2J$kxDHVOgE" role="33vP2m">
+                    <node concept="30H73N" id="2J$kxDHVOgF" role="2Oq$k0" />
+                    <node concept="2Xjw5R" id="2J$kxDHVOgG" role="2OqNvi">
+                      <node concept="1xMEDy" id="2J$kxDHVOgH" role="1xVPHs">
+                        <node concept="chp4Y" id="2J$kxDHYOWs" role="ri$Ld">
+                          <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="2J$kxDHVOgJ" role="3cqZAp" />
+              <node concept="3cpWs8" id="2J$kxDHVOgK" role="3cqZAp">
+                <node concept="3cpWsn" id="2J$kxDHVOgL" role="3cpWs9">
+                  <property role="TrG5h" value="rtRules" />
+                  <node concept="2OqwBi" id="2J$kxDHVOgM" role="33vP2m">
+                    <node concept="37vLTw" id="2J$kxDHVOgN" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2J$kxDHVOgC" resolve="tpl" />
+                    </node>
+                    <node concept="2Rf3mk" id="2J$kxDHVOgO" role="2OqNvi">
+                      <node concept="1xMEDy" id="2J$kxDHVOgP" role="1xVPHs">
+                        <node concept="chp4Y" id="2J$kxDHVOgQ" role="ri$Ld">
+                          <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="A3Dl8" id="2J$kxDHVOgR" role="1tU5fm">
+                    <node concept="3Tqbb2" id="2J$kxDHVOgS" role="A3Ik2">
+                      <ref role="ehGHo" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="2J$kxDHVOgT" role="3cqZAp">
+                <node concept="3cpWsn" id="2J$kxDHVOgU" role="3cpWs9">
+                  <property role="TrG5h" value="order" />
+                  <node concept="10Oyi0" id="2J$kxDHVOgV" role="1tU5fm" />
+                  <node concept="2OqwBi" id="2J$kxDHVOgW" role="33vP2m">
+                    <node concept="37vLTw" id="2J$kxDHVOgX" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2J$kxDHVOgL" resolve="rtRules" />
+                    </node>
+                    <node concept="2WmjW8" id="2J$kxDHVOgY" role="2OqNvi">
+                      <node concept="30H73N" id="2J$kxDHVOgZ" role="25WWJ7" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="2J$kxDHVOh0" role="3cqZAp">
+                <node concept="3K4zz7" id="2J$kxDHVOh1" role="3clFbG">
+                  <node concept="2OqwBi" id="2J$kxDHVOh2" role="3K4E3e">
+                    <node concept="37vLTw" id="2J$kxDHVOh3" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2J$kxDHVOgC" resolve="tpl" />
+                    </node>
+                    <node concept="3TrcHB" id="2J$kxDHVOh4" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                  </node>
+                  <node concept="3cpWs3" id="2J$kxDHVOh5" role="3K4GZi">
+                    <node concept="2OqwBi" id="2J$kxDHVOh6" role="3uHU7B">
+                      <node concept="37vLTw" id="2J$kxDHVOh7" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2J$kxDHVOgC" resolve="tpl" />
+                      </node>
+                      <node concept="3TrcHB" id="2J$kxDHVOh8" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="2J$kxDHVOh9" role="3uHU7w">
+                      <ref role="3cqZAo" node="2J$kxDHVOgU" resolve="order" />
+                    </node>
+                  </node>
+                  <node concept="3clFbC" id="2J$kxDHVOha" role="3K4Cdx">
+                    <node concept="3cmrfG" id="2J$kxDHVOhb" role="3uHU7w">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                    <node concept="37vLTw" id="2J$kxDHVOhc" role="3uHU7B">
+                      <ref role="3cqZAo" node="2J$kxDHVOgU" resolve="order" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2J$kxDHVq3F" role="jymVt" />
+      <node concept="3Tm1VV" id="2J$kxDHVpwA" role="1B3o_S" />
+      <node concept="3uibUv" id="2J$kxDHVpJI" role="1zkMxy">
+        <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index b7692a32..f361cc2e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -4,6 +4,7 @@
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -157,9 +158,6 @@
         <child id="1145567471833" name="createdType" index="2T96Bj" />
       </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>
       <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
         <reference id="1154546997487" name="concept" index="3gnhBz" />
       </concept>
@@ -292,13 +290,14 @@
   <node concept="13h7C7" id="75vUFrSKpqp">
     <property role="3GE5qa" value="rule.component" />
     <ref role="13h7C2" to="wq2x:6p0DfM0a3d3" resolve="RuleComponent" />
-    <node concept="13i0hz" id="3PWU9gizV6b" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="exportedLogicalVariable" />
-      <ref role="13i0hy" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-      <node concept="3Tm1VV" id="3PWU9gizV6c" role="1B3o_S" />
-      <node concept="3clFbS" id="3PWU9gizV6h" role="3clF47">
+    <node concept="13hLZK" id="75vUFrSKpqq" role="13h7CW">
+      <node concept="3clFbS" id="75vUFrSKpqr" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="5TXeSYSIrL8" role="13h7CS">
+      <property role="TrG5h" value="availableLogicalVariable" />
+      <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+      <node concept="3Tm1VV" id="5TXeSYSIrL9" role="1B3o_S" />
+      <node concept="3clFbS" id="5TXeSYSIrLf" role="3clF47">
         <node concept="3clFbF" id="PB1R3Y8Ylk" role="3cqZAp">
           <node concept="2OqwBi" id="7lt0LtPpP5o" role="3clFbG">
             <node concept="2OqwBi" id="7lt0LtPpP5p" role="2Oq$k0">
@@ -330,15 +329,12 @@
           </node>
         </node>
       </node>
-      <node concept="A3Dl8" id="3PWU9gi$65f" role="3clF45">
-        <node concept="3Tqbb2" id="3PWU9gi$6oD" role="A3Ik2">
+      <node concept="A3Dl8" id="5TXeSYSIrLg" role="3clF45">
+        <node concept="3Tqbb2" id="5TXeSYSIrLh" role="A3Ik2">
           <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
         </node>
       </node>
     </node>
-    <node concept="13hLZK" id="75vUFrSKpqq" role="13h7CW">
-      <node concept="3clFbS" id="75vUFrSKpqr" role="2VODD2" />
-    </node>
   </node>
   <node concept="13h7C7" id="1hX44vMIE6x">
     <ref role="13h7C2" to="wq2x:1hX44vMFoce" resolve="CodeBlock" />
@@ -464,13 +460,13 @@
     <node concept="13hLZK" id="7IysFeA8BcB" role="13h7CW">
       <node concept="3clFbS" id="7IysFeA8BcC" role="2VODD2" />
     </node>
-    <node concept="13i0hz" id="7IysFeA8Bdp" role="13h7CS">
+    <node concept="13i0hz" id="7IysFeA8BdB" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
-      <property role="TrG5h" value="exportedLogicalVariable" />
-      <ref role="13i0hy" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-      <node concept="3Tm1VV" id="7IysFeA8Bdq" role="1B3o_S" />
-      <node concept="3clFbS" id="7IysFeA8Bdw" role="3clF47">
+      <property role="TrG5h" value="availableLogicalVariable" />
+      <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+      <node concept="3Tm1VV" id="7IysFeA8BdC" role="1B3o_S" />
+      <node concept="3clFbS" id="7IysFeA8BdI" role="3clF47">
         <node concept="3clFbF" id="7IysFeA8Bja" role="3cqZAp">
           <node concept="2OqwBi" id="7IysFeA8DmN" role="3clFbG">
             <node concept="2OqwBi" id="7IysFeA8BqX" role="2Oq$k0">
@@ -502,28 +498,6 @@
           </node>
         </node>
       </node>
-      <node concept="A3Dl8" id="7IysFeA8Bdx" role="3clF45">
-        <node concept="3Tqbb2" id="7IysFeA8Bdy" role="A3Ik2">
-          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="7IysFeA8BdB" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="availableLogicalVariable" />
-      <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
-      <node concept="3Tm1VV" id="7IysFeA8BdC" role="1B3o_S" />
-      <node concept="3clFbS" id="7IysFeA8BdI" role="3clF47">
-        <node concept="3clFbF" id="7IysFeA8IsI" role="3cqZAp">
-          <node concept="2OqwBi" id="7IysFeA8IEE" role="3clFbG">
-            <node concept="13iPFW" id="7IysFeA8IsH" role="2Oq$k0" />
-            <node concept="2qgKlT" id="7IysFeA8IXE" role="2OqNvi">
-              <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="A3Dl8" id="7IysFeA8BdJ" role="3clF45">
         <node concept="3Tqbb2" id="7IysFeA8BdK" role="A3Ik2">
           <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
@@ -591,33 +565,6 @@
         </node>
       </node>
     </node>
-    <node concept="13i0hz" id="3AWu6Emeo_B" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="exportedLogicalVariable" />
-      <ref role="13i0hy" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-      <node concept="3Tm1VV" id="3AWu6Emeo_C" role="1B3o_S" />
-      <node concept="3clFbS" id="3AWu6Emeo_I" role="3clF47">
-        <node concept="3clFbF" id="3AWu6EmeoG2" role="3cqZAp">
-          <node concept="2OqwBi" id="3AWu6EmeplJ" role="3clFbG">
-            <node concept="2OqwBi" id="3AWu6EmeoPF" role="2Oq$k0">
-              <node concept="13iPFW" id="3AWu6EmeoG1" role="2Oq$k0" />
-              <node concept="3TrEf2" id="3AWu6Emep0S" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:7IysFe_ZQc2" resolve="body" />
-              </node>
-            </node>
-            <node concept="2qgKlT" id="3AWu6EmepDt" role="2OqNvi">
-              <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="A3Dl8" id="3AWu6Emeo_J" role="3clF45">
-        <node concept="3Tqbb2" id="3AWu6Emeo_K" role="A3Ik2">
-          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="13h7C7" id="1L74NXEmF9X">
     <property role="3GE5qa" value="macro.invoke" />
@@ -958,64 +905,6 @@
     <node concept="13hLZK" id="36tQV5Arwjs" role="13h7CW">
       <node concept="3clFbS" id="36tQV5Arwjt" role="2VODD2" />
     </node>
-    <node concept="13i0hz" id="36tQV5ArwjA" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="exportedLogicalVariable" />
-      <ref role="13i0hy" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-      <node concept="3Tm1VV" id="36tQV5ArwjB" role="1B3o_S" />
-      <node concept="3clFbS" id="36tQV5ArwjH" role="3clF47">
-        <node concept="3clFbF" id="7lt0LtPIAI_" role="3cqZAp">
-          <node concept="2OqwBi" id="7lt0LtPIBoo" role="3clFbG">
-            <node concept="2OqwBi" id="7lt0LtPICAE" role="2Oq$k0">
-              <node concept="2OqwBi" id="7lt0LtPICAF" role="2Oq$k0">
-                <node concept="2OqwBi" id="7lt0LtPICAG" role="2Oq$k0">
-                  <node concept="13iPFW" id="7lt0LtPICAH" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="7lt0LtPICAI" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:36tQV5AmIss" resolve="code" />
-                  </node>
-                </node>
-                <node concept="2Rf3mk" id="7lt0LtPICAJ" role="2OqNvi">
-                  <node concept="1xMEDy" id="7lt0LtPICAK" role="1xVPHs">
-                    <node concept="chp4Y" id="7lt0LtPICAL" role="ri$Ld">
-                      <ref role="cht4Q" to="wq2x:36tQV5AmIt0" resolve="ConstraintRuleStatement" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="13MTOL" id="7lt0LtPICAM" role="2OqNvi">
-                <ref role="13MTZf" to="wq2x:36tQV5AmIt1" resolve="rule" />
-              </node>
-            </node>
-            <node concept="3goQfb" id="7lt0LtPIBBl" role="2OqNvi">
-              <node concept="1bVj0M" id="7lt0LtPIBBn" role="23t8la">
-                <node concept="3clFbS" id="7lt0LtPIBBo" role="1bW5cS">
-                  <node concept="3clFbF" id="7lt0LtPIBHn" role="3cqZAp">
-                    <node concept="2OqwBi" id="7lt0LtPIBX7" role="3clFbG">
-                      <node concept="37vLTw" id="7lt0LtPIBHm" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7lt0LtPIBBp" resolve="it" />
-                      </node>
-                      <node concept="2qgKlT" id="7lt0LtPICj1" role="2OqNvi">
-                        <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Rh6nW" id="7lt0LtPIBBp" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7lt0LtPIBBq" role="1tU5fm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="A3Dl8" id="36tQV5ArwjI" role="3clF45">
-        <node concept="3Tqbb2" id="36tQV5ArwjJ" role="A3Ik2">
-          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
-        </node>
-      </node>
-    </node>
     <node concept="13i0hz" id="36tQV5ArwjO" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
@@ -1023,13 +912,8 @@
       <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
       <node concept="3Tm1VV" id="36tQV5ArwjP" role="1B3o_S" />
       <node concept="3clFbS" id="36tQV5ArwjV" role="3clF47">
-        <node concept="3clFbF" id="36tQV5ArwPu" role="3cqZAp">
-          <node concept="2OqwBi" id="36tQV5ArwPv" role="3clFbG">
-            <node concept="13iPFW" id="36tQV5ArwPw" role="2Oq$k0" />
-            <node concept="2qgKlT" id="36tQV5ArwPx" role="2OqNvi">
-              <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-            </node>
-          </node>
+        <node concept="3clFbF" id="5TXeSYT3c7u" role="3cqZAp">
+          <node concept="10Nm6u" id="5TXeSYT3c7t" role="3clFbG" />
         </node>
       </node>
       <node concept="A3Dl8" id="36tQV5ArwjW" role="3clF45">
@@ -1038,24 +922,6 @@
         </node>
       </node>
     </node>
-    <node concept="13i0hz" id="36tQV5ArwpJ" role="13h7CS">
-      <property role="TrG5h" value="localContextNames" />
-      <property role="13i0it" value="false" />
-      <property role="13i0iv" value="false" />
-      <node concept="3Tm1VV" id="36tQV5ArwpK" role="1B3o_S" />
-      <node concept="3clFbS" id="36tQV5ArwpL" role="3clF47">
-        <node concept="3clFbF" id="36tQV5As2Yc" role="3cqZAp">
-          <node concept="BsUDl" id="36tQV5As2Ye" role="3clFbG">
-            <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-          </node>
-        </node>
-      </node>
-      <node concept="A3Dl8" id="36tQV5Arwqg" role="3clF45">
-        <node concept="3Tqbb2" id="36tQV5Arwqh" role="A3Ik2">
-          <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="13h7C7" id="36tQV5ArDPG">
     <property role="3GE5qa" value="rule" />
@@ -1063,13 +929,13 @@
     <node concept="13hLZK" id="36tQV5ArDPH" role="13h7CW">
       <node concept="3clFbS" id="36tQV5ArDPI" role="2VODD2" />
     </node>
-    <node concept="13i0hz" id="7lt0LtPInTD" role="13h7CS">
+    <node concept="13i0hz" id="7lt0LtPInTR" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
-      <property role="TrG5h" value="exportedLogicalVariable" />
-      <ref role="13i0hy" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-      <node concept="3Tm1VV" id="7lt0LtPInTE" role="1B3o_S" />
-      <node concept="3clFbS" id="7lt0LtPInTK" role="3clF47">
+      <property role="TrG5h" value="availableLogicalVariable" />
+      <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+      <node concept="3Tm1VV" id="7lt0LtPInTS" role="1B3o_S" />
+      <node concept="3clFbS" id="7lt0LtPInTY" role="3clF47">
         <node concept="3cpWs8" id="7lt0LtPIy7m" role="3cqZAp">
           <node concept="3cpWsn" id="7lt0LtPIy7n" role="3cpWs9">
             <property role="TrG5h" value="varDecls" />
@@ -1093,8 +959,8 @@
                         <node concept="37vLTw" id="7lt0LtPIy7z" role="2Oq$k0">
                           <ref role="3cqZAo" node="7lt0LtPIy7_" resolve="hd" />
                         </node>
-                        <node concept="2qgKlT" id="7lt0LtPIy7$" role="2OqNvi">
-                          <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
+                        <node concept="2qgKlT" id="5TXeSYSxOKn" role="2OqNvi">
+                          <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                         </node>
                       </node>
                     </node>
@@ -1129,8 +995,8 @@
                           <node concept="37vLTw" id="7lt0LtPIy7O" role="2Oq$k0">
                             <ref role="3cqZAo" node="7lt0LtPIy7Q" resolve="it" />
                           </node>
-                          <node concept="2qgKlT" id="7lt0LtPIy7P" role="2OqNvi">
-                            <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
+                          <node concept="2qgKlT" id="5TXeSYSxPiA" role="2OqNvi">
+                            <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                           </node>
                         </node>
                       </node>
@@ -1146,28 +1012,6 @@
           </node>
         </node>
       </node>
-      <node concept="A3Dl8" id="7lt0LtPInTL" role="3clF45">
-        <node concept="3Tqbb2" id="7lt0LtPInTM" role="A3Ik2">
-          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
-        </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="7lt0LtPInTR" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="availableLogicalVariable" />
-      <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
-      <node concept="3Tm1VV" id="7lt0LtPInTS" role="1B3o_S" />
-      <node concept="3clFbS" id="7lt0LtPInTY" role="3clF47">
-        <node concept="3clFbF" id="7lt0LtPI_c3" role="3cqZAp">
-          <node concept="2OqwBi" id="7lt0LtPI_mg" role="3clFbG">
-            <node concept="13iPFW" id="7lt0LtPI_c2" role="2Oq$k0" />
-            <node concept="2qgKlT" id="7lt0LtPI_BJ" role="2OqNvi">
-              <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="A3Dl8" id="7lt0LtPInTZ" role="3clF45">
         <node concept="3Tqbb2" id="7lt0LtPInU0" role="A3Ik2">
           <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
@@ -1213,6 +1057,24 @@
         </node>
       </node>
     </node>
+    <node concept="13i0hz" id="2J$kxDHW6DA" role="13h7CS">
+      <property role="TrG5h" value="localContextNames" />
+      <property role="13i0it" value="false" />
+      <property role="13i0iv" value="false" />
+      <node concept="3Tm1VV" id="2J$kxDHW6DB" role="1B3o_S" />
+      <node concept="3clFbS" id="2J$kxDHW6DC" role="3clF47">
+        <node concept="3clFbF" id="2J$kxDHW6DD" role="3cqZAp">
+          <node concept="BsUDl" id="2J$kxDI0NDW" role="3clFbG">
+            <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="2J$kxDHW6DF" role="3clF45">
+        <node concept="3Tqbb2" id="2J$kxDHW6DG" role="A3Ik2">
+          <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="13h7C7" id="7lt0LtPpOZD">
     <property role="3GE5qa" value="rule.component" />
@@ -1220,13 +1082,11 @@
     <node concept="13hLZK" id="7lt0LtPpOZE" role="13h7CW">
       <node concept="3clFbS" id="7lt0LtPpOZF" role="2VODD2" />
     </node>
-    <node concept="13i0hz" id="7lt0LtPpOZO" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="exportedLogicalVariable" />
-      <ref role="13i0hy" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-      <node concept="3Tm1VV" id="7lt0LtPpOZP" role="1B3o_S" />
-      <node concept="3clFbS" id="7lt0LtPpOZV" role="3clF47">
+    <node concept="13i0hz" id="5TXeSYSxSF9" role="13h7CS">
+      <property role="TrG5h" value="availableLogicalVariable" />
+      <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+      <node concept="3Tm1VV" id="5TXeSYSxSFa" role="1B3o_S" />
+      <node concept="3clFbS" id="5TXeSYSxSFg" role="3clF47">
         <node concept="3clFbF" id="7lt0LtPpPoS" role="3cqZAp">
           <node concept="2OqwBi" id="7lt0LtPpPoT" role="3clFbG">
             <node concept="2OqwBi" id="7lt0LtPpPoU" role="2Oq$k0">
@@ -1258,8 +1118,8 @@
           </node>
         </node>
       </node>
-      <node concept="A3Dl8" id="7lt0LtPpOZW" role="3clF45">
-        <node concept="3Tqbb2" id="7lt0LtPpOZX" role="A3Ik2">
+      <node concept="A3Dl8" id="5TXeSYSxSFh" role="3clF45">
+        <node concept="3Tqbb2" id="5TXeSYSxSFi" role="A3Ik2">
           <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
         </node>
       </node>
@@ -1406,64 +1266,6 @@
   <node concept="13h7C7" id="6OXbTDz3CCF">
     <property role="3GE5qa" value="query" />
     <ref role="13h7C2" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
-    <node concept="13i0hz" id="6OXbTDz3CCQ" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="exportedLogicalVariable" />
-      <ref role="13i0hy" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-      <node concept="3Tm1VV" id="6OXbTDz3CCR" role="1B3o_S" />
-      <node concept="3clFbS" id="6OXbTDz3CCS" role="3clF47">
-        <node concept="3clFbF" id="6OXbTDz3CCT" role="3cqZAp">
-          <node concept="2OqwBi" id="6OXbTDz3CCU" role="3clFbG">
-            <node concept="2OqwBi" id="6OXbTDz3CCV" role="2Oq$k0">
-              <node concept="2OqwBi" id="6OXbTDz3CCW" role="2Oq$k0">
-                <node concept="2OqwBi" id="6OXbTDz3CCX" role="2Oq$k0">
-                  <node concept="13iPFW" id="6OXbTDz3CCY" role="2Oq$k0" />
-                  <node concept="3TrEf2" id="6OXbTDz3CCZ" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:6OXbTDyyU9U" resolve="code" />
-                  </node>
-                </node>
-                <node concept="2Rf3mk" id="6OXbTDz3CD0" role="2OqNvi">
-                  <node concept="1xMEDy" id="6OXbTDz3CD1" role="1xVPHs">
-                    <node concept="chp4Y" id="6OXbTDz3CD2" role="ri$Ld">
-                      <ref role="cht4Q" to="wq2x:36tQV5AmIt0" resolve="ConstraintRuleStatement" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="13MTOL" id="6OXbTDz3CD3" role="2OqNvi">
-                <ref role="13MTZf" to="wq2x:36tQV5AmIt1" resolve="rule" />
-              </node>
-            </node>
-            <node concept="3goQfb" id="6OXbTDz3CD4" role="2OqNvi">
-              <node concept="1bVj0M" id="6OXbTDz3CD5" role="23t8la">
-                <node concept="3clFbS" id="6OXbTDz3CD6" role="1bW5cS">
-                  <node concept="3clFbF" id="6OXbTDz3CD7" role="3cqZAp">
-                    <node concept="2OqwBi" id="6OXbTDz3CD8" role="3clFbG">
-                      <node concept="37vLTw" id="6OXbTDz3CD9" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6OXbTDz3CDb" resolve="it" />
-                      </node>
-                      <node concept="2qgKlT" id="6OXbTDz3CDa" role="2OqNvi">
-                        <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Rh6nW" id="6OXbTDz3CDb" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6OXbTDz3CDc" role="1tU5fm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="A3Dl8" id="6OXbTDz3CDd" role="3clF45">
-        <node concept="3Tqbb2" id="6OXbTDz3CDe" role="A3Ik2">
-          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
-        </node>
-      </node>
-    </node>
     <node concept="13i0hz" id="6OXbTDz3CDf" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
@@ -1471,13 +1273,8 @@
       <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
       <node concept="3Tm1VV" id="6OXbTDz3CDg" role="1B3o_S" />
       <node concept="3clFbS" id="6OXbTDz3CDh" role="3clF47">
-        <node concept="3clFbF" id="6OXbTDz3CDi" role="3cqZAp">
-          <node concept="2OqwBi" id="6OXbTDz3CDj" role="3clFbG">
-            <node concept="13iPFW" id="6OXbTDz3CDk" role="2Oq$k0" />
-            <node concept="2qgKlT" id="6OXbTDz3CDl" role="2OqNvi">
-              <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-            </node>
-          </node>
+        <node concept="3clFbF" id="5TXeSYT3c0U" role="3cqZAp">
+          <node concept="10Nm6u" id="5TXeSYT3c0T" role="3clFbG" />
         </node>
       </node>
       <node concept="A3Dl8" id="6OXbTDz3CDm" role="3clF45">
@@ -1486,24 +1283,6 @@
         </node>
       </node>
     </node>
-    <node concept="13i0hz" id="6OXbTDz3CDo" role="13h7CS">
-      <property role="TrG5h" value="localContextNames" />
-      <property role="13i0it" value="false" />
-      <property role="13i0iv" value="false" />
-      <node concept="3Tm1VV" id="6OXbTDz3CDp" role="1B3o_S" />
-      <node concept="3clFbS" id="6OXbTDz3CDq" role="3clF47">
-        <node concept="3clFbF" id="6OXbTDz3CDr" role="3cqZAp">
-          <node concept="BsUDl" id="6OXbTDz3CDs" role="3clFbG">
-            <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
-          </node>
-        </node>
-      </node>
-      <node concept="A3Dl8" id="6OXbTDz3CDt" role="3clF45">
-        <node concept="3Tqbb2" id="6OXbTDz3CDu" role="A3Ik2">
-          <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
-        </node>
-      </node>
-    </node>
     <node concept="13hLZK" id="6OXbTDz3CCG" role="13h7CW">
       <node concept="3clFbS" id="6OXbTDz3CCH" role="2VODD2" />
     </node>
@@ -1583,5 +1362,32 @@
       </node>
     </node>
   </node>
+  <node concept="13h7C7" id="5TXeSYSAm_6">
+    <property role="3GE5qa" value="constraint.variable" />
+    <ref role="13h7C2" to="wq2x:2E5lcNn5Ub2" resolve="LocalDeclarationStatement" />
+    <node concept="13hLZK" id="5TXeSYSAm_7" role="13h7CW">
+      <node concept="3clFbS" id="5TXeSYSAm_8" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="5TXeSYSAmKS" role="13h7CS">
+      <property role="TrG5h" value="availableLogicalVariable" />
+      <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+      <node concept="3Tm1VV" id="5TXeSYSAmKT" role="1B3o_S" />
+      <node concept="3clFbS" id="5TXeSYSAmKZ" role="3clF47">
+        <node concept="3clFbF" id="5TXeSYSAoxs" role="3cqZAp">
+          <node concept="2OqwBi" id="5TXeSYSAoJR" role="3clFbG">
+            <node concept="13iPFW" id="5TXeSYSAoxr" role="2Oq$k0" />
+            <node concept="3Tsc0h" id="5TXeSYSAp8i" role="2OqNvi">
+              <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="5TXeSYSAmL0" role="3clF45">
+        <node concept="3Tqbb2" id="5TXeSYSAmL1" role="A3Ik2">
+          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+        </node>
+      </node>
+    </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 8b09116e..1454380e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -1264,6 +1264,9 @@
     <property role="EcuMT" value="3063948360254202562" />
     <ref role="1TJDcQ" node="2E5lcNn8iYG" resolve="LogicVariableDeclarationStatement" />
     <node concept="asaX9" id="4nIWweBB$7z" role="lGtFl" />
+    <node concept="PrWs8" id="5TXeSYSAmha" role="PzmwI">
+      <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
+    </node>
   </node>
   <node concept="1TIwiD" id="72RDgINeSQJ">
     <property role="EcuMT" value="8122141922656226735" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
index 8d126406..2d54bd95 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -209,22 +209,6 @@
   <node concept="13h7C7" id="7E86$tKAuhI">
     <property role="3GE5qa" value="logical.variable" />
     <ref role="13h7C2" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
-    <node concept="13i0hz" id="7E86$tKAujJ" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="true" />
-      <property role="TrG5h" value="exportedLogicalVariable" />
-      <node concept="3Tm1VV" id="7E86$tKAujK" role="1B3o_S" />
-      <node concept="A3Dl8" id="3PWU9gi$5Wx" role="3clF45">
-        <node concept="3Tqbb2" id="3PWU9gi$5WL" role="A3Ik2">
-          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="7E86$tKAujM" role="3clF47">
-        <node concept="3clFbF" id="7E86$tKAuA2" role="3cqZAp">
-          <node concept="10Nm6u" id="7E86$tKAuA1" role="3clFbG" />
-        </node>
-      </node>
-    </node>
     <node concept="13i0hz" id="6YKq674fNYS" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="true" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
index 25aa627e..a26591fb 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -22,13 +22,15 @@
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
+      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
+        <child id="1082485599096" name="statements" index="9aQI4" />
+      </concept>
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -76,6 +78,7 @@
       </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
         <child id="1206060520071" name="elsifClauses" index="3eNLev" />
@@ -176,6 +179,9 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
+        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
+      </concept>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -296,7 +302,6 @@
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
-      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
   </registry>
   <node concept="1M2fIO" id="3qvzBqWDzqQ">
@@ -543,94 +548,69 @@
                 </node>
                 <node concept="3clFbS" id="6fXjIfxgfO_" role="1bW5cS">
                   <node concept="3clFbJ" id="6fXjIfxgfOA" role="3cqZAp">
-                    <node concept="3clFbS" id="6fXjIfxgfOB" role="3clFbx">
-                      <node concept="3clFbH" id="6fXjIfxgfOC" role="3cqZAp" />
-                      <node concept="3cpWs8" id="6fXjIfxgfOD" role="3cqZAp">
-                        <node concept="3cpWsn" id="6fXjIfxgfOE" role="3cpWs9">
+                    <node concept="2OqwBi" id="6fXjIfxgfQg" role="3clFbw">
+                      <node concept="37vLTw" id="6fXjIfxgfQh" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
+                      </node>
+                      <node concept="1mIQ4w" id="6fXjIfxgfQi" role="2OqNvi">
+                        <node concept="chp4Y" id="6fXjIfxgfQj" role="cj9EA">
+                          <ref role="cht4Q" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbS" id="6fXjIfxgfPC" role="3clFbx">
+                      <node concept="3clFbH" id="6fXjIfxgfPD" role="3cqZAp" />
+                      <node concept="3cpWs8" id="6fXjIfxgfPE" role="3cqZAp">
+                        <node concept="3cpWsn" id="6fXjIfxgfPF" role="3cpWs9">
                           <property role="TrG5h" value="childrenScope" />
-                          <node concept="3uibUv" id="6fXjIfxgfOF" role="1tU5fm">
+                          <node concept="3uibUv" id="6fXjIfxgfPG" role="1tU5fm">
                             <ref role="3uigEE" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                           </node>
-                          <node concept="2ShNRf" id="6fXjIfxgfOG" role="33vP2m">
-                            <node concept="YeOm9" id="6fXjIfxgfOH" role="2ShVmc">
-                              <node concept="1Y3b0j" id="6fXjIfxgfOI" role="YeSDq">
+                          <node concept="2ShNRf" id="6fXjIfxgfPH" role="33vP2m">
+                            <node concept="YeOm9" id="6fXjIfxgfPI" role="2ShVmc">
+                              <node concept="1Y3b0j" id="6fXjIfxgfPJ" role="YeSDq">
                                 <property role="2bfB8j" value="true" />
-                                <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
                                 <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
-                                <node concept="2tJIrI" id="6fXjIfxgfOJ" role="jymVt" />
-                                <node concept="2OqwBi" id="6fXjIfxgfOK" role="37wK5m">
-                                  <node concept="2OqwBi" id="6fXjIfxgfOL" role="2Oq$k0">
-                                    <node concept="2OqwBi" id="6fXjIfxgfOM" role="2Oq$k0">
-                                      <node concept="37vLTw" id="6fXjIfxgfON" role="2Oq$k0">
+                                <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
+                                <node concept="2OqwBi" id="6fXjIfxgfPK" role="37wK5m">
+                                  <node concept="2OqwBi" id="6fXjIfxgfPL" role="2Oq$k0">
+                                    <node concept="1PxgMI" id="6fXjIfxgfPM" role="2Oq$k0">
+                                      <node concept="37vLTw" id="6fXjIfxgfPN" role="1m5AlR">
                                         <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
                                       </node>
-                                      <node concept="32TBzR" id="6fXjIfxgfOO" role="2OqNvi" />
-                                    </node>
-                                    <node concept="3goQfb" id="6fXjIfxgfOP" role="2OqNvi">
-                                      <node concept="1bVj0M" id="6fXjIfxgfOQ" role="23t8la">
-                                        <node concept="3clFbS" id="6fXjIfxgfOR" role="1bW5cS">
-                                          <node concept="3clFbF" id="6fXjIfxgfOS" role="3cqZAp">
-                                            <node concept="2OqwBi" id="6fXjIfxgfOT" role="3clFbG">
-                                              <node concept="37vLTw" id="6fXjIfxgfOU" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="6fXjIfxgfOW" resolve="it" />
-                                              </node>
-                                              <node concept="32TBzR" id="6fXjIfxgfOV" role="2OqNvi" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                        <node concept="Rh6nW" id="6fXjIfxgfOW" role="1bW2Oz">
-                                          <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="6fXjIfxgfOX" role="1tU5fm" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3zZkjj" id="6fXjIfxgfOY" role="2OqNvi">
-                                    <node concept="1bVj0M" id="6fXjIfxgfOZ" role="23t8la">
-                                      <node concept="3clFbS" id="6fXjIfxgfP0" role="1bW5cS">
-                                        <node concept="3clFbF" id="6fXjIfxgfP1" role="3cqZAp">
-                                          <node concept="2OqwBi" id="6fXjIfxgfP2" role="3clFbG">
-                                            <node concept="37vLTw" id="6fXjIfxgfP3" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="6fXjIfxgfP6" resolve="chd" />
-                                            </node>
-                                            <node concept="1mIQ4w" id="6fXjIfxgfP4" role="2OqNvi">
-                                              <node concept="chp4Y" id="6fXjIfxgfP5" role="cj9EA">
-                                                <ref role="cht4Q" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="Rh6nW" id="6fXjIfxgfP6" role="1bW2Oz">
-                                        <property role="TrG5h" value="chd" />
-                                        <node concept="2jxLKc" id="6fXjIfxgfP7" role="1tU5fm" />
+                                      <node concept="chp4Y" id="6fXjIfxgndS" role="3oSUPX">
+                                        <ref role="cht4Q" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
                                       </node>
                                     </node>
+                                    <node concept="2qgKlT" id="6fXjIfxgfPO" role="2OqNvi">
+                                      <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                                    </node>
                                   </node>
+                                  <node concept="ANE8D" id="6fXjIfxgfPP" role="2OqNvi" />
                                 </node>
-                                <node concept="3Tm1VV" id="6fXjIfxgfP8" role="1B3o_S" />
-                                <node concept="3clFb_" id="6fXjIfxgfP9" role="jymVt">
+                                <node concept="3Tm1VV" id="6fXjIfxgfPQ" role="1B3o_S" />
+                                <node concept="3clFb_" id="6fXjIfxgfPR" role="jymVt">
                                   <property role="1EzhhJ" value="false" />
                                   <property role="TrG5h" value="getName" />
-                                  <node concept="17QB3L" id="6fXjIfxgfPa" role="3clF45" />
-                                  <node concept="3Tm1VV" id="6fXjIfxgfPb" role="1B3o_S" />
-                                  <node concept="37vLTG" id="6fXjIfxgfPc" role="3clF46">
+                                  <node concept="17QB3L" id="6fXjIfxgfPS" role="3clF45" />
+                                  <node concept="3Tm1VV" id="6fXjIfxgfPT" role="1B3o_S" />
+                                  <node concept="37vLTG" id="6fXjIfxgfPU" role="3clF46">
                                     <property role="TrG5h" value="child" />
-                                    <node concept="3Tqbb2" id="6fXjIfxgfPd" role="1tU5fm" />
+                                    <node concept="3Tqbb2" id="6fXjIfxgfPV" role="1tU5fm" />
                                   </node>
-                                  <node concept="3clFbS" id="6fXjIfxgfPe" role="3clF47">
-                                    <node concept="3clFbF" id="6fXjIfxgfPf" role="3cqZAp">
-                                      <node concept="2OqwBi" id="6fXjIfxgfPg" role="3clFbG">
-                                        <node concept="1PxgMI" id="6fXjIfxgfPh" role="2Oq$k0">
+                                  <node concept="3clFbS" id="6fXjIfxgfPW" role="3clF47">
+                                    <node concept="3clFbF" id="6fXjIfxgfPX" role="3cqZAp">
+                                      <node concept="2OqwBi" id="6fXjIfxgfPY" role="3clFbG">
+                                        <node concept="1PxgMI" id="6fXjIfxgfPZ" role="2Oq$k0">
                                           <property role="1BlNFB" value="true" />
-                                          <node concept="37vLTw" id="6fXjIfxgfPi" role="1m5AlR">
-                                            <ref role="3cqZAo" node="6fXjIfxgfPc" resolve="child" />
+                                          <node concept="37vLTw" id="6fXjIfxgfQ0" role="1m5AlR">
+                                            <ref role="3cqZAo" node="6fXjIfxgfPU" resolve="child" />
                                           </node>
-                                          <node concept="chp4Y" id="6fXjIfxgndR" role="3oSUPX">
+                                          <node concept="chp4Y" id="6fXjIfxgndK" role="3oSUPX">
                                             <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                                           </node>
                                         </node>
-                                        <node concept="3TrcHB" id="6fXjIfxgfPj" role="2OqNvi">
+                                        <node concept="3TrcHB" id="6fXjIfxgfQ1" role="2OqNvi">
                                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                                         </node>
                                       </node>
@@ -642,34 +622,34 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbH" id="6fXjIfxgfPk" role="3cqZAp" />
-                      <node concept="3cpWs6" id="6fXjIfxgfPl" role="3cqZAp">
-                        <node concept="2YIFZM" id="6fXjIfxgfPm" role="3cqZAk">
-                          <ref role="1Pybhc" to="fnmy:3A2qfoxVUBF" resolve="Scopes" />
+                      <node concept="3clFbH" id="6fXjIfxgfQ2" role="3cqZAp" />
+                      <node concept="3cpWs6" id="6fXjIfxgfQ3" role="3cqZAp">
+                        <node concept="2YIFZM" id="6fXjIfxgfQ4" role="3cqZAk">
                           <ref role="37wK5l" to="fnmy:6Kqn2fZyoZp" resolve="defaultWithNameHiding" />
-                          <node concept="35c_gC" id="6fXjIfxgfPn" role="37wK5m">
+                          <ref role="1Pybhc" to="fnmy:3A2qfoxVUBF" resolve="Scopes" />
+                          <node concept="35c_gC" id="6fXjIfxgfQ5" role="37wK5m">
                             <ref role="35c_gD" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
                           </node>
-                          <node concept="37vLTw" id="6fXjIfxgfPo" role="37wK5m">
-                            <ref role="3cqZAo" node="6fXjIfxgfOE" resolve="childrenScope" />
+                          <node concept="37vLTw" id="6fXjIfxgfQ6" role="37wK5m">
+                            <ref role="3cqZAo" node="6fXjIfxgfPF" resolve="childrenScope" />
                           </node>
-                          <node concept="2Sg_IR" id="6fXjIfxgfPp" role="37wK5m">
-                            <node concept="37vLTw" id="6fXjIfxgfPq" role="2SgG2M">
+                          <node concept="2Sg_IR" id="6fXjIfxgfQ7" role="37wK5m">
+                            <node concept="37vLTw" id="6fXjIfxgfQ8" role="2SgG2M">
                               <ref role="3cqZAo" node="6fXjIfxgfOr" resolve="parentScope" />
                             </node>
-                            <node concept="2OqwBi" id="6fXjIfxgfPr" role="2SgHGx">
-                              <node concept="37vLTw" id="6fXjIfxgfPs" role="2Oq$k0">
+                            <node concept="2OqwBi" id="6fXjIfxgfQ9" role="2SgHGx">
+                              <node concept="37vLTw" id="6fXjIfxgfQa" role="2Oq$k0">
                                 <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
                               </node>
-                              <node concept="2Xjw5R" id="6fXjIfxgfPt" role="2OqNvi">
-                                <node concept="3gmYPX" id="6fXjIfxgfPu" role="1xVPHs">
-                                  <node concept="3gn64h" id="6fXjIfxgfPv" role="3gmYPZ">
-                                    <ref role="3gnhBz" to="tpee:fzclF80" resolve="StatementList" />
-                                  </node>
-                                  <node concept="3gn64h" id="6fXjIfxgfPw" role="3gmYPZ">
+                              <node concept="2Xjw5R" id="6fXjIfxgfQb" role="2OqNvi">
+                                <node concept="3gmYPX" id="6fXjIfxgfQc" role="1xVPHs">
+                                  <node concept="3gn64h" id="6fXjIfxgfQe" role="3gmYPZ">
                                     <ref role="3gnhBz" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
                                   </node>
-                                  <node concept="3gn64h" id="6fXjIfxgfPx" role="3gmYPZ">
+                                  <node concept="3gn64h" id="5TXeSYSL7mk" role="3gmYPZ">
+                                    <ref role="3gnhBz" to="tpee:fzclF80" resolve="StatementList" />
+                                  </node>
+                                  <node concept="3gn64h" id="6fXjIfxgfQf" role="3gmYPZ">
                                     <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                   </node>
                                 </node>
@@ -678,72 +658,101 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbH" id="6fXjIfxgfPy" role="3cqZAp" />
+                      <node concept="3clFbH" id="5TXeSYSA8iw" role="3cqZAp" />
                     </node>
-                    <node concept="2OqwBi" id="6fXjIfxgfPz" role="3clFbw">
-                      <node concept="37vLTw" id="6fXjIfxgfP$" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
-                      </node>
-                      <node concept="1mIQ4w" id="6fXjIfxgfP_" role="2OqNvi">
-                        <node concept="chp4Y" id="6fXjIfxgfPA" role="cj9EA">
-                          <ref role="cht4Q" to="tpee:fzclF80" resolve="StatementList" />
+                    <node concept="9aQIb" id="5TXeSYSA7GN" role="9aQIa">
+                      <node concept="3clFbS" id="5TXeSYSA7GO" role="9aQI4">
+                        <node concept="3cpWs6" id="5TXeSYSA7VE" role="3cqZAp">
+                          <node concept="10Nm6u" id="5TXeSYSA7VF" role="3cqZAk" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3eNFk2" id="6fXjIfxgfPB" role="3eNLev">
-                      <node concept="3clFbS" id="6fXjIfxgfPC" role="3eOfB_">
-                        <node concept="3clFbH" id="6fXjIfxgfPD" role="3cqZAp" />
-                        <node concept="3cpWs8" id="6fXjIfxgfPE" role="3cqZAp">
-                          <node concept="3cpWsn" id="6fXjIfxgfPF" role="3cpWs9">
+                    <node concept="3eNFk2" id="5TXeSYSL93i" role="3eNLev">
+                      <node concept="2OqwBi" id="5TXeSYSL9IF" role="3eO9$A">
+                        <node concept="37vLTw" id="5TXeSYSL9je" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
+                        </node>
+                        <node concept="1mIQ4w" id="5TXeSYSLa44" role="2OqNvi">
+                          <node concept="chp4Y" id="5TXeSYSLagr" role="cj9EA">
+                            <ref role="cht4Q" to="tpee:fzclF80" resolve="StatementList" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbS" id="5TXeSYSL93k" role="3eOfB_">
+                        <node concept="3clFbH" id="5TXeSYSLav_" role="3cqZAp" />
+                        <node concept="3cpWs8" id="5TXeSYSLaRF" role="3cqZAp">
+                          <node concept="3cpWsn" id="5TXeSYSLaRG" role="3cpWs9">
                             <property role="TrG5h" value="childrenScope" />
-                            <node concept="3uibUv" id="6fXjIfxgfPG" role="1tU5fm">
+                            <node concept="3uibUv" id="5TXeSYSLaRH" role="1tU5fm">
                               <ref role="3uigEE" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                             </node>
-                            <node concept="2ShNRf" id="6fXjIfxgfPH" role="33vP2m">
-                              <node concept="YeOm9" id="6fXjIfxgfPI" role="2ShVmc">
-                                <node concept="1Y3b0j" id="6fXjIfxgfPJ" role="YeSDq">
+                            <node concept="2ShNRf" id="5TXeSYSLaRI" role="33vP2m">
+                              <node concept="YeOm9" id="5TXeSYSLaRJ" role="2ShVmc">
+                                <node concept="1Y3b0j" id="5TXeSYSLaRK" role="YeSDq">
                                   <property role="2bfB8j" value="true" />
-                                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                                   <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                                  <node concept="2OqwBi" id="6fXjIfxgfPK" role="37wK5m">
-                                    <node concept="2OqwBi" id="6fXjIfxgfPL" role="2Oq$k0">
-                                      <node concept="1PxgMI" id="6fXjIfxgfPM" role="2Oq$k0">
-                                        <node concept="37vLTw" id="6fXjIfxgfPN" role="1m5AlR">
-                                          <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
+                                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
+                                  <node concept="2OqwBi" id="5TXeSYSLaRL" role="37wK5m">
+                                    <node concept="ANE8D" id="5TXeSYSLaRR" role="2OqNvi" />
+                                    <node concept="2OqwBi" id="5TXeSYSLhAk" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="5TXeSYSLeXa" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="5TXeSYSLdt5" role="2Oq$k0">
+                                          <node concept="37vLTw" id="5TXeSYSLcUJ" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
+                                          </node>
+                                          <node concept="32TBzR" id="5TXeSYSLdRv" role="2OqNvi" />
                                         </node>
-                                        <node concept="chp4Y" id="6fXjIfxgndS" role="3oSUPX">
-                                          <ref role="cht4Q" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
+                                        <node concept="v3k3i" id="5TXeSYSLg21" role="2OqNvi">
+                                          <node concept="chp4Y" id="rAc95LZxIf" role="v3oSu">
+                                            <ref role="cht4Q" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
+                                          </node>
                                         </node>
                                       </node>
-                                      <node concept="2qgKlT" id="6fXjIfxgfPO" role="2OqNvi">
-                                        <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                                      <node concept="3goQfb" id="5TXeSYSLifH" role="2OqNvi">
+                                        <node concept="1bVj0M" id="5TXeSYSLifJ" role="23t8la">
+                                          <node concept="3clFbS" id="5TXeSYSLifK" role="1bW5cS">
+                                            <node concept="3clFbF" id="5TXeSYSLiBz" role="3cqZAp">
+                                              <node concept="2OqwBi" id="5TXeSYSLaRM" role="3clFbG">
+                                                <node concept="37vLTw" id="5TXeSYSLjnX" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="5TXeSYSLifL" resolve="it" />
+                                                </node>
+                                                <node concept="2qgKlT" id="5TXeSYSLqFn" role="2OqNvi">
+                                                  <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="Rh6nW" id="5TXeSYSLifL" role="1bW2Oz">
+                                            <property role="TrG5h" value="it" />
+                                            <node concept="2jxLKc" id="5TXeSYSLifM" role="1tU5fm" />
+                                          </node>
+                                        </node>
                                       </node>
                                     </node>
-                                    <node concept="ANE8D" id="6fXjIfxgfPP" role="2OqNvi" />
                                   </node>
-                                  <node concept="3Tm1VV" id="6fXjIfxgfPQ" role="1B3o_S" />
-                                  <node concept="3clFb_" id="6fXjIfxgfPR" role="jymVt">
+                                  <node concept="3Tm1VV" id="5TXeSYSLaRS" role="1B3o_S" />
+                                  <node concept="3clFb_" id="5TXeSYSLaRT" role="jymVt">
                                     <property role="1EzhhJ" value="false" />
                                     <property role="TrG5h" value="getName" />
-                                    <node concept="17QB3L" id="6fXjIfxgfPS" role="3clF45" />
-                                    <node concept="3Tm1VV" id="6fXjIfxgfPT" role="1B3o_S" />
-                                    <node concept="37vLTG" id="6fXjIfxgfPU" role="3clF46">
+                                    <node concept="17QB3L" id="5TXeSYSLaRU" role="3clF45" />
+                                    <node concept="3Tm1VV" id="5TXeSYSLaRV" role="1B3o_S" />
+                                    <node concept="37vLTG" id="5TXeSYSLaRW" role="3clF46">
                                       <property role="TrG5h" value="child" />
-                                      <node concept="3Tqbb2" id="6fXjIfxgfPV" role="1tU5fm" />
+                                      <node concept="3Tqbb2" id="5TXeSYSLaRX" role="1tU5fm" />
                                     </node>
-                                    <node concept="3clFbS" id="6fXjIfxgfPW" role="3clF47">
-                                      <node concept="3clFbF" id="6fXjIfxgfPX" role="3cqZAp">
-                                        <node concept="2OqwBi" id="6fXjIfxgfPY" role="3clFbG">
-                                          <node concept="1PxgMI" id="6fXjIfxgfPZ" role="2Oq$k0">
+                                    <node concept="3clFbS" id="5TXeSYSLaRY" role="3clF47">
+                                      <node concept="3clFbF" id="5TXeSYSLaRZ" role="3cqZAp">
+                                        <node concept="2OqwBi" id="5TXeSYSLaS0" role="3clFbG">
+                                          <node concept="1PxgMI" id="5TXeSYSLaS1" role="2Oq$k0">
                                             <property role="1BlNFB" value="true" />
-                                            <node concept="37vLTw" id="6fXjIfxgfQ0" role="1m5AlR">
-                                              <ref role="3cqZAo" node="6fXjIfxgfPU" resolve="child" />
+                                            <node concept="37vLTw" id="5TXeSYSLaS2" role="1m5AlR">
+                                              <ref role="3cqZAo" node="5TXeSYSLaRW" resolve="child" />
                                             </node>
-                                            <node concept="chp4Y" id="6fXjIfxgndK" role="3oSUPX">
+                                            <node concept="chp4Y" id="5TXeSYSLaS3" role="3oSUPX">
                                               <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
                                             </node>
                                           </node>
-                                          <node concept="3TrcHB" id="6fXjIfxgfQ1" role="2OqNvi">
+                                          <node concept="3TrcHB" id="5TXeSYSLaS4" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                                           </node>
                                         </node>
@@ -755,34 +764,34 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbH" id="6fXjIfxgfQ2" role="3cqZAp" />
-                        <node concept="3cpWs6" id="6fXjIfxgfQ3" role="3cqZAp">
-                          <node concept="2YIFZM" id="6fXjIfxgfQ4" role="3cqZAk">
+                        <node concept="3clFbH" id="5TXeSYSLaS5" role="3cqZAp" />
+                        <node concept="3cpWs6" id="5TXeSYSLaS6" role="3cqZAp">
+                          <node concept="2YIFZM" id="5TXeSYSLaS7" role="3cqZAk">
                             <ref role="37wK5l" to="fnmy:6Kqn2fZyoZp" resolve="defaultWithNameHiding" />
                             <ref role="1Pybhc" to="fnmy:3A2qfoxVUBF" resolve="Scopes" />
-                            <node concept="35c_gC" id="6fXjIfxgfQ5" role="37wK5m">
+                            <node concept="35c_gC" id="5TXeSYSLaS8" role="37wK5m">
                               <ref role="35c_gD" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
                             </node>
-                            <node concept="37vLTw" id="6fXjIfxgfQ6" role="37wK5m">
-                              <ref role="3cqZAo" node="6fXjIfxgfPF" resolve="childrenScope" />
+                            <node concept="37vLTw" id="5TXeSYSLaS9" role="37wK5m">
+                              <ref role="3cqZAo" node="5TXeSYSLaRG" resolve="childrenScope" />
                             </node>
-                            <node concept="2Sg_IR" id="6fXjIfxgfQ7" role="37wK5m">
-                              <node concept="37vLTw" id="6fXjIfxgfQ8" role="2SgG2M">
+                            <node concept="2Sg_IR" id="5TXeSYSLaSa" role="37wK5m">
+                              <node concept="37vLTw" id="5TXeSYSLaSb" role="2SgG2M">
                                 <ref role="3cqZAo" node="6fXjIfxgfOr" resolve="parentScope" />
                               </node>
-                              <node concept="2OqwBi" id="6fXjIfxgfQ9" role="2SgHGx">
-                                <node concept="37vLTw" id="6fXjIfxgfQa" role="2Oq$k0">
+                              <node concept="2OqwBi" id="5TXeSYSLaSc" role="2SgHGx">
+                                <node concept="37vLTw" id="5TXeSYSLaSd" role="2Oq$k0">
                                   <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
                                 </node>
-                                <node concept="2Xjw5R" id="6fXjIfxgfQb" role="2OqNvi">
-                                  <node concept="3gmYPX" id="6fXjIfxgfQc" role="1xVPHs">
-                                    <node concept="3gn64h" id="6fXjIfxgfQd" role="3gmYPZ">
-                                      <ref role="3gnhBz" to="tpee:fzclF80" resolve="StatementList" />
-                                    </node>
-                                    <node concept="3gn64h" id="6fXjIfxgfQe" role="3gmYPZ">
+                                <node concept="2Xjw5R" id="5TXeSYSLaSe" role="2OqNvi">
+                                  <node concept="3gmYPX" id="5TXeSYSLaSf" role="1xVPHs">
+                                    <node concept="3gn64h" id="5TXeSYSLaSg" role="3gmYPZ">
                                       <ref role="3gnhBz" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
                                     </node>
-                                    <node concept="3gn64h" id="6fXjIfxgfQf" role="3gmYPZ">
+                                    <node concept="3gn64h" id="5TXeSYSLaSh" role="3gmYPZ">
+                                      <ref role="3gnhBz" to="tpee:fzclF80" resolve="StatementList" />
+                                    </node>
+                                    <node concept="3gn64h" id="5TXeSYSLaSi" role="3gmYPZ">
                                       <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                     </node>
                                   </node>
@@ -791,23 +800,12 @@
                             </node>
                           </node>
                         </node>
-                      </node>
-                      <node concept="2OqwBi" id="6fXjIfxgfQg" role="3eO9$A">
-                        <node concept="37vLTw" id="6fXjIfxgfQh" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6fXjIfxgfOz" resolve="container" />
-                        </node>
-                        <node concept="1mIQ4w" id="6fXjIfxgfQi" role="2OqNvi">
-                          <node concept="chp4Y" id="6fXjIfxgfQj" role="cj9EA">
-                            <ref role="cht4Q" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
-                          </node>
-                        </node>
+                        <node concept="3clFbH" id="5TXeSYSLavE" role="3cqZAp" />
+                        <node concept="3clFbH" id="5TXeSYSLavK" role="3cqZAp" />
                       </node>
                     </node>
                   </node>
                   <node concept="3clFbH" id="6fXjIfxgfQk" role="3cqZAp" />
-                  <node concept="3clFbF" id="6fXjIfxgfQl" role="3cqZAp">
-                    <node concept="10Nm6u" id="6fXjIfxgfQm" role="3clFbG" />
-                  </node>
                 </node>
               </node>
               <node concept="37vLTw" id="6fXjIfxgfQn" role="37vLTJ">
@@ -825,12 +823,12 @@
                 <node concept="2rP1CM" id="6fXjIfxgfQt" role="2Oq$k0" />
                 <node concept="2Xjw5R" id="6fXjIfxgfQu" role="2OqNvi">
                   <node concept="3gmYPX" id="6fXjIfxgfQv" role="1xVPHs">
-                    <node concept="3gn64h" id="6fXjIfxgfQw" role="3gmYPZ">
-                      <ref role="3gnhBz" to="tpee:fzclF80" resolve="StatementList" />
-                    </node>
                     <node concept="3gn64h" id="6fXjIfxgfQx" role="3gmYPZ">
                       <ref role="3gnhBz" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
                     </node>
+                    <node concept="3gn64h" id="5TXeSYSL8HK" role="3gmYPZ">
+                      <ref role="3gnhBz" to="tpee:fzclF80" resolve="StatementList" />
+                    </node>
                     <node concept="3gn64h" id="6fXjIfxgfQy" role="3gmYPZ">
                       <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                     </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index 0190a570..b646d8ff 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -57,7 +57,9 @@
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
         <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
-      <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
+      <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ">
+        <child id="1169127546356" name="extends" index="PrDN$" />
+      </concept>
       <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
         <reference id="1169127628841" name="intfc" index="PrY4T" />
       </concept>
@@ -317,6 +319,9 @@
       <property role="IQ2ns" value="6399471711045617306" />
       <ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
     </node>
+    <node concept="PrWs8" id="2vhmmFtwaxm" role="PrDN$">
+      <ref role="PrY4T" node="7E86$tK$Rgo" resolve="LogicalVariableScope" />
+    </node>
   </node>
   <node concept="1TIwiD" id="7HUwyZb1HXL">
     <property role="3GE5qa" value="logical.type" />