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 5c1f331d..79b573bc 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
@@ -23819,7 +23819,9 @@
               <node concept="aZer4" id="euG2bFds1W" role="3XD1gS">
                 <property role="TrG5h" value="ElementNode" />
               </node>
-              <node concept="3Tqbb2" id="5f6wxQ3mXXK" role="3vLBG7" />
+              <node concept="3Tqbb2" id="5f6wxQ3mXXK" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="5f6wxQ33WHl" role="0Rg$4">
               <node concept="aZer4" id="euG2bFds2m" role="3XD1gS">
@@ -23918,7 +23920,9 @@
               <node concept="aZer4" id="euG2bFdq0X" role="3XD1gS">
                 <property role="TrG5h" value="ElementNode" />
               </node>
-              <node concept="3Tqbb2" id="5f6wxQ3mQzs" role="3vLBG7" />
+              <node concept="3Tqbb2" id="5f6wxQ3mQzs" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="5f6wxQ33Vbr" role="0Rg$4">
               <node concept="3Tqbb2" id="5f6wxQ33VbA" role="3vLBG7" />
@@ -24118,7 +24122,9 @@
               <node concept="aZer4" id="euG2bFdwIa" role="3XD1gS">
                 <property role="TrG5h" value="BoundNode" />
               </node>
-              <node concept="3Tqbb2" id="5f6wxQ35wtZ" role="3vLBG7" />
+              <node concept="3Tqbb2" id="5f6wxQ35wtZ" role="3vLBG7">
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+              </node>
             </node>
             <node concept="3NuqgR" id="5f6wxQ33XDu" role="0Rg$4">
               <node concept="aZer4" id="euG2bFdwI$" role="3XD1gS">
@@ -31127,15 +31133,11 @@
                       <ref role="nsMwP" node="JOGAOsVt2P" resolve="val" />
                       <node concept="10QFUN" id="4vr5SApIFtT" role="nsMwV">
                         <node concept="2OqwBi" id="4vr5SApIFtO" role="10QFUP">
-                          <node concept="2YIFZM" id="4vr5SApIFtP" role="2Oq$k0">
-                            <ref role="1Pybhc" to="zdap:~StringUtil" resolve="StringUtil" />
+                          <node concept="2YIFZM" id="1stFrrzJcTS" role="2Oq$k0">
                             <ref role="37wK5l" to="zdap:~StringUtil.unescapeStringCharacters(java.lang.String)" resolve="unescapeStringCharacters" />
-                            <node concept="1nq8_$" id="5itBwMaD7gr" role="37wK5m">
-                              <node concept="37jhX" id="5itBwMaD7gq" role="1nq8_t">
-                                <node concept="3hN9Ij" id="5itBwMaD7go" role="37jj2">
-                                  <ref role="3hLkJx" node="5itBwMaD2oM" resolve="value" />
-                                </node>
-                              </node>
+                            <ref role="1Pybhc" to="zdap:~StringUtil" resolve="StringUtil" />
+                            <node concept="3hN9Ij" id="1stFrrzJcUZ" role="37wK5m">
+                              <ref role="3hLkJx" node="5itBwMaD2oM" resolve="value" />
                             </node>
                           </node>
                           <node concept="liA8E" id="4vr5SApIFtR" role="2OqNvi">
@@ -31606,12 +31608,8 @@
                         <node concept="2YIFZM" id="4vr5SApBLib" role="nsMwV">
                           <ref role="37wK5l" to="wyt6:~Float.parseFloat(java.lang.String)" resolve="parseFloat" />
                           <ref role="1Pybhc" to="wyt6:~Float" resolve="Float" />
-                          <node concept="1nq8_$" id="5itBwMaFDvD" role="37wK5m">
-                            <node concept="37jhX" id="5itBwMaFDvC" role="1nq8_t">
-                              <node concept="3hN9Ij" id="5itBwMaFDvA" role="37jj2">
-                                <ref role="3hLkJx" node="5itBwMaF$Bx" resolve="value" />
-                              </node>
-                            </node>
+                          <node concept="3hN9Ij" id="1stFrrzJcW0" role="37wK5m">
+                            <ref role="3hLkJx" node="5itBwMaF$Bx" resolve="value" />
                           </node>
                         </node>
                       </node>
