diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 62ec8b88..3fe55157 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -417,6 +417,7 @@
       <concept id="1195502151594" name="jetbrains.mps.lang.generator.structure.MappingScriptReference" flags="lg" index="1puMqW">
         <reference id="1195502167610" name="mappingScript" index="1puQsG" />
       </concept>
+      <concept id="1184792613450" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_parentOutputNode" flags="nn" index="3r99dp" />
       <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
         <child id="982871510064032342" name="parameter" index="1s_3oS" />
       </concept>
@@ -574,10 +575,10 @@
       <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
-      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
-      <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
-        <child id="1138662048170" name="value" index="tz02z" />
+      <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
+        <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
@@ -631,6 +632,7 @@
       </concept>
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
       </concept>
@@ -731,6 +733,10 @@
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
+      <concept id="1225711141656" name="jetbrains.mps.baseLanguage.collections.structure.ListElementAccessExpression" flags="nn" index="1y4W85">
+        <child id="1225711182005" name="list" index="1y566C" />
+        <child id="1225711191269" name="index" index="1y58nS" />
+      </concept>
       <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="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -4916,79 +4922,141 @@
                                         </node>
                                       </node>
                                       <node concept="3clFbH" id="5WBVN_N1Yd7" role="3cqZAp" />
-                                      <node concept="1Dw8fO" id="5WBVN_N1Yd8" role="3cqZAp">
-                                        <node concept="3clFbS" id="5WBVN_N1Yd9" role="2LFqv$">
-                                          <node concept="3cpWs8" id="5WBVN_N1Yda" role="3cqZAp">
-                                            <node concept="3cpWsn" id="5WBVN_N1Ydb" role="3cpWs9">
-                                              <property role="TrG5h" value="ivref" />
-                                              <node concept="3Tqbb2" id="5WBVN_N1Ydc" role="1tU5fm">
-                                                <ref role="ehGHo" to="tp68:h7VmV7M" resolve="InternalVariableReference" />
-                                              </node>
-                                              <node concept="2OqwBi" id="5WBVN_N1Ydd" role="33vP2m">
-                                                <node concept="2OqwBi" id="5WBVN_N1Yde" role="2Oq$k0">
-                                                  <node concept="37vLTw" id="5WBVN_N1Ydf" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="5WBVN_N1YcZ" resolve="argUsages" />
+                                      <node concept="3cpWs8" id="49obaclr3Hl" role="3cqZAp">
+                                        <node concept="3cpWsn" id="49obaclr3Hm" role="3cpWs9">
+                                          <property role="TrG5h" value="decls" />
+                                          <node concept="_YKpA" id="49obaclr3Hn" role="1tU5fm">
+                                            <node concept="3Tqbb2" id="49obaclr3Ho" role="_ZDj9" />
+                                          </node>
+                                          <node concept="2OqwBi" id="49obaclr3Hp" role="33vP2m">
+                                            <node concept="2OqwBi" id="49obaclr3Hq" role="2Oq$k0">
+                                              <node concept="2OqwBi" id="49obaclr3Hr" role="2Oq$k0">
+                                                <node concept="2OqwBi" id="49obaclr3Hs" role="2Oq$k0">
+                                                  <node concept="3r99dp" id="49obaclr3Ht" role="2Oq$k0" />
+                                                  <node concept="2Xjw5R" id="49obaclr3Hu" role="2OqNvi">
+                                                    <node concept="1xMEDy" id="49obaclr3Hv" role="1xVPHs">
+                                                      <node concept="chp4Y" id="49obaclr3Hw" role="ri$Ld">
+                                                        <ref role="cht4Q" to="tpee:fzclF80" resolve="StatementList" />
+                                                      </node>
+                                                    </node>
+                                                    <node concept="1xIGOp" id="49obaclr3Hx" role="1xVPHs" />
                                                   </node>
-                                                  <node concept="34jXtK" id="5WBVN_N1Ydg" role="2OqNvi">
-                                                    <node concept="37vLTw" id="5WBVN_N1Ydh" role="25WWJ7">
-                                                      <ref role="3cqZAo" node="5WBVN_N1Yds" resolve="i" />
+                                                </node>
+                                                <node concept="3Tsc0h" id="49obaclr3Hy" role="2OqNvi">
+                                                  <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                                                </node>
+                                              </node>
+                                              <node concept="3zZkjj" id="49obaclr3Hz" role="2OqNvi">
+                                                <node concept="1bVj0M" id="49obaclr3H$" role="23t8la">
+                                                  <node concept="3clFbS" id="49obaclr3H_" role="1bW5cS">
+                                                    <node concept="3clFbF" id="49obaclr3HA" role="3cqZAp">
+                                                      <node concept="2OqwBi" id="49obaclr3HB" role="3clFbG">
+                                                        <node concept="37vLTw" id="49obaclr3HC" role="2Oq$k0">
+                                                          <ref role="3cqZAo" node="49obaclr3HF" resolve="it" />
+                                                        </node>
+                                                        <node concept="1mIQ4w" id="49obaclr3HD" role="2OqNvi">
+                                                          <node concept="chp4Y" id="49obaclr3HE" role="cj9EA">
+                                                            <ref role="cht4Q" to="tpee:fzcpWvK" resolve="LocalVariableDeclarationStatement" />
+                                                          </node>
+                                                        </node>
+                                                      </node>
                                                     </node>
                                                   </node>
-                                                </node>
-                                                <node concept="1_qnLN" id="5WBVN_N1Ydi" role="2OqNvi">
-                                                  <ref role="1_rbq0" to="tp68:h7VmV7M" resolve="InternalVariableReference" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                          <node concept="3clFbF" id="5WBVN_N1Ydj" role="3cqZAp">
-                                            <node concept="2OqwBi" id="5WBVN_N1Ydk" role="3clFbG">
-                                              <node concept="2OqwBi" id="5WBVN_N1Ydl" role="2Oq$k0">
-                                                <node concept="37vLTw" id="5WBVN_N1Ydm" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="5WBVN_N1Ydb" resolve="ivref" />
-                                                </node>
-                                                <node concept="3TrcHB" id="5WBVN_N1Ydn" role="2OqNvi">
-                                                  <ref role="3TsBF5" to="tp68:h7VnrL9" resolve="name" />
-                                                </node>
-                                              </node>
-                                              <node concept="tyxLq" id="5WBVN_N1Ydo" role="2OqNvi">
-                                                <node concept="3cpWs3" id="5WBVN_N1Ydp" role="tz02z">
-                                                  <node concept="37vLTw" id="5WBVN_N1Ydq" role="3uHU7w">
-                                                    <ref role="3cqZAo" node="5WBVN_N1Yds" resolve="i" />
-                                                  </node>
-                                                  <node concept="Xl_RD" id="5WBVN_N1Ydr" role="3uHU7B">
-                                                    <property role="Xl_RC" value="typedArg" />
+                                                  <node concept="Rh6nW" id="49obaclr3HF" role="1bW2Oz">
+                                                    <property role="TrG5h" value="it" />
+                                                    <node concept="2jxLKc" id="49obaclr3HG" role="1tU5fm" />
                                                   </node>
                                                 </node>
                                               </node>
                                             </node>
-                                          </node>
-                                        </node>
-                                        <node concept="3cpWsn" id="5WBVN_N1Yds" role="1Duv9x">
-                                          <property role="TrG5h" value="i" />
-                                          <node concept="10Oyi0" id="5WBVN_N1Ydt" role="1tU5fm" />
-                                          <node concept="3cmrfG" id="5WBVN_N1Ydu" role="33vP2m">
-                                            <property role="3cmrfH" value="0" />
-                                          </node>
-                                        </node>
-                                        <node concept="3eOVzh" id="5WBVN_N1Ydv" role="1Dwp0S">
-                                          <node concept="2OqwBi" id="5WBVN_N1Ydw" role="3uHU7w">
-                                            <node concept="37vLTw" id="5WBVN_N1Ydx" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="5WBVN_N1YcZ" resolve="argUsages" />
-                                            </node>
-                                            <node concept="34oBXx" id="5WBVN_N1Ydy" role="2OqNvi" />
-                                          </node>
-                                          <node concept="37vLTw" id="5WBVN_N1Ydz" role="3uHU7B">
-                                            <ref role="3cqZAo" node="5WBVN_N1Yds" resolve="i" />
-                                          </node>
-                                        </node>
-                                        <node concept="3uNrnE" id="5WBVN_N1Yd$" role="1Dwrff">
-                                          <node concept="37vLTw" id="5WBVN_N1Yd_" role="2$L3a6">
-                                            <ref role="3cqZAo" node="5WBVN_N1Yds" resolve="i" />
+                                            <node concept="ANE8D" id="49obaclr3HH" role="2OqNvi" />
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="3clFbH" id="5WBVN_N1YdA" role="3cqZAp" />
+                                      <node concept="1Dw8fO" id="49obaclr3HI" role="3cqZAp">
+                                        <node concept="3clFbS" id="49obaclr3HJ" role="2LFqv$">
+                                          <node concept="3cpWs8" id="49obaclr3HK" role="3cqZAp">
+                                            <node concept="3cpWsn" id="49obaclr3HL" role="3cpWs9">
+                                              <property role="TrG5h" value="vref" />
+                                              <node concept="3Tqbb2" id="49obaclr3HM" role="1tU5fm">
+                                                <ref role="ehGHo" to="tpee:fz7vLUo" resolve="VariableReference" />
+                                              </node>
+                                              <node concept="2OqwBi" id="49obaclr3HN" role="33vP2m">
+                                                <node concept="2OqwBi" id="49obaclr3HO" role="2Oq$k0">
+                                                  <node concept="37vLTw" id="49obaclr3HP" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="5WBVN_N1YcZ" resolve="argUsages" />
+                                                  </node>
+                                                  <node concept="34jXtK" id="49obaclr3HQ" role="2OqNvi">
+                                                    <node concept="37vLTw" id="49obaclr3HR" role="25WWJ7">
+                                                      <ref role="3cqZAo" node="49obaclr3I6" resolve="i" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                                <node concept="1_qnLN" id="49obaclr3HS" role="2OqNvi">
+                                                  <ref role="1_rbq0" to="tpee:fz7vLUo" resolve="VariableReference" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="3clFbF" id="49obaclr3HT" role="3cqZAp">
+                                            <node concept="2OqwBi" id="49obaclr3HU" role="3clFbG">
+                                              <node concept="2OqwBi" id="49obaclr3HV" role="2Oq$k0">
+                                                <node concept="37vLTw" id="49obaclr3HW" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="49obaclr3HL" resolve="vref" />
+                                                </node>
+                                                <node concept="3TrEf2" id="49obaclr3HX" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
+                                                </node>
+                                              </node>
+                                              <node concept="2oxUTD" id="49obaclr3HY" role="2OqNvi">
+                                                <node concept="2OqwBi" id="49obaclr3HZ" role="2oxUTC">
+                                                  <node concept="1PxgMI" id="49obaclr3I0" role="2Oq$k0">
+                                                    <property role="1BlNFB" value="true" />
+                                                    <node concept="chp4Y" id="49obaclr3I1" role="3oSUPX">
+                                                      <ref role="cht4Q" to="tpee:fzcpWvK" resolve="LocalVariableDeclarationStatement" />
+                                                    </node>
+                                                    <node concept="1y4W85" id="49obaclr3I2" role="1m5AlR">
+                                                      <node concept="37vLTw" id="49obaclr3I3" role="1y58nS">
+                                                        <ref role="3cqZAo" node="49obaclr3I6" resolve="i" />
+                                                      </node>
+                                                      <node concept="37vLTw" id="49obaclr3I4" role="1y566C">
+                                                        <ref role="3cqZAo" node="49obaclr3Hm" resolve="decls" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3TrEf2" id="49obaclr3I5" role="2OqNvi">
+                                                    <ref role="3Tt5mk" to="tpee:fzcpWvL" resolve="localVariableDeclaration" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="3cpWsn" id="49obaclr3I6" role="1Duv9x">
+                                          <property role="TrG5h" value="i" />
+                                          <node concept="10Oyi0" id="49obaclr3I7" role="1tU5fm" />
+                                          <node concept="3cmrfG" id="49obaclr3I8" role="33vP2m">
+                                            <property role="3cmrfH" value="0" />
+                                          </node>
+                                        </node>
+                                        <node concept="3eOVzh" id="49obaclr3I9" role="1Dwp0S">
+                                          <node concept="2OqwBi" id="49obaclr3Ia" role="3uHU7w">
+                                            <node concept="37vLTw" id="49obaclr3Ib" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="5WBVN_N1YcZ" resolve="argUsages" />
+                                            </node>
+                                            <node concept="34oBXx" id="49obaclr3Ic" role="2OqNvi" />
+                                          </node>
+                                          <node concept="37vLTw" id="49obaclr3Id" role="3uHU7B">
+                                            <ref role="3cqZAo" node="49obaclr3I6" resolve="i" />
+                                          </node>
+                                        </node>
+                                        <node concept="3uNrnE" id="49obaclr3Ie" role="1Dwrff">
+                                          <node concept="37vLTw" id="49obaclr3If" role="2$L3a6">
+                                            <ref role="3cqZAo" node="49obaclr3I6" resolve="i" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="3clFbH" id="49obaclr5oU" role="3cqZAp" />
                                       <node concept="3clFbF" id="5WBVN_N1YdB" role="3cqZAp">
                                         <node concept="2OqwBi" id="5WBVN_N1YdC" role="3clFbG">
                                           <node concept="37vLTw" id="5WBVN_N1YdD" role="2Oq$k0">
@@ -5088,15 +5156,15 @@
                                               <node concept="2OqwBi" id="5WBVN_MlDWg" role="3clFbG">
                                                 <node concept="2OqwBi" id="5WBVN_MlDWh" role="2Oq$k0">
                                                   <node concept="30H73N" id="5WBVN_MlDWi" role="2Oq$k0" />
-                                                  <node concept="2qgKlT" id="5WBVN_MlDWj" role="2OqNvi">
-                                                    <ref role="37wK5l" to="x5bw:5QftlvwM57x" resolve="ruleInputReferences" />
+                                                  <node concept="2qgKlT" id="49obaclzZbT" role="2OqNvi">
+                                                    <ref role="37wK5l" to="x5bw:2KSgAgV9U$u" resolve="logicalExpressions" />
                                                   </node>
                                                 </node>
                                                 <node concept="3QWeyG" id="5WBVN_MlDWk" role="2OqNvi">
                                                   <node concept="2OqwBi" id="5WBVN_MlDWl" role="576Qk">
                                                     <node concept="30H73N" id="5WBVN_MlDWm" role="2Oq$k0" />
-                                                    <node concept="2qgKlT" id="5WBVN_MlDWn" role="2OqNvi">
-                                                      <ref role="37wK5l" to="x5bw:2KSgAgV9U$u" resolve="logicalExpressions" />
+                                                    <node concept="2qgKlT" id="49obaclzZGJ" role="2OqNvi">
+                                                      <ref role="37wK5l" to="x5bw:5QftlvwM57x" resolve="ruleInputReferences" />
                                                     </node>
                                                   </node>
                                                 </node>
@@ -5228,15 +5296,15 @@
                                         <node concept="2OqwBi" id="5WBVN_Mb0$x" role="3clFbG">
                                           <node concept="2OqwBi" id="5WBVN_Mb0$y" role="2Oq$k0">
                                             <node concept="30H73N" id="5WBVN_Mb0$z" role="2Oq$k0" />
-                                            <node concept="2qgKlT" id="5WBVN_Mb0$$" role="2OqNvi">
-                                              <ref role="37wK5l" to="x5bw:5QftlvwM57x" resolve="ruleInputReferences" />
+                                            <node concept="2qgKlT" id="49obacl$0tZ" role="2OqNvi">
+                                              <ref role="37wK5l" to="x5bw:2KSgAgV9U$u" resolve="logicalExpressions" />
                                             </node>
                                           </node>
                                           <node concept="3QWeyG" id="5WBVN_Mb0$_" role="2OqNvi">
                                             <node concept="2OqwBi" id="5WBVN_Mb0$A" role="576Qk">
                                               <node concept="30H73N" id="5WBVN_Mb0$B" role="2Oq$k0" />
-                                              <node concept="2qgKlT" id="5WBVN_Mb0$C" role="2OqNvi">
-                                                <ref role="37wK5l" to="x5bw:2KSgAgV9U$u" resolve="logicalExpressions" />
+                                              <node concept="2qgKlT" id="49obacl$1Q0" role="2OqNvi">
+                                                <ref role="37wK5l" to="x5bw:5QftlvwM57x" resolve="ruleInputReferences" />
                                               </node>
                                             </node>
                                           </node>
@@ -5295,13 +5363,64 @@
                                           </node>
                                         </node>
                                         <node concept="3clFbH" id="5WBVN_M3OOr" role="3cqZAp" />
+                                        <node concept="3cpWs8" id="49obaclqu4q" role="3cqZAp">
+                                          <node concept="3cpWsn" id="49obaclqu4r" role="3cpWs9">
+                                            <property role="TrG5h" value="decls" />
+                                            <node concept="_YKpA" id="49obaclqu4d" role="1tU5fm">
+                                              <node concept="3Tqbb2" id="49obaclqEw4" role="_ZDj9" />
+                                            </node>
+                                            <node concept="2OqwBi" id="49obaclqu4s" role="33vP2m">
+                                              <node concept="2OqwBi" id="49obaclqu4t" role="2Oq$k0">
+                                                <node concept="2OqwBi" id="49obaclqu4u" role="2Oq$k0">
+                                                  <node concept="2OqwBi" id="49obaclqu4v" role="2Oq$k0">
+                                                    <node concept="3r99dp" id="49obaclqu4w" role="2Oq$k0" />
+                                                    <node concept="2Xjw5R" id="49obaclqu4x" role="2OqNvi">
+                                                      <node concept="1xMEDy" id="49obaclqu4y" role="1xVPHs">
+                                                        <node concept="chp4Y" id="49obaclqu4z" role="ri$Ld">
+                                                          <ref role="cht4Q" to="tpee:fzclF80" resolve="StatementList" />
+                                                        </node>
+                                                      </node>
+                                                      <node concept="1xIGOp" id="49obaclqu4$" role="1xVPHs" />
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3Tsc0h" id="49obaclqu4_" role="2OqNvi">
+                                                    <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                                                  </node>
+                                                </node>
+                                                <node concept="3zZkjj" id="49obaclqwsZ" role="2OqNvi">
+                                                  <node concept="1bVj0M" id="49obaclqwt1" role="23t8la">
+                                                    <node concept="3clFbS" id="49obaclqwt2" role="1bW5cS">
+                                                      <node concept="3clFbF" id="49obaclqwt3" role="3cqZAp">
+                                                        <node concept="2OqwBi" id="49obaclqwt4" role="3clFbG">
+                                                          <node concept="37vLTw" id="49obaclqwt5" role="2Oq$k0">
+                                                            <ref role="3cqZAo" node="49obaclqwt8" resolve="it" />
+                                                          </node>
+                                                          <node concept="1mIQ4w" id="49obaclqwt6" role="2OqNvi">
+                                                            <node concept="chp4Y" id="49obaclqwt7" role="cj9EA">
+                                                              <ref role="cht4Q" to="tpee:fzcpWvK" resolve="LocalVariableDeclarationStatement" />
+                                                            </node>
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                    </node>
+                                                    <node concept="Rh6nW" id="49obaclqwt8" role="1bW2Oz">
+                                                      <property role="TrG5h" value="it" />
+                                                      <node concept="2jxLKc" id="49obaclqwt9" role="1tU5fm" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="ANE8D" id="49obaclqu4K" role="2OqNvi" />
+                                            </node>
+                                          </node>
+                                        </node>
                                         <node concept="1Dw8fO" id="5WBVN_M3OOs" role="3cqZAp">
                                           <node concept="3clFbS" id="5WBVN_M3OOt" role="2LFqv$">
                                             <node concept="3cpWs8" id="5WBVN_MfQPL" role="3cqZAp">
                                               <node concept="3cpWsn" id="5WBVN_MfQPM" role="3cpWs9">
-                                                <property role="TrG5h" value="ivref" />
+                                                <property role="TrG5h" value="vref" />
                                                 <node concept="3Tqbb2" id="5WBVN_MfQPF" role="1tU5fm">
-                                                  <ref role="ehGHo" to="tp68:h7VmV7M" resolve="InternalVariableReference" />
+                                                  <ref role="ehGHo" to="tpee:fz7vLUo" resolve="VariableReference" />
                                                 </node>
                                                 <node concept="2OqwBi" id="5WBVN_MfQPN" role="33vP2m">
                                                   <node concept="2OqwBi" id="5WBVN_MfQPO" role="2Oq$k0">
@@ -5315,28 +5434,39 @@
                                                     </node>
                                                   </node>
                                                   <node concept="1_qnLN" id="5WBVN_MfQPS" role="2OqNvi">
-                                                    <ref role="1_rbq0" to="tp68:h7VmV7M" resolve="InternalVariableReference" />
+                                                    <ref role="1_rbq0" to="tpee:fz7vLUo" resolve="VariableReference" />
                                                   </node>
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="3clFbF" id="5WBVN_Mblfc" role="3cqZAp">
-                                              <node concept="2OqwBi" id="5WBVN_MbnMM" role="3clFbG">
-                                                <node concept="2OqwBi" id="5WBVN_MblN4" role="2Oq$k0">
-                                                  <node concept="37vLTw" id="5WBVN_MfX4z" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="5WBVN_MfQPM" resolve="ivref" />
+                                            <node concept="3clFbF" id="49obaclqLe1" role="3cqZAp">
+                                              <node concept="2OqwBi" id="49obaclqNw6" role="3clFbG">
+                                                <node concept="2OqwBi" id="49obaclqLKe" role="2Oq$k0">
+                                                  <node concept="37vLTw" id="49obaclqLdZ" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="5WBVN_MfQPM" resolve="vref" />
                                                   </node>
-                                                  <node concept="3TrcHB" id="5WBVN_MbmMD" role="2OqNvi">
-                                                    <ref role="3TsBF5" to="tp68:h7VnrL9" resolve="name" />
+                                                  <node concept="3TrEf2" id="49obaclqMBu" role="2OqNvi">
+                                                    <ref role="3Tt5mk" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
                                                   </node>
                                                 </node>
-                                                <node concept="tyxLq" id="5WBVN_MboD2" role="2OqNvi">
-                                                  <node concept="3cpWs3" id="5WBVN_MbskV" role="tz02z">
-                                                    <node concept="37vLTw" id="5WBVN_MbsXP" role="3uHU7w">
-                                                      <ref role="3cqZAo" node="5WBVN_M3OOK" resolve="i" />
+                                                <node concept="2oxUTD" id="49obaclqOao" role="2OqNvi">
+                                                  <node concept="2OqwBi" id="49obaclr0zN" role="2oxUTC">
+                                                    <node concept="1PxgMI" id="49obaclqZcp" role="2Oq$k0">
+                                                      <property role="1BlNFB" value="true" />
+                                                      <node concept="chp4Y" id="49obaclqZJC" role="3oSUPX">
+                                                        <ref role="cht4Q" to="tpee:fzcpWvK" resolve="LocalVariableDeclarationStatement" />
+                                                      </node>
+                                                      <node concept="1y4W85" id="49obaclqUUj" role="1m5AlR">
+                                                        <node concept="37vLTw" id="49obaclqVtL" role="1y58nS">
+                                                          <ref role="3cqZAo" node="5WBVN_M3OOK" resolve="i" />
+                                                        </node>
+                                                        <node concept="37vLTw" id="49obaclqOIq" role="1y566C">
+                                                          <ref role="3cqZAo" node="49obaclqu4r" resolve="decls" />
+                                                        </node>
+                                                      </node>
                                                     </node>
-                                                    <node concept="Xl_RD" id="5WBVN_Mbpj4" role="3uHU7B">
-                                                      <property role="Xl_RC" value="typedArg" />
+                                                    <node concept="3TrEf2" id="49obaclr1k8" role="2OqNvi">
+                                                      <ref role="3Tt5mk" to="tpee:fzcpWvL" resolve="localVariableDeclaration" />
                                                     </node>
                                                   </node>
                                                 </node>
@@ -12383,6 +12513,43 @@
         <node concept="3uibUv" id="7HUwyZb4SpF" role="1Koe22">
           <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
           <node concept="raruj" id="7HUwyZb4SpK" role="lGtFl" />
+          <node concept="3uibUv" id="49obaclwgxi" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            <node concept="29HgVG" id="49obaclwgxy" role="lGtFl">
+              <node concept="3NFfHV" id="49obaclwgxD" role="3NFExx">
+                <node concept="3clFbS" id="49obaclwgxE" role="2VODD2">
+                  <node concept="3clFbJ" id="49obaclwhoa" role="3cqZAp">
+                    <node concept="3y3z36" id="49obaclwioN" role="3clFbw">
+                      <node concept="10Nm6u" id="49obaclwip1" role="3uHU7w" />
+                      <node concept="2OqwBi" id="49obaclwhCd" role="3uHU7B">
+                        <node concept="30H73N" id="49obaclwhrE" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="49obaclwhZk" role="2OqNvi">
+                          <ref role="3Tt5mk" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbS" id="49obaclwhoc" role="3clFbx">
+                      <node concept="3cpWs6" id="49obaclwiuR" role="3cqZAp">
+                        <node concept="2OqwBi" id="49obaclwgJU" role="3cqZAk">
+                          <node concept="30H73N" id="49obaclwg$Y" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="49obaclwh70" role="2OqNvi">
+                            <ref role="3Tt5mk" to="5j4j:5zfvpQ71CIE" resolve="dataType" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="49obaclwiUA" role="3cqZAp">
+                    <node concept="2c44tf" id="49obaclwiUy" role="3clFbG">
+                      <node concept="3uibUv" id="49obaclwjaK" role="2c44tc">
+                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
       </node>
     </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index 6742ae83..8d78fcc3 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.lang.typesystem2" uuid="c4803b19-6d89-4a3b-bf82-390769514add" languageVersion="4" moduleVersion="0">
+<language namespace="jetbrains.mps.lang.typesystem2" uuid="c4803b19-6d89-4a3b-bf82-390769514add" languageVersion="5" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
index d9faf864..4779a264 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -527,8 +527,8 @@
             <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 concept="chp4Y" id="49obaclgFk1" role="ri$Ld">
+                  <ref role="cht4Q" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
                 </node>
               </node>
               <node concept="hTh3S" id="2KSgAgV9UDR" role="1xVPHs">
@@ -541,7 +541,7 @@
         </node>
       </node>
       <node concept="2I9FWS" id="2KSgAgV9UDH" role="3clF45">
-        <ref role="2I9WkF" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
+        <ref role="2I9WkF" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
       </node>
     </node>
     <node concept="13i0hz" id="5QftlvwM57x" role="13h7CS">
@@ -1917,8 +1917,8 @@
             <node concept="13iPFW" id="5WBVN_N1Xud" role="2Oq$k0" />
             <node concept="2Rf3mk" id="5WBVN_Ne6ZL" role="2OqNvi">
               <node concept="1xMEDy" id="5WBVN_Ne6ZN" role="1xVPHs">
-                <node concept="chp4Y" id="5WBVN_Ne6ZO" role="ri$Ld">
-                  <ref role="cht4Q" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
+                <node concept="chp4Y" id="49obaclgJrG" role="ri$Ld">
+                  <ref role="cht4Q" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
                 </node>
               </node>
               <node concept="hTh3S" id="5WBVN_Ne6ZP" role="1xVPHs">
@@ -1931,7 +1931,7 @@
         </node>
       </node>
       <node concept="2I9FWS" id="5WBVN_N1Xuj" role="3clF45">
-        <ref role="2I9WkF" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
+        <ref role="2I9WkF" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
       </node>
     </node>
     <node concept="13i0hz" id="5WBVN_N1Xuk" role="13h7CS">
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 66657e9c..cf07e1da 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -328,7 +328,6 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1179360813171" name="jetbrains.mps.baseLanguage.structure.HexIntegerLiteral" flags="nn" index="2nou5x">
         <property id="1179360856892" name="value" index="2noCCI" />
       </concept>
@@ -354,10 +353,6 @@
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
-      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
-        <child id="1070534934091" name="type" index="10QFUM" />
-        <child id="1070534934092" name="expression" index="10QFUP" />
-      </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -415,12 +410,6 @@
       <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="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
@@ -454,10 +443,6 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
-      <concept id="5253134957341697434" name="jetbrains.mps.lang.smodel.structure.LinkNameRefExpression" flags="nn" index="prKvN">
-        <reference id="5253134957341833005" name="conceptDeclaration" index="prhl4" />
-        <reference id="5253134957341833006" name="linkDeclaration" index="prhl7" />
-      </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
         <child id="1138662048170" name="value" index="tz02z" />
@@ -510,9 +495,6 @@
       <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
         <reference id="1138056546658" name="link" index="3TtcxE" />
       </concept>
-      <concept id="1172424058054" name="jetbrains.mps.lang.smodel.structure.ConceptRefExpression" flags="nn" index="3TUQnm">
-        <reference id="1172424100906" name="conceptDeclaration" index="3TV0OU" />
-      </concept>
       <concept id="1228341669568" name="jetbrains.mps.lang.smodel.structure.Node_DetachOperation" flags="nn" index="3YRAZt" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -532,9 +514,6 @@
       </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>
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -5265,11 +5244,6 @@
         <ref role="2kkw0f" node="4bWqD4C22Ew" resolve="TermDeclaration_parameter" />
       </node>
     </node>
-    <node concept="1s_PAr" id="4hPXq9Jmew6" role="3ft7WO">
-      <node concept="2kknPI" id="4hPXq9Jmew7" role="1s_PAo">
-        <ref role="2kkw0f" node="4hPXq9Jmeuj" resolve="Expression_subst_LogicExpressionWrapper" />
-      </node>
-    </node>
     <node concept="1s_PAr" id="4hPXq9JmeAu" role="3ft7WO">
       <node concept="2kknPI" id="4hPXq9JmeAv" role="1s_PAo">
         <ref role="2kkw0f" node="4hPXq9JmezX" resolve="ContextParameter_Expression" />
@@ -5522,140 +5496,6 @@
       </node>
     </node>
   </node>
-  <node concept="Q6S24" id="4hPXq9Jmeuj">
-    <property role="TrG5h" value="Expression_subst_LogicExpressionWrapper" />
-    <ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
-    <node concept="2F$Pav" id="4hPXq9Jmeul" role="3ft7WO">
-      <node concept="3Tqbb2" id="4hPXq9Jmeum" role="2ZBHrp" />
-      <node concept="2$S_p_" id="4hPXq9Jmeun" role="2$S_pT">
-        <node concept="3clFbS" id="4hPXq9Jmeuo" role="2VODD2">
-          <node concept="3SKdUt" id="4hPXq9Jmeup" role="3cqZAp">
-            <node concept="3SKdUq" id="4hPXq9Jmeuq" role="3SKWNk">
-              <property role="3SKdUp" value="see ChildSubstituteActionsHelper" />
-            </node>
-          </node>
-          <node concept="3cpWs8" id="4hPXq9Jmeur" role="3cqZAp">
-            <node concept="3cpWsn" id="4hPXq9Jmeus" role="3cpWs9">
-              <property role="TrG5h" value="srd" />
-              <node concept="3uibUv" id="4hPXq9Jmeut" role="1tU5fm">
-                <ref role="3uigEE" to="ykok:~ReferenceDescriptor" resolve="ReferenceDescriptor" />
-              </node>
-              <node concept="2YIFZM" id="4hPXq9Jmeuu" role="33vP2m">
-                <ref role="37wK5l" to="ykok:~ModelConstraints.getSmartReferenceDescriptor(org.jetbrains.mps.openapi.model.SNode,java.lang.String,int,org.jetbrains.mps.openapi.model.SNode):jetbrains.mps.smodel.constraints.ReferenceDescriptor" resolve="getSmartReferenceDescriptor" />
-                <ref role="1Pybhc" to="ykok:~ModelConstraints" resolve="ModelConstraints" />
-                <node concept="3bvxqY" id="4hPXq9JmeuH" role="37wK5m" />
-                <node concept="prKvN" id="4hPXq9Jmeuw" role="37wK5m">
-                  <ref role="prhl4" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
-                  <ref role="prhl7" to="5j4j:7E86$tK_PaH" resolve="declaration" />
-                </node>
-                <node concept="3cmrfG" id="4hPXq9Jmeux" role="37wK5m">
-                  <property role="3cmrfH" value="-1" />
-                </node>
-                <node concept="3TUQnm" id="4hPXq9Jmeuy" role="37wK5m">
-                  <ref role="3TV0OU" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="4hPXq9Jmeuz" role="3cqZAp">
-            <node concept="10QFUN" id="4hPXq9Jmeu$" role="3clFbG">
-              <node concept="A3Dl8" id="4hPXq9Jmeu_" role="10QFUM">
-                <node concept="3Tqbb2" id="4hPXq9JmeuA" role="A3Ik2" />
-              </node>
-              <node concept="2OqwBi" id="4hPXq9JmeuB" role="10QFUP">
-                <node concept="2OqwBi" id="4hPXq9JmeuC" role="2Oq$k0">
-                  <node concept="37vLTw" id="4hPXq9JmeuD" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4hPXq9Jmeus" resolve="srd" />
-                  </node>
-                  <node concept="liA8E" id="4hPXq9JmeuE" role="2OqNvi">
-                    <ref role="37wK5l" to="ykok:~ReferenceDescriptor.getScope():jetbrains.mps.scope.Scope" resolve="getScope" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="4hPXq9JmeuF" role="2OqNvi">
-                  <ref role="37wK5l" to="35tq:~Scope.getAvailableElements(java.lang.String):java.lang.Iterable" resolve="getAvailableElements" />
-                  <node concept="Xl_RD" id="4hPXq9JmeuG" role="37wK5m">
-                    <property role="Xl_RC" value="" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3eGOop" id="4hPXq9Jmev8" role="2$S_pN">
-        <ref role="3EoQqy" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
-        <node concept="ucgPf" id="4hPXq9Jmev9" role="3aKz83">
-          <node concept="3clFbS" id="4hPXq9Jmeva" role="2VODD2">
-            <node concept="3cpWs8" id="4hPXq9Jmevb" role="3cqZAp">
-              <node concept="3cpWsn" id="4hPXq9Jmevc" role="3cpWs9">
-                <property role="TrG5h" value="lew" />
-                <node concept="3Tqbb2" id="4hPXq9Jmevd" role="1tU5fm">
-                  <ref role="ehGHo" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
-                </node>
-                <node concept="2OqwBi" id="4hPXq9Jmeve" role="33vP2m">
-                  <node concept="1rpKSd" id="4hPXq9JmevB" role="2Oq$k0" />
-                  <node concept="15TzpJ" id="4hPXq9Jmevg" role="2OqNvi">
-                    <ref role="I8UWU" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="4hPXq9Jmevh" role="3cqZAp">
-              <node concept="3cpWsn" id="4hPXq9Jmevi" role="3cpWs9">
-                <property role="TrG5h" value="lvr" />
-                <node concept="3Tqbb2" id="4hPXq9Jmevj" role="1tU5fm">
-                  <ref role="ehGHo" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
-                </node>
-                <node concept="2OqwBi" id="4hPXq9Jmevk" role="33vP2m">
-                  <node concept="1rpKSd" id="4hPXq9JmevC" role="2Oq$k0" />
-                  <node concept="15TzpJ" id="4hPXq9Jmevm" role="2OqNvi">
-                    <ref role="I8UWU" to="5j4j:7E86$tK_OxQ" resolve="LogicalVariable" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4hPXq9Jmevn" role="3cqZAp">
-              <node concept="2OqwBi" id="4hPXq9Jmevo" role="3clFbG">
-                <node concept="2OqwBi" id="4hPXq9Jmevp" role="2Oq$k0">
-                  <node concept="37vLTw" id="4hPXq9Jmevq" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4hPXq9Jmevc" resolve="lew" />
-                  </node>
-                  <node concept="3TrEf2" id="4hPXq9Jmevr" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:6p0DfM0pQge" resolve="content" />
-                  </node>
-                </node>
-                <node concept="2oxUTD" id="4hPXq9Jmevs" role="2OqNvi">
-                  <node concept="37vLTw" id="4hPXq9Jmevt" role="2oxUTC">
-                    <ref role="3cqZAo" node="4hPXq9Jmevi" resolve="lvr" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4hPXq9Jmevu" role="3cqZAp">
-              <node concept="2OqwBi" id="4hPXq9Jmevv" role="3clFbG">
-                <node concept="2OqwBi" id="4hPXq9Jmevw" role="2Oq$k0">
-                  <node concept="37vLTw" id="4hPXq9Jmevx" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4hPXq9Jmevi" resolve="lvr" />
-                  </node>
-                  <node concept="3TrEf2" id="4hPXq9Jmevy" role="2OqNvi">
-                    <ref role="3Tt5mk" to="5j4j:7E86$tK_PaH" resolve="declaration" />
-                  </node>
-                </node>
-                <node concept="2oxUTD" id="4hPXq9Jmevz" role="2OqNvi">
-                  <node concept="2ZBlsa" id="4hPXq9JmevD" role="2oxUTC" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4hPXq9Jmev_" role="3cqZAp">
-              <node concept="37vLTw" id="4hPXq9JmevA" role="3clFbG">
-                <ref role="3cqZAo" node="4hPXq9Jmevc" resolve="lew" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="Q6S24" id="4hPXq9Jmew8">
     <property role="TrG5h" value="Statement_subst_LogicVarDeclarationStatement" />
     <ref role="aqKnT" to="tpee:fzclF8l" resolve="Statement" />
@@ -6892,50 +6732,6 @@
   </node>
   <node concept="3p36aQ" id="7XmdqtdNMJ7">
     <ref role="aqKnT" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
-    <node concept="3N5dw7" id="7XmdqtdNMLp" role="3ft7WO">
-      <node concept="3N5aqt" id="7XmdqtdNMLq" role="3Na0zg">
-        <node concept="3clFbS" id="7XmdqtdNMLr" role="2VODD2">
-          <node concept="3cpWs8" id="7XmdqtdNSAC" role="3cqZAp">
-            <node concept="3cpWsn" id="7XmdqtdNSAD" role="3cpWs9">
-              <property role="TrG5h" value="le" />
-              <node concept="3Tqbb2" id="7XmdqtdNSAB" role="1tU5fm">
-                <ref role="ehGHo" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
-              </node>
-              <node concept="2ShNRf" id="7XmdqtdNSAE" role="33vP2m">
-                <node concept="3zrR0B" id="7XmdqtdNSAF" role="2ShVmc">
-                  <node concept="3Tqbb2" id="7XmdqtdNSAG" role="3zrR0E">
-                    <ref role="ehGHo" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="7XmdqtdNMWX" role="3cqZAp">
-            <node concept="2OqwBi" id="7XmdqtdNTZn" role="3clFbG">
-              <node concept="2OqwBi" id="7XmdqtdNTtp" role="2Oq$k0">
-                <node concept="37vLTw" id="7XmdqtdNSAH" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7XmdqtdNSAD" resolve="le" />
-                </node>
-                <node concept="3TrEf2" id="7XmdqtdNTEb" role="2OqNvi">
-                  <ref role="3Tt5mk" to="wq2x:6p0DfM0pQge" resolve="content" />
-                </node>
-              </node>
-              <node concept="2oxUTD" id="7XmdqtdNUmX" role="2OqNvi">
-                <node concept="3N4pyC" id="7XmdqtdNUwC" role="2oxUTC" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="7XmdqtdNUKS" role="3cqZAp">
-            <node concept="37vLTw" id="7XmdqtdNUKQ" role="3clFbG">
-              <ref role="3cqZAo" node="7XmdqtdNSAD" resolve="le" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2kknPJ" id="7XmdqtdNMPi" role="2klrvf">
-        <ref role="2ZyFGn" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
-      </node>
-    </node>
   </node>
   <node concept="3p36aQ" id="7XmdqtdOhwc">
     <property role="3GE5qa" value="term" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/migration.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/migration.mps
index 433f31bf..6db8ab18 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/migration.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/migration.mps
@@ -1443,5 +1443,173 @@
       <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
     </node>
   </node>
+  <node concept="3SyAh_" id="49obacldLFJ">
+    <property role="qMTe8" value="4" />
+    <property role="TrG5h" value="Replace_LogicalExpression" />
+    <node concept="3Tm1VV" id="49obacldLFK" role="1B3o_S" />
+    <node concept="3tTeZs" id="49obacldLFL" role="jymVt">
+      <property role="3tTeZt" value="&lt;no execute after&gt;" />
+      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
+    </node>
+    <node concept="3tTeZs" id="49obacldLFM" role="jymVt">
+      <property role="3tTeZt" value="&lt;no required data&gt;" />
+      <ref role="3tTeZr" to="slm6:3A3gNhf1WPI" resolve="requires data" />
+    </node>
+    <node concept="3tTeZs" id="49obacldLFN" role="jymVt">
+      <property role="3tTeZt" value="&lt;no produced data&gt;" />
+      <ref role="3tTeZr" to="slm6:536fTXa4WHO" resolve="produces data" />
+    </node>
+    <node concept="2tJIrI" id="49obacldLFO" role="jymVt" />
+    <node concept="3tYpMH" id="49obacldLMg" role="jymVt">
+      <property role="TrG5h" value="isRerunnable" />
+      <property role="3tYpME" value="true" />
+      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
+      <node concept="3Tm1VV" id="49obacldLMi" role="1B3o_S" />
+      <node concept="10P_77" id="49obacldLMj" role="1tU5fm" />
+    </node>
+    <node concept="3tYpXE" id="49obacldLMV" role="jymVt">
+      <property role="TrG5h" value="description" />
+      <property role="3tYpXF" value="Replace deprecated LogicalExpression with the one from Logic lang" />
+      <ref role="25KYV2" to="slm6:1_lSsE3RFpE" resolve="description" />
+      <node concept="3Tm1VV" id="49obacldLMX" role="1B3o_S" />
+      <node concept="17QB3L" id="49obacldLMY" role="1tU5fm" />
+    </node>
+    <node concept="q3mfD" id="49obacldLFR" role="jymVt">
+      <property role="TrG5h" value="execute" />
+      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
+      <node concept="3Tm1VV" id="49obacldLFT" role="1B3o_S" />
+      <node concept="3clFbS" id="49obacldLFV" role="3clF47">
+        <node concept="3cpWs8" id="49obacldNQ8" role="3cqZAp">
+          <node concept="3cpWsn" id="49obacldNQ9" role="3cpWs9">
+            <property role="TrG5h" value="instances" />
+            <node concept="_YKpA" id="49obacldNQa" role="1tU5fm">
+              <node concept="3Tqbb2" id="49obacldVFO" role="_ZDj9" />
+            </node>
+            <node concept="2ShNRf" id="49obacldNQc" role="33vP2m">
+              <node concept="Tc6Ow" id="49obacldNQd" role="2ShVmc">
+                <node concept="3Tqbb2" id="49obacldWCu" role="HW$YZ" />
+                <node concept="2OqwBi" id="49obacldNQf" role="I$8f6">
+                  <node concept="2YIFZM" id="49obacldNQg" role="2Oq$k0">
+                    <ref role="37wK5l" to="lui2:~FindUsagesFacade.getInstance():org.jetbrains.mps.openapi.module.FindUsagesFacade" resolve="getInstance" />
+                    <ref role="1Pybhc" to="lui2:~FindUsagesFacade" resolve="FindUsagesFacade" />
+                  </node>
+                  <node concept="liA8E" id="49obacldNQh" role="2OqNvi">
+                    <ref role="37wK5l" to="lui2:~FindUsagesFacade.findInstances(org.jetbrains.mps.openapi.module.SearchScope,java.util.Set,boolean,org.jetbrains.mps.openapi.util.ProgressMonitor):java.util.Set" resolve="findInstances" />
+                    <node concept="2ShNRf" id="49obacldNQi" role="37wK5m">
+                      <node concept="1pGfFk" id="49obacldNQj" role="2ShVmc">
+                        <ref role="37wK5l" to="mte5:~ModulesScope.&lt;init&gt;(org.jetbrains.mps.openapi.module.SModule...)" resolve="ModulesScope" />
+                        <node concept="37vLTw" id="49obacldNQk" role="37wK5m">
+                          <ref role="3cqZAo" node="49obacldLFX" resolve="m" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2YIFZM" id="49obacldNQl" role="37wK5m">
+                      <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object):java.util.Set" resolve="singleton" />
+                      <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                      <node concept="35c_gC" id="49obacldNQm" role="37wK5m">
+                        <ref role="35c_gD" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
+                      </node>
+                    </node>
+                    <node concept="3clFbT" id="49obacldNQn" role="37wK5m">
+                      <property role="3clFbU" value="false" />
+                    </node>
+                    <node concept="2ShNRf" id="49obacldNQo" role="37wK5m">
+                      <node concept="1pGfFk" id="49obacldNQp" role="2ShVmc">
+                        <ref role="37wK5l" to="mk8z:~EmptyProgressMonitor.&lt;init&gt;()" resolve="EmptyProgressMonitor" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="49obacldPsM" role="3cqZAp">
+          <node concept="3clFbS" id="49obacldPsP" role="2LFqv$">
+            <node concept="3cpWs8" id="49obacldZ3Y" role="3cqZAp">
+              <node concept="3cpWsn" id="49obacldZ3Z" role="3cpWs9">
+                <property role="TrG5h" value="content" />
+                <node concept="3Tqbb2" id="49obacldZ3U" role="1tU5fm">
+                  <ref role="ehGHo" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
+                </node>
+                <node concept="2OqwBi" id="49obacldZ40" role="33vP2m">
+                  <node concept="1PxgMI" id="49obacldZ41" role="2Oq$k0">
+                    <property role="1BlNFB" value="true" />
+                    <node concept="chp4Y" id="49obacldZ42" role="3oSUPX">
+                      <ref role="cht4Q" to="wq2x:6p0DfM0pKSO" resolve="LogicalExpression" />
+                    </node>
+                    <node concept="37vLTw" id="49obacldZ43" role="1m5AlR">
+                      <ref role="3cqZAo" node="49obacldPsQ" resolve="inst" />
+                    </node>
+                  </node>
+                  <node concept="3TrEf2" id="49obacldZ44" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:6p0DfM0pQge" resolve="content" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="49obacldZAN" role="3cqZAp">
+              <node concept="3cpWsn" id="49obacldZAO" role="3cpWs9">
+                <property role="TrG5h" value="repl" />
+                <node concept="3Tqbb2" id="49obacldZAK" role="1tU5fm">
+                  <ref role="ehGHo" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
+                </node>
+                <node concept="2OqwBi" id="49obacldZAP" role="33vP2m">
+                  <node concept="37vLTw" id="49obacldZAQ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="49obacldPsQ" resolve="inst" />
+                  </node>
+                  <node concept="1_qnLN" id="49obacldZAR" role="2OqNvi">
+                    <ref role="1_rbq0" to="5j4j:49obaclcan7" resolve="LogicalExpression" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="49obacldYN8" role="3cqZAp">
+              <node concept="2OqwBi" id="49obacle0es" role="3clFbG">
+                <node concept="2OqwBi" id="49obacldZJ4" role="2Oq$k0">
+                  <node concept="37vLTw" id="49obacldZAS" role="2Oq$k0">
+                    <ref role="3cqZAo" node="49obacldZAO" resolve="repl" />
+                  </node>
+                  <node concept="3TrEf2" id="49obacldZU$" role="2OqNvi">
+                    <ref role="3Tt5mk" to="5j4j:49obaclcanY" resolve="logical" />
+                  </node>
+                </node>
+                <node concept="2oxUTD" id="49obacle0DB" role="2OqNvi">
+                  <node concept="2OqwBi" id="49obacle0NI" role="2oxUTC">
+                    <node concept="37vLTw" id="49obacle0Ga" role="2Oq$k0">
+                      <ref role="3cqZAo" node="49obacldZ3Z" resolve="content" />
+                    </node>
+                    <node concept="3YRAZt" id="49obacle1c8" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="49obacldPsQ" role="1Duv9x">
+            <property role="TrG5h" value="inst" />
+            <node concept="3Tqbb2" id="49obacldXA5" role="1tU5fm" />
+          </node>
+          <node concept="37vLTw" id="49obacldPsV" role="1DdaDG">
+            <ref role="3cqZAo" node="49obacldNQ9" resolve="instances" />
+          </node>
+        </node>
+      </node>
+      <node concept="ffn8J" id="49obacldLFX" role="3clF46">
+        <property role="TrG5h" value="m" />
+        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
+        <node concept="3uibUv" id="49obacldLFW" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+      </node>
+      <node concept="q3mfm" id="49obacldLFY" role="3clF45">
+        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
+        <ref role="1QQUv3" node="49obacldLFR" resolve="execute" />
+      </node>
+    </node>
+    <node concept="3tTeZs" id="49obacldLFZ" role="jymVt">
+      <property role="3tTeZt" value="&lt;no result checking&gt;" />
+      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index 0366e241..2dd1be82 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -322,6 +322,7 @@
       <property role="IQ2ns" value="7368070394771104782" />
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
+    <node concept="asaX9" id="49obaclcan8" role="lGtFl" />
   </node>
   <node concept="1TIwiD" id="2E5lcNn01_F">
     <property role="3GE5qa" value="constraint.typespecific" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.program.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.program.mps
index 86142922..0ee45966 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.program.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.program.mps
@@ -1870,9 +1870,7 @@
         <property role="TrG5h" value="type" />
         <node concept="3uibUv" id="7nPD14NODpv" role="1tU5fm">
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-          <node concept="16syzq" id="7nPD14NOHFA" role="11_B2D">
-            <ref role="16sUi3" node="7nPD14NOHEv" resolve="V" />
-          </node>
+          <node concept="3qTvmN" id="49obaclnSbP" role="11_B2D" />
         </node>
       </node>
       <node concept="3uibUv" id="7nPD14NOCUy" role="3clF45">
@@ -1909,9 +1907,7 @@
         <property role="TrG5h" value="type" />
         <node concept="3uibUv" id="7nPD14NOI_X" role="1tU5fm">
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-          <node concept="16syzq" id="7nPD14NOI_Y" role="11_B2D">
-            <ref role="16sUi3" node="7nPD14NOIA7" resolve="V" />
-          </node>
+          <node concept="3qTvmN" id="49obaclnSgw" role="11_B2D" />
         </node>
       </node>
       <node concept="37vLTG" id="7nPD14NOIRc" role="3clF46">
@@ -1951,9 +1947,7 @@
         <property role="TrG5h" value="type" />
         <node concept="3uibUv" id="7nPD14NOHGY" role="1tU5fm">
           <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-          <node concept="16syzq" id="7nPD14NOHGZ" role="11_B2D">
-            <ref role="16sUi3" node="7nPD14NOHH8" resolve="V" />
-          </node>
+          <node concept="3qTvmN" id="49obaclnSlf" role="11_B2D" />
         </node>
       </node>
       <node concept="3uibUv" id="7nPD14NOHH0" role="3clF45">