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 dc29c85b..95ca0ba0 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
@@ -636,6 +636,20 @@
       <node concept="3clFbS" id="2WQBycG$nvV" role="1nLNMH">
         <node concept="1nLNNL" id="12QmIo_7sfB" role="3cqZAp">
           <node concept="1nLNMm" id="12QmIo_7sfC" role="1nLNNK">
+            <node concept="3NuqgR" id="5upUcEtdUWB" role="0Rg$4">
+              <node concept="aZer4" id="5upUcEtdUWC" role="3XD1gS">
+                <property role="TrG5h" value="Node" />
+              </node>
+              <node concept="3Tqbb2" id="5f6wxQ30Ugg" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYFkwG" role="0Rg$4">
+              <node concept="aZer4" id="6$MmqWfm96E" role="3XD1gS">
+                <property role="TrG5h" value="ResultTypeNode" />
+              </node>
+              <node concept="3Tqbb2" id="6$zPHjYFky5" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
+            </node>
             <node concept="3Aq93q" id="5upUcEtdUWy" role="1nLNMb">
               <node concept="3I6sU6" id="5upUcEtdUWz" role="3Ip0Jz">
                 <node concept="3I6s7M" id="5upUcEtdXZM" role="3I6sU7">
@@ -672,20 +686,13 @@
                 </node>
               </node>
             </node>
-            <node concept="3NuqgR" id="5upUcEtdUWB" role="0Rg$4">
-              <node concept="aZer4" id="5upUcEtdUWC" role="3XD1gS">
-                <property role="TrG5h" value="Node" />
-              </node>
-              <node concept="aZer4" id="6$MmqWfm96E" role="3XD1gS">
-                <property role="TrG5h" value="ResultTypeNode" />
-              </node>
-              <node concept="3Tqbb2" id="5f6wxQ30Ugg" role="3vLBG7" />
-            </node>
             <node concept="3NuqgR" id="2WQBycG$nBx" role="0Rg$4">
               <node concept="aZer4" id="2WQBycG$nBy" role="3XD1gS">
                 <property role="TrG5h" value="ParamTypesNodes" />
               </node>
-              <node concept="2I9FWS" id="2WQBycG$nBP" role="3vLBG7" />
+              <node concept="2I9FWS" id="2WQBycG$nBP" role="3vLBG7">
+                <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="6$MmqWfm8Xj" role="0Rg$4">
               <node concept="aZer4" id="6$MmqWfm8Xk" role="3XD1gS">
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
index 2287b4f8..72af8b3d 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
@@ -2450,10 +2450,15 @@
               <node concept="aZer4" id="1oUE7CX3RAn" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="1oUE7CX3RAp" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$L0" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX3RAo" role="3XD1gS">
                 <property role="TrG5h" value="CompNode" />
               </node>
-              <node concept="3Tqbb2" id="1oUE7CX3RAp" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$Lj" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="1oUE7CX3RAq" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX3RAr" role="3XD1gS">
@@ -2544,10 +2549,15 @@
               <node concept="aZer4" id="1oUE7CX42nk" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="1oUE7CX42nm" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$LY" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX42nl" role="3XD1gS">
                 <property role="TrG5h" value="CompNode" />
               </node>
-              <node concept="3Tqbb2" id="1oUE7CX42nm" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$Mh" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="1oUE7CX42nn" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX42no" role="3XD1gS">
@@ -2638,10 +2648,15 @@
               <node concept="aZer4" id="1BcUSjg7glR" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="1BcUSjg7glT" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$MW" role="0Rg$4">
               <node concept="aZer4" id="1BcUSjg7glS" role="3XD1gS">
                 <property role="TrG5h" value="CompNode" />
               </node>
-              <node concept="3Tqbb2" id="1BcUSjg7glT" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$Nf" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="1BcUSjg7glU" role="0Rg$4">
               <node concept="aZer4" id="1BcUSjg7glV" role="3XD1gS">
@@ -2732,10 +2747,15 @@
               <node concept="aZer4" id="1oUE7CX45vE" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="1oUE7CX45vG" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$NU" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX45vF" role="3XD1gS">
                 <property role="TrG5h" value="CompNode" />
               </node>