@@ -31726,12 +31724,8 @@
                         <node concept="2YIFZM" id="4vr5SApBLyJ" role="nsMwV">
                           <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String)" resolve="parseDouble" />
                           <ref role="1Pybhc" to="wyt6:~Double" resolve="Double" />
-                          <node concept="1nq8_$" id="5itBwMaFYFH" role="37wK5m">
-                            <node concept="37jhX" id="5itBwMaFYFG" role="1nq8_t">
-                              <node concept="3hN9Ij" id="5itBwMaFYFE" role="37jj2">
-                                <ref role="3hLkJx" node="5itBwMaFV77" resolve="value" />
-                              </node>
-                            </node>
+                          <node concept="3hN9Ij" id="1stFrrzJcV_" role="37wK5m">
+                            <ref role="3hLkJx" node="5itBwMaFV77" resolve="value" />
                           </node>
                         </node>
                       </node>
@@ -36997,53 +36991,69 @@
       <property role="TrG5h" value="expect_typeOf_expression" />
       <property role="1nmhW7" value="true" />
       <node concept="3clFbS" id="12QmIo_7seZ" role="1nLNMH">
-        <node concept="1nLNNL" id="12QmIo_7sf0" role="3cqZAp">
-          <node concept="1nLNMm" id="12QmIo_7sf1" role="1nLNNK">
-            <node concept="3Aq93q" id="20Zoq4kTODB" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="4nIWweBEY4u" role="3Ip0Jz">
-                <node concept="3I6s7M" id="4nIWweBEY4v" role="3I6sU7">
-                  <node concept="3Aqt3T" id="20Zoq4kTOWU" role="3I6s78">
-                    <ref role="3AqCNq" node="20Zoq4kTOFb" resolve="recoverAll" />
-                    <node concept="a7P8L" id="5fMWD6H$68P" role="3AunhB">
-                      <ref role="a7OzE" node="5fMWD6H$66C" resolve="TypesUpdate" />
+        <node concept="3clFbJ" id="1stFrrz_apB" role="3cqZAp">
+          <node concept="3clFbS" id="1stFrrz_apD" role="3clFbx">
+            <node concept="1nLNNL" id="12QmIo_7sf0" role="3cqZAp">
+              <node concept="1nLNMm" id="12QmIo_7sf1" role="1nLNNK">
+                <node concept="3Aq93q" id="20Zoq4kTODB" role="1nLNMb">
+                  <property role="3ArMco" value="true" />
+                  <node concept="3I6sU6" id="4nIWweBEY4u" role="3Ip0Jz">
+                    <node concept="3I6s7M" id="4nIWweBEY4v" role="3I6sU7">
+                      <node concept="3Aqt3T" id="20Zoq4kTOWU" role="3I6s78">
+                        <ref role="3AqCNq" node="20Zoq4kTOFb" resolve="recoverAll" />
+                        <node concept="a7P8L" id="5fMWD6H$68P" role="3AunhB">
+                          <ref role="a7OzE" node="5fMWD6H$66C" resolve="TypesUpdate" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3NuqgR" id="5fMWD6H$66B" role="0Rg$4">
+                  <node concept="aZer4" id="5fMWD6H$66C" role="3XD1gS">
+                    <property role="TrG5h" value="TypesUpdate" />
+                  </node>
+                  <node concept="3uibUv" id="5fMWD6HQXZl" role="3vLBG7">
+                    <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
+                    <node concept="2sp9CU" id="3CulEO2b4Wv" role="11_B2D" />
+                    <node concept="3Tqbb2" id="5fMWD6HQXZn" role="11_B2D" />
+                  </node>
+                </node>
+                <node concept="3NuqgR" id="20Zoq4kTODF" role="0Rg$4">
+                  <node concept="aZer4" id="20Zoq4kTODG" role="3XD1gS">
+                    <property role="TrG5h" value="Type" />
+                  </node>
+                  <node concept="32pEOW" id="24ciDNzxNHm" role="3vLBG7" />
+                </node>
+                <node concept="3xSepi" id="6E2cNicdilW" role="3xSepv">
+                  <node concept="3Aq9E8" id="20Zoq4kTOEi" role="3xSepj">
+                    <node concept="3I6sU6" id="4nIWweBEY51" role="3Ip0Jz">
+                      <node concept="3I6s7M" id="4nIWweBEY52" role="3I6sU7">
+                        <node concept="3Aqt3T" id="20Zoq4kTOEw" role="3I6s78">
+                          <ref role="3AqCNq" node="35YJGAJTRng" resolve="expectType" />
+                          <node concept="37jhX" id="1TH_SRmhruv" role="3AunhB">
+                            <node concept="3A2sRY" id="35YJGAJTTpz" role="37jj2">
+                              <ref role="3A2yKK" node="20Zoq4kTOD0" resolve="expr" />
+                            </node>
+                          </node>
+                          <node concept="a7P8L" id="6QbNnfq3aV8" role="3AunhB">
+                            <ref role="a7OzE" node="5fMWD6H$66C" resolve="TypesUpdate" />
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3NuqgR" id="5fMWD6H$66B" role="0Rg$4">
-              <node concept="aZer4" id="5fMWD6H$66C" role="3XD1gS">
-                <property role="TrG5h" value="TypesUpdate" />
+          </node>
+          <node concept="3fqX7Q" id="1stFrrz_aq8" role="3clFbw">
+            <node concept="2OqwBi" id="1stFrrz_bTB" role="3fr31v">
+              <node concept="3A2sRY" id="1stFrrz_aqe" role="2Oq$k0">
+                <ref role="3A2yKK" node="20Zoq4kTOD0" resolve="expr" />
               </node>
