diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 2687e2fb..5f69fc52 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -433,6 +433,9 @@
         <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>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="1173122760281" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorsOperation" flags="nn" index="z$bX8" />
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
@@ -44187,17 +44190,6 @@
     <property role="3GE5qa" value="rule.code" />
     <property role="TrG5h" value="VarDecl" />
     <ref role="2YbDB9" node="34$A1Mf51rY" resolve="TypeOf" />
-    <node concept="3AqmO8" id="554EtBHJcip" role="8PkJo">
-      <property role="TrG5h" value="varDeclImpl" />
-      <node concept="1zAUYm" id="554EtBHMOU2" role="1zAUyy">
-        <property role="TrG5h" value="vdecl" />
-        <node concept="3Tqbb2" id="554EtBHMPbZ" role="3gTf24" />
-      </node>
-      <node concept="1zAUYm" id="554EtBHJcrb" role="1zAUyy">
-        <property role="TrG5h" value="type" />
-        <node concept="32pEOW" id="554EtBHJcrg" role="3gTf24" />
-      </node>
-    </node>
     <node concept="1nLNMY" id="39eNUjlkRi8" role="1nK1Vg">
       <property role="TrG5h" value="variableDeclaration_require" />
       <node concept="3clFbS" id="39eNUjlkRi9" role="1nLNMH">
@@ -44320,110 +44312,71 @@
     <node concept="1nLNMY" id="12QmIo_7snE" role="1nK1Vg">
       <property role="TrG5h" value="checkVariableDeclaration" />
       <node concept="3clFbS" id="12QmIo_7snF" role="1nLNMH">