-              <node concept="3Tqbb2" id="1oUE7CX45vG" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$Od" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="1oUE7CX45vH" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX45vI" role="3XD1gS">
@@ -2826,10 +2846,15 @@
               <node concept="aZer4" id="1oUE7CX45GS" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="1oUE7CX45GU" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$Pp" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX45GT" role="3XD1gS">
                 <property role="TrG5h" value="CompNode" />
               </node>
-              <node concept="3Tqbb2" id="1oUE7CX45GU" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$PG" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="1oUE7CX45GV" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX45GW" role="3XD1gS">
@@ -2920,10 +2945,15 @@
               <node concept="aZer4" id="1oUE7CX43sD" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="1oUE7CX43sF" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$Qn" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX43sE" role="3XD1gS">
                 <property role="TrG5h" value="CompNode" />
               </node>
-              <node concept="3Tqbb2" id="1oUE7CX43sF" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$QE" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="1oUE7CX43sG" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX43sH" role="3XD1gS">
@@ -2982,6 +3012,20 @@
       <node concept="3clFbS" id="1oUE7CX43ki" role="1nLNMH">
         <node concept="1nLNNL" id="1oUE7CX43kj" role="3cqZAp">
           <node concept="1nLNMm" id="1oUE7CX43kk" role="1nLNNK">
+            <node concept="3NuqgR" id="1oUE7CX43kw" role="0Rg$4">
+              <node concept="aZer4" id="1oUE7CX43kx" role="3XD1gS">
+                <property role="TrG5h" value="Node" />
+              </node>
+              <node concept="3Tqbb2" id="1oUE7CX43kz" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$xw" role="0Rg$4">
+              <node concept="aZer4" id="1oUE7CX43ky" role="3XD1gS">
+                <property role="TrG5h" value="CompNode" />
+              </node>
+              <node concept="3Tqbb2" id="6$zPHjYH$AT" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
+            </node>
             <node concept="3Aq93q" id="1oUE7CX43kl" role="1nLNMb">
               <node concept="3I6sU6" id="1oUE7CX43km" role="3Ip0Jz">
                 <node concept="3I6s7M" id="1oUE7CX43kn" role="3I6sU7">
@@ -3010,15 +3054,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3NuqgR" id="1oUE7CX43kw" role="0Rg$4">
-              <node concept="aZer4" id="1oUE7CX43kx" role="3XD1gS">
-                <property role="TrG5h" value="Node" />
-              </node>
-              <node concept="aZer4" id="1oUE7CX43ky" role="3XD1gS">
-                <property role="TrG5h" value="CompNode" />
-              </node>
-              <node concept="3Tqbb2" id="1oUE7CX43kz" role="3vLBG7" />
-            </node>
             <node concept="3NuqgR" id="1oUE7CX43k$" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX43k_" role="3XD1gS">
                 <property role="TrG5h" value="Type" />
@@ -3108,10 +3143,15 @@
               <node concept="aZer4" id="5upUcEtdUWC" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="5f6wxQ30Ugg" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$C2" role="0Rg$4">
               <node concept="aZer4" id="4NtT$ZxGJHu" role="3XD1gS">
                 <property role="TrG5h" value="CompNode" />
               </node>
-              <node concept="3Tqbb2" id="5f6wxQ30Ugg" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$Cl" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="5f6wxQ30Unu" role="0Rg$4">
               <node concept="aZer4" id="5upUcEtdY0_" role="3XD1gS">
@@ -3202,10 +3242,15 @@
               <node concept="aZer4" id="1oUE7CX3Xi4" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="1oUE7CX3Xi6" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$D0" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX3Xi5" role="3XD1gS">
                 <property role="TrG5h" value="CompNode" />
               </node>
-              <node concept="3Tqbb2" id="1oUE7CX3Xi6" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$Dj" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="1oUE7CX3Xi7" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX3Xi8" role="3XD1gS">
@@ -3304,13 +3349,18 @@
               <node concept="aZer4" id="1oUE7CX42Ni" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="1oUE7CX42Nk" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$E7" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX42Nj" role="3XD1gS">
                 <property role="TrG5h" value="KeyNode" />
               </node>
               <node concept="aZer4" id="1oUE7CX42WO" role="3XD1gS">
                 <property role="TrG5h" value="ValueNode" />
               </node>