-              <node concept="3uibUv" id="5fMWD6HQXZl" role="3vLBG7">
-                <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
-                <node concept="2sp9CU" id="3CulEO2b4Wv" role="11_B2D" />
-                <node concept="3Tqbb2" id="5fMWD6HQXZn" role="11_B2D" />
-              </node>
-            </node>
-            <node concept="3NuqgR" id="20Zoq4kTODF" role="0Rg$4">
-              <node concept="aZer4" id="20Zoq4kTODG" role="3XD1gS">
-                <property role="TrG5h" value="Type" />
-              </node>
-              <node concept="32pEOW" id="24ciDNzxNHm" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="6E2cNicdilW" role="3xSepv">
-              <node concept="3Aq9E8" id="20Zoq4kTOEi" role="3xSepj">
-                <node concept="3I6sU6" id="4nIWweBEY51" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="4nIWweBEY52" role="3I6sU7">
-                    <node concept="3Aqt3T" id="20Zoq4kTOEw" role="3I6s78">
-                      <ref role="3AqCNq" node="35YJGAJTRng" resolve="expectType" />
-                      <node concept="37jhX" id="1TH_SRmhruv" role="3AunhB">
-                        <node concept="3A2sRY" id="35YJGAJTTpz" role="37jj2">
-                          <ref role="3A2yKK" node="20Zoq4kTOD0" resolve="expr" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="6QbNnfq3aV8" role="3AunhB">
-                        <ref role="a7OzE" node="5fMWD6H$66C" resolve="TypesUpdate" />
-                      </node>
-                    </node>
-                  </node>
+              <node concept="1mIQ4w" id="1stFrrz_d63" role="2OqNvi">
+                <node concept="chp4Y" id="1stFrrz_d6e" role="cj9EA">
+                  <ref role="cht4Q" to="tpee:hiAHcMF" resolve="AnnotationInstance" />
                 </node>
               </node>
             </node>
@@ -39258,6 +39268,36 @@
                 <node concept="3clFbH" id="dabFeLJbUI" role="3cqZAp" />
                 <node concept="3Hbl2A" id="dabFeLLfoc" role="3cqZAp">
                   <node concept="3clFbS" id="dabFeLLfoe" role="9aQI4">