-        <node concept="3SKdUt" id="554EtBHJcQ0" role="3cqZAp">
-          <node concept="1PaTwC" id="554EtBHJcQ1" role="1aUNEU">
-            <node concept="3oM_SD" id="554EtBHJcQ2" role="1PaTwD">
-              <property role="3oM_SC" value="Produce" />
-            </node>
-            <node concept="3oM_SD" id="554EtBHJcQU" role="1PaTwD">
-              <property role="3oM_SC" value="typeOf" />
-            </node>
-            <node concept="3oM_SD" id="554EtBHJcQX" role="1PaTwD">
-              <property role="3oM_SC" value="only" />
-            </node>
-            <node concept="3oM_SD" id="554EtBHJcR1" role="1PaTwD">
-              <property role="3oM_SC" value="if" />
-            </node>
-            <node concept="3oM_SD" id="554EtBHJcR6" role="1PaTwD">
-              <property role="3oM_SC" value="there" />
-            </node>
-            <node concept="3oM_SD" id="554EtBHJcRc" role="1PaTwD">
-              <property role="3oM_SC" value="exists" />
-            </node>
-            <node concept="3oM_SD" id="554EtBHJcRj" role="1PaTwD">
-              <property role="3oM_SC" value="macro" />
-            </node>
-            <node concept="3oM_SD" id="1oUE7CX1vTy" role="1PaTwD">
-              <property role="3oM_SC" value="for" />
-            </node>
-            <node concept="3oM_SD" id="1oUE7CX1vTv" role="1PaTwD">
-              <property role="3oM_SC" value="the" />
-            </node>
-            <node concept="3oM_SD" id="1oUE7CX1vTz" role="1PaTwD">
-              <property role="3oM_SC" value="type" />
-            </node>
-            <node concept="3oM_SD" id="1oUE7CX1vTw" role="1PaTwD">
-              <property role="3oM_SC" value="of" />
-            </node>
-            <node concept="3oM_SD" id="1oUE7CX1vTx" role="1PaTwD">
-              <property role="3oM_SC" value="this" />
-            </node>
-            <node concept="3oM_SD" id="554EtBHJcRI" role="1PaTwD">
-              <property role="3oM_SC" value="variable" />
-            </node>
-          </node>
-        </node>
-        <node concept="1nLNNL" id="12QmIo_7snG" role="3cqZAp">
-          <node concept="1nLNMm" id="12QmIo_7snH" role="1nLNNK">
-            <node concept="3Aq93q" id="34$A1MfabSV" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="34$A1MfabSW" role="3Ip0Jz">
-                <node concept="3I6s7M" id="34$A1MfabT0" role="3I6sU7">
-                  <node concept="3Aqt3T" id="34$A1MfabSZ" role="3I6s78">
-                    <ref role="3AqCNq" node="34$A1MfabR$" resolve="checkAll" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3NuqgR" id="4nIWweBEUDG" role="0Rg$4">
-              <node concept="aZer4" id="5JTOzCQRR4L" role="3XD1gS">
-                <property role="TrG5h" value="Var" />
-              </node>
-              <node concept="32pEOW" id="24ciDNzxNBp" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="6E2cNicdihJ" role="3xSepv">
-              <node concept="3Aq9E8" id="7gr_rompwNZ" role="3xSepj">
-                <node concept="3I6sU6" id="4nIWweBEUEB" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="4nIWweBEUEC" role="3I6sU7">
-                    <node concept="3jbYBd" id="5itBwMb5r7s" role="3I6s78">
-                      <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
-                      <node concept="2OqwBi" id="1laj_RS_L3p" role="3jbY8P">
-                        <node concept="3A2sRY" id="1laj_RS_L3q" role="2Oq$k0">
-                          <ref role="3A2yKK" node="7gr_rompslL" resolve="vdecl" />
-                        </node>
-                        <node concept="3TrEf2" id="1laj_RS_L3r" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="3TnYLtqaNyP" role="3jbY8V">
-                        <ref role="a7OzE" node="5JTOzCQRR4L" resolve="Var" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3I6s7M" id="4nIWweBEUED" role="3I6sU7">
-                    <node concept="3Aqt3T" id="554EtBHJcr8" role="3I6s78">
-                      <ref role="3AqCNq" node="554EtBHJcip" resolve="varDeclImpl" />
-                      <node concept="37jhX" id="554EtBHMPvO" role="3AunhB">
-                        <node concept="3A2sRY" id="554EtBHMPvM" role="37jj2">
-                          <ref role="3A2yKK" node="7gr_rompslL" resolve="vdecl" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="554EtBHJd15" role="3AunhB">
-                        <ref role="a7OzE" node="5JTOzCQRR4L" resolve="Var" />
+        <node concept="3clFbJ" id="44MBIFN6zDg" role="3cqZAp">
+          <node concept="3clFbS" id="44MBIFN6zDi" role="3clFbx">
+            <node concept="1nLNNL" id="12QmIo_7snG" role="3cqZAp">
+              <node concept="1nLNMm" id="12QmIo_7snH" role="1nLNNK">
+                <node concept="3Aq93q" id="34$A1MfabSV" role="1nLNMb">
+                  <property role="3ArMco" value="true" />
+                  <node concept="3I6sU6" id="34$A1MfabSW" role="3Ip0Jz">
+                    <node concept="3I6s7M" id="34$A1MfabT0" role="3I6sU7">
+                      <node concept="3Aqt3T" id="34$A1MfabSZ" role="3I6s78">
+                        <ref role="3AqCNq" node="34$A1MfabR$" resolve="checkAll" />
                       </node>
                     </node>
                   </node>
                 </node>