-              <node concept="3Tqbb2" id="1oUE7CX42Nk" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$Es" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="1oUE7CX42Nl" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX42Nm" role="3XD1gS">
@@ -3432,13 +3482,18 @@
               <node concept="aZer4" id="1oUE7CX437N" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="1oUE7CX437Q" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$Fs" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX437O" role="3XD1gS">
                 <property role="TrG5h" value="KeyNode" />
               </node>
               <node concept="aZer4" id="1oUE7CX437P" role="3XD1gS">
                 <property role="TrG5h" value="ValueNode" />
               </node>
-              <node concept="3Tqbb2" id="1oUE7CX437Q" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$FL" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="1oUE7CX437R" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX437S" role="3XD1gS">
@@ -3560,13 +3615,18 @@
               <node concept="aZer4" id="1oUE7CX45hd" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="1oUE7CX45hg" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$GL" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX45he" role="3XD1gS">
                 <property role="TrG5h" value="KeyNode" />
               </node>
               <node concept="aZer4" id="1oUE7CX45hf" role="3XD1gS">
                 <property role="TrG5h" value="ValueNode" />
               </node>
-              <node concept="3Tqbb2" id="1oUE7CX45hg" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$H6" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="1oUE7CX45hh" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX45hi" role="3XD1gS">
@@ -3680,10 +3740,15 @@
               <node concept="aZer4" id="1oUE7CX42yK" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="1oUE7CX42yM" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$I6" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX42yL" role="3XD1gS">
                 <property role="TrG5h" value="CompNode" />
               </node>
-              <node concept="3Tqbb2" id="1oUE7CX42yM" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$Ip" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="1oUE7CX42yN" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX42yO" role="3XD1gS">
@@ -3774,10 +3839,15 @@
               <node concept="aZer4" id="1oUE7CX42Fc" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="1oUE7CX42Fe" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$J4" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX42Fd" role="3XD1gS">
                 <property role="TrG5h" value="CompNode" />
               </node>
-              <node concept="3Tqbb2" id="1oUE7CX42Fe" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$Jn" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="1oUE7CX42Ff" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX42Fg" role="3XD1gS">
@@ -3868,10 +3938,15 @@
               <node concept="aZer4" id="1oUE7CX42Ad" role="3XD1gS">
                 <property role="TrG5h" value="Node" />
               </node>
+              <node concept="3Tqbb2" id="1oUE7CX42Af" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6$zPHjYH$K2" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX42Ae" role="3XD1gS">
                 <property role="TrG5h" value="CompNode" />
               </node>
-              <node concept="3Tqbb2" id="1oUE7CX42Af" role="3vLBG7" />
+              <node concept="3Tqbb2" id="6$zPHjYH$Kl" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="1oUE7CX42Ag" role="0Rg$4">
               <node concept="aZer4" id="1oUE7CX42Ah" role="3XD1gS">
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 7995b265..60b00a42 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
@@ -24019,7 +24019,9 @@
               <node concept="aZer4" id="euG2bFdunq" role="3XD1gS">
                 <property role="TrG5h" value="BoundNode" />
               </node>
-              <node concept="3Tqbb2" id="5f6wxQ35wnB" role="3vLBG7" />
+              <node concept="3Tqbb2" id="5f6wxQ35wnB" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="5f6wxQ33X7h" role="0Rg$4">
               <node concept="aZer4" id="euG2bFdunO" role="3XD1gS">
@@ -25929,7 +25931,9 @@
               <node concept="aZer4" id="3hZrJU5VyPR" role="3XD1gS">
                 <property role="TrG5h" value="TVDecl" />
               </node>
-              <node concept="3Tqbb2" id="3hZrJU5VyQd" role="3vLBG7" />
+              <node concept="3Tqbb2" id="3hZrJU5VyQd" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
+              </node>
             </node>
             <node concept="3xSepi" id="6E2cNicdikH" role="3xSepv">
               <node concept="3Aq9E8" id="3fECE2uRVnA" role="3xSepj">
@@ -43812,7 +43816,9 @@
               <node concept="aZer4" id="3hZrJU5VyXi" role="3XD1gS">
                 <property role="TrG5h" value="TVDecl" />
               </node>
-              <node concept="3Tqbb2" id="3hZrJU5VyXj" role="3vLBG7" />
+              <node concept="3Tqbb2" id="3hZrJU5VyXj" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
+              </node>
             </node>
             <node concept="3xSepi" id="6E2cNicdiiz" role="3xSepv">
               <node concept="3Aq9E8" id="5o9$c3zOrUy" role="3xSepj">