diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
index fe9f77d5..a2623768 100644
--- a/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -31,6 +31,7 @@
         <property id="1225194472834" name="isAbstract" index="13i0iv" />
         <reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
       </concept>
+      <concept id="1225194628440" name="jetbrains.mps.lang.behavior.structure.SuperNodeExpression" flags="nn" index="13iAh5" />
       <concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -117,6 +118,7 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
@@ -171,14 +173,16 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
+      <concept id="1176906603202" name="jetbrains.mps.baseLanguage.collections.structure.BinaryOperation" flags="nn" index="56pJg">
+        <child id="1176906787974" name="rightExpression" index="576Qk" />
+      </concept>
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="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" />
-      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
+      <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
     </language>
   </registry>
   <node concept="13h7C7" id="6ntBQ9KFIzq">
@@ -203,19 +207,86 @@
       <node concept="3Tqbb2" id="6ntBQ9KHl18" role="3clF45" />
     </node>
   </node>
-  <node concept="13h7C7" id="5JTOzCQUVB8">
-    <property role="3GE5qa" value="rule" />
-    <ref role="13h7C2" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
-    <node concept="13hLZK" id="5JTOzCQUVB9" role="13h7CW">
-      <node concept="3clFbS" id="5JTOzCQUVBa" role="2VODD2" />
-    </node>
-  </node>
   <node concept="13h7C7" id="5JTOzCQWtZa">
     <property role="3GE5qa" value="rule.component" />
     <ref role="13h7C2" to="wq2x:6p0DfM0a3TO" resolve="Body" />
     <node concept="13hLZK" id="5JTOzCQWtZb" role="13h7CW">
       <node concept="3clFbS" id="5JTOzCQWtZc" role="2VODD2" />
     </node>
+    <node concept="13i0hz" id="3PWU9gi$6Ty" 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="3PWU9gi$6Tz" role="1B3o_S" />
+      <node concept="3clFbS" id="3PWU9gi$6TD" role="3clF47">
+        <node concept="3clFbF" id="3PWU9gi$7aR" role="3cqZAp">
+          <node concept="2OqwBi" id="3PWU9gi$7aS" role="3clFbG">
+            <node concept="2OqwBi" id="3PWU9gi$7aT" role="2Oq$k0">
+              <node concept="2OqwBi" id="3PWU9gi$7aU" role="2Oq$k0">
+                <node concept="2OqwBi" id="3PWU9gi$7aV" role="2Oq$k0">
+                  <node concept="13iPFW" id="3PWU9gi$7aW" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="3PWU9gi$7aX" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" />
+                  </node>
+                </node>
+                <node concept="32TBzR" id="3PWU9gi$7aY" role="2OqNvi" />
+              </node>
+              <node concept="3zZkjj" id="3PWU9gi$7aZ" role="2OqNvi">
+                <node concept="1bVj0M" id="3PWU9gi$7b0" role="23t8la">
+                  <node concept="3clFbS" id="3PWU9gi$7b1" role="1bW5cS">
+                    <node concept="3clFbF" id="3PWU9gi$7b2" role="3cqZAp">
+                      <node concept="2OqwBi" id="3PWU9gi$7b3" role="3clFbG">
+                        <node concept="37vLTw" id="3PWU9gi$7b4" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3PWU9gi$7b7" resolve="stm" />
+                        </node>
+                        <node concept="1mIQ4w" id="3PWU9gi$7b5" role="2OqNvi">
+                          <node concept="chp4Y" id="3PWU9gi$7Dk" role="cj9EA">
+                            <ref role="cht4Q" to="wq2x:2E5lcNn5Ub2" resolve="LocalDeclarationStatement" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="3PWU9gi$7b7" role="1bW2Oz">
+                    <property role="TrG5h" value="stm" />
+                    <node concept="2jxLKc" id="3PWU9gi$7b8" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3goQfb" id="3PWU9gi$7b9" role="2OqNvi">
+              <node concept="1bVj0M" id="3PWU9gi$7ba" role="23t8la">
+                <node concept="3clFbS" id="3PWU9gi$7bb" role="1bW5cS">
+                  <node concept="3clFbF" id="3PWU9gi$7bc" role="3cqZAp">
+                    <node concept="2OqwBi" id="3PWU9gi$7bd" role="3clFbG">
+                      <node concept="1PxgMI" id="3PWU9gi$7be" role="2Oq$k0">
+                        <ref role="1PxNhF" to="wq2x:2E5lcNn5Ub2" resolve="LocalDeclarationStatement" />
+                        <node concept="37vLTw" id="3PWU9gi$7bf" role="1PxMeX">
+                          <ref role="3cqZAo" node="3PWU9gi$7bh" resolve="pds" />
+                        </node>
+                      </node>
+                      <node concept="3Tsc0h" id="3PWU9gi$7bg" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:2E5lcNn8k3O" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="3PWU9gi$7bh" role="1bW2Oz">
+                  <property role="TrG5h" value="pds" />
+                  <node concept="2jxLKc" id="3PWU9gi$7bi" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="3PWU9gi$6TE" role="3clF45">
+        <node concept="3Tqbb2" id="3PWU9gi$6TF" role="A3Ik2">
+          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="13h7C7" id="1zN1RIkNimz">
     <property role="3GE5qa" value="rule.code.parameter" />
@@ -371,6 +442,15 @@
       <node concept="3Tm1VV" id="4EfgX2E$3Ea" role="1B3o_S" />
       <node concept="3clFbS" id="4EfgX2E$3Eb" role="3clF47">
         <node concept="1_3QMa" id="4EfgX2E$Mtv" role="3cqZAp">