+                    <node concept="3cpWs8" id="1stFrrzzlQL" role="3cqZAp">
+                      <node concept="3cpWsn" id="1stFrrzzlQM" role="3cpWs9">
+                        <property role="TrG5h" value="overridingReturnType" />
+                        <node concept="3Tqbb2" id="1stFrrzzlQK" role="1tU5fm">
+                          <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+                        </node>
+                        <node concept="2OqwBi" id="1stFrrzzlQN" role="33vP2m">
+                          <node concept="2OqwBi" id="1stFrrzzlQO" role="2Oq$k0">
+                            <node concept="37vLTw" id="1stFrrzzlQP" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4JBuioHZA$E" resolve="vertex" />
+                            </node>
+                            <node concept="liA8E" id="1stFrrzzlQQ" role="2OqNvi">
+                              <ref role="37wK5l" node="rZZ6H505u" resolve="substitutionMap" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="1stFrrzzlQR" role="2OqNvi">
+                            <ref role="37wK5l" node="4JBuioHVoYX" resolve="resolveAll" />
+                            <node concept="2OqwBi" id="1stFrrzzmiW" role="37wK5m">
+                              <node concept="2GrUjf" id="1stFrrzzmhA" role="2Oq$k0">
+                                <ref role="2Gs0qQ" node="29sKO70xzlx" resolve="overridingMethod" />
+                              </node>
+                              <node concept="3TrEf2" id="1stFrrzzmlr" role="2OqNvi">
+                                <ref role="3Tt5mk" to="tpee:fzclF7X" resolve="returnType" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="1stFrrzzl_Z" role="3cqZAp" />
                     <node concept="1nLNNL" id="dabFeLJny4" role="3cqZAp">
                       <node concept="1nLNMm" id="dabFeLJny6" role="1nLNNK">
                         <node concept="3xSepi" id="dabFeLJqh5" role="3xSepv">
@@ -39281,22 +39321,6 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3Aqczg" id="dabFeLJpEx" role="3cqZAp">
-                                    <node concept="3jbYBd" id="5itBwMb5r7A" role="3Aqpz8">
-                                      <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
-                                      <node concept="2OqwBi" id="dabFeLJnZh" role="3jbY8P">
-                                        <node concept="2GrUjf" id="dabFeLJnAK" role="2Oq$k0">
-                                          <ref role="2Gs0qQ" node="29sKO70xzlx" resolve="overridingMethod" />
-                                        </node>
-                                        <node concept="3TrEf2" id="dabFeLJp8H" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="tpee:fzclF7X" resolve="returnType" />
-                                        </node>
-                                      </node>
-                                      <node concept="a7P8L" id="dabFeLJnAD" role="3jbY8V">
-                                        <ref role="a7OzE" node="dabFeLJn_3" resolve="RetTy" />
-                                      </node>
-                                    </node>
-                                  </node>
                                   <node concept="3Aqczg" id="dabFeLJpEy" role="3cqZAp">
                                     <node concept="3jbYBd" id="5itBwMb5r7B" role="3Aqpz8">
                                       <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
@@ -39308,6 +39332,17 @@
                                       </node>
                                     </node>
                                   </node>
+                                  <node concept="3Aqczg" id="dabFeLJpEx" role="3cqZAp">
+                                    <node concept="3jbYBd" id="5itBwMb5r7A" role="3Aqpz8">
+                                      <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
+                                      <node concept="37vLTw" id="1stFrrzzmny" role="3jbY8P">
+                                        <ref role="3cqZAo" node="1stFrrzzlQM" resolve="overridingReturnType" />
+                                      </node>
+                                      <node concept="a7P8L" id="dabFeLJnAD" role="3jbY8V">
+                                        <ref role="a7OzE" node="dabFeLJn_3" resolve="RetTy" />
+                                      </node>
+                                    </node>
+                                  </node>
                                   <node concept="3Aqczg" id="dabFeLJpEz" role="3cqZAp">
                                     <node concept="3Aqt3T" id="dabFeLJpiR" role="3Aqpz8">
                                       <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="defaultConvertsTo" />
@@ -50661,8 +50696,8 @@
                   <ref role="3cqZAo" node="4JBuioHVqST" resolve="type" />
                 </node>
                 <node concept="1mIQ4w" id="4JBuioHVyUq" role="2OqNvi">
-                  <node concept="chp4Y" id="4JBuioHVyWY" role="cj9EA">
-                    <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+                  <node concept="chp4Y" id="1stFrrz$kZW" role="cj9EA">
+                    <ref role="cht4Q" to="tpee:fz3vP1H" resolve="Type" />
                   </node>
                 </node>
               </node>
@@ -50671,8 +50706,8 @@
                   <node concept="1rXfSq" id="4JBuioHVDIc" role="3cqZAk">
                     <ref role="37wK5l" node="74XSvywJzAV" resolve="substituteTypeVariables" />
                     <node concept="1PxgMI" id="4JBuioHVFaz" role="37wK5m">
-                      <node concept="chp4Y" id="4JBuioHVF_f" role="3oSUPX">
-                        <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+                      <node concept="chp4Y" id="1stFrrz$lA2" role="3oSUPX">
+                        <ref role="cht4Q" to="tpee:fz3vP1H" resolve="Type" />
                       </node>
                       <node concept="37vLTw" id="4JBuioHVEw2" role="1m5AlR">
                         <ref role="3cqZAo" node="4JBuioHVqST" resolve="type" />
@@ -50779,12 +50814,12 @@
         <property role="TrG5h" value="substituteTypeVariables" />
         <node concept="37vLTG" id="74XSvywJBxg" role="3clF46">
           <property role="TrG5h" value="ctype" />
-          <node concept="3Tqbb2" id="74XSvywJBQ0" role="1tU5fm">
-            <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+          <node concept="3Tqbb2" id="1stFrrzAaXP" role="1tU5fm">
+            <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
           </node>
         </node>
-        <node concept="3Tqbb2" id="74XSvywJEG4" role="3clF45">
-          <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+        <node concept="3Tqbb2" id="1stFrrzAaIo" role="3clF45">
+          <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
         </node>
         <node concept="3Tm1VV" id="74XSvywJzAY" role="1B3o_S" />
         <node concept="3clFbS" id="74XSvywJzAZ" role="3clF47">
@@ -50792,7 +50827,7 @@
             <node concept="3cpWsn" id="74XSvywJHD5" role="3cpWs9">
               <property role="TrG5h" value="ctypeCopy" />
               <node concept="3Tqbb2" id="74XSvywJDwd" role="1tU5fm">
-                <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
               </node>
               <node concept="2OqwBi" id="74XSvywJJTd" role="33vP2m">
                 <node concept="37vLTw" id="74XSvywJHD6" role="2Oq$k0">
@@ -51820,14 +51855,19 @@
                                         <node concept="1bVj0M" id="74XSvywK0A6" role="23t8la">
                                           <node concept="3clFbS" id="74XSvywK0A7" role="1bW5cS">
                                             <node concept="3clFbF" id="74XSvywK0Li" role="3cqZAp">
-                                              <node concept="2OqwBi" id="74XSvywK0XS" role="3clFbG">
-                                                <node concept="37vLTw" id="74XSvywK0Lh" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="74XSvywJvEi" resolve="substitutionMap" />
+                                              <node concept="1PxgMI" id="1stFrrzAdvh" role="3clFbG">
+                                                <node concept="chp4Y" id="1stFrrzAdFg" role="3oSUPX">
+                                                  <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
                                                 </node>
-                                                <node concept="liA8E" id="74XSvywK1it" role="2OqNvi">
-                                                  <ref role="37wK5l" node="74XSvywJzAV" resolve="substituteTypeVariables" />
-                                                  <node concept="37vLTw" id="74XSvywK1yg" role="37wK5m">
-                                                    <ref role="3cqZAo" node="74XSvywK0A8" resolve="it" />
+                                                <node concept="2OqwBi" id="74XSvywK0XS" role="1m5AlR">
+                                                  <node concept="37vLTw" id="74XSvywK0Lh" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="74XSvywJvEi" resolve="substitutionMap" />
+                                                  </node>
+                                                  <node concept="liA8E" id="74XSvywK1it" role="2OqNvi">
+                                                    <ref role="37wK5l" node="74XSvywJzAV" resolve="substituteTypeVariables" />
+                                                    <node concept="37vLTw" id="74XSvywK1yg" role="37wK5m">
+                                                      <ref role="3cqZAo" node="74XSvywK0A8" resolve="it" />
+                                                    </node>
                                                   </node>
                                                 </node>
                                               </node>