diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
index 6f3a78df..bbf07193 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
@@ -741,14 +741,31 @@
             <node concept="3xSepi" id="1uV2bz2BGTT" role="3xSepv">
               <node concept="3Aq9E8" id="1uV2bz2BGTU" role="3xSepj">
                 <node concept="3I6sU6" id="1uV2bz2BGTV" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="1uV2bz2BGTW" role="3I6sU7">
-                    <node concept="3A8Hvi" id="1uV2bz2BGTX" role="3I6s78">
-                      <node concept="a7P8L" id="1uV2bz2BGTY" role="3A8w4Q">
+                  <node concept="3I6s7M" id="AjlLkeqEs8" role="3I6sU7">
+                    <node concept="3Aqt3T" id="AjlLkeqFcf" role="3I6s78">
+                      <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
+                      <node concept="a7P8L" id="AjlLkeqF_w" role="3AunhB">
                         <ref role="a7OzE" node="1uV2bz2BGTR" resolve="FType" />
                       </node>
-                      <node concept="a7P8L" id="1uV2bz2BGTZ" role="3A8wtg">
+                      <node concept="a7P8L" id="AjlLkeqFAP" role="3AunhB">
                         <ref role="a7OzE" node="1uV2bz2BGTQ" resolve="TScheme" />
                       </node>
+                      <node concept="37jhX" id="AjlLkeLi9G" role="3AunhB">
+                        <node concept="2OqwBi" id="AjlLkeQgws" role="37jj2">
+                          <node concept="2OqwBi" id="AjlLkeLik4" role="2Oq$k0">
+                            <node concept="2YIFZM" id="AjlLkeLiaD" role="2Oq$k0">
+                              <ref role="37wK5l" to="kqnc:4O7HczOeR2N" resolve="getNew" />
+                              <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
+                            </node>
+                            <node concept="liA8E" id="AjlLkeLiBK" role="2OqNvi">
+                              <ref role="37wK5l" to="kqnc:1j7WR6S8dB2" resolve="forbidBoxing" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="AjlLkeQgOX" role="2OqNvi">
+                            <ref role="37wK5l" to="kqnc:4O7HczOeOsd" resolve="toOptions" />
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -1184,6 +1201,23 @@
                                 </node>
                               </node>
                             </node>
+                            <node concept="9aQIb" id="AjlLkeqoLD" role="9aQIa">
+                              <node concept="3clFbS" id="AjlLkeqoLE" role="9aQI4">
+                                <node concept="3Aqczg" id="AjlLkeqoN7" role="3cqZAp">
+                                  <node concept="3Aqt3T" id="AjlLkeqoN6" role="3Aqpz8">
+                                    <ref role="3AqCNq" to="kqnc:31ObkDYZPlP" resolve="inferenceVar" />
+                                    <node concept="37jhX" id="AjlLkeqq2I" role="3AunhB">
+                                      <node concept="3A2sRY" id="AjlLkeqq2G" role="37jj2">
+                                        <ref role="3A2yKK" node="4S1mDSNOe5l" resolve="cl" />
+                                      </node>
+                                    </node>
+                                    <node concept="a7P8L" id="AjlLkeqq4E" role="3AunhB">
+                                      <ref role="a7OzE" node="vrUbziaSV4" resolve="VarRetT" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
                           </node>
                           <node concept="3clFbH" id="1aCOVaclOY8" role="3cqZAp" />
                           <node concept="3Aqczg" id="vrUbziDm9Q" role="3cqZAp">
@@ -2202,6 +2236,16 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="3Aqczg" id="AjlLkeqqEI" role="3cqZAp">
+                        <node concept="3Aqt3T" id="AjlLkeqqEH" role="3Aqpz8">
+                          <ref role="3AqCNq" to="kqnc:31ObkDYZPm0" resolve="resolveInferenceVar" />
+                          <node concept="37jhX" id="AjlLkeqqI_" role="3AunhB">
+                            <node concept="3A2sRY" id="AjlLkeqqI$" role="37jj2">
+                              <ref role="3A2yKK" node="4S1mDSNOe5l" resolve="cl" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                       <node concept="3Aqczg" id="4Z0pyZIF$Y3" role="3cqZAp">
                         <node concept="3A8Hvi" id="4Z0pyZIF$XX" role="3Aqpz8">
                           <node concept="a7P8L" id="4Z0pyZIF$Yt" role="3A8wtg">