+          <node concept="2OqwBi" id="3U_KxQf9kcN" role="1_3QMn">
+            <node concept="2OqwBi" id="3U_KxQf9kcO" role="2Oq$k0">
+              <node concept="13iPFW" id="3U_KxQf9kcP" role="2Oq$k0" />
+              <node concept="3TrEf2" id="3U_KxQf9kcQ" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:4EfgX2EvGcc" />
+              </node>
+            </node>
+            <node concept="2yIwOk" id="5Z2pjOG_XvZ" role="2OqNvi" />
+          </node>
           <node concept="1_3QMl" id="4EfgX2E$N44" role="1_3QMm">
             <node concept="3gn64h" id="4EfgX2E$N4Z" role="3Kbmr1">
               <ref role="3gnhBz" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
@@ -484,15 +564,6 @@
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="3U_KxQf9kcN" role="1_3QMn">
-            <node concept="2OqwBi" id="3U_KxQf9kcO" role="2Oq$k0">
-              <node concept="13iPFW" id="3U_KxQf9kcP" role="2Oq$k0" />
-              <node concept="3TrEf2" id="3U_KxQf9kcQ" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:4EfgX2EvGcc" />
-              </node>
-            </node>
-            <node concept="2yIwOk" id="5Z2pjOG_XvZ" role="2OqNvi" />
-          </node>
         </node>
         <node concept="3clFbH" id="4EfgX2E$N7Z" role="3cqZAp" />
         <node concept="3cpWs6" id="4EfgX2E$N93" role="3cqZAp">
@@ -517,112 +588,73 @@
       <ref role="13i0hy" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
       <node concept="3Tm1VV" id="5JTOzCQUVCt" role="1B3o_S" />
       <node concept="3clFbS" id="5JTOzCQUVCy" role="3clF47">
-        <node concept="3clFbH" id="5JTOzCQUVEO" role="3cqZAp" />
-        <node concept="3clFbF" id="5JTOzCQUYDR" role="3cqZAp">
-          <node concept="2OqwBi" id="5JTOzCQV4dI" role="3clFbG">
-            <node concept="2OqwBi" id="6Ng87FPZcwp" role="2Oq$k0">
-              <node concept="2OqwBi" id="6Ng87FPZcwq" role="2Oq$k0">
-                <node concept="2OqwBi" id="5JTOzCQV1he" role="2Oq$k0">
-                  <node concept="13iPFW" id="5JTOzCQV115" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="1ffsG7bN2vG" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:1ffsG7bCfL5" />
-                  </node>
-                </node>
-                <node concept="3$u5V9" id="6Ng87FPZcwF" role="2OqNvi">
-                  <node concept="1bVj0M" id="6Ng87FPZcwG" role="23t8la">
-                    <node concept="3clFbS" id="6Ng87FPZcwH" role="1bW5cS">
-                      <node concept="3clFbF" id="6Ng87FPZcwI" role="3cqZAp">
-                        <node concept="2OqwBi" id="6Ng87FPZcwJ" role="3clFbG">
-                          <node concept="37vLTw" id="6Ng87FPZcwL" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6Ng87FPZcwN" resolve="head" />
-                          </node>
-                          <node concept="3TrEf2" id="1ffsG7bN4CZ" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="6Ng87FPZcwN" role="1bW2Oz">
-                      <property role="TrG5h" value="head" />
-                      <node concept="2jxLKc" id="6Ng87FPZcwO" role="1tU5fm" />
-                    </node>
-                  </node>
+        <node concept="3clFbF" id="3PWU9gi$7V7" role="3cqZAp">
+          <node concept="2OqwBi" id="3PWU9gi$cJf" role="3clFbG">
+            <node concept="2OqwBi" id="3PWU9gi$96H" role="2Oq$k0">
+              <node concept="2OqwBi" id="3PWU9gi$7XP" role="2Oq$k0">
+                <node concept="13iPFW" id="3PWU9gi$7V6" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="3PWU9gi$88q" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:1ffsG7bCfL5" />
                 </node>
               </node>
-              <node concept="3goQfb" id="6Ng87FPZcwP" role="2OqNvi">
-                <node concept="1bVj0M" id="6Ng87FPZcwQ" role="23t8la">
-                  <node concept="3clFbS" id="6Ng87FPZcwR" role="1bW5cS">
-                    <node concept="3clFbF" id="6Ng87FPZcwS" role="3cqZAp">
-                      <node concept="2OqwBi" id="6Ng87FPZcwT" role="3clFbG">
-                        <node concept="2OqwBi" id="6Ng87FPZcwU" role="2Oq$k0">
-                          <node concept="2OqwBi" id="6Ng87FPZcwV" role="2Oq$k0">
-                            <node concept="37vLTw" id="6Ng87FPZcwW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6Ng87FPZcxi" resolve="c" />
-                            </node>
-                            <node concept="32TBzR" id="6Ng87FPZcwX" role="2OqNvi" />
-                          </node>
-                          <node concept="3zZkjj" id="6Ng87FPZcwY" role="2OqNvi">
-                            <node concept="1bVj0M" id="6Ng87FPZcwZ" role="23t8la">
-                              <node concept="3clFbS" id="6Ng87FPZcx0" role="1bW5cS">
-                                <node concept="3clFbF" id="6Ng87FPZcx1" role="3cqZAp">
-                                  <node concept="2OqwBi" id="6Ng87FPZcx2" role="3clFbG">
-                                    <node concept="37vLTw" id="6Ng87FPZcx3" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6Ng87FPZcx6" resolve="stm" />
-                                    </node>
-                                    <node concept="1mIQ4w" id="6Ng87FPZcx4" role="2OqNvi">
-                                      <node concept="chp4Y" id="6Ng87FPZcx5" role="cj9EA">
-                                        <ref role="cht4Q" to="wq2x:2E5lcNn5kn6" resolve="ParameterDeclarationStatement" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="Rh6nW" id="6Ng87FPZcx6" role="1bW2Oz">
-                                <property role="TrG5h" value="stm" />
-                                <node concept="2jxLKc" id="6Ng87FPZcx7" role="1tU5fm" />
-                              </node>
-                            </node>
-                          </node>
+              <node concept="3goQfb" id="3PWU9gi$bUQ" role="2OqNvi">
+                <node concept="1bVj0M" id="3PWU9gi$bUS" role="23t8la">
+                  <node concept="3clFbS" id="3PWU9gi$bUT" role="1bW5cS">
+                    <node concept="3clFbF" id="3PWU9gi$c0B" role="3cqZAp">
+                      <node concept="2OqwBi" id="3PWU9gi$c54" role="3clFbG">
+                        <node concept="37vLTw" id="3PWU9gi$c0A" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3PWU9gi$bUU" resolve="hd" />
                         </node>
-                        <node concept="3goQfb" id="6Ng87FPZcx8" role="2OqNvi">
-                          <node concept="1bVj0M" id="6Ng87FPZcx9" role="23t8la">
-                            <node concept="3clFbS" id="6Ng87FPZcxa" role="1bW5cS">
-                              <node concept="3clFbF" id="6Ng87FPZcxb" role="3cqZAp">
-                                <node concept="2OqwBi" id="6Ng87FPZcxc" role="3clFbG">
-                                  <node concept="1PxgMI" id="6Ng87FPZcxd" role="2Oq$k0">
-                                    <ref role="1PxNhF" to="wq2x:2E5lcNn5kn6" resolve="ParameterDeclarationStatement" />
-                                    <node concept="37vLTw" id="6Ng87FPZcxe" role="1PxMeX">
-                                      <ref role="3cqZAo" node="6Ng87FPZcxg" resolve="pds" />
-                                    </node>
-                                  </node>
-                                  <node concept="3Tsc0h" id="6Ng87FPZcxf" role="2OqNvi">
-                                    <ref role="3TtcxE" to="wq2x:2E5lcNn8k3O" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="Rh6nW" id="6Ng87FPZcxg" role="1bW2Oz">
-                              <property role="TrG5h" value="pds" />
-                              <node concept="2jxLKc" id="6Ng87FPZcxh" role="1tU5fm" />
-                            </node>
-                          </node>
+                        <node concept="2qgKlT" id="3PWU9gi$cgr" role="2OqNvi">
+                          <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="6Ng87FPZcxi" role="1bW2Oz">
-                    <property role="TrG5h" value="c" />
-                    <node concept="2jxLKc" id="6Ng87FPZcxj" role="1tU5fm" />
+                  <node concept="Rh6nW" id="3PWU9gi$bUU" role="1bW2Oz">
+                    <property role="TrG5h" value="hd" />
+                    <node concept="2jxLKc" id="3PWU9gi$bUV" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3QWeyG" id="3PWU9gi$d9l" role="2OqNvi">
+              <node concept="2OqwBi" id="3PWU9gi$enc" role="576Qk">
+                <node concept="2OqwBi" id="3PWU9gi$dkU" role="2Oq$k0">
+                  <node concept="13iPFW" id="3PWU9gi$df3" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="3PWU9gi$dyV" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:1ffsG7bIxDv" />
+                  </node>
+                </node>
+                <node concept="3goQfb" id="3PWU9gi$hfO" role="2OqNvi">
+                  <node concept="1bVj0M" id="3PWU9gi$hfQ" role="23t8la">
+                    <node concept="3clFbS" id="3PWU9gi$hfR" role="1bW5cS">
+                      <node concept="3clFbF" id="3PWU9gi$hup" role="3cqZAp">
+                        <node concept="2OqwBi" id="3PWU9gi$hAd" role="3clFbG">
+                          <node concept="37vLTw" id="3PWU9gi$huo" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3PWU9gi$hfS" resolve="bd" />
+                          </node>
+                          <node concept="2qgKlT" id="3PWU9gi$igd" role="2OqNvi">
+                            <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="3PWU9gi$hfS" role="1bW2Oz">
+                      <property role="TrG5h" value="bd" />
+                      <node concept="2jxLKc" id="3PWU9gi$hfT" role="1tU5fm" />
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="ANE8D" id="5JTOzCQV6XR" role="2OqNvi" />
           </node>
         </node>
       </node>
-      <node concept="2I9FWS" id="5JTOzCQUVCz" role="3clF45">
-        <ref role="2I9WkF" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+      <node concept="A3Dl8" id="3PWU9gi$5XJ" role="3clF45">
+        <node concept="3Tqbb2" id="3PWU9gi$5XO" role="A3Ik2">
+          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+        </node>
       </node>
     </node>
     <node concept="13hLZK" id="1ffsG7bN0rG" role="13h7CW">
@@ -651,5 +683,152 @@
       <node concept="3clFbS" id="1CgWc1TyELU" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="3PWU9gizUU7">
+    <property role="3GE5qa" value="rule.component" />
+    <ref role="13h7C2" to="wq2x:6p0DfM0a3gA" resolve="Head" />
+    <node concept="13hLZK" id="3PWU9gizUU8" role="13h7CW">
+      <node concept="3clFbS" id="3PWU9gizUU9" role="2VODD2" />
+    </node>
+    <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="3clFbF" id="3PWU9gizVon" role="3cqZAp">
+          <node concept="2OqwBi" id="3PWU9gi$1YO" role="3clFbG">
+            <node concept="2OqwBi" id="3PWU9gizZ7B" role="2Oq$k0">
+              <node concept="2OqwBi" id="3PWU9gizXd_" role="2Oq$k0">
+                <node concept="2OqwBi" id="3PWU9gizW4t" role="2Oq$k0">
+                  <node concept="13iPFW" id="3PWU9gizVos" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="3PWU9gizWov" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:6p0DfM0a5m9" />
+                  </node>
+                </node>
+                <node concept="32TBzR" id="3PWU9gizXTw" role="2OqNvi" />
+              </node>
+              <node concept="3zZkjj" id="3PWU9gi$0LN" role="2OqNvi">
+                <node concept="1bVj0M" id="3PWU9gi$0LP" role="23t8la">
+                  <node concept="3clFbS" id="3PWU9gi$0LQ" role="1bW5cS">
+                    <node concept="3clFbF" id="3PWU9gi$1_H" role="3cqZAp">
+                      <node concept="2OqwBi" id="3PWU9gi$1_I" role="3clFbG">
+                        <node concept="37vLTw" id="3PWU9gi$1_J" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3PWU9gi$0LR" resolve="stm" />
+                        </node>
+                        <node concept="1mIQ4w" id="3PWU9gi$1_K" role="2OqNvi">
+                          <node concept="chp4Y" id="3PWU9gi$1_L" role="cj9EA">
+                            <ref role="cht4Q" to="wq2x:2E5lcNn5kn6" resolve="ParameterDeclarationStatement" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="3PWU9gi$0LR" role="1bW2Oz">
+                    <property role="TrG5h" value="stm" />
+                    <node concept="2jxLKc" id="3PWU9gi$0LS" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3goQfb" id="3PWU9gi$2zR" role="2OqNvi">
+              <node concept="1bVj0M" id="3PWU9gi$2zT" role="23t8la">
+                <node concept="3clFbS" id="3PWU9gi$2zU" role="1bW5cS">
+                  <node concept="3clFbF" id="3PWU9gi$3Hg" role="3cqZAp">
+                    <node concept="2OqwBi" id="3PWU9gi$3Hh" role="3clFbG">
+                      <node concept="1PxgMI" id="3PWU9gi$3Hi" role="2Oq$k0">
+                        <ref role="1PxNhF" to="wq2x:2E5lcNn5kn6" resolve="ParameterDeclarationStatement" />
+                        <node concept="37vLTw" id="3PWU9gi$3Hj" role="1PxMeX">
+                          <ref role="3cqZAo" node="3PWU9gi$2zV" resolve="pds" />
+                        </node>
+                      </node>
+                      <node concept="3Tsc0h" id="3PWU9gi$3Hk" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:2E5lcNn8k3O" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="3PWU9gi$2zV" role="1bW2Oz">
+                  <property role="TrG5h" value="pds" />
+                  <node concept="2jxLKc" id="3PWU9gi$2zW" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="3PWU9gi$65f" role="3clF45">
+        <node concept="3Tqbb2" id="3PWU9gi$6oD" role="A3Ik2">
+          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="13h7C7" id="3PWU9gi_qaW">
+    <property role="3GE5qa" value="rule" />
+    <ref role="13h7C2" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
+    <node concept="13hLZK" id="3PWU9gi_qaX" role="13h7CW">
+      <node concept="3clFbS" id="3PWU9gi_qaY" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="3PWU9gi_qhg" 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="3PWU9gi_qhh" role="1B3o_S" />
+      <node concept="3clFbS" id="3PWU9gi_qhM" role="3clF47">
+        <node concept="3clFbF" id="3PWU9gi_qhS" role="3cqZAp">
+          <node concept="2OqwBi" id="3PWU9gi_qro" role="3clFbG">
+            <node concept="2OqwBi" id="3PWU9gi_qhP" role="2Oq$k0">
+              <node concept="13iAh5" id="3PWU9gi_qhQ" role="2Oq$k0" />
+              <node concept="2qgKlT" id="3PWU9gi_qhR" role="2OqNvi">
+                <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
+              </node>
+            </node>
+            <node concept="3QWeyG" id="3PWU9gi_qKp" role="2OqNvi">
+              <node concept="2OqwBi" id="3PWU9gi_s7q" role="576Qk">
+                <node concept="2OqwBi" id="3PWU9gi_qRn" role="2Oq$k0">
+                  <node concept="13iPFW" id="3PWU9gi_qMT" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="3PWU9gi_rkL" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:6wQEDbCLoaZ" />
+                  </node>
+                </node>
+                <node concept="3goQfb" id="3PWU9gi_uoW" role="2OqNvi">
+                  <node concept="1bVj0M" id="3PWU9gi_uoY" role="23t8la">
+                    <node concept="3clFbS" id="3PWU9gi_uoZ" role="1bW5cS">
+                      <node concept="3clFbF" id="3PWU9gi_uyT" role="3cqZAp">
+                        <node concept="2OqwBi" id="3PWU9gi_uYc" role="3clFbG">
+                          <node concept="2OqwBi" id="3PWU9gi_uBu" role="2Oq$k0">
+                            <node concept="37vLTw" id="3PWU9gi_uyS" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3PWU9gi_up0" resolve="inc" />
+                            </node>
+                            <node concept="3TrEf2" id="3PWU9gi_uLR" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:6wQEDbCL4Fj" />
+                            </node>
+                          </node>
+                          <node concept="2qgKlT" id="3PWU9gi_vfw" role="2OqNvi">
+                            <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="3PWU9gi_up0" role="1bW2Oz">
+                      <property role="TrG5h" value="inc" />
+                      <node concept="2jxLKc" id="3PWU9gi_up1" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="3PWU9gi_qhN" role="3clF45">
+        <node concept="3Tqbb2" id="3PWU9gi_qhO" role="A3Ik2">
+          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 7acd1323..db95468e 100644
--- a/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="-1" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -597,6 +597,17 @@
                 <property role="VOm3f" value="true" />
               </node>
             </node>
+            <node concept="3F2HdR" id="6wQEDbCLGSM" role="3EZMnx">
+              <ref role="1NtTu8" to="wq2x:6wQEDbCLoaZ" />
+              <node concept="ljvvj" id="6wQEDbCLGTo" role="3F10Kt">
+                <property role="VOm3f" value="true" />
+              </node>
+              <node concept="2iRkQZ" id="6wQEDbCMBJo" role="2czzBx" />
+              <node concept="3F0ifn" id="6wQEDbCLGTr" role="2czzBI">
+                <property role="3F0ifm" value="" />
+                <property role="ilYzB" value="with no fragments" />
+              </node>
+            </node>
             <node concept="3F1sOY" id="1zN1RIkQKV0" role="3EZMnx">
               <property role="1$x2rV" value="with no bindings" />
               <ref role="1NtTu8" to="wq2x:6wQEDbCHGnY" />
@@ -2220,5 +2231,182 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="6wQEDbCHtaR">
+    <property role="3GE5qa" value="rule" />
+    <ref role="1XX52x" to="wq2x:6wQEDbCHt15" resolve="Fragment" />
+    <node concept="3EZMnI" id="6wQEDbCHtaT" role="2wV5jI">
+      <node concept="PMmxH" id="6wQEDbCHtaU" role="3EZMnx">
+        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="3F0A7n" id="6wQEDbCHtaV" role="3EZMnx">
+        <ref role="1k5W1q" to="tpen:hshUnm6" resolve="StaticMethod" />
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+      </node>
+      <node concept="3F1sOY" id="6wQEDbCHtaW" role="3EZMnx">
+        <property role="1$x2rV" value="with no input" />
+        <ref role="1NtTu8" to="wq2x:6wQEDbCCPyR" />
+      </node>
+      <node concept="3EZMnI" id="6wQEDbCHtbA" role="3EZMnx">
+        <property role="S$Qs1" value="true" />
+        <node concept="VPM3Z" id="6wQEDbCHtbB" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="lj46D" id="6wQEDbCHtbC" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="l2Vlx" id="6wQEDbCHtbD" role="2iSdaV" />
+        <node concept="3EZMnI" id="6wQEDbCHtbE" role="3EZMnx">
+          <node concept="VPM3Z" id="6wQEDbCHtck" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="l2Vlx" id="6wQEDbCHtcl" role="2iSdaV" />
+          <node concept="3EZMnI" id="6wQEDbCHtcm" role="3EZMnx">
+            <node concept="VPM3Z" id="6wQEDbCHtcn" role="3F10Kt">
+              <property role="VOm3f" value="false" />
+            </node>
+            <node concept="l2Vlx" id="6wQEDbCHtco" role="2iSdaV" />
+            <node concept="3F1sOY" id="6wQEDbCHtct" role="3EZMnx">
+              <property role="1$x2rV" value="no required nodes" />
+              <ref role="1NtTu8" to="wq2x:1ffsG7bh6Cz" />
+              <node concept="pVoyu" id="6wQEDbCL1N1" role="3F10Kt">
+                <property role="VOm3f" value="true" />
+              </node>
+              <node concept="ljvvj" id="6wQEDbCHtcu" role="3F10Kt">
+                <property role="VOm3f" value="true" />
+              </node>
+            </node>
+            <node concept="3F1sOY" id="6wQEDbCHtcv" role="3EZMnx">
+              <property role="1$x2rV" value="with no bindings" />
+              <ref role="1NtTu8" to="wq2x:6wQEDbCHGnY" />
+              <node concept="ljvvj" id="6wQEDbCHtcw" role="3F10Kt">
+                <property role="VOm3f" value="true" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3F0ifn" id="6wQEDbCHtcx" role="3EZMnx">
+          <ref role="1k5W1q" to="tpen:hshO_Yc" resolve="Comment" />
+          <node concept="VPM3Z" id="6wQEDbCHtcy" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="ljvvj" id="6wQEDbCHtcz" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="3EZMnI" id="6wQEDbCHtc$" role="3EZMnx">
+          <node concept="VPM3Z" id="6wQEDbCHtc_" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="3F2HdR" id="6wQEDbCHtcA" role="3EZMnx">
+            <property role="2czwfO" value=" " />
+            <ref role="1NtTu8" to="wq2x:1ffsG7bCfL5" />
+            <node concept="l2Vlx" id="6wQEDbCHtcB" role="2czzBx" />
+            <node concept="tppnM" id="6wQEDbCHtcC" role="sWeuL">
+              <node concept="ljvvj" id="6wQEDbCHtcD" role="3F10Kt">
+                <property role="VOm3f" value="true" />
+              </node>
+            </node>
+            <node concept="lj46D" id="6wQEDbCHtcE" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="ljvvj" id="6wQEDbCHtcF" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="3F0ifn" id="6wQEDbCHtcG" role="2czzBI">
+              <property role="3F0ifm" value="no head" />
+              <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
+              <node concept="Vb9p2" id="6wQEDbCHtcH" role="3F10Kt">
+                <property role="Vbekb" value="BOLD" />
+              </node>
+            </node>
+          </node>
+          <node concept="3F2HdR" id="6wQEDbCHtcI" role="3EZMnx">
+            <property role="2czwfO" value=" " />
+            <ref role="1NtTu8" to="wq2x:1ffsG7bFM2v" />
+            <node concept="l2Vlx" id="6wQEDbCHtcJ" role="2czzBx" />
+            <node concept="tppnM" id="6wQEDbCHtcK" role="sWeuL">
+              <node concept="ljvvj" id="6wQEDbCHtcL" role="3F10Kt">
+                <property role="VOm3f" value="true" />
+              </node>
+            </node>
+            <node concept="lj46D" id="6wQEDbCHtcM" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="ljvvj" id="6wQEDbCHtcN" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="3F0ifn" id="6wQEDbCHtcO" role="2czzBI">
+              <property role="3F0ifm" value="unconditionally" />
+              <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
+              <node concept="Vb9p2" id="6wQEDbCHtcP" role="3F10Kt">
+                <property role="Vbekb" value="BOLD" />
+              </node>
+            </node>
+          </node>
+          <node concept="3F2HdR" id="6wQEDbCHtcQ" role="3EZMnx">
+            <property role="2czwfO" value=" " />
+            <ref role="1NtTu8" to="wq2x:1ffsG7bIxDv" />
+            <node concept="l2Vlx" id="6wQEDbCHtcR" role="2czzBx" />
+            <node concept="tppnM" id="6wQEDbCHtcS" role="sWeuL">
+              <node concept="ljvvj" id="6wQEDbCHtcT" role="3F10Kt">
+                <property role="VOm3f" value="true" />
+              </node>
+            </node>
+            <node concept="lj46D" id="6wQEDbCHtcU" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="ljvvj" id="6wQEDbCHtcV" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="3F0ifn" id="6wQEDbCHtcW" role="2czzBI">
+              <property role="3F0ifm" value="no body" />
+              <ref role="1k5W1q" to="tpen:hinfsDb" resolve="EmptyCell" />
+              <node concept="Vb9p2" id="6wQEDbCHtcX" role="3F10Kt">
+                <property role="Vbekb" value="BOLD" />
+              </node>
+            </node>
+          </node>
+          <node concept="l2Vlx" id="6wQEDbCHtcY" role="2iSdaV" />
+        </node>
+        <node concept="3F0ifn" id="6wQEDbCHtcZ" role="AHCbl">
+          <property role="3F0ifm" value="..." />
+          <ref role="1k5W1q" to="tpen:4vxLnq9T43C" resolve="FoldedCell" />
+        </node>
+      </node>
+      <node concept="l2Vlx" id="6wQEDbCHtd0" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="6wQEDbCL4Fx">
+    <property role="3GE5qa" value="rule" />
+    <ref role="1XX52x" to="wq2x:6wQEDbCL4Fi" resolve="IncludeFragmentClause" />
+    <node concept="3EZMnI" id="6wQEDbCL4Fz" role="2wV5jI">
+      <node concept="3F0ifn" id="6wQEDbCL4G3" role="3EZMnx">
+        <property role="3F0ifm" value="include" />
+        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
+      </node>
+      <node concept="1iCGBv" id="6wQEDbCL4FI" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:6wQEDbCL4Fj" />
+        <node concept="1sVBvm" id="6wQEDbCL4FK" role="1sWHZn">
+          <node concept="3F0A7n" id="6wQEDbCL4FV" role="2wV5jI">
+            <property role="1Intyy" value="true" />
+            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="6wQEDbCL4Gf" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+      </node>
+      <node concept="3F1sOY" id="6wQEDbCL4GT" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:6wQEDbCL4Fp" />
+      </node>
+      <node concept="3F0ifn" id="6wQEDbCL4GD" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+      </node>
+      <node concept="l2Vlx" id="6wQEDbCL4FA" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index 41c0f127..7b055b9e 100644
--- a/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -150,6 +150,12 @@
       <ref role="20lvS9" node="1zN1RIkQtcr" resolve="BoundParameterBlock" />
       <node concept="asaX9" id="6wQEDbCIWty" role="lGtFl" />
     </node>
+    <node concept="1TJgyj" id="6wQEDbCLoaZ" role="1TKVEi">
+      <property role="20lmBu" value="aggregation" />
+      <property role="20lbJX" value="0..n" />
+      <property role="20kJfa" value="includeClause" />
+      <ref role="20lvS9" node="6wQEDbCL4Fi" resolve="IncludeFragmentClause" />
+    </node>
     <node concept="PrWs8" id="5bC6UNl$TEw" role="PzmwI">
       <ref role="PrY4T" node="1CgWc1Tyjkz" resolve="ICanBeCommented" />
     </node>
@@ -166,6 +172,9 @@
       <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
     </node>
+    <node concept="PrWs8" id="3PWU9gizUQY" role="PzmwI">
+      <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
+    </node>
   </node>
   <node concept="1TIwiD" id="6p0DfM0a3gA">
     <property role="TrG5h" value="Head" />
@@ -708,5 +717,29 @@
       <ref role="PrY4T" to="tpck:1_TrU5E6oyb" resolve="IDontSubstituteByDefault" />
     </node>
   </node>
+  <node concept="1TIwiD" id="6wQEDbCL4Fi">
+    <property role="3GE5qa" value="rule" />
+    <property role="TrG5h" value="IncludeFragmentClause" />
+    <property role="34LRSv" value="include" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="6wQEDbCL4Fp" role="1TKVEi">
+      <property role="20lmBu" value="aggregation" />
+      <property role="20lbJX" value="1" />
+      <property role="20kJfa" value="argument" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+    <node concept="1TJgyj" id="6wQEDbCL4Fj" role="1TKVEi">
+      <property role="20lmBu" value="reference" />
+      <property role="20kJfa" value="fragment" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" node="6wQEDbCHt15" resolve="Fragment" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="6wQEDbCHt15">
+    <property role="3GE5qa" value="rule" />
+    <property role="TrG5h" value="Fragment" />
+    <property role="34LRSv" value="fragment" />
+    <ref role="1TJDcQ" node="4EfgX2ET3GH" resolve="AbstractRule" />
+  </node>
 </model>
 
diff --git a/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 5ae454a6..66ee6405 100644
--- a/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -37,6 +37,7 @@
         <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
         <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
+        <language id="894463aa-8754-49c0-bf4b-6a32af66b376" fqName="jetbrains.mps.jchr" version="0" />
         <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
         <language id="b401a680-8325-4110-8fd3-84331ff25bef" fqName="jetbrains.mps.lang.generator" version="0" />
         <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
@@ -79,6 +80,7 @@
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">894463aa-8754-49c0-bf4b-6a32af66b376(jetbrains.mps.jchr)</dependency>
     <dependency reexport="false">c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.typesystem2)</dependency>
+    <dependency reexport="false">35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)</dependency>
   </dependencies>
   <usedLanguages>
     <usedLanguage>daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)</usedLanguage>
@@ -98,6 +100,7 @@
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
     <language id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" fqName="jetbrains.mps.baseLanguage.regexp" version="0" />
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language id="894463aa-8754-49c0-bf4b-6a32af66b376" fqName="jetbrains.mps.jchr" version="0" />
     <language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
     <language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />
diff --git a/languages/jetbrains.mps.logic/languageModels/behavior.mps b/languages/jetbrains.mps.logic/languageModels/behavior.mps
index e19a3e92..d554c5c0 100644
--- a/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -73,9 +73,6 @@
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
-      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
-        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
-      </concept>
       <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
         <reference id="1154546997487" name="concept" index="3gnhBz" />
       </concept>
@@ -108,6 +105,11 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+    </language>
   </registry>
   <node concept="13h7C7" id="7E86$tKAuhI">
     <property role="3GE5qa" value="logical" />
@@ -117,8 +119,10 @@
       <property role="13i0it" value="true" />
       <property role="TrG5h" value="exportedLogicalVariable" />
       <node concept="3Tm1VV" id="7E86$tKAujK" role="1B3o_S" />
-      <node concept="2I9FWS" id="7E86$tKAuon" role="3clF45">
-        <ref role="2I9WkF" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+      <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">
diff --git a/languages/jetbrains.mps.logic/languageModels/constraints.mps b/languages/jetbrains.mps.logic/languageModels/constraints.mps
index 0871edb4..e9ab0518 100644
--- a/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -10,10 +10,10 @@
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
     <import index="fnmy" ref="r:89c0fb70-0977-4113-a076-5906f9d8630f(jetbrains.mps.baseLanguage.scopes)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
+    <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tpfp" ref="r:00000000-0000-4000-0000-011c89590519(jetbrains.mps.baseLanguage.regexp.jetbrains.mps.regexp.accessory)" implicit="true" />
-    <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" implicit="true" />
-    <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -168,6 +168,9 @@
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <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="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
+        <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
+      </concept>
       <concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
         <child id="1154546920563" name="concept" index="3gmYPZ" />
       </concept>
@@ -197,9 +200,6 @@
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
-      <concept id="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
-        <reference id="1172424100906" name="conceptDeclaration" index="3TV0OU" />
-      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -560,9 +560,9 @@
                       <node concept="3cpWs6" id="6Ng87FPZcw9" role="3cqZAp">
                         <node concept="2YIFZM" id="6Ng87FPZcwa" role="3cqZAk">
                           <ref role="1Pybhc" to="fnmy:3A2qfoxVUBF" resolve="Scopes" />
-                          <ref role="37wK5l" to="fnmy:3A2qfoxXWxA" resolve="defaultWithNameHiding" />
-                          <node concept="3TUQnm" id="6Ng87FPZcwb" role="37wK5m">
-                            <ref role="3TV0OU" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+                          <ref role="37wK5l" to="fnmy:6Kqn2fZyoZp" resolve="defaultWithNameHiding" />
+                          <node concept="35c_gC" id="3PWU9gizU1o" role="37wK5m">
+                            <ref role="35c_gD" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
                           </node>
                           <node concept="37vLTw" id="6Ng87FPZcwc" role="37wK5m">
                             <ref role="3cqZAo" node="6Ng87FPZcvl" resolve="childrenScope" />
@@ -607,51 +607,56 @@
                     <node concept="3eNFk2" id="6Ng87FPZcwl" role="3eNLev">
                       <node concept="3clFbS" id="6Ng87FPZcwm" role="3eOfB_">
                         <node concept="3clFbH" id="6Ng87FPZcwn" role="3cqZAp" />
-                        <node concept="3cpWs6" id="7E86$tKACLG" role="3cqZAp">
-                          <node concept="2ShNRf" id="7E86$tKAEHa" role="3cqZAk">
-                            <node concept="YeOm9" id="7E86$tKAF_i" role="2ShVmc">
-                              <node concept="1Y3b0j" id="7E86$tKAF_l" 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="5JTOzCQSwAf" role="37wK5m">
-                                  <node concept="2OqwBi" id="7E86$tKBKrs" role="2Oq$k0">
-                                    <node concept="1PxgMI" id="7E86$tKBKrt" role="2Oq$k0">
-                                      <ref role="1PxNhF" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
-                                      <node concept="37vLTw" id="7E86$tKBKru" role="1PxMeX">
-                                        <ref role="3cqZAo" node="6Ng87FPZcve" resolve="container" />
+                        <node concept="3cpWs8" id="3PWU9gi_g4$" role="3cqZAp">
+                          <node concept="3cpWsn" id="3PWU9gi_g4_" role="3cpWs9">
+                            <property role="TrG5h" value="childrenScope" />
+                            <node concept="3uibUv" id="3PWU9gi_g4z" role="1tU5fm">
+                              <ref role="3uigEE" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
+                            </node>
+                            <node concept="2ShNRf" id="3PWU9gi_g4A" role="33vP2m">
+                              <node concept="YeOm9" id="3PWU9gi_g4B" role="2ShVmc">
+                                <node concept="1Y3b0j" id="3PWU9gi_g4C" 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="3PWU9gi_g4D" role="37wK5m">
+                                    <node concept="2OqwBi" id="3PWU9gi_g4E" role="2Oq$k0">
+                                      <node concept="1PxgMI" id="3PWU9gi_g4F" role="2Oq$k0">
+                                        <ref role="1PxNhF" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
+                                        <node concept="37vLTw" id="3PWU9gi_g4G" role="1PxMeX">
+                                          <ref role="3cqZAo" node="6Ng87FPZcve" resolve="container" />
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="3PWU9gi_g4H" role="2OqNvi">
+                                        <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
                                       </node>
                                     </node>
-                                    <node concept="2qgKlT" id="7E86$tKBKrv" role="2OqNvi">
-                                      <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
+                                    <node concept="ANE8D" id="3PWU9gi_g4I" role="2OqNvi" />
+                                  </node>
+                                  <node concept="3Tm1VV" id="3PWU9gi_g4J" role="1B3o_S" />
+                                  <node concept="3clFb_" id="3PWU9gi_g4K" role="jymVt">
+                                    <property role="1EzhhJ" value="false" />
+                                    <property role="TrG5h" value="getName" />
+                                    <node concept="17QB3L" id="3PWU9gi_g4L" role="3clF45" />
+                                    <node concept="3Tm1VV" id="3PWU9gi_g4M" role="1B3o_S" />
+                                    <node concept="37vLTG" id="3PWU9gi_g4N" role="3clF46">
+                                      <property role="TrG5h" value="child" />
+                                      <node concept="3Tqbb2" id="3PWU9gi_g4O" role="1tU5fm" />
                                     </node>
-                                  </node>
-                                  <node concept="ANE8D" id="5JTOzCQS$NU" role="2OqNvi" />
-                                </node>
-                                <node concept="3Tm1VV" id="7E86$tKAF_m" role="1B3o_S" />
-                                <node concept="2tJIrI" id="7E86$tKAH90" role="jymVt" />
-                                <node concept="3clFb_" id="7E86$tKAF_n" role="jymVt">
-                                  <property role="1EzhhJ" value="false" />
-                                  <property role="TrG5h" value="getName" />
-                                  <node concept="17QB3L" id="7E86$tKAF_o" role="3clF45" />
-                                  <node concept="3Tm1VV" id="7E86$tKAF_p" role="1B3o_S" />
-                                  <node concept="37vLTG" id="7E86$tKAF_r" role="3clF46">
-                                    <property role="TrG5h" value="child" />
-                                    <node concept="3Tqbb2" id="7E86$tKAF_s" role="1tU5fm" />
-                                  </node>
-                                  <node concept="3clFbS" id="7E86$tKAF_t" role="3clF47">
-                                    <node concept="3clFbF" id="7E86$tKAIlg" role="3cqZAp">
-                                      <node concept="2OqwBi" id="7E86$tKAIlh" role="3clFbG">
-                                        <node concept="1PxgMI" id="7E86$tKAIli" role="2Oq$k0">
-                                          <property role="1BlNFB" value="true" />
-                                          <ref role="1PxNhF" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                          <node concept="37vLTw" id="7E86$tKAIlj" role="1PxMeX">
-                                            <ref role="3cqZAo" node="7E86$tKAF_r" resolve="child" />
+                                    <node concept="3clFbS" id="3PWU9gi_g4P" role="3clF47">
+                                      <node concept="3clFbF" id="3PWU9gi_g4Q" role="3cqZAp">
+                                        <node concept="2OqwBi" id="3PWU9gi_g4R" role="3clFbG">
+                                          <node concept="1PxgMI" id="3PWU9gi_g4S" role="2Oq$k0">
+                                            <property role="1BlNFB" value="true" />
+                                            <ref role="1PxNhF" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                                            <node concept="37vLTw" id="3PWU9gi_g4T" role="1PxMeX">
+                                              <ref role="3cqZAo" node="3PWU9gi_g4N" resolve="child" />
+                                            </node>
+                                          </node>
+                                          <node concept="3TrcHB" id="3PWU9gi_g4U" role="2OqNvi">
+                                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                                           </node>
                                         </node>
-                                        <node concept="3TrcHB" id="7E86$tKAIlk" role="2OqNvi">
-                                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                                        </node>
                                       </node>
                                     </node>
                                   </node>
@@ -660,6 +665,42 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="3clFbH" id="3PWU9gi_idr" role="3cqZAp" />
+                        <node concept="3cpWs6" id="3PWU9gi_iqn" role="3cqZAp">
+                          <node concept="2YIFZM" id="3PWU9gi_iqo" role="3cqZAk">
+                            <ref role="37wK5l" to="fnmy:6Kqn2fZyoZp" resolve="defaultWithNameHiding" />
+                            <ref role="1Pybhc" to="fnmy:3A2qfoxVUBF" resolve="Scopes" />
+                            <node concept="35c_gC" id="3PWU9gi_iqp" role="37wK5m">
+                              <ref role="35c_gD" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+                            </node>
+                            <node concept="37vLTw" id="3PWU9gi_jaj" role="37wK5m">
+                              <ref role="3cqZAo" node="3PWU9gi_g4_" resolve="childrenScope" />
+                            </node>
+                            <node concept="2Sg_IR" id="3PWU9gi_iqr" role="37wK5m">
+                              <node concept="37vLTw" id="3PWU9gi_iqs" role="2SgG2M">
+                                <ref role="3cqZAo" node="6Ng87FPZcv6" resolve="parentScope" />
+                              </node>
+                              <node concept="2OqwBi" id="3PWU9gi_iqt" role="2SgHGx">
+                                <node concept="37vLTw" id="3PWU9gi_iqu" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="6Ng87FPZcve" resolve="container" />
+                                </node>
+                                <node concept="2Xjw5R" id="3PWU9gi_iqv" role="2OqNvi">
+                                  <node concept="3gmYPX" id="3PWU9gi_iqw" role="1xVPHs">
+                                    <node concept="3gn64h" id="3PWU9gi_iqx" role="3gmYPZ">
+                                      <ref role="3gnhBz" to="tpee:fzclF80" resolve="StatementList" />
+                                    </node>
+                                    <node concept="3gn64h" id="3PWU9gi_iqy" role="3gmYPZ">
+                                      <ref role="3gnhBz" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
+                                    </node>
+                                    <node concept="3gn64h" id="3PWU9gi_iqz" role="3gmYPZ">
+                                      <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
                       </node>
                       <node concept="2OqwBi" id="6Ng87FPZcyw" role="3eO9$A">
                         <node concept="37vLTw" id="6Ng87FPZcyx" role="2Oq$k0">
@@ -703,7 +744,6 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="7E86$tK_TI7" role="3cqZAp" />
         </node>
       </node>
     </node>