diff --git a/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index a11e155d..a09d2ea8 100644
--- a/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -307,6 +307,7 @@
         <reference id="1194566366375" name="includeTemplate" index="xH3mL" />
       </concept>
       <concept id="1167087469898" name="jetbrains.mps.lang.generator.structure.CreateRootRule" flags="lg" index="2VPoh5">
+        <reference id="1200923511980" name="label" index="2sBCQV" />
         <reference id="1167087469901" name="templateNode" index="2VPoh2" />
       </concept>
       <concept id="5133195082121471908" name="jetbrains.mps.lang.generator.structure.LabelMacro" flags="ln" index="2ZBi8u" />
@@ -423,6 +424,9 @@
         <reference id="1216860049628" name="label" index="1iwH77" />
         <child id="1216860049632" name="inputNode" index="1iwH7V" />
       </concept>
+      <concept id="1216860049622" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOutputByLabel" flags="nn" index="1iwH7d">
+        <reference id="1216860049623" name="label" index="1iwH7c" />
+      </concept>
       <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
       <concept id="7430509679014182526" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_ContextVarRef" flags="ng" index="1qCSth">
         <property id="7430509679014182818" name="contextVarName" index="1qCSqd" />
@@ -3924,65 +3928,73 @@
     </node>
     <node concept="3aamgX" id="5uFPQ7CiVua" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
-      <node concept="gft3U" id="5uFPQ7CiW2e" role="1lVwrX">
-        <node concept="2ShNRf" id="5uFPQ7CiW2k" role="gfFT$">
-          <node concept="1pGfFk" id="5uFPQ7Cjdqc" role="2ShVmc">
-            <ref role="37wK5l" to="e2ud:5$WbtTOYsLU" resolve="JavaPredicate" />
-            <node concept="Xl_RD" id="5uFPQ7CjdSe" role="37wK5m">
-              <property role="Xl_RC" value="template" />
-              <node concept="17Uvod" id="5uFPQ7CjdSf" role="lGtFl">
-                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                <property role="2qtEX9" value="value" />
-                <node concept="3zFVjK" id="5uFPQ7CjdSg" role="3zH0cK">
-                  <node concept="3clFbS" id="5uFPQ7CjdSh" role="2VODD2">
-                    <node concept="3clFbF" id="5uFPQ7CjdSi" role="3cqZAp">
-                      <node concept="2OqwBi" id="5uFPQ7CjdSj" role="3clFbG">
-                        <node concept="30H73N" id="5uFPQ7CjdSk" role="2Oq$k0" />
-                        <node concept="2qgKlT" id="5uFPQ7CjdSl" role="2OqNvi">
-                          <ref role="37wK5l" to="x5bw:4EfgX2E$3E9" resolve="toJava" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="10Nm6u" id="5uFPQ7CjdSm" role="37wK5m">
-              <node concept="2b32R4" id="5uFPQ7CjdSn" role="lGtFl">
-                <node concept="3JmXsc" id="5uFPQ7CjdSo" role="2P8S$">
-                  <node concept="3clFbS" id="5uFPQ7CjdSp" role="2VODD2">
-                    <node concept="3clFbF" id="5uFPQ7CjdSq" role="3cqZAp">
-                      <node concept="2OqwBi" id="5uFPQ7CjdSr" role="3clFbG">
-                        <node concept="2OqwBi" id="5uFPQ7CjdSs" role="2Oq$k0">
-                          <node concept="2OqwBi" id="5uFPQ7CjdSt" role="2Oq$k0">
-                            <node concept="30H73N" id="5uFPQ7CjdSu" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="5uFPQ7CjdSv" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:4EfgX2EvGcc" />
-                            </node>
-                          </node>
-                          <node concept="32TBzR" id="5uFPQ7CjdSw" role="2OqNvi" />
-                        </node>
-                        <node concept="3zZkjj" id="5uFPQ7CjdSx" role="2OqNvi">
-                          <node concept="1bVj0M" id="5uFPQ7CjdSy" role="23t8la">
-                            <node concept="3clFbS" id="5uFPQ7CjdSz" role="1bW5cS">
-                              <node concept="3clFbF" id="5uFPQ7CjdS$" role="3cqZAp">
-                                <node concept="3fqX7Q" id="5uFPQ7CjdS_" role="3clFbG">
-                                  <node concept="2OqwBi" id="5uFPQ7CjdSA" role="3fr31v">
-                                    <node concept="37vLTw" id="5uFPQ7CjdSB" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="5uFPQ7CjdSE" resolve="it" />
-                                    </node>
-                                    <node concept="1mIQ4w" id="5uFPQ7CjdSC" role="2OqNvi">
-                                      <node concept="chp4Y" id="5uFPQ7CjdSD" role="cj9EA">
-                                        <ref role="cht4Q" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
-                                      </node>
-                                    </node>
+      <node concept="1Koe21" id="2KSgAgV9JRv" role="1lVwrX">
+        <node concept="3clFbS" id="2KSgAgV9K3t" role="1Koe22">
+          <node concept="3clFbF" id="2KSgAgV9K3T" role="3cqZAp">
+            <node concept="2ShNRf" id="2KSgAgV9K3P" role="3clFbG">
+              <node concept="1pGfFk" id="2KSgAgV9SF8" role="2ShVmc">
+                <ref role="37wK5l" to="e2ud:5$WbtTOYsLU" resolve="JavaPredicate" />
+                <node concept="2ShNRf" id="2KSgAgV9AfS" role="37wK5m">
+                  <node concept="1pGfFk" id="2KSgAgV9Bmp" role="2ShVmc">
+                    <ref role="37wK5l" to="qrld:5uFPQ7BMJfy" resolve="JavaPredicateSymbol" />
+                    <node concept="3cmrfG" id="2KSgAgVa0Bv" role="37wK5m">
+                      <property role="3cmrfH" value="0" />
+                      <node concept="17Uvod" id="2KSgAgVa0Ha" role="lGtFl">
+                        <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
+                        <property role="2qtEX9" value="value" />
+                        <node concept="3zFVjK" id="2KSgAgVa0Hb" role="3zH0cK">
+                          <node concept="3clFbS" id="2KSgAgVa0Hc" role="2VODD2">
+                            <node concept="3clFbF" id="2KSgAgVa0Xm" role="3cqZAp">
+                              <node concept="2OqwBi" id="2KSgAgVa25g" role="3clFbG">
+                                <node concept="2OqwBi" id="2KSgAgVa1bK" role="2Oq$k0">
+                                  <node concept="30H73N" id="2KSgAgVa18n" role="2Oq$k0" />
+                                  <node concept="2qgKlT" id="2KSgAgVa1B4" role="2OqNvi">
+                                    <ref role="37wK5l" to="x5bw:2KSgAgV9U$u" resolve="logicalExpressions" />
                                   </node>
                                 </node>
+                                <node concept="34oBXx" id="2KSgAgVa3VH" role="2OqNvi" />
                               </node>
                             </node>
-                            <node concept="Rh6nW" id="5uFPQ7CjdSE" role="1bW2Oz">
-                              <property role="TrG5h" value="it" />
-                              <node concept="2jxLKc" id="5uFPQ7CjdSF" role="1tU5fm" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Xl_RD" id="2KSgAgV9ZMU" role="37wK5m">
+                  <property role="Xl_RC" value="" />
+                  <node concept="17Uvod" id="2KSgAgV9ZRv" role="lGtFl">
+                    <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                    <property role="2qtEX9" value="value" />
+                    <node concept="3zFVjK" id="2KSgAgV9ZRy" role="3zH0cK">
+                      <node concept="3clFbS" id="2KSgAgV9ZRz" role="2VODD2">
+                        <node concept="3clFbF" id="2KSgAgVa0jJ" role="3cqZAp">
+                          <node concept="2YIFZM" id="2KSgAgV9Boq" role="3clFbG">
+                            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                            <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                            <node concept="2OqwBi" id="2KSgAgV9BMi" role="37wK5m">
+                              <node concept="2JrnkZ" id="2KSgAgV9BJT" role="2Oq$k0">
+                                <node concept="30H73N" id="2KSgAgVa0np" role="2JrQYb" />
+                              </node>
+                              <node concept="liA8E" id="2KSgAgV9BQt" role="2OqNvi">
+                                <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="10Nm6u" id="2KSgAgV9V0r" role="37wK5m">
+                  <node concept="2b32R4" id="2KSgAgV9Vek" role="lGtFl">
+                    <node concept="3JmXsc" id="2KSgAgV9Ven" role="2P8S$">
+                      <node concept="3clFbS" id="2KSgAgV9Veo" role="2VODD2">
+                        <node concept="3clFbF" id="2KSgAgV9Veu" role="3cqZAp">
+                          <node concept="2OqwBi" id="2KSgAgV9Vep" role="3clFbG">
+                            <node concept="30H73N" id="2KSgAgV9Vet" role="2Oq$k0" />
+                            <node concept="2qgKlT" id="2KSgAgV9VIp" role="2OqNvi">
+                              <ref role="37wK5l" to="x5bw:2KSgAgV9U$u" resolve="logicalExpressions" />
                             </node>
                           </node>
                         </node>
@@ -3991,6 +4003,7 @@
                   </node>
                 </node>
               </node>
+              <node concept="raruj" id="2KSgAgV9Vdq" role="lGtFl" />
             </node>
           </node>
         </node>
@@ -4274,6 +4287,42 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6w6CYIRhnKJ" role="jymVt" />
+    <node concept="3clFb_" id="1ggxSI7z25H" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="javaExpressionSolver" />
+      <property role="od$2w" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="2aFKle" value="false" />
+      <node concept="3Tm1VV" id="1ggxSI7z25J" role="1B3o_S" />
+      <node concept="3uibUv" id="1ggxSI7z25K" role="3clF45">
+        <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+      </node>
+      <node concept="3clFbS" id="1ggxSI7z25L" role="3clF47">
+        <node concept="3clFbF" id="1ggxSI7z28i" role="3cqZAp">
+          <node concept="2ShNRf" id="1ggxSI7z28g" role="3clFbG">
+            <node concept="HV5vD" id="1ggxSI7z2kY" role="2ShVmc">
+              <ref role="HV5vE" node="1sCZQVeRJry" resolve="ExpressionSolver" />
+              <node concept="1ZhdrF" id="1ggxSI7z2Yl" role="lGtFl">
+                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/2820489544401957797/2820489544401957798" />
+                <property role="2qtEX8" value="classifier" />
+                <node concept="3$xsQk" id="1ggxSI7z2Ym" role="3$ytzL">
+                  <node concept="3clFbS" id="1ggxSI7z2Yn" role="2VODD2">
+                    <node concept="3clFbF" id="1ggxSI7z3bG" role="3cqZAp">
+                      <node concept="2OqwBi" id="1ggxSI7z3fu" role="3clFbG">
+                        <node concept="1iwH7S" id="1ggxSI7z3bF" role="2Oq$k0" />
+                        <node concept="1iwH7d" id="1ggxSI7z3h0" role="2OqNvi">
+                          <ref role="1iwH7c" node="1ggxSI7z2TP" resolve="ExpressionSolverClass" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="5MHpiylJzam">
     <property role="TrG5h" value="IteratingRuleTemplate" />
@@ -12459,6 +12508,7 @@
   </node>
   <node concept="312cEu" id="1sCZQVeRJry">
     <property role="TrG5h" value="ExpressionSolver" />
+    <property role="3GE5qa" value="expression" />
     <node concept="2tJIrI" id="1sCZQVeRJsO" role="jymVt" />
     <node concept="2tJIrI" id="1sCZQVeRK95" role="jymVt" />
     <node concept="3clFb_" id="1sCZQVeRK9t" role="jymVt">
@@ -12537,10 +12587,15 @@
                           <node concept="3zFVjK" id="1sCZQVeYynQ" role="3zH0cK">
                             <node concept="3clFbS" id="1sCZQVeYynR" role="2VODD2">
                               <node concept="3clFbF" id="1sCZQVeYynS" role="3cqZAp">
-                                <node concept="2OqwBi" id="1sCZQVeYynT" role="3clFbG">
-                                  <node concept="1iwH7S" id="1sCZQVeYynU" role="2Oq$k0" />
-                                  <node concept="1qCSth" id="1sCZQVeYynV" role="2OqNvi">
-                                    <property role="1qCSqd" value="index" />
+                                <node concept="3cpWs3" id="6X5F0NgshPo" role="3clFbG">
+                                  <node concept="3cmrfG" id="6X5F0NgshPF" role="3uHU7w">
+                                    <property role="3cmrfH" value="1" />
+                                  </node>
+                                  <node concept="2OqwBi" id="1sCZQVeYynT" role="3uHU7B">
+                                    <node concept="1iwH7S" id="1sCZQVeYynU" role="2Oq$k0" />
+                                    <node concept="1qCSth" id="1sCZQVeYynV" role="2OqNvi">
+                                      <property role="1qCSqd" value="index" />
+                                    </node>
                                   </node>
                                 </node>
                               </node>
@@ -12617,31 +12672,44 @@
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="1sCZQVeRZx5" role="3KbGdf">
-            <node concept="37vLTw" id="1sCZQVeS0bI" role="2Oq$k0">
-              <ref role="3cqZAo" node="1sCZQVeRK9u" resolve="predicateSymbol" />
-            </node>
-            <node concept="liA8E" id="1sCZQVeRZx7" role="2OqNvi">
-              <ref role="37wK5l" to="qrld:54i3FxcZMvt" resolve="id" />
-            </node>
-          </node>
           <node concept="3clFbS" id="1sCZQVeRZx8" role="3Kb1Dw">
             <node concept="YS8fn" id="1sCZQVeRZx9" role="3cqZAp">
               <node concept="2ShNRf" id="1sCZQVeRZxa" role="YScLw">
                 <node concept="1pGfFk" id="1sCZQVeRZxb" role="2ShVmc">
                   <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;(java.lang.String)" resolve="UnsupportedOperationException" />
                   <node concept="3cpWs3" id="1sCZQVeRZxc" role="37wK5m">
-                    <node concept="37vLTw" id="1sCZQVeS0IP" role="3uHU7w">
-                      <ref role="3cqZAo" node="1sCZQVeRK9u" resolve="predicateSymbol" />
-                    </node>
                     <node concept="Xl_RD" id="1sCZQVeRZxe" role="3uHU7B">
                       <property role="Xl_RC" value="unknown expression: " />
                     </node>
+                    <node concept="2YIFZM" id="6X5F0NguD6K" role="3uHU7w">
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                      <node concept="AH0OO" id="6X5F0NguD6L" role="37wK5m">
+                        <node concept="3cmrfG" id="6X5F0NguD6M" role="AHEQo">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                        <node concept="37vLTw" id="6X5F0NguD6N" role="AHHXb">
+                          <ref role="3cqZAo" node="1sCZQVeRK9w" resolve="args" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="2YIFZM" id="6X5F0NgsgMr" role="3KbGdf">
+            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+            <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+            <node concept="AH0OO" id="6X5F0Ngshc_" role="37wK5m">
+              <node concept="3cmrfG" id="6X5F0NgshfZ" role="AHEQo">
+                <property role="3cmrfH" value="0" />
+              </node>
+              <node concept="37vLTw" id="6X5F0Ngsh9V" role="AHHXb">
+                <ref role="3cqZAo" node="1sCZQVeRK9w" resolve="args" />
+              </node>
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2AHcQZ" id="1sCZQVeRKiC" role="2AJF6D">
@@ -12968,8 +13036,14 @@
   </node>
   <node concept="bUwia" id="1sCZQVeRS5H">
     <property role="TrG5h" value="expression" />
+    <property role="3GE5qa" value="expression" />
     <node concept="2VPoh5" id="1sCZQVeSZKK" role="2VS0gm">
       <ref role="2VPoh2" node="1sCZQVeRJry" resolve="ExpressionSolver" />
+      <ref role="2sBCQV" node="1ggxSI7z2TP" resolve="ExpressionSolverClass" />
+    </node>
+    <node concept="2rT7sh" id="1ggxSI7z2TP" role="2rTMjI">
+      <property role="TrG5h" value="ExpressionSolverClass" />
+      <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
     </node>
     <node concept="2rT7sh" id="1sCZQVeRS5I" role="2rTMjI">
       <property role="TrG5h" value="Expression_Eval" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
index aa8f2d9b..677a1372 100644
--- a/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -15,8 +15,9 @@
     <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="qrld" ref="r:2a79c8aa-e372-4c00-8d71-5d7f3db517e4(jetbrains.mps.logic.reactor.constraint)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -110,6 +111,12 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
+        <property id="6329021646629104958" name="text" index="3SKdUp" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
+      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
@@ -128,6 +135,15 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <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="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
+        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      </concept>
+      <concept id="1803469493727536395" name="jetbrains.mps.lang.smodel.structure.OperationParm_StopConceptList" flags="ng" index="hTh3S">
+        <child id="1803469493727536396" name="concept" index="hTh3Z" />
+      </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" />
@@ -137,11 +153,15 @@
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
+      <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
         <reference id="1154546997487" name="concept" index="3gnhBz" />
       </concept>
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
       <concept id="5944356402132808749" name="jetbrains.mps.lang.smodel.structure.ConceptSwitchStatement" flags="nn" index="1_3QMa">
         <child id="5944356402132808753" name="case" index="1_3QMm" />
         <child id="5944356402132808752" name="expression" index="1_3QMn" />
@@ -377,6 +397,11 @@
       <property role="TrG5h" value="toJava" />
       <node concept="3Tm1VV" id="4EfgX2E$3Ea" role="1B3o_S" />
       <node concept="3clFbS" id="4EfgX2E$3Eb" role="3clF47">
+        <node concept="3SKdUt" id="2KSgAgV9$z$" role="3cqZAp">
+          <node concept="3SKdUq" id="2KSgAgV9$zA" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME: remove this" />
+          </node>
+        </node>
         <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">
@@ -510,6 +535,32 @@
       </node>
       <node concept="17QB3L" id="4EfgX2E$3Eh" role="3clF45" />
     </node>
+    <node concept="13i0hz" id="2KSgAgV9U$u" role="13h7CS">
+      <property role="TrG5h" value="logicalExpressions" />
+      <node concept="3Tm1VV" id="2KSgAgV9U$v" role="1B3o_S" />
+      <node concept="3clFbS" id="2KSgAgV9U$w" role="3clF47">
+        <node concept="3clFbF" id="2KSgAgV9UDK" role="3cqZAp">
+          <node concept="2OqwBi" id="2KSgAgV9UDM" role="3clFbG">
+            <node concept="13iPFW" id="2KSgAgV9UDN" role="2Oq$k0" />
+            <node concept="2Rf3mk" id="2KSgAgV9UDO" role="2OqNvi">
+              <node concept="1xMEDy" id="2KSgAgV9UDP" role="1xVPHs">
+                <node concept="chp4Y" id="2KSgAgV9UDQ" role="ri$Ld">
+                  <ref role="cht4Q" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
+                </node>
+              </node>
+              <node concept="hTh3S" id="2KSgAgV9UDR" role="1xVPHs">
+                <node concept="3gn64h" id="2KSgAgV9UDS" role="hTh3Z">
+                  <ref role="3gnhBz" to="5j4j:7E86$tKsl45" resolve="LogicalClause" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2I9FWS" id="2KSgAgV9UDH" role="3clF45">
+        <ref role="2I9WkF" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
+      </node>
+    </node>
     <node concept="13hLZK" id="4EfgX2E$3BJ" role="13h7CW">
       <node concept="3clFbS" id="4EfgX2E$3BK" role="2VODD2" />
     </node>
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd
index 91131f2d..e0444bc7 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/jetbrains.mps.lang.typesystem2.samplechecker.msd
@@ -19,6 +19,7 @@
     <language id="fd392034-7849-419d-9071-12563d152375" fqName="jetbrains.mps.baseLanguage.closures" version="0" />
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" fqName="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language id="96ee7a94-411d-4cf8-9b94-96cad7e52411" fqName="jetbrains.mps.baseLanguage.jdk7" 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" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
index 927c182e..7ad417c9 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps
@@ -509,9 +509,11 @@
     <node concept="2tJIrI" id="3Qp4N06byjo" role="jymVt" />
     <node concept="2YIFZL" id="3Qp4N06byjp" role="jymVt">
       <property role="TrG5h" value="collect" />
-      <node concept="37vLTG" id="7rWjIq$Idyf" role="3clF46">
-        <property role="TrG5h" value="templatesModel" />
-        <node concept="H_c77" id="7rWjIq$Ie8n" role="1tU5fm" />
+      <node concept="37vLTG" id="1ggxSI7$AM5" role="3clF46">
+        <property role="TrG5h" value="manifest" />
+        <node concept="3uibUv" id="1ggxSI7$B44" role="1tU5fm">
+          <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+        </node>
       </node>
       <node concept="37vLTG" id="2Rw7mr8Siv1" role="3clF46">
         <property role="TrG5h" value="root" />
@@ -526,22 +528,6 @@
       <node concept="10Oyi0" id="3xj1Uscu7dI" role="3clF45" />
       <node concept="3Tm1VV" id="3Qp4N06byju" role="1B3o_S" />
       <node concept="3clFbS" id="3Qp4N06byjv" role="3clF47">
-        <node concept="3cpWs8" id="3Qp4N06byj_" role="3cqZAp">
-          <node concept="3cpWsn" id="3Qp4N06byjA" role="3cpWs9">
-            <property role="TrG5h" value="manifest" />
-            <node concept="3uibUv" id="3Qp4N06byjB" role="1tU5fm">
-              <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
-            </node>
-            <node concept="2YIFZM" id="3Qp4N06byjC" role="33vP2m">
-              <ref role="1Pybhc" node="3Qp4N06byjn" resolve="CollectRuleTemplates" />
-              <ref role="37wK5l" node="3Qp4N06bynQ" resolve="getRuleManifest" />
-              <node concept="37vLTw" id="3Qp4N06byjD" role="37wK5m">
-                <ref role="3cqZAo" node="7rWjIq$Idyf" resolve="templatesModel" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3Qp4N06byjE" role="3cqZAp" />
         <node concept="3cpWs8" id="3Qp4N06byjF" role="3cqZAp">
           <node concept="3cpWsn" id="3Qp4N06byjG" role="3cpWs9">
             <property role="TrG5h" value="rtc" />
@@ -566,7 +552,7 @@
             <node concept="liA8E" id="3Qp4N06byjO" role="2OqNvi">
               <ref role="37wK5l" to="138j:12yN8Dyvyy6" resolve="collectTemplates" />
               <node concept="37vLTw" id="3Qp4N06byjP" role="37wK5m">
-                <ref role="3cqZAo" node="3Qp4N06byjA" resolve="manifest" />
+                <ref role="3cqZAo" node="1ggxSI7$AM5" resolve="manifest" />
               </node>
             </node>
           </node>
@@ -931,7 +917,7 @@
     <node concept="2tJIrI" id="7nkyKX7nCRK" role="jymVt" />
     <node concept="2YIFZL" id="3Qp4N06bynQ" role="jymVt">
       <property role="TrG5h" value="getRuleManifest" />
-      <node concept="3Tm6S6" id="3Qp4N06bynR" role="1B3o_S" />
+      <node concept="3Tm1VV" id="1ggxSI7$AC_" role="1B3o_S" />
       <node concept="3uibUv" id="3Qp4N06bynS" role="3clF45">
         <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
       </node>
@@ -1747,6 +1733,22 @@
             <ref role="1PxDUh" to="xq5w:5$WbtTOYoMb" resolve="LogicalPredicate" />
             <ref role="3cqZAo" to="xq5w:5uFPQ7C279$" resolve="FREE_SYM" />
           </node>
+          <node concept="10M0yZ" id="1ggxSI7vXEc" role="3g7hyw">
+            <ref role="1PxDUh" to="qrld:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+            <ref role="3cqZAo" to="qrld:1ggxSI7vUYU" resolve="EXPRESSION0" />
+          </node>
+          <node concept="10M0yZ" id="1ggxSI7vXSW" role="3g7hyw">
+            <ref role="1PxDUh" to="qrld:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+            <ref role="3cqZAo" to="qrld:1ggxSI7vV1O" resolve="EXPRESSION1" />
+          </node>
+          <node concept="10M0yZ" id="1ggxSI7vY7W" role="3g7hyw">
+            <ref role="1PxDUh" to="qrld:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+            <ref role="3cqZAo" to="qrld:1ggxSI7vV3x" resolve="EXPRESSION2" />
+          </node>
+          <node concept="10M0yZ" id="1ggxSI7vYn6" role="3g7hyw">
+            <ref role="1PxDUh" to="qrld:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+            <ref role="3cqZAo" to="qrld:1ggxSI7vV5$" resolve="EXPRESSION3" />
+          </node>
           <node concept="3uibUv" id="5mr7UHcbqo2" role="3g7fb8">
             <ref role="3uigEE" to="qrld:5uFPQ7B$$3f" resolve="PredicateSymbol" />
           </node>
@@ -1951,7 +1953,16 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="41ox5Vnki5Z" role="3cqZAp" />
+        <node concept="3cpWs8" id="1ggxSI7yVf5" role="3cqZAp">
+          <node concept="3cpWsn" id="1ggxSI7yVf6" role="3cpWs9">
+            <property role="TrG5h" value="javaSolver" />
+            <node concept="3uibUv" id="1ggxSI7yVF_" role="1tU5fm">
+              <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+            </node>
+            <node concept="10Nm6u" id="1ggxSI7yVf7" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="1ggxSI7yVGx" role="3cqZAp" />
         <node concept="3cpWs8" id="5mr7UHcbsDR" role="3cqZAp">
           <node concept="3cpWsn" id="5mr7UHcbsDS" role="3cpWs9">
             <property role="TrG5h" value="evaluationSession" />
@@ -1962,18 +1973,34 @@
               <node concept="2OqwBi" id="5mr7UHcbsDU" role="2Oq$k0">
                 <node concept="2OqwBi" id="5mr7UHcbsDV" role="2Oq$k0">
                   <node concept="2OqwBi" id="5jPBdKSAEU" role="2Oq$k0">
-                    <node concept="2OqwBi" id="5mr7UHcbsDW" role="2Oq$k0">
-                      <node concept="2YIFZM" id="5mr7UHcbsDX" role="2Oq$k0">
-                        <ref role="37wK5l" to="rchb:7ISVfSIwfH" resolve="newSession" />
-                        <ref role="1Pybhc" to="rchb:5uFPQ7BvN_d" resolve="EvaluationSession" />
-                      </node>
-                      <node concept="liA8E" id="5mr7UHcbsDY" role="2OqNvi">
-                        <ref role="37wK5l" to="rchb:5mr7UHcbbR2" resolve="withParam" />
-                        <node concept="Xl_RD" id="5mr7UHcbsDZ" role="37wK5m">
-                          <property role="Xl_RC" value="jchr.handler.class" />
+                    <node concept="2OqwBi" id="1ggxSI7ySc8" role="2Oq$k0">
+                      <node concept="2OqwBi" id="5mr7UHcbsDW" role="2Oq$k0">
+                        <node concept="2YIFZM" id="5mr7UHcbsDX" role="2Oq$k0">
+                          <ref role="37wK5l" to="rchb:7ISVfSIwfH" resolve="newSession" />
+                          <ref role="1Pybhc" to="rchb:5uFPQ7BvN_d" resolve="EvaluationSession" />
                         </node>
-                        <node concept="37vLTw" id="5mr7UHcbsE0" role="37wK5m">
-                          <ref role="3cqZAo" node="41ox5Vnki5N" resolve="handlerCls" />
+                        <node concept="liA8E" id="5mr7UHcbsDY" role="2OqNvi">
+                          <ref role="37wK5l" to="rchb:5mr7UHcbbR2" resolve="withParam" />
+                          <node concept="Xl_RD" id="5mr7UHcbsDZ" role="37wK5m">
+                            <property role="Xl_RC" value="jchr.handler.class" />
+                          </node>
+                          <node concept="37vLTw" id="5mr7UHcbsE0" role="37wK5m">
+                            <ref role="3cqZAo" node="41ox5Vnki5N" resolve="handlerCls" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="1ggxSI7yShU" role="2OqNvi">
+                        <ref role="37wK5l" to="rchb:5mr7UHcbbR2" resolve="withParam" />
+                        <node concept="Xl_RD" id="1ggxSI7yShV" role="37wK5m">
+                          <property role="Xl_RC" value="session.solver" />
+                        </node>
+                        <node concept="2OqwBi" id="6X5F0NginmB" role="37wK5m">
+                          <node concept="37vLTw" id="6X5F0Ngin1_" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6X5F0Ngiil4" resolve="program" />
+                          </node>
+                          <node concept="liA8E" id="6X5F0Ngi$$S" role="2OqNvi">
+                            <ref role="37wK5l" to="rchb:6X5F0Ngip_N" resolve="sessionSolver" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -2174,6 +2201,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="41ox5VnkgxL" role="1B3o_S" />
+      <node concept="37vLTG" id="6X5F0Ngiil4" role="3clF46">
+        <property role="TrG5h" value="program" />
+        <node concept="3uibUv" id="6X5F0NgiiKX" role="1tU5fm">
+          <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="PlanningSession" />
+        </node>
+      </node>
       <node concept="37vLTG" id="1zN1RIkMJJI" role="3clF46">
         <property role="TrG5h" value="root" />
         <node concept="3Tqbb2" id="1zN1RIkMJJH" role="1tU5fm" />
@@ -5805,6 +5838,54 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="3cpWs8" id="3Qp4N06byj_" role="3cqZAp">
+                          <node concept="3cpWsn" id="3Qp4N06byjA" role="3cpWs9">
+                            <property role="TrG5h" value="manifest" />
+                            <node concept="3uibUv" id="3Qp4N06byjB" role="1tU5fm">
+                              <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+                            </node>
+                            <node concept="2YIFZM" id="3Qp4N06byjC" role="33vP2m">
+                              <ref role="37wK5l" node="3Qp4N06bynQ" resolve="getRuleManifest" />
+                              <ref role="1Pybhc" node="3Qp4N06byjn" resolve="CollectRuleTemplates" />
+                              <node concept="2OqwBi" id="1pPth$lGtu2" role="37wK5m">
+                                <node concept="Xjq3P" id="1pPth$lGtu3" role="2Oq$k0">
+                                  <ref role="1HBi2w" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
+                                </node>
+                                <node concept="liA8E" id="1pPth$lGtu4" role="2OqNvi">
+                                  <ref role="37wK5l" node="1pPth$lA58k" resolve="templatesModel" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="6X5F0Ngi7oR" role="3cqZAp" />
+                        <node concept="3SKdUt" id="6X5F0Ngi2Wb" role="3cqZAp">
+                          <node concept="3SKdUq" id="6X5F0Ngi2Wd" role="3SKWNk">
+                            <property role="3SKdUp" value="FIXME: extract to implementation-dependent component?" />
+                          </node>
+                        </node>
+                        <node concept="3cpWs8" id="6X5F0Ngi13x" role="3cqZAp">
+                          <node concept="3cpWsn" id="6X5F0Ngi13y" role="3cpWs9">
+                            <property role="TrG5h" value="solver" />
+                            <node concept="3uibUv" id="6X5F0Ngi13u" role="1tU5fm">
+                              <ref role="3uigEE" to="95zw:7ISVfSIxNO" resolve="JchrSolver" />
+                            </node>
+                            <node concept="2ShNRf" id="6X5F0Ngi13z" role="33vP2m">
+                              <node concept="1pGfFk" id="6X5F0Ngi13$" role="2ShVmc">
+                                <ref role="37wK5l" to="95zw:1ggxSI7xM_O" resolve="JchrSolver" />
+                                <node concept="2OqwBi" id="6X5F0Ngi13_" role="37wK5m">
+                                  <node concept="37vLTw" id="6X5F0Ngi13A" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="3Qp4N06byjA" resolve="manifest" />
+                                  </node>
+                                  <node concept="liA8E" id="6X5F0Ngi13B" role="2OqNvi">
+                                    <ref role="37wK5l" to="i348:1ggxSI7z1S5" resolve="javaExpressionSolver" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="6X5F0Ngi1$P" role="3cqZAp" />
                         <node concept="3cpWs8" id="78CwJJcTyWU" role="3cqZAp">
                           <node concept="3cpWsn" id="78CwJJcTyWV" role="3cpWs9">
                             <property role="TrG5h" value="planningSession" />
@@ -5822,10 +5903,8 @@
                                   <ref role="3cqZAo" node="78CwJJcTyWt" resolve="nameHint" />
                                 </node>
                               </node>
-                              <node concept="2ShNRf" id="2tcGHBEvatL" role="37wK5m">
-                                <node concept="HV5vD" id="2tcGHBEvatM" role="2ShVmc">
-                                  <ref role="HV5vE" to="95zw:7ISVfSIxNO" resolve="JchrSolver" />
-                                </node>
+                              <node concept="37vLTw" id="6X5F0Ngi13C" role="37wK5m">
+                                <ref role="3cqZAo" node="6X5F0Ngi13y" resolve="solver" />
                               </node>
                             </node>
                           </node>
@@ -5838,13 +5917,8 @@
                             <node concept="2YIFZM" id="1pPth$lGtu1" role="37vLTx">
                               <ref role="1Pybhc" node="3Qp4N06byjn" resolve="CollectRuleTemplates" />
                               <ref role="37wK5l" node="3Qp4N06byjp" resolve="collect" />
-                              <node concept="2OqwBi" id="1pPth$lGtu2" role="37wK5m">
-                                <node concept="Xjq3P" id="1pPth$lGtu3" role="2Oq$k0">
-                                  <ref role="1HBi2w" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-                                </node>
-                                <node concept="liA8E" id="1pPth$lGtu4" role="2OqNvi">
-                                  <ref role="37wK5l" node="1pPth$lA58k" resolve="templatesModel" />
-                                </node>
+                              <node concept="37vLTw" id="1ggxSI7$FCx" role="37wK5m">
+                                <ref role="3cqZAo" node="3Qp4N06byjA" resolve="manifest" />
                               </node>
                               <node concept="37vLTw" id="1pPth$lGtu5" role="37wK5m">
                                 <ref role="3cqZAo" node="1pPth$l_ZeY" resolve="containingRoot" />
@@ -6034,6 +6108,26 @@
                         <node concept="3clFbS" id="1pPth$l_ZgC" role="SfCbr">
                           <node concept="1DcWWT" id="1pPth$lEdgC" role="3cqZAp">
                             <node concept="3clFbS" id="1pPth$lEdgE" role="2LFqv$">
+                              <node concept="3clFbJ" id="6X5F0NghFAI" role="3cqZAp">
+                                <node concept="3clFbS" id="6X5F0NghFAK" role="3clFbx">
+                                  <node concept="3clFbF" id="6X5F0NghHtO" role="3cqZAp">
+                                    <node concept="37vLTI" id="6X5F0NghHG8" role="3clFbG">
+                                      <node concept="37vLTw" id="6X5F0NghHXE" role="37vLTx">
+                                        <ref role="3cqZAo" node="1pPth$lEdgG" resolve="session" />
+                                      </node>
+                                      <node concept="37vLTw" id="6X5F0NghHtM" role="37vLTJ">
+                                        <ref role="3cqZAo" node="6X5F0NghEyj" resolve="program" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbC" id="6X5F0NghGjh" role="3clFbw">
+                                  <node concept="10Nm6u" id="6X5F0NghGwH" role="3uHU7w" />
+                                  <node concept="37vLTw" id="6X5F0NghG23" role="3uHU7B">
+                                    <ref role="3cqZAo" node="6X5F0NghEyj" resolve="program" />
+                                  </node>
+                                </node>
+                              </node>
                               <node concept="3clFbF" id="1pPth$l_ZgD" role="3cqZAp">
                                 <node concept="2OqwBi" id="1pPth$l_ZgE" role="3clFbG">
                                   <node concept="2ShNRf" id="1pPth$l_ZgF" role="2Oq$k0">
@@ -6153,6 +6247,14 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="6X5F0NghV_l" role="jymVt" />
+      <node concept="312cEg" id="6X5F0NghEyj" role="jymVt">
+        <property role="TrG5h" value="program" />
+        <node concept="3Tm6S6" id="6X5F0NghEyk" role="1B3o_S" />
+        <node concept="3uibUv" id="6X5F0NghF4d" role="1tU5fm">
+          <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="PlanningSession" />
+        </node>
+      </node>
       <node concept="3Tm6S6" id="1pPth$lNeRB" role="1B3o_S" />
       <node concept="3uibUv" id="1pPth$lB20z" role="1zkMxy">
         <ref role="3uigEE" node="1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
@@ -6190,6 +6292,22 @@
         <node concept="3cqZAl" id="1pPth$lBEhH" role="3clF45" />
         <node concept="3Tm1VV" id="1pPth$lBEhI" role="1B3o_S" />
         <node concept="3clFbS" id="1pPth$lBEhK" role="3clF47">
+          <node concept="3clFbF" id="6X5F0NghSP3" role="3cqZAp">
+            <node concept="37vLTI" id="6X5F0NghT6B" role="3clFbG">
+              <node concept="2OqwBi" id="6X5F0NghVeE" role="37vLTx">
+                <node concept="37vLTw" id="6X5F0NghUZx" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1pPth$lEuZa" resolve="prev" />
+                </node>
+                <node concept="2OwXpG" id="6X5F0NghVol" role="2OqNvi">
+                  <ref role="2Oxat5" node="6X5F0NghEyj" resolve="program" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="6X5F0NghSP1" role="37vLTJ">
+                <ref role="3cqZAo" node="6X5F0NghPZr" resolve="program" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="6X5F0NghVwe" role="3cqZAp" />
           <node concept="3clFbJ" id="1pPth$l_ZhV" role="3cqZAp">
             <node concept="3clFbS" id="1pPth$l_ZhW" role="3clFbx">
               <node concept="3clFbF" id="1pPth$lMQxX" role="3cqZAp">
@@ -6246,6 +6364,14 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="6X5F0NghI3j" role="jymVt" />
+      <node concept="312cEg" id="6X5F0NghPZr" role="jymVt">
+        <property role="TrG5h" value="program" />
+        <node concept="3Tm6S6" id="6X5F0NghPZs" role="1B3o_S" />
+        <node concept="3uibUv" id="6X5F0NghPZt" role="1tU5fm">
+          <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="PlanningSession" />
+        </node>
+      </node>
       <node concept="3Tm6S6" id="1pPth$lNf1$" role="1B3o_S" />
       <node concept="3uibUv" id="1pPth$lBEfy" role="1zkMxy">
         <ref role="3uigEE" node="1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
@@ -6473,6 +6599,14 @@
                                 <node concept="2YIFZM" id="7dgRGU4KU26" role="3fr31v">
                                   <ref role="1Pybhc" node="41ox5Vnk76a" resolve="RunTypecheckingRules" />
                                   <ref role="37wK5l" node="41ox5Vnkht$" resolve="runTypecheckingRules" />
+                                  <node concept="2OqwBi" id="6X5F0NgikIf" role="37wK5m">
+                                    <node concept="37vLTw" id="6X5F0Ngik8L" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="1pPth$lEDHT" resolve="prev" />
+                                    </node>
+                                    <node concept="2OwXpG" id="6X5F0Ngills" role="2OqNvi">
+                                      <ref role="2Oxat5" node="6X5F0NghPZr" resolve="program" />
+                                    </node>
+                                  </node>
                                   <node concept="2OqwBi" id="7dgRGU4KU27" role="37wK5m">
                                     <node concept="37vLTw" id="7dgRGU4KU28" role="2Oq$k0">
                                       <ref role="3cqZAo" node="1pPth$lHsef" resolve="node" />
@@ -6735,6 +6869,16 @@
           </node>
         </node>
       </node>
+      <node concept="312cEg" id="6X5F0NghA$I" role="jymVt">
+        <property role="34CwA1" value="false" />
+        <property role="eg7rD" value="false" />
+        <property role="TrG5h" value="program" />
+        <property role="3TUv4t" value="false" />
+        <node concept="3Tmbuc" id="6X5F0NghxGc" role="1B3o_S" />
+        <node concept="3uibUv" id="6X5F0NghAyj" role="1tU5fm">
+          <ref role="3uigEE" to="rchb:5uFPQ7BvNzE" resolve="PlanningSession" />
+        </node>
+      </node>
       <node concept="3Tm6S6" id="1pPth$lNgE8" role="1B3o_S" />
       <node concept="3uibUv" id="1pPth$lBP1p" role="1zkMxy">
         <ref role="3uigEE" node="1pPth$lAzAx" resolve="TypecheckingHelper.Step" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps b/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps
index a1bd776f..bf27365a 100644
--- a/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps
@@ -560,6 +560,19 @@
       <node concept="3Tm1VV" id="4OKkcnfu_xk" role="1B3o_S" />
       <node concept="3clFbS" id="4OKkcnfu_xl" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="1ggxSI7z1Os" role="jymVt" />
+    <node concept="3clFb_" id="1ggxSI7z1S5" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="javaExpressionSolver" />
+      <property role="od$2w" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="2aFKle" value="false" />
+      <node concept="3clFbS" id="1ggxSI7z1S8" role="3clF47" />
+      <node concept="3Tm1VV" id="1ggxSI7z1OS" role="1B3o_S" />
+      <node concept="3uibUv" id="1ggxSI7z1Pj" role="3clF45">
+        <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="4OKkcnfu_xm" role="jymVt" />
     <node concept="3Tm1VV" id="4OKkcnfu_xn" role="1B3o_S" />
   </node>
diff --git a/solutions/jetbrains.mps.typechecking.handling/models/jetbrains/mps/typechecking/handler/producer.mps b/solutions/jetbrains.mps.typechecking.handling/models/jetbrains/mps/typechecking/handler/producer.mps
index 79ceebe5..5bef2d8e 100644
--- a/solutions/jetbrains.mps.typechecking.handling/models/jetbrains/mps/typechecking/handler/producer.mps
+++ b/solutions/jetbrains.mps.typechecking.handling/models/jetbrains/mps/typechecking/handler/producer.mps
@@ -37,6 +37,7 @@
     <import index="i8dg" ref="r:e8529b97-a186-4c32-8f12-771b2a92b55a(jetbrains.mps.logic.reactor.rule)" />
     <import index="xq5w" ref="r:729bada4-05fa-458f-8bf8-28b9cb978726(jetbrains.mps.logic.builtin.var)" />
     <import index="rchb" ref="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)" />
+    <import index="e2ud" ref="r:86a12676-9e8d-407a-83b6-a911ff5a7cf8(jetbrains.mps.logic.builtin.java)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -225,6 +226,9 @@
       <concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
         <child id="1171903916107" name="bound" index="3qUE_r" />
       </concept>
+      <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
+        <property id="8355037393041754995" name="isNative" index="2aFKle" />
+      </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
@@ -379,6 +383,10 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
+      <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
+        <child id="1226511765987" name="elementType" index="2hN53Y" />
+      </concept>
+      <concept id="1226516258405" name="jetbrains.mps.baseLanguage.collections.structure.HashSetCreator" flags="nn" index="2i4dXS" />
       <concept id="6801639034384703212" name="jetbrains.mps.baseLanguage.collections.structure.StackType" flags="in" index="oyxx6" />
       <concept id="5784983078884872741" name="jetbrains.mps.baseLanguage.collections.structure.PeekOperation" flags="nn" index="2oR75g" />
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
@@ -409,6 +417,7 @@
         <child id="1197932525128" name="key" index="3ElVtu" />
       </concept>
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
+      <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
       <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
         <child id="5686963296372573084" name="elementType" index="3O5elw" />
       </concept>
@@ -988,7 +997,34 @@
       <node concept="3cqZAl" id="2fk6$tOpuba" role="3clF45" />
       <node concept="3Tm6S6" id="2fk6$tOpubb" role="1B3o_S" />
       <node concept="3clFbS" id="2fk6$tOpubc" role="3clF47">
-        <node concept="3clFbH" id="54i3Fxd4gWE" role="3cqZAp" />
+        <node concept="3cpWs8" id="1ggxSI7pkoT" role="3cqZAp">
+          <node concept="3cpWsn" id="1ggxSI7pkoW" role="3cpWs9">
+            <property role="TrG5h" value="solverClasses" />
+            <node concept="2hMVRd" id="1ggxSI7pkoP" role="1tU5fm">
+              <node concept="3uibUv" id="1ggxSI7pkBn" role="2hN53Y">
+                <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+                <node concept="3qUE_q" id="1ggxSI7pkHz" role="11_B2D">
+                  <node concept="3uibUv" id="1ggxSI7pkJn" role="3qUE_r">
+                    <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2ShNRf" id="1ggxSI7pkSt" role="33vP2m">
+              <node concept="2i4dXS" id="1ggxSI7pkS7" role="2ShVmc">
+                <node concept="3uibUv" id="1ggxSI7pkS8" role="HW$YZ">
+                  <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+                  <node concept="3qUE_q" id="1ggxSI7pkS9" role="11_B2D">
+                    <node concept="3uibUv" id="1ggxSI7pkSa" role="3qUE_r">
+                      <ref role="3uigEE" to="qrld:6Kcfpq7AYBh" resolve="Queryable" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1ggxSI7pkVb" role="3cqZAp" />
         <node concept="1DcWWT" id="2pvEdquv_2U" role="3cqZAp">
           <node concept="3clFbS" id="2pvEdquv_2V" role="2LFqv$">
             <node concept="3clFbH" id="78CwJJcPf7c" role="3cqZAp" />
@@ -1018,6 +1054,19 @@
             </node>
             <node concept="3clFbJ" id="54i3Fxd4bOV" role="3cqZAp">
               <node concept="3clFbS" id="54i3Fxd4bOX" role="3clFbx">
+                <node concept="3clFbF" id="1ggxSI7pnco" role="3cqZAp">
+                  <node concept="2OqwBi" id="1ggxSI7pnuI" role="3clFbG">
+                    <node concept="37vLTw" id="1ggxSI7pncm" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1ggxSI7pkoW" resolve="solverClasses" />
+                    </node>
+                    <node concept="TSZUe" id="1ggxSI7pob_" role="2OqNvi">
+                      <node concept="37vLTw" id="1ggxSI7pojf" role="25WWJ7">
+                        <ref role="3cqZAo" node="78CwJJcPfJx" resolve="solverClass" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="1ggxSI7ponk" role="3cqZAp" />
                 <node concept="3cpWs8" id="2pvEdquvVXV" role="3cqZAp">
                   <node concept="3cpWsn" id="2pvEdquvVXW" role="3cpWs9">
                     <property role="TrG5h" value="solverNode" />
@@ -1179,10 +1228,24 @@
                   </node>
                 </node>
               </node>
-              <node concept="3y3z36" id="54i3Fxd4cV8" role="3clFbw">
-                <node concept="10Nm6u" id="54i3Fxd4cXh" role="3uHU7w" />
-                <node concept="37vLTw" id="78CwJJcPfJC" role="3uHU7B">
-                  <ref role="3cqZAo" node="78CwJJcPfJx" resolve="solverClass" />
+              <node concept="1Wc70l" id="1ggxSI7plgn" role="3clFbw">
+                <node concept="3fqX7Q" id="1ggxSI7plou" role="3uHU7w">
+                  <node concept="2OqwBi" id="1ggxSI7plG$" role="3fr31v">
+                    <node concept="37vLTw" id="1ggxSI7pluo" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1ggxSI7pkoW" resolve="solverClasses" />
+                    </node>
+                    <node concept="3JPx81" id="1ggxSI7pmQ9" role="2OqNvi">
+                      <node concept="37vLTw" id="1ggxSI7pmXg" role="25WWJ7">
+                        <ref role="3cqZAo" node="78CwJJcPfJx" resolve="solverClass" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3y3z36" id="54i3Fxd4cV8" role="3uHU7B">
+                  <node concept="37vLTw" id="78CwJJcPfJC" role="3uHU7B">
+                    <ref role="3cqZAo" node="78CwJJcPfJx" resolve="solverClass" />
+                  </node>
+                  <node concept="10Nm6u" id="54i3Fxd4cXh" role="3uHU7w" />
                 </node>
               </node>
             </node>
@@ -3044,7 +3107,12 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="5uFPQ7BM_r4" role="3cqZAp" />
+            <node concept="3clFbH" id="2KSgAgVghfY" role="3cqZAp" />
+            <node concept="3SKdUt" id="2KSgAgVgg62" role="3cqZAp">
+              <node concept="3SKdUq" id="2KSgAgVgg64" role="3SKWNk">
+                <property role="3SKdUp" value="return early" />
+              </node>
+            </node>
             <node concept="3cpWs6" id="5uFPQ7BM_r7" role="3cqZAp">
               <node concept="37vLTw" id="5uFPQ7BM_r8" role="3cqZAk">
                 <ref role="3cqZAo" node="5uFPQ7BM_np" resolve="expNode" />
@@ -3083,16 +3151,21 @@
             </node>
           </node>
           <node concept="3eNFk2" id="5uFPQ7BMB2h" role="3eNLev">
-            <node concept="2ZW3vV" id="5uFPQ7BRvVK" role="3eO9$A">
-              <node concept="3uibUv" id="5uFPQ7BRvXY" role="2ZW6by">
-                <ref role="3uigEE" to="qrld:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+            <node concept="1Wc70l" id="2KSgAgVcbbG" role="3eO9$A">
+              <node concept="3clFbT" id="2KSgAgVccmb" role="3uHU7B">
+                <property role="3clFbU" value="false" />
               </node>
-              <node concept="2OqwBi" id="5uFPQ7BRvLo" role="2ZW6bz">
-                <node concept="37vLTw" id="5uFPQ7BRvI4" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5uFPQ7BMz7a" resolve="pred" />
+              <node concept="2ZW3vV" id="5uFPQ7BRvVK" role="3uHU7w">
+                <node concept="3uibUv" id="5uFPQ7BRvXY" role="2ZW6by">
+                  <ref role="3uigEE" to="qrld:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
                 </node>
-                <node concept="liA8E" id="5uFPQ7BRvOM" role="2OqNvi">
-                  <ref role="37wK5l" to="qrld:6Kcfpq7Bjgi" resolve="symbol" />
+                <node concept="2OqwBi" id="5uFPQ7BRvLo" role="2ZW6bz">
+                  <node concept="37vLTw" id="5uFPQ7BRvI4" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5uFPQ7BMz7a" resolve="pred" />
+                  </node>
+                  <node concept="liA8E" id="5uFPQ7BRvOM" role="2OqNvi">
+                    <ref role="37wK5l" to="qrld:6Kcfpq7Bjgi" resolve="symbol" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -3172,6 +3245,79 @@
               <node concept="3clFbH" id="5uFPQ7BRvYs" role="3cqZAp" />
             </node>
           </node>
+          <node concept="3eNFk2" id="2KSgAgVc9BE" role="3eNLev">
+            <node concept="3clFbS" id="2KSgAgVc9BG" role="3eOfB_">
+              <node concept="3cpWs8" id="2KSgAgVdqBV" role="3cqZAp">
+                <node concept="3cpWsn" id="2KSgAgVdqBW" role="3cpWs9">
+                  <property role="TrG5h" value="jec" />
+                  <node concept="3Tqbb2" id="2KSgAgVdqBR" role="1tU5fm">
+                    <ref role="ehGHo" to="vgt0:2KSgAgVcjDm" resolve="JavaExpressionConstraint" />
+                  </node>
+                  <node concept="2OqwBi" id="2KSgAgVdqBX" role="33vP2m">
+                    <node concept="37vLTw" id="2KSgAgVdqBY" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5uFPQ7BMz78" resolve="targetModel" />
+                    </node>
+                    <node concept="15TzpJ" id="2KSgAgVdqBZ" role="2OqNvi">
+                      <ref role="I8UWU" to="vgt0:2KSgAgVcjDm" resolve="JavaExpressionConstraint" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="2KSgAgVdz1_" role="3cqZAp">
+                <node concept="2OqwBi" id="2KSgAgVd$QM" role="3clFbG">
+                  <node concept="2OqwBi" id="2KSgAgVd$dJ" role="2Oq$k0">
+                    <node concept="37vLTw" id="2KSgAgVdz1z" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2KSgAgVdqBW" resolve="jec" />
+                    </node>
+                    <node concept="3TrcHB" id="2KSgAgVd$IV" role="2OqNvi">
+                      <ref role="3TsBF5" to="vgt0:2KSgAgVcjDt" resolve="expressionId" />
+                    </node>
+                  </node>
+                  <node concept="tyxLq" id="2KSgAgVd$Xr" role="2OqNvi">
+                    <node concept="2OqwBi" id="6X5F0NgybuG" role="tz02z">
+                      <node concept="1eOMI4" id="6X5F0Ngya6i" role="2Oq$k0">
+                        <node concept="10QFUN" id="6X5F0Ngya6f" role="1eOMHV">
+                          <node concept="3uibUv" id="6X5F0Ngybpi" role="10QFUM">
+                            <ref role="3uigEE" to="e2ud:5$WbtTOYoMb" resolve="JavaPredicate" />
+                          </node>
+                          <node concept="37vLTw" id="6X5F0Ngybsx" role="10QFUP">
+                            <ref role="3cqZAo" node="5uFPQ7BMz7a" resolve="pred" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="6X5F0NgybyT" role="2OqNvi">
+                        <ref role="37wK5l" to="e2ud:6X5F0Ngy7Gy" resolve="id" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="2KSgAgVccHM" role="3cqZAp">
+                <node concept="37vLTI" id="2KSgAgVccHN" role="3clFbG">
+                  <node concept="37vLTw" id="2KSgAgVdNPk" role="37vLTx">
+                    <ref role="3cqZAo" node="2KSgAgVdqBW" resolve="jec" />
+                  </node>
+                  <node concept="37vLTw" id="2KSgAgVccHP" role="37vLTJ">
+                    <ref role="3cqZAo" node="5uFPQ7BM_np" resolve="expNode" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="2KSgAgVccHh" role="3cqZAp" />
+            </node>
+            <node concept="2ZW3vV" id="2KSgAgVcb7F" role="3eO9$A">
+              <node concept="3uibUv" id="2KSgAgVcb7G" role="2ZW6by">
+                <ref role="3uigEE" to="qrld:5uFPQ7BMJeJ" resolve="JavaPredicateSymbol" />
+              </node>
+              <node concept="2OqwBi" id="2KSgAgVcb7H" role="2ZW6bz">
+                <node concept="37vLTw" id="2KSgAgVcb7I" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5uFPQ7BMz7a" resolve="pred" />
+                </node>
+                <node concept="liA8E" id="2KSgAgVcb7J" role="2OqNvi">
+                  <ref role="37wK5l" to="qrld:6Kcfpq7Bjgi" resolve="symbol" />
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="9aQIb" id="5uFPQ7BMDXf" role="9aQIa">
             <node concept="3clFbS" id="5uFPQ7BMDXg" role="9aQI4">
               <node concept="3clFbF" id="5uFPQ7BMEH3" role="3cqZAp">
@@ -6480,6 +6626,28 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7eGEHDlcF7m" role="jymVt" />
+    <node concept="3clFb_" id="6X5F0NgiqA5" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="sessionSolver" />
+      <property role="od$2w" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="2aFKle" value="false" />
+      <node concept="3Tm1VV" id="6X5F0NgiqA7" role="1B3o_S" />
+      <node concept="3uibUv" id="6X5F0NgiqA8" role="3clF45">
+        <ref role="3uigEE" to="qrld:6Kcfpq7B0b0" resolve="SessionSolver" />
+      </node>
+      <node concept="3clFbS" id="6X5F0NgiqA9" role="3clF47">
+        <node concept="3clFbF" id="6X5F0NgiwQo" role="3cqZAp">
+          <node concept="37vLTw" id="6X5F0NgiwQn" role="3clFbG">
+            <ref role="3cqZAo" node="2tcGHBEqGgM" resolve="sessionSolver" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6X5F0Ngir_4" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6X5F0NgiwUs" role="jymVt" />
     <node concept="3clFb_" id="78CwJJcXhUF" role="jymVt">
       <property role="TrG5h" value="constraintArgumentTypes" />
       <property role="1EzhhJ" value="false" />