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 4ffaa3d7..95b1beb8 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
@@ -29323,31 +29323,56 @@
       <node concept="3clFbS" id="6GOqnFkhymk" role="3hEL4E">
         <node concept="3clFbJ" id="6GOqnFkhy$I" role="3cqZAp">
           <node concept="3clFbS" id="6GOqnFkhy$J" role="3clFbx">
-            <node concept="3Aqczg" id="6GOqnFkhy$K" role="3cqZAp">
-              <node concept="3jbYBd" id="6GOqnFkhy$L" role="3Aqpz8">
-                <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
-                <node concept="3hN9Ij" id="6GOqnFkhyTA" role="3jbY8P">
-                  <ref role="3hLkJx" node="6GOqnFkhyxT" resolve="eraseTo" />
+            <node concept="3Aqczg" id="4ldrYjLXqgT" role="3cqZAp">
+              <node concept="3jm4v3" id="4ldrYjLXqgU" role="3Aqpz8">
+                <ref role="3jm46O" node="3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
+                <node concept="2OqwBi" id="4ldrYjLXqIQ" role="3jicU7">
+                  <node concept="1PxgMI" id="4ldrYjLXqyH" role="2Oq$k0">
+                    <node concept="chp4Y" id="4ldrYjLXqzs" role="3oSUPX">
+                      <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+                    </node>
+                    <node concept="3hN9Ij" id="4ldrYjLXqpz" role="1m5AlR">
+                      <ref role="3hLkJx" node="6GOqnFkhyxT" resolve="eraseTo" />
+                    </node>
+                  </node>
+                  <node concept="3TrEf2" id="4ldrYjLXrbT" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                  </node>
                 </node>
-                <node concept="a7P8L" id="6GOqnFkhy$P" role="3jbY8V">
+                <node concept="a7P8L" id="4ldrYjLXqgZ" role="3jm6SO">
                   <ref role="a7OzE" node="6GOqnFkhyyQ" resolve="Bound" />
                 </node>
-                <node concept="3jhG_Y" id="6cGbuqP0NFS" role="3jhGvd">
-                  <node concept="3jhG_Z" id="6cGbuqP0NFU" role="3jhGob">
-                    <ref role="3jhG_U" node="5itBwMaLICh" resolve="substitution" />
-                    <node concept="3hN9Ij" id="6cGbuqP0NFY" role="3jhG_S">
-                      <ref role="3hLkJx" node="6GOqnFkhyzx" resolve="subs" />
+              </node>
+            </node>
+          </node>
+          <node concept="3eNFk2" id="4ldrYjLXnC4" role="3eNLev">
+            <node concept="3clFbS" id="4ldrYjLXnC6" role="3eOfB_">
+              <node concept="3Aqczg" id="6GOqnFkhy$K" role="3cqZAp">
+                <node concept="3jbYBd" id="6GOqnFkhy$L" role="3Aqpz8">
+                  <ref role="3jbY9l" node="5itBwMau8m1" resolve="lift" />
+                  <node concept="3hN9Ij" id="6GOqnFkhyTA" role="3jbY8P">
+                    <ref role="3hLkJx" node="6GOqnFkhyxT" resolve="eraseTo" />
+                  </node>
+                  <node concept="a7P8L" id="6GOqnFkhy$P" role="3jbY8V">
+                    <ref role="a7OzE" node="6GOqnFkhyyQ" resolve="Bound" />
+                  </node>
+                  <node concept="3jhG_Y" id="6cGbuqP0NFS" role="3jhGvd">
+                    <node concept="3jhG_Z" id="6cGbuqP0NFU" role="3jhGob">
+                      <ref role="3jhG_U" node="5itBwMaLICh" resolve="substitution" />
+                      <node concept="3hN9Ij" id="6cGbuqP0NFY" role="3jhG_S">
+                        <ref role="3hLkJx" node="6GOqnFkhyzx" resolve="subs" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-          </node>
-          <node concept="2OqwBi" id="6GOqnFkhy$Q" role="3clFbw">
-            <node concept="3hN9Ij" id="6GOqnFkhyTG" role="2Oq$k0">
-              <ref role="3hLkJx" node="6GOqnFkhyxT" resolve="eraseTo" />
+            <node concept="2OqwBi" id="6GOqnFkhy$Q" role="3eO9$A">
+              <node concept="3hN9Ij" id="6GOqnFkhyTG" role="2Oq$k0">
+                <ref role="3hLkJx" node="6GOqnFkhyxT" resolve="eraseTo" />
+              </node>
+              <node concept="3x8VRR" id="6GOqnFkhy$U" role="2OqNvi" />
             </node>
-            <node concept="3x8VRR" id="6GOqnFkhy$U" role="2OqNvi" />
           </node>
           <node concept="9aQIb" id="6GOqnFkhy$V" role="9aQIa">
             <node concept="3clFbS" id="6GOqnFkhy$W" role="9aQI4">
@@ -29371,6 +29396,16 @@
               </node>
             </node>
           </node>
+          <node concept="2OqwBi" id="4ldrYjLXpXb" role="3clFbw">
+            <node concept="3hN9Ij" id="4ldrYjLXpM_" role="2Oq$k0">
+              <ref role="3hLkJx" node="6GOqnFkhyxT" resolve="eraseTo" />
+            </node>
+            <node concept="1mIQ4w" id="4ldrYjLXqdG" role="2OqNvi">
+              <node concept="chp4Y" id="4ldrYjLXqe4" role="cj9EA">
+                <ref role="cht4Q" to="tpee:g7uibYu" resolve="ClassifierType" />
+              </node>
+            </node>
+          </node>
         </node>
         <node concept="3Aqczg" id="6GOqnFkhyPU" role="3cqZAp">
           <node concept="3A8Hvi" id="6GOqnFkhyPO" role="3Aqpz8">