-              </node>
-            </node>
-            <node concept="3xSepi" id="6E2cNicdihK" role="3xSepv">
-              <node concept="3Aq9E8" id="5moyjRHtQ4u" role="3xSepj">
-                <node concept="3I6sU6" id="5moyjRHtQ4v" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="1laj_RS_KYy" role="3I6sU7">
-                    <node concept="1lHd6T" id="1laj_RS_KYx" role="3I6s78">
-                      <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
-                      <node concept="Xl_RD" id="1laj_RS_KYF" role="1ljv2e">
-                        <property role="Xl_RC" value="malformed type" />
+                <node concept="3NuqgR" id="4nIWweBEUDG" role="0Rg$4">
+                  <node concept="aZer4" id="5JTOzCQRR4L" role="3XD1gS">
+                    <property role="TrG5h" value="Var" />
+                  </node>
+                  <node concept="32pEOW" id="24ciDNzxNBp" role="3vLBG7" />
+                </node>
+                <node concept="3xSepi" id="6E2cNicdihJ" role="3xSepv">
+                  <node concept="3Aq9E8" id="7gr_rompwNZ" role="3xSepj">
+                    <node concept="3I6sU6" id="4nIWweBEUEB" role="3Ip0Jz">
+                      <node concept="3I6s7M" id="4nIWweBEUEC" role="3I6sU7">
+                        <node concept="3jbYBd" id="5itBwMb5r7s" role="3I6s78">
+                          <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
+                          <node concept="2OqwBi" id="1laj_RS_L3p" role="3jbY8P">
+                            <node concept="3A2sRY" id="1laj_RS_L3q" role="2Oq$k0">
+                              <ref role="3A2yKK" node="7gr_rompslL" resolve="vdecl" />
+                            </node>
+                            <node concept="3TrEf2" id="1laj_RS_L3r" role="2OqNvi">
+                              <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
+                            </node>
+                          </node>
+                          <node concept="a7P8L" id="3TnYLtqaNyP" role="3jbY8V">
+                            <ref role="a7OzE" node="5JTOzCQRR4L" resolve="Var" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3I6s7M" id="5Tpg521kvXb" role="3I6sU7">
+                        <node concept="3Aqt3T" id="5Tpg521kvXc" role="3I6s78">
+                          <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
+                          <node concept="37jhX" id="5Tpg521kvXd" role="3AunhB">
+                            <node concept="3A2sRY" id="5Tpg521kvXe" role="37jj2">
+                              <ref role="3A2yKK" node="7gr_rompslL" resolve="vdecl" />
+                            </node>
+                          </node>
+                          <node concept="a7P8L" id="5Tpg521kvXf" role="3AunhB">
+                            <ref role="a7OzE" node="5JTOzCQRR4L" resolve="Var" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3xSepi" id="6E2cNicdihK" role="3xSepv">
+                  <node concept="3Aq9E8" id="5moyjRHtQ4u" role="3xSepj">
+                    <node concept="3I6sU6" id="5moyjRHtQ4v" role="3Ip0Jz">
+                      <node concept="3I6s7M" id="1laj_RS_KYy" role="3I6sU7">
+                        <node concept="1lHd6T" id="1laj_RS_KYx" role="3I6s78">
+                          <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
+                          <node concept="Xl_RD" id="1laj_RS_KYF" role="1ljv2e">
+                            <property role="Xl_RC" value="malformed type" />
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -44431,100 +44384,19 @@
               </node>
             </node>
           </node>
-        </node>
-        <node concept="3clFbH" id="554EtBHJcUD" role="3cqZAp" />
-        <node concept="1nLNNL" id="554EtBHJcir" role="3cqZAp">
-          <node concept="1nLNMm" id="554EtBHJcis" role="1nLNNK">
-            <node concept="3Aq93q" id="554EtBHJcit" role="1nLNMb">
-              <node concept="3I6sU6" id="554EtBHJciu" role="3Ip0Jz">
-                <node concept="3I6s7M" id="554EtBHJciv" role="3I6sU7">
-                  <node concept="3Aqt3T" id="554EtBHJcrl" role="3I6s78">
-                    <ref role="3AqCNq" node="554EtBHJcip" resolve="varDeclImpl" />
-                    <node concept="37jhX" id="554EtBHMOMs" role="3AunhB">
-                      <node concept="3A2sRY" id="554EtBHMPqt" role="37jj2">
-                        <ref role="3A2yKK" node="7gr_rompslL" resolve="vdecl" />
-                      </node>
-                    </node>
-                    <node concept="a7P8L" id="554EtBHJcGL" role="3AunhB">
-                      <ref role="a7OzE" node="554EtBHJciy" resolve="Var" />
-                    </node>
-                  </node>
+          <node concept="3fqX7Q" id="44MBIFN6A1n" role="3clFbw">
+            <node concept="2OqwBi" id="44MBIFN6$VE" role="3fr31v">
+              <node concept="1PxgMI" id="44MBIFN6zTV" role="2Oq$k0">
+                <property role="1BlNFB" value="true" />
+                <node concept="chp4Y" id="44MBIFN6$eV" role="3oSUPX">
+                  <ref role="cht4Q" to="tpee:5B8En1ST6Bm" resolve="IInferredExpression" />
+                </node>
+                <node concept="3A2sRY" id="44MBIFN6zDr" role="1m5AlR">
+                  <ref role="3A2yKK" node="7gr_rompslL" resolve="vdecl" />
                 </node>
               </node>
-            </node>
-            <node concept="3NuqgR" id="554EtBHJcix" role="0Rg$4">
-              <node concept="aZer4" id="554EtBHJciy" role="3XD1gS">
-                <property role="TrG5h" value="Var" />
-              </node>
-              <node concept="32pEOW" id="554EtBHJciz" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="554EtBHJci$" role="3xSepv">
-              <node concept="3Aq9E8" id="554EtBHJci_" role="3xSepj">
-                <node concept="3I6sU6" id="554EtBHJciA" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="554EtBHJciH" role="3I6sU7">
-                    <node concept="3Aqt3T" id="554EtBHJciI" role="3I6s78">
-                      <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
-                      <node concept="37jhX" id="554EtBHJciJ" role="3AunhB">
-                        <node concept="3A2sRY" id="554EtBHJciK" role="37jj2">
-                          <ref role="3A2yKK" node="7gr_rompslL" resolve="vdecl" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="554EtBHJciL" role="3AunhB">
-                        <ref role="a7OzE" node="554EtBHJciy" resolve="Var" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9_M" id="554EtBHJcIC" role="1nLNMa">
-              <node concept="3I6sU6" id="554EtBHJcID" role="3Ip0Jz">
-                <node concept="3I6s7M" id="554EtBHJcIH" role="3I6sU7">
-                  <node concept="2aM9Np" id="554EtBHJcPQ" role="3I6s78">
-                    <node concept="a7P8L" id="554EtBHJcPT" role="2aLmnP">
-                      <ref role="a7OzE" node="554EtBHJciy" resolve="Var" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1oUE7CX1vOd" role="3cqZAp" />
-        <node concept="1nLNNL" id="1oUE7CX1vF3" role="3cqZAp">
-          <node concept="1nLNMm" id="1oUE7CX1vF4" role="1nLNNK">
-            <node concept="3Aq93q" id="1oUE7CX1vF5" role="1nLNMb">
-              <node concept="3I6sU6" id="1oUE7CX1vF6" role="3Ip0Jz">
-                <node concept="3I6s7M" id="1oUE7CX1vF7" role="3I6sU7">
-                  <node concept="3Aqt3T" id="1oUE7CX1vF8" role="3I6s78">
-                    <ref role="3AqCNq" node="554EtBHJcip" resolve="varDeclImpl" />
-                    <node concept="37jhX" id="1oUE7CX1vF9" role="3AunhB">
-                      <node concept="3A2sRY" id="1oUE7CX1vFa" role="37jj2">
-                        <ref role="3A2yKK" node="7gr_rompslL" resolve="vdecl" />
-                      </node>
-                    </node>
-                    <node concept="a7P8L" id="1oUE7CX1vFb" role="3AunhB">
-                      <ref role="a7OzE" node="1oUE7CX1vFd" resolve="Var" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3NuqgR" id="1oUE7CX1vFc" role="0Rg$4">
-              <node concept="aZer4" id="1oUE7CX1vFd" role="3XD1gS">
-                <property role="TrG5h" value="Var" />
-              </node>
-              <node concept="32pEOW" id="1oUE7CX1vFe" role="3vLBG7" />
-            </node>
-            <node concept="3Aq9_M" id="1oUE7CX1vFn" role="1nLNMa">
-              <node concept="3I6sU6" id="1oUE7CX1vFo" role="3Ip0Jz">
-                <node concept="3I6s7M" id="1oUE7CX1vFp" role="3I6sU7">
-                  <node concept="2aLmEc" id="1oUE7CX1vOE" role="3I6s78">
-                    <node concept="a7P8L" id="1oUE7CX1vOG" role="2aLmnP">
-                      <ref role="a7OzE" node="1oUE7CX1vFd" resolve="Var" />
-                    </node>
-                  </node>
-                </node>
+              <node concept="2qgKlT" id="44MBIFN6_tY" role="2OqNvi">
+                <ref role="37wK5l" to="tpek:Q$FjPqwIoN" resolve="needInference" />
               </node>
             </node>
           </node>
@@ -59376,6 +59248,57 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="7o7XkDtsoc2" role="1nK1Vg">
+      <property role="TrG5h" value="iInferredExpression" />
+      <node concept="3clFbS" id="7o7XkDtsoc3" role="1nLNMH">
+        <node concept="Oftf1" id="7o7XkDtsosG" role="3cqZAp">
+          <node concept="2OqwBi" id="7o7XkDtsoth" role="Oftjs">
+            <node concept="2OqwBi" id="7o7XkDtsoti" role="2Oq$k0">
+              <node concept="2OqwBi" id="7o7XkDtsotj" role="2Oq$k0">
+                <node concept="3A2sRY" id="7o7XkDtsotk" role="2Oq$k0">
+                  <ref role="3A2yKK" node="7o7XkDtsoc5" resolve="iie" />
+                </node>
+                <node concept="z$bX8" id="7o7XkDtsotl" role="2OqNvi" />
+              </node>
+              <node concept="v3k3i" id="7o7XkDtsotm" role="2OqNvi">
+                <node concept="chp4Y" id="7o7XkDtsotn" role="v3oSu">
+                  <ref role="cht4Q" to="tpee:JiVENj$YN9" resolve="IInferenceContextProvider" />
+                </node>
+              </node>
+            </node>
+            <node concept="3zZkjj" id="7o7XkDtsoto" role="2OqNvi">
+              <node concept="1bVj0M" id="7o7XkDtsotp" role="23t8la">
+                <node concept="3clFbS" id="7o7XkDtsotq" role="1bW5cS">
+                  <node concept="3clFbF" id="7o7XkDtsotr" role="3cqZAp">
+                    <node concept="2OqwBi" id="7o7XkDtsots" role="3clFbG">
+                      <node concept="37vLTw" id="7o7XkDtsott" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7o7XkDtsotw" resolve="it" />
+                      </node>
+                      <node concept="2qgKlT" id="7o7XkDtsotu" role="2OqNvi">
+                        <ref role="37wK5l" to="tpek:JiVENj$Z0y" resolve="canProvideInferenceContext" />
+                        <node concept="3A2sRY" id="7o7XkDtsouU" role="37wK5m">
+                          <ref role="3A2yKK" node="7o7XkDtsoc5" resolve="iie" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="gl6BB" id="7o7XkDtsotw" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="7o7XkDtsotx" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="7o7XkDtsoc4" role="1nLNMg">
+        <ref role="2t_S0q" to="tpee:5B8En1ST6Bm" resolve="IInferredExpression" />
+        <node concept="3A20r5" id="7o7XkDtsoc5" role="2t_VXX">
+          <property role="TrG5h" value="iie" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="6mVkPJZtoEO">
     <property role="3GE5qa" value="util" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
index d40d5331..e160d2c9 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
@@ -62,6 +62,7 @@
   </generators>
   <dependencies>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)</dependency>
+    <dependency reexport="false">96eeb076-cd7e-4797-9c2a-348e3f826e65(jetbrains.mps.baseLanguage.function)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -122,6 +123,7 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="96eeb076-cd7e-4797-9c2a-348e3f826e65(jetbrains.mps.baseLanguage.function)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
     <module reference="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps
index d99a94f8..eb387215 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps
@@ -11,11 +11,16 @@
   <imports>
     <import index="kqnc" ref="r:92b96158-68e6-4f53-a32b-36e2b456fe01(jetbrains.mps.baseLanguageExt.types)" />
     <import index="tp68" ref="r:00000000-0000-4000-0000-011c895903ac(jetbrains.mps.baseLanguageInternal.structure)" />
+    <import index="fa4b" ref="r:57e7708d-cfea-4f42-80e2-39fcd20eebc8(jetbrains.mps.baseLanguage.function.types)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
+        <child id="1154032183016" name="body" index="2LFqv$" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -23,12 +28,35 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
+      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
+        <child id="1144226360166" name="iterable" index="1DdaDG" />
+      </concept>
+      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
+        <child id="1144230900587" name="variable" index="1Duv9x" />
+      </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
@@ -51,8 +79,11 @@
       </concept>
       <concept id="8829335963593820278" name="jetbrains.mps.logic.structure.LogicalVariable" flags="ng" index="a7P8L">
         <reference id="8829335963593822893" name="declaration" index="a7OzE" />
+        <child id="6036655413806858011" name="indexExpr" index="3gCZO6" />
+      </concept>
+      <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4">
+        <child id="6036655413809169524" name="cardinalityExpr" index="3gj$pD" />
       </concept>
-      <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
       <concept id="6856711987710888499" name="jetbrains.mps.logic.structure.DataNodeLiteral" flags="ng" index="Hz6ka">
         <child id="6856711987710888500" name="root" index="Hz6kd" />
       </concept>
@@ -64,12 +95,23 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1179168000618" name="jetbrains.mps.lang.smodel.structure.Node_GetIndexInParentOperation" flags="nn" index="2bSWHS" />
+      <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="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
       <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
         <reference id="1138056395725" name="property" index="3TsBF5" />
       </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
@@ -93,6 +135,9 @@
         <child id="2535923850359271783" name="elements" index="1PaTwD" />
       </concept>
     </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
+    </language>
     <language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
       <concept id="1618328391714763069" name="jetbrains.mps.lang.coderules.structure.MacroTable" flags="ng" index="0oKg$">
         <reference id="6097203247219331496" name="extends" index="3tg4Y$" />
@@ -198,6 +243,9 @@
       <concept id="2316688792938825384" name="jetbrains.mps.lang.coderules.structure.LogicalClauseList" flags="ng" index="3I6sU6">
         <child id="2316688792938825385" name="clauses" index="3I6sU7" />
       </concept>
+      <concept id="2316688792939428589" name="jetbrains.mps.lang.coderules.structure.TemplateLogicalClause" flags="ng" index="3IrJb3">
+        <child id="2316688792939428590" name="code" index="3IrJb0" />
+      </concept>
       <concept id="965748826975413063" name="jetbrains.mps.lang.coderules.structure.RulePartParameterDeclaration" flags="ng" index="3NuqgR" />
       <concept id="3972229586021710485" name="jetbrains.mps.lang.coderules.structure.ExpandMacroParameterUsage" flags="ng" index="1QfGHm">
         <reference id="3972229586021710487" name="declaration" index="1QfGHk" />
@@ -666,6 +714,153 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="5Tpg521nDML" role="1nK1Vg">
+      <property role="TrG5h" value="internalLambdaExpression" />
+      <node concept="3clFbS" id="5Tpg521nDMM" role="1nLNMH">
+        <node concept="1nLNNL" id="5Tpg521nDNW" role="3cqZAp">
+          <node concept="1nLNMm" id="5Tpg521nDNX" role="1nLNNK">
+            <node concept="3Aq93q" id="5Tpg521nU9O" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="5Tpg521nU9P" role="3Ip0Jz">
+                <node concept="3IrJb3" id="5Tpg521nUc_" role="3I6sU7">
+                  <node concept="3clFbS" id="5Tpg521nUcA" role="3IrJb0">
+                    <node concept="1DcWWT" id="5Tpg521nV72" role="3cqZAp">
+                      <node concept="3clFbS" id="5Tpg521nV75" role="2LFqv$">
+                        <node concept="3clFbJ" id="5Tpg521r9od" role="3cqZAp">
+                          <node concept="3clFbS" id="5Tpg521r9of" role="3clFbx">
+                            <node concept="3Aqczg" id="5Tpg521oah6" role="3cqZAp">
+                              <node concept="3Aqt3T" id="5Tpg521oah5" role="3Aqpz8">
+                                <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                                <node concept="37jhX" id="5Tpg521oajj" role="3AunhB">
+                                  <node concept="37vLTw" id="5Tpg521oajh" role="37jj2">
+                                    <ref role="3cqZAo" node="5Tpg521nV76" resolve="p" />
+                                  </node>
+                                </node>
+                                <node concept="a7P8L" id="5Tpg521oav6" role="3AunhB">
+                                  <ref role="a7OzE" node="5Tpg521nDP4" resolve="ParamT" />
+                                  <node concept="2OqwBi" id="5Tpg521oaBF" role="3gCZO6">
+                                    <node concept="37vLTw" id="5Tpg521oawy" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="5Tpg521nV76" resolve="p" />
+                                    </node>
+                                    <node concept="2bSWHS" id="5Tpg521oaUO" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3fqX7Q" id="5Tpg521r9oU" role="3clFbw">
+                            <node concept="1eOMI4" id="5Tpg521rbUh" role="3fr31v">
+                              <node concept="2OqwBi" id="5Tpg521r9xM" role="1eOMHV">
+                                <node concept="37vLTw" id="5Tpg521r9p8" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="5Tpg521nV76" resolve="p" />
+                                </node>
+                                <node concept="1mIQ4w" id="5Tpg521ra0c" role="2OqNvi">
+                                  <node concept="chp4Y" id="5Tpg521ra3Q" role="cj9EA">
+                                    <ref role="cht4Q" to="tpee:5B8En1ST6Bm" resolve="IInferredExpression" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWsn" id="5Tpg521nV76" role="1Duv9x">
+                        <property role="TrG5h" value="p" />
+                        <node concept="3Tqbb2" id="5Tpg521o4gy" role="1tU5fm" />
+                      </node>
+                      <node concept="2OqwBi" id="5Tpg521nV7b" role="1DdaDG">
+                        <node concept="3A2sRY" id="5Tpg521nV7c" role="2Oq$k0">
+                          <ref role="3A2yKK" node="5Tpg521nDMO" resolve="ile" />
+                        </node>
+                        <node concept="3Tsc0h" id="5Tpg521nV7d" role="2OqNvi">
+                          <ref role="3TtcxE" to="tp68:htbW2KO" resolve="parameter" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="5Tpg521nDP3" role="0Rg$4">
+              <node concept="aZer4" id="5Tpg521nDP4" role="3XD1gS">
+                <property role="TrG5h" value="ParamT" />
+                <node concept="2OqwBi" id="5Tpg521nLtD" role="3gj$pD">
+                  <node concept="2OqwBi" id="5Tpg521nE3O" role="2Oq$k0">
+                    <node concept="3A2sRY" id="5Tpg521nDT0" role="2Oq$k0">
+                      <ref role="3A2yKK" node="5Tpg521nDMO" resolve="ile" />
+                    </node>
+                    <node concept="3Tsc0h" id="5Tpg521nG2o" role="2OqNvi">
+                      <ref role="3TtcxE" to="tp68:htbW2KO" resolve="parameter" />
+                    </node>
+                  </node>
+                  <node concept="34oBXx" id="5Tpg521nU3s" role="2OqNvi" />
+                </node>
+              </node>
+              <node concept="32pEOW" id="5Tpg521nDQh" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="5Tpg521nU7i" role="0Rg$4">
+              <node concept="aZer4" id="5Tpg521nU7j" role="3XD1gS">
+                <property role="TrG5h" value="RetT" />
+              </node>
+              <node concept="32pEOW" id="5Tpg521nU8w" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="5Tpg521nUaW" role="3xSepv">
+              <node concept="3Aq9E8" id="5Tpg521nUaX" role="3xSepj">
+                <node concept="3I6sU6" id="5Tpg521nUaY" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="5Tpg521rrvu" role="3I6sU7">
+                    <node concept="3jbYBd" id="5Tpg521rrvr" role="3I6s78">
+                      <ref role="3jbY9l" to="kqnc:5itBwMau8m1" resolve="lift" />
+                      <node concept="2OqwBi" id="5Tpg521rrFn" role="3jbY8P">
+                        <node concept="3A2sRY" id="5Tpg521rrxc" role="2Oq$k0">
+                          <ref role="3A2yKK" node="5Tpg521nDMO" resolve="ile" />
+                        </node>
+                        <node concept="3TrEf2" id="5Tpg521rvj$" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tp68:2SO3lBM826m" resolve="returnType" />
+                        </node>
+                      </node>
+                      <node concept="a7P8L" id="5Tpg521rrx6" role="3jbY8V">
+                        <ref role="a7OzE" node="5Tpg521nU7j" resolve="RetT" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="5Tpg521ohA3" role="3I6sU7">
+                    <node concept="3Aqt3T" id="5Tpg521ohA2" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
+                      <node concept="37jhX" id="5Tpg521ohAD" role="3AunhB">
+                        <node concept="3A2sRY" id="5Tpg521ohAB" role="37jj2">
+                          <ref role="3A2yKK" node="5Tpg521nDMO" resolve="ile" />
+                        </node>
+                      </node>
+                      <node concept="ns1u0" id="5Tpg521olmN" role="3AunhB">
+                        <ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
+                        <node concept="nsMwS" id="5Tpg521olmO" role="ns1xD">
+                          <ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
+                          <node concept="a7P8L" id="5Tpg521ows_" role="iSaTp">
+                            <ref role="a7OzE" node="5Tpg521nDP4" resolve="ParamT" />
+                          </node>
+                        </node>
+                        <node concept="nsMwS" id="5Tpg521owsA" role="ns1xD">
+                          <ref role="nsMwP" to="fa4b:6$MmqWflYdg" resolve="result" />
+                          <node concept="a7P8L" id="5Tpg521owvn" role="iSaTp">
+                            <ref role="a7OzE" node="5Tpg521nU7j" resolve="RetT" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2t___k" id="5Tpg521nDMN" role="1nLNMg">
+        <ref role="2t_S0q" to="tp68:2SO3lBM81WG" resolve="InternalLambdaExpression" />
+        <node concept="3A20r5" id="5Tpg521nDMO" role="2t_VXX">
+          <property role="TrG5h" value="ile" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="AVZre" id="7gMIJIxWkXz">
     <property role="TrG5h" value="TypeOfExtractExpression" />