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 637f56ce..08e168f7 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
@@ -8292,55 +8292,63 @@
                         </node>
                         <node concept="3clFbH" id="4xoHD1GdBFc" role="3cqZAp" />
                       </node>
-                      <node concept="3y3z36" id="4xoHD1GdBFd" role="3clFbw">
-                        <node concept="2OqwBi" id="4xoHD1GdBFe" role="3uHU7w">
-                          <node concept="37vLTw" id="4xoHD1GdBFf" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4xoHD1G0uIE" resolve="ctvds" />
-                          </node>
-                          <node concept="34oBXx" id="4xoHD1GdBFg" role="2OqNvi" />
-                        </node>
-                        <node concept="2OqwBi" id="4xoHD1GdBFh" role="3uHU7B">
-                          <node concept="37vLTw" id="4xoHD1GdBFi" role="2Oq$k0">
+                      <node concept="1Wc70l" id="5o9$c3zZZtq" role="3clFbw">
+                        <node concept="2OqwBi" id="5o9$c3$0249" role="3uHU7B">
+                          <node concept="37vLTw" id="5o9$c3zZZUg" role="2Oq$k0">
                             <ref role="3cqZAo" node="4xoHD1G0$4I" resolve="tyArgs" />
                           </node>
-                          <node concept="34oBXx" id="4xoHD1GdBFj" role="2OqNvi" />
+                          <node concept="3GX2aA" id="5o9$c3$0aaE" role="2OqNvi" />
+                        </node>
+                        <node concept="3y3z36" id="4xoHD1GdBFd" role="3uHU7w">
+                          <node concept="2OqwBi" id="4xoHD1GdBFe" role="3uHU7w">
+                            <node concept="37vLTw" id="4xoHD1GdBFf" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4xoHD1G0uIE" resolve="ctvds" />
+                            </node>
+                            <node concept="34oBXx" id="4xoHD1GdBFg" role="2OqNvi" />
+                          </node>
+                          <node concept="2OqwBi" id="4xoHD1GdBFh" role="3uHU7B">
+                            <node concept="37vLTw" id="4xoHD1GdBFi" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4xoHD1G0$4I" resolve="tyArgs" />
+                            </node>
+                            <node concept="34oBXx" id="4xoHD1GdBFj" role="2OqNvi" />
+                          </node>
                         </node>
                       </node>
                       <node concept="9aQIb" id="4xoHD1GdBFk" role="9aQIa">
                         <node concept="3clFbS" id="4xoHD1GdBFl" role="9aQI4">
-                          <node concept="3Aqczg" id="4xoHD1GdBFm" role="3cqZAp">
-                            <node concept="B_ONY" id="4xoHD1GdD5Y" role="3Aqpz8">
+                          <node concept="3Aqczg" id="5o9$c3$LmkY" role="3cqZAp">
+                            <node concept="B_ONY" id="5o9$c3$LmkZ" role="3Aqpz8">
                               <ref role="17QRF" node="4btN1w5JZi$" resolve="classifierType" />
-                              <node concept="a7P8L" id="4xoHD1GdJCr" role="B_OMz">
+                              <node concept="a7P8L" id="5o9$c3$Lml0" role="B_OMz">
                                 <ref role="a7OzE" node="4xoHD1GdINh" resolve="ClsTy" />
                               </node>
-                              <node concept="1Q7qz5" id="4xoHD1GdD6n" role="150vd">
-                                <node concept="1Q7q5z" id="4xoHD1GdD6p" role="1Q7qz4">
+                              <node concept="1Q7qz5" id="5o9$c3$Lml1" role="150vd">
+                                <node concept="1Q7q5z" id="5o9$c3$Lml2" role="1Q7qz4">
                                   <ref role="1Q7tcy" node="4btN1w5K2NJ" resolve="cls" />
-                                  <node concept="37vLTw" id="4xoHD1GdD6t" role="1KxKwY">
+                                  <node concept="37vLTw" id="5o9$c3$Lml3" role="1KxKwY">
                                     <ref role="3cqZAo" node="4xoHD1G0Ncl" resolve="cls" />
                                   </node>
                                 </node>
-                                <node concept="1Q7q5z" id="4xoHD1GdD6y" role="1Q7qz4">
+                                <node concept="1Q7q5z" id="5o9$c3$Lml4" role="1Q7qz4">
                                   <ref role="1Q7tcy" node="4btN1w5K05d" resolve="tyArgs" />
-                                  <node concept="37vLTw" id="4xoHD1GdD6O" role="1KxKwY">
+                                  <node concept="37vLTw" id="5o9$c3$Lml5" role="1KxKwY">
                                     <ref role="3cqZAo" node="4xoHD1G0$4I" resolve="tyArgs" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="3Aqczg" id="4xoHD1GdBFq" role="3cqZAp">
-                            <node concept="3A8Hvi" id="4xoHD1GdBFr" role="3Aqpz8">
-                              <node concept="a7P8L" id="4xoHD1Gegek" role="3A8wtg">
+                          <node concept="3Aqczg" id="5o9$c3$rx9i" role="3cqZAp">
+                            <node concept="3A8Hvi" id="5o9$c3$rx9j" role="3Aqpz8">
+                              <node concept="a7P8L" id="5o9$c3$rx9k" role="3A8wtg">
                                 <ref role="a7OzE" node="4xoHD1GdINh" resolve="ClsTy" />
                               </node>
-                              <node concept="ns1u0" id="4xoHD1GdBFt" role="3A8w4Q">
+                              <node concept="ns1u0" id="5o9$c3$rx9l" role="3A8w4Q">
                                 <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
-                                <node concept="nsMwS" id="4xoHD1GdBFu" role="ns1xD">
+                                <node concept="nsMwS" id="5o9$c3$rx9m" role="ns1xD">
                                   <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
-                                  <node concept="1nq8_$" id="4xoHD1GdBFv" role="nsMwV">
-                                    <node concept="a7P8L" id="4xoHD1GdJCw" role="1nq8_t">
+                                  <node concept="1nq8_$" id="5o9$c3$rx9n" role="nsMwV">
+                                    <node concept="a7P8L" id="5o9$c3$rx9o" role="1nq8_t">
                                       <ref role="a7OzE" node="4xoHD1GdINi" resolve="TyArgs" />
                                     </node>
                                   </node>
@@ -8472,8 +8480,8 @@
                             </node>
                             <node concept="3eOVzh" id="4xoHD1GdBGW" role="1Dwp0S">
                               <node concept="2OqwBi" id="4xoHD1GdBGX" role="3uHU7w">
-                                <node concept="37vLTw" id="4xoHD1GdJGV" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4xoHD1G0uIE" resolve="ctvds" />
+                                <node concept="37vLTw" id="5o9$c3$7uWb" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4xoHD1G0$4I" resolve="tyArgs" />
                                 </node>
                                 <node concept="34oBXx" id="4xoHD1GdBGZ" role="2OqNvi" />
                               </node>
@@ -8487,34 +8495,81 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="3clFbH" id="4xoHD1GdDar" role="3cqZAp" />
-                          <node concept="3Aqczg" id="4xoHD1G0uJJ" role="3cqZAp">
-                            <node concept="3Aqt3T" id="4xoHD1G0uJK" role="3Aqpz8">
-                              <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
-                              <node concept="37jhX" id="4xoHD1G0uJL" role="3AunhB">
-                                <node concept="2OqwBi" id="4xoHD1G0uJM" role="37jj2">
-                                  <node concept="3A2sRY" id="4xoHD1G0uJN" role="2Oq$k0">
-                                    <ref role="3A2yKK" node="4xoHD1G0uJX" resolve="dcc" />
+                          <node concept="3clFbH" id="5o9$c3$rBOH" role="3cqZAp" />
+                          <node concept="3clFbJ" id="5o9$c3$rBI_" role="3cqZAp">
+                            <node concept="3clFbS" id="5o9$c3$rBIA" role="3clFbx">
+                              <node concept="3Aqczg" id="5o9$c3$rBIB" role="3cqZAp">
+                                <node concept="3Aqt3T" id="5o9$c3$rBIC" role="3Aqpz8">
+                                  <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
+                                  <node concept="37jhX" id="5o9$c3$rBID" role="3AunhB">
+                                    <node concept="2OqwBi" id="5o9$c3$rBIE" role="37jj2">
+                                      <node concept="3A2sRY" id="5o9$c3$rBQE" role="2Oq$k0">
+                                        <ref role="3A2yKK" node="4xoHD1G0uJX" resolve="dcc" />
+                                      </node>
+                                      <node concept="iZEcu" id="5o9$c3$rBIG" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                  <node concept="ns1u0" id="5o9$c3$rBIH" role="3AunhB">
+                                    <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
+                                    <node concept="nsMwS" id="5o9$c3$rBII" role="ns1xD">
+                                      <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                                      <node concept="2OqwBi" id="5o9$c3$rBIJ" role="nsMwV">
+                                        <node concept="37vLTw" id="5o9$c3$rBIK" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="4xoHD1G0Ncl" resolve="cls" />
+                                        </node>
+                                        <node concept="iZEcu" id="5o9$c3$rBIL" role="2OqNvi" />
+                                      </node>
+                                    </node>
+                                    <node concept="nsMwS" id="5o9$c3$rBIM" role="ns1xD">
+                                      <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
+                                      <node concept="1nq8_$" id="5o9$c3$rBIN" role="nsMwV">
+                                        <node concept="a7P8L" id="5o9$c3$rBIO" role="1nq8_t">
+                                          <ref role="a7OzE" node="4xoHD1GdINm" resolve="TyArgCaps" />
+                                        </node>
+                                      </node>
+                                    </node>
                                   </node>
-                                  <node concept="iZEcu" id="4xoHD1G0uJO" role="2OqNvi" />
                                 </node>
                               </node>
-                              <node concept="ns1u0" id="4xoHD1GdDgg" role="3AunhB">
-                                <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
-                                <node concept="nsMwS" id="4xoHD1GdDgi" role="ns1xD">
-                                  <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                                  <node concept="2OqwBi" id="4xoHD1GdDoQ" role="nsMwV">
-                                    <node concept="37vLTw" id="4xoHD1GdDgm" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4xoHD1G0Ncl" resolve="cls" />
+                            </node>
+                            <node concept="2OqwBi" id="5o9$c3$rBIP" role="3clFbw">
+                              <node concept="37vLTw" id="5o9$c3$rBIQ" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4xoHD1G0$4I" resolve="tyArgs" />
+                              </node>
+                              <node concept="3GX2aA" id="5o9$c3$rBIR" role="2OqNvi" />
+                            </node>
+                            <node concept="9aQIb" id="5o9$c3$rBIS" role="9aQIa">
+                              <node concept="3clFbS" id="5o9$c3$rBIT" role="9aQI4">
+                                <node concept="3Aqczg" id="5o9$c3$rBIU" role="3cqZAp">
+                                  <node concept="3Aqt3T" id="5o9$c3$rBIV" role="3Aqpz8">
+                                    <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
+                                    <node concept="37jhX" id="5o9$c3$rBIW" role="3AunhB">
+                                      <node concept="2OqwBi" id="5o9$c3$rBIX" role="37jj2">
+                                        <node concept="3A2sRY" id="5o9$c3$rHgX" role="2Oq$k0">
+                                          <ref role="3A2yKK" node="4xoHD1G0uJX" resolve="dcc" />
+                                        </node>
+                                        <node concept="iZEcu" id="5o9$c3$rBIZ" role="2OqNvi" />
+                                      </node>
                                     </node>
-                                    <node concept="iZEcu" id="4xoHD1GdDyp" role="2OqNvi" />
-                                  </node>
-                                </node>
-                                <node concept="nsMwS" id="4xoHD1GdDyI" role="ns1xD">
-                                  <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
-                                  <node concept="1nq8_$" id="4xoHD1GdIMi" role="nsMwV">
-                                    <node concept="a7P8L" id="4xoHD1GdJKt" role="1nq8_t">
-                                      <ref role="a7OzE" node="4xoHD1GdINm" resolve="TyArgCaps" />
+                                    <node concept="ns1u0" id="5o9$c3$rBJ0" role="3AunhB">
+                                      <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
+                                      <node concept="nsMwS" id="5o9$c3$rBJ1" role="ns1xD">
+                                        <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                                        <node concept="2OqwBi" id="5o9$c3$rBJ2" role="nsMwV">
+                                          <node concept="37vLTw" id="5o9$c3$rBJ3" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="4xoHD1G0Ncl" resolve="cls" />
+                                          </node>
+                                          <node concept="iZEcu" id="5o9$c3$rBJ4" role="2OqNvi" />
+                                        </node>
+                                      </node>
+                                      <node concept="nsMwS" id="5o9$c3$rBJ5" role="ns1xD">
+                                        <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
+                                        <node concept="1nq8_$" id="5o9$c3$rBJ6" role="nsMwV">
+                                          <node concept="a7P8L" id="5o9$c3$rBJ7" role="1nq8_t">
+                                            <ref role="a7OzE" node="4xoHD1GdINi" resolve="TyArgs" />
+                                          </node>
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -8852,18 +8907,26 @@
                         </node>
                         <node concept="3clFbH" id="4xoHD1Gi1kA" role="3cqZAp" />
                       </node>
-                      <node concept="3y3z36" id="4xoHD1Gi1kB" role="3clFbw">
-                        <node concept="2OqwBi" id="4xoHD1Gi1kC" role="3uHU7w">
-                          <node concept="37vLTw" id="4xoHD1Gi1kD" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4xoHD1Gi1jG" resolve="ctvds" />
-                          </node>
-                          <node concept="34oBXx" id="4xoHD1Gi1kE" role="2OqNvi" />
-                        </node>
-                        <node concept="2OqwBi" id="4xoHD1Gi1kF" role="3uHU7B">
-                          <node concept="37vLTw" id="4xoHD1Gi1kG" role="2Oq$k0">
+                      <node concept="1Wc70l" id="5o9$c3zZw_o" role="3clFbw">
+                        <node concept="2OqwBi" id="5o9$c3zZ$7p" role="3uHU7B">
+                          <node concept="37vLTw" id="5o9$c3zZx8g" role="2Oq$k0">
                             <ref role="3cqZAo" node="4xoHD1Gi1jM" resolve="tyArgs" />
                           </node>
-                          <node concept="34oBXx" id="4xoHD1Gi1kH" role="2OqNvi" />
+                          <node concept="3GX2aA" id="5o9$c3$0cQd" role="2OqNvi" />
+                        </node>
+                        <node concept="3y3z36" id="4xoHD1Gi1kB" role="3uHU7w">
+                          <node concept="2OqwBi" id="4xoHD1Gi1kC" role="3uHU7w">
+                            <node concept="37vLTw" id="4xoHD1Gi1kD" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4xoHD1Gi1jG" resolve="ctvds" />
+                            </node>
+                            <node concept="34oBXx" id="4xoHD1Gi1kE" role="2OqNvi" />
+                          </node>
+                          <node concept="2OqwBi" id="4xoHD1Gi1kF" role="3uHU7B">
+                            <node concept="37vLTw" id="4xoHD1Gi1kG" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4xoHD1Gi1jM" resolve="tyArgs" />
+                            </node>
+                            <node concept="34oBXx" id="4xoHD1Gi1kH" role="2OqNvi" />
+                          </node>
                         </node>
                       </node>
                       <node concept="9aQIb" id="4xoHD1Gi1kI" role="9aQIa">
@@ -8911,39 +8974,39 @@
                             </node>
                             <node concept="3clFbS" id="4xoHD1GjHih" role="1$59iG">
                               <node concept="3clFbH" id="4xoHD1GjLFj" role="3cqZAp" />
-                              <node concept="3Aqczg" id="4xoHD1Gi1kK" role="3cqZAp">
-                                <node concept="B_ONY" id="4xoHD1Gi1kL" role="3Aqpz8">
+                              <node concept="3Aqczg" id="5o9$c3$Lm3m" role="3cqZAp">
+                                <node concept="B_ONY" id="5o9$c3$Lm3n" role="3Aqpz8">
                                   <ref role="17QRF" node="4btN1w5JZi$" resolve="classifierType" />
-                                  <node concept="a7P8L" id="4xoHD1Gi1kM" role="B_OMz">
+                                  <node concept="a7P8L" id="5o9$c3$Lm3o" role="B_OMz">
                                     <ref role="a7OzE" node="4xoHD1Gi1jW" resolve="ClsTy" />
                                   </node>
-                                  <node concept="1Q7qz5" id="4xoHD1Gi1kN" role="150vd">
-                                    <node concept="1Q7q5z" id="4xoHD1Gi1kO" role="1Q7qz4">
+                                  <node concept="1Q7qz5" id="5o9$c3$Lm3p" role="150vd">
+                                    <node concept="1Q7q5z" id="5o9$c3$Lm3q" role="1Q7qz4">
                                       <ref role="1Q7tcy" node="4btN1w5K2NJ" resolve="cls" />
-                                      <node concept="37vLTw" id="4xoHD1Gi1kP" role="1KxKwY">
+                                      <node concept="37vLTw" id="5o9$c3$Lm3r" role="1KxKwY">
                                         <ref role="3cqZAo" node="4xoHD1Gi1jA" resolve="cls" />
                                       </node>
                                     </node>
-                                    <node concept="1Q7q5z" id="4xoHD1Gi1kQ" role="1Q7qz4">
+                                    <node concept="1Q7q5z" id="5o9$c3$Lm3s" role="1Q7qz4">
                                       <ref role="1Q7tcy" node="4btN1w5K05d" resolve="tyArgs" />
-                                      <node concept="37vLTw" id="4xoHD1Gi1kR" role="1KxKwY">
+                                      <node concept="37vLTw" id="5o9$c3$Lm3t" role="1KxKwY">
                                         <ref role="3cqZAo" node="4xoHD1Gi1jM" resolve="tyArgs" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3Aqczg" id="4xoHD1Gi1kS" role="3cqZAp">
-                                <node concept="3A8Hvi" id="4xoHD1Gi1kT" role="3Aqpz8">
-                                  <node concept="a7P8L" id="4xoHD1Gi1kU" role="3A8wtg">
+                              <node concept="3Aqczg" id="5o9$c3$rx6k" role="3cqZAp">
+                                <node concept="3A8Hvi" id="5o9$c3$rx6l" role="3Aqpz8">
+                                  <node concept="a7P8L" id="5o9$c3$rx6m" role="3A8wtg">
                                     <ref role="a7OzE" node="4xoHD1Gi1jW" resolve="ClsTy" />
                                   </node>
-                                  <node concept="ns1u0" id="4xoHD1Gi1kV" role="3A8w4Q">
+                                  <node concept="ns1u0" id="5o9$c3$rx6n" role="3A8w4Q">
                                     <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
-                                    <node concept="nsMwS" id="4xoHD1Gi1kW" role="ns1xD">
+                                    <node concept="nsMwS" id="5o9$c3$rx6o" role="ns1xD">
                                       <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
-                                      <node concept="1nq8_$" id="4xoHD1Gi1kX" role="nsMwV">
-                                        <node concept="a7P8L" id="4xoHD1Gi1kY" role="1nq8_t">
+                                      <node concept="1nq8_$" id="5o9$c3$rx6p" role="nsMwV">
+                                        <node concept="a7P8L" id="5o9$c3$rx6q" role="1nq8_t">
                                           <ref role="a7OzE" node="4xoHD1Gi1jX" resolve="TyArgs" />
                                         </node>
                                       </node>
@@ -9075,8 +9138,8 @@
                                 </node>
                                 <node concept="3eOVzh" id="4xoHD1Gi1lK" role="1Dwp0S">
                                   <node concept="2OqwBi" id="4xoHD1Gi1lL" role="3uHU7w">
-                                    <node concept="37vLTw" id="4xoHD1Gi1lM" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4xoHD1Gi1jG" resolve="ctvds" />
+                                    <node concept="37vLTw" id="5o9$c3$7uQR" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="4xoHD1Gi1jM" resolve="tyArgs" />
                                     </node>
                                     <node concept="34oBXx" id="4xoHD1Gi1lN" role="2OqNvi" />
                                   </node>
@@ -9158,33 +9221,80 @@
                                 </node>
                               </node>
                               <node concept="3clFbH" id="4xoHD1Gjel0" role="3cqZAp" />
-                              <node concept="3Aqczg" id="4xoHD1Gi1lS" role="3cqZAp">
-                                <node concept="3Aqt3T" id="4xoHD1Gi1lT" role="3Aqpz8">
-                                  <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
-                                  <node concept="37jhX" id="4xoHD1Gi1lU" role="3AunhB">
-                                    <node concept="2OqwBi" id="4xoHD1Gi1lV" role="37jj2">
-                                      <node concept="3A2sRY" id="4xoHD1Gi1lW" role="2Oq$k0">
-                                        <ref role="3A2yKK" node="4xoHD1Gi1m8" resolve="anonCls" />
+                              <node concept="3clFbJ" id="5o9$c3$rjui" role="3cqZAp">
+                                <node concept="3clFbS" id="5o9$c3$rjuj" role="3clFbx">
+                                  <node concept="3Aqczg" id="5o9$c3$rjuk" role="3cqZAp">
+                                    <node concept="3Aqt3T" id="5o9$c3$rjul" role="3Aqpz8">
+                                      <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
+                                      <node concept="37jhX" id="5o9$c3$rjum" role="3AunhB">
+                                        <node concept="2OqwBi" id="5o9$c3$rjun" role="37jj2">
+                                          <node concept="iZEcu" id="5o9$c3$rjup" role="2OqNvi" />
+                                          <node concept="3A2sRY" id="5o9$c3$roV7" role="2Oq$k0">
+                                            <ref role="3A2yKK" node="4xoHD1Gi1m8" resolve="anonCls" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="ns1u0" id="5o9$c3$rjuq" role="3AunhB">
+                                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
+                                        <node concept="nsMwS" id="5o9$c3$rjur" role="ns1xD">
+                                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                                          <node concept="2OqwBi" id="5o9$c3$rjus" role="nsMwV">
+                                            <node concept="37vLTw" id="5o9$c3$rjut" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="4xoHD1Gi1jA" resolve="cls" />
+                                            </node>
+                                            <node concept="iZEcu" id="5o9$c3$rjuu" role="2OqNvi" />
+                                          </node>
+                                        </node>
+                                        <node concept="nsMwS" id="5o9$c3$rjuv" role="ns1xD">
+                                          <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
+                                          <node concept="1nq8_$" id="5o9$c3$rjuw" role="nsMwV">
+                                            <node concept="a7P8L" id="5o9$c3$rjux" role="1nq8_t">
+                                              <ref role="a7OzE" node="4xoHD1Gi1k1" resolve="TyArgCaps" />
+                                            </node>
+                                          </node>
+                                        </node>
                                       </node>
-                                      <node concept="iZEcu" id="4xoHD1Gi1lX" role="2OqNvi" />
                                     </node>
                                   </node>
-                                  <node concept="ns1u0" id="4xoHD1Gi1lY" role="3AunhB">
-                                    <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
-                                    <node concept="nsMwS" id="4xoHD1Gi1lZ" role="ns1xD">
-                                      <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                                      <node concept="2OqwBi" id="4xoHD1Gi1m0" role="nsMwV">
-                                        <node concept="37vLTw" id="4xoHD1Gi1m1" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4xoHD1Gi1jA" resolve="cls" />
+                                </node>
+                                <node concept="2OqwBi" id="5o9$c3$rjuy" role="3clFbw">
+                                  <node concept="37vLTw" id="5o9$c3$rjuz" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="4xoHD1Gi1jM" resolve="tyArgs" />
+                                  </node>
+                                  <node concept="3GX2aA" id="5o9$c3$rju$" role="2OqNvi" />
+                                </node>
+                                <node concept="9aQIb" id="5o9$c3$rju_" role="9aQIa">
+                                  <node concept="3clFbS" id="5o9$c3$rjuA" role="9aQI4">
+                                    <node concept="3Aqczg" id="5o9$c3$rjuB" role="3cqZAp">
+                                      <node concept="3Aqt3T" id="5o9$c3$rjuC" role="3Aqpz8">
+                                        <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
+                                        <node concept="37jhX" id="5o9$c3$rjuD" role="3AunhB">
+                                          <node concept="2OqwBi" id="5o9$c3$rjuE" role="37jj2">
+                                            <node concept="3A2sRY" id="5o9$c3$rrCG" role="2Oq$k0">
+                                              <ref role="3A2yKK" node="4xoHD1Gi1m8" resolve="anonCls" />
+                                            </node>
+                                            <node concept="iZEcu" id="5o9$c3$rjuG" role="2OqNvi" />
+                                          </node>
                                         </node>
-                                        <node concept="iZEcu" id="4xoHD1Gi1m2" role="2OqNvi" />
-                                      </node>
-                                    </node>
-                                    <node concept="nsMwS" id="4xoHD1Gi1m3" role="ns1xD">
-                                      <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
-                                      <node concept="1nq8_$" id="4xoHD1Gi1m4" role="nsMwV">
-                                        <node concept="a7P8L" id="4xoHD1Gi1m5" role="1nq8_t">
-                                          <ref role="a7OzE" node="4xoHD1Gi1k1" resolve="TyArgCaps" />
+                                        <node concept="ns1u0" id="5o9$c3$rjuH" role="3AunhB">
+                                          <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
+                                          <node concept="nsMwS" id="5o9$c3$rjuI" role="ns1xD">
+                                            <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                                            <node concept="2OqwBi" id="5o9$c3$rjuJ" role="nsMwV">
+                                              <node concept="37vLTw" id="5o9$c3$rjuK" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="4xoHD1Gi1jA" resolve="cls" />
+                                              </node>
+                                              <node concept="iZEcu" id="5o9$c3$rjuL" role="2OqNvi" />
+                                            </node>
+                                          </node>
+                                          <node concept="nsMwS" id="5o9$c3$rjuM" role="ns1xD">
+                                            <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
+                                            <node concept="1nq8_$" id="5o9$c3$rjuN" role="nsMwV">
+                                              <node concept="a7P8L" id="5o9$c3$rjuO" role="1nq8_t">
+                                                <ref role="a7OzE" node="4xoHD1Gi1jX" resolve="TyArgs" />
+                                              </node>
+                                            </node>
+                                          </node>
                                         </node>
                                       </node>
                                     </node>
@@ -9352,23 +9462,26 @@
           </node>
         </node>
         <node concept="3clFbH" id="4xoHD1GqImM" role="3cqZAp" />
-        <node concept="3SKdUt" id="4xoHD1GqIw4" role="3cqZAp">
-          <node concept="1PaTwC" id="4xoHD1GqIw5" role="3ndbpf">
-            <node concept="3oM_SD" id="4xoHD1GqIw7" role="1PaTwD">
+        <node concept="3SKdUt" id="5o9$c3zZwp8" role="3cqZAp">
+          <node concept="1PaTwC" id="5o9$c3zZwp9" role="3ndbpf">
+            <node concept="3oM_SD" id="5o9$c3zZwpb" role="1PaTwD">
               <property role="3oM_SC" value="NB:" />
             </node>
-            <node concept="3oM_SD" id="4xoHD1GqIKm" role="1PaTwD">
+            <node concept="3oM_SD" id="5o9$c3zZwu6" role="1PaTwD">
               <property role="3oM_SC" value="identical" />
             </node>
-            <node concept="3oM_SD" id="4xoHD1GqIKp" role="1PaTwD">
+            <node concept="3oM_SD" id="5o9$c3zZwu9" role="1PaTwD">
               <property role="3oM_SC" value="to" />
             </node>
-            <node concept="3oM_SD" id="4xoHD1GqIOg" role="1PaTwD">
+            <node concept="3oM_SD" id="5o9$c3zZwzm" role="1PaTwD">
               <property role="3oM_SC" value="anonymousClass" />
             </node>
+            <node concept="3oM_SD" id="5o9$c3zZwzr" role="1PaTwD">
+              <property role="3oM_SC" value="rule" />
+            </node>
           </node>
         </node>
-        <node concept="3clFbH" id="4xoHD1GpWdo" role="3cqZAp" />
+        <node concept="3clFbH" id="5o9$c3zZwuo" role="3cqZAp" />
         <node concept="1nLNNL" id="4xoHD1GpWdp" role="3cqZAp">
           <node concept="1nLNMm" id="4xoHD1GpWdq" role="1nLNNK">
             <node concept="0eUR_" id="4xoHD1GpWdr" role="0UC6o">
@@ -9379,8 +9492,8 @@
                 <node concept="aZer4" id="4xoHD1GpWdu" role="3XD1gS">
                   <property role="TrG5h" value="TyArgs" />
                   <node concept="2OqwBi" id="4xoHD1GpWdv" role="3gj$pD">
-                    <node concept="37vLTw" id="4xoHD1GpWdw" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4xoHD1GpWcM" resolve="tyArgs" />
+                    <node concept="37vLTw" id="5o9$c3$b72B" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4xoHD1GpWcG" resolve="ctvds" />
                     </node>
                     <node concept="34oBXx" id="4xoHD1GpWdx" role="2OqNvi" />
                   </node>
@@ -9388,8 +9501,8 @@
                 <node concept="aZer4" id="4xoHD1GpWdy" role="3XD1gS">
                   <property role="TrG5h" value="TyArgCaps" />
                   <node concept="2OqwBi" id="4xoHD1GpWdz" role="3gj$pD">
-                    <node concept="37vLTw" id="4xoHD1GpWd$" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4xoHD1GpWcM" resolve="tyArgs" />
+                    <node concept="37vLTw" id="5o9$c3$b77W" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4xoHD1GpWcG" resolve="ctvds" />
                     </node>
                     <node concept="34oBXx" id="4xoHD1GpWd_" role="2OqNvi" />
                   </node>
@@ -9550,18 +9663,26 @@
                         </node>
                         <node concept="3clFbH" id="4xoHD1GpWeF" role="3cqZAp" />
                       </node>
-                      <node concept="3y3z36" id="4xoHD1GpWeG" role="3clFbw">
-                        <node concept="2OqwBi" id="4xoHD1GpWeH" role="3uHU7w">
-                          <node concept="37vLTw" id="4xoHD1GpWeI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4xoHD1GpWcG" resolve="ctvds" />
-                          </node>
-                          <node concept="34oBXx" id="4xoHD1GpWeJ" role="2OqNvi" />
-                        </node>
-                        <node concept="2OqwBi" id="4xoHD1GpWeK" role="3uHU7B">
-                          <node concept="37vLTw" id="4xoHD1GpWeL" role="2Oq$k0">
+                      <node concept="1Wc70l" id="5o9$c3zZmrx" role="3clFbw">
+                        <node concept="2OqwBi" id="5o9$c3zZpy2" role="3uHU7B">
+                          <node concept="37vLTw" id="5o9$c3zZmW$" role="2Oq$k0">
                             <ref role="3cqZAo" node="4xoHD1GpWcM" resolve="tyArgs" />
                           </node>
-                          <node concept="34oBXx" id="4xoHD1GpWeM" role="2OqNvi" />
+                          <node concept="3GX2aA" id="5o9$c3$0fFq" role="2OqNvi" />
+                        </node>
+                        <node concept="3y3z36" id="4xoHD1GpWeG" role="3uHU7w">
+                          <node concept="2OqwBi" id="4xoHD1GpWeH" role="3uHU7w">
+                            <node concept="37vLTw" id="4xoHD1GpWeI" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4xoHD1GpWcG" resolve="ctvds" />
+                            </node>
+                            <node concept="34oBXx" id="4xoHD1GpWeJ" role="2OqNvi" />
+                          </node>
+                          <node concept="2OqwBi" id="4xoHD1GpWeK" role="3uHU7B">
+                            <node concept="37vLTw" id="4xoHD1GpWeL" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4xoHD1GpWcM" resolve="tyArgs" />
+                            </node>
+                            <node concept="34oBXx" id="4xoHD1GpWeM" role="2OqNvi" />
+                          </node>
                         </node>
                       </node>
                       <node concept="9aQIb" id="4xoHD1GpWeN" role="9aQIa">
@@ -9707,16 +9828,16 @@
                                     <node concept="3cpWsn" id="4xoHD1GpWfJ" role="3cpWs9">
                                       <property role="TrG5h" value="errNodePtr" />
                                       <node concept="2sp9CU" id="4xoHD1GpWfK" role="1tU5fm" />
-                                      <node concept="2OqwBi" id="4xoHD1GpWfL" role="33vP2m">
-                                        <node concept="1y4W85" id="4xoHD1GpWfM" role="2Oq$k0">
-                                          <node concept="37vLTw" id="4xoHD1GpWfN" role="1y58nS">
+                                      <node concept="2OqwBi" id="5o9$c3$kcc6" role="33vP2m">
+                                        <node concept="1y4W85" id="5o9$c3$mvLs" role="2Oq$k0">
+                                          <node concept="37vLTw" id="5o9$c3$mwk_" role="1y58nS">
                                             <ref role="3cqZAo" node="4xoHD1GpWg6" resolve="i" />
                                           </node>
-                                          <node concept="37vLTw" id="4xoHD1GpWfO" role="1y566C">
+                                          <node concept="37vLTw" id="5o9$c3$k89z" role="1y566C">
                                             <ref role="3cqZAo" node="4xoHD1GpWcM" resolve="tyArgs" />
                                           </node>
                                         </node>
-                                        <node concept="iZEcu" id="4xoHD1GpWfP" role="2OqNvi" />
+                                        <node concept="iZEcu" id="5o9$c3$kcoy" role="2OqNvi" />
                                       </node>
                                     </node>
                                   </node>
@@ -9773,8 +9894,8 @@
                                 </node>
                                 <node concept="3eOVzh" id="4xoHD1GpWg9" role="1Dwp0S">
                                   <node concept="2OqwBi" id="4xoHD1GpWga" role="3uHU7w">
-                                    <node concept="37vLTw" id="4xoHD1GpWgb" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4xoHD1GpWcG" resolve="ctvds" />
+                                    <node concept="37vLTw" id="5o9$c3$oRPF" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="4xoHD1GpWcM" resolve="tyArgs" />
                                     </node>
                                     <node concept="34oBXx" id="4xoHD1GpWgc" role="2OqNvi" />
                                   </node>
@@ -9855,34 +9976,81 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="4xoHD1GpWgH" role="3cqZAp" />
-                              <node concept="3Aqczg" id="4xoHD1GpWgI" role="3cqZAp">
-                                <node concept="3Aqt3T" id="4xoHD1GpWgJ" role="3Aqpz8">
-                                  <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
-                                  <node concept="37jhX" id="4xoHD1GpWgK" role="3AunhB">
-                                    <node concept="2OqwBi" id="4xoHD1GpWgL" role="37jj2">
-                                      <node concept="3A2sRY" id="4xoHD1GpWgM" role="2Oq$k0">
-                                        <ref role="3A2yKK" node="4xoHD1GpWgY" resolve="cc" />
+                              <node concept="3clFbH" id="5o9$c3$hIeK" role="3cqZAp" />
+                              <node concept="3clFbJ" id="5o9$c3$oRWT" role="3cqZAp">
+                                <node concept="3clFbS" id="5o9$c3$oRWV" role="3clFbx">
+                                  <node concept="3Aqczg" id="4xoHD1GpWgI" role="3cqZAp">
+                                    <node concept="3Aqt3T" id="4xoHD1GpWgJ" role="3Aqpz8">
+                                      <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
+                                      <node concept="37jhX" id="4xoHD1GpWgK" role="3AunhB">
+                                        <node concept="2OqwBi" id="4xoHD1GpWgL" role="37jj2">
+                                          <node concept="3A2sRY" id="4xoHD1GpWgM" role="2Oq$k0">
+                                            <ref role="3A2yKK" node="4xoHD1GpWgY" resolve="cc" />
+                                          </node>
+                                          <node concept="iZEcu" id="4xoHD1GpWgN" role="2OqNvi" />
+                                        </node>
+                                      </node>
+                                      <node concept="ns1u0" id="4xoHD1GpWgO" role="3AunhB">
+                                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
+                                        <node concept="nsMwS" id="4xoHD1GpWgP" role="ns1xD">
+                                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                                          <node concept="2OqwBi" id="4xoHD1GpWgQ" role="nsMwV">
+                                            <node concept="37vLTw" id="4xoHD1GpWgR" role="2Oq$k0">
+                                              <ref role="3cqZAo" node="4xoHD1GpWcA" resolve="cls" />
+                                            </node>
+                                            <node concept="iZEcu" id="4xoHD1GpWgS" role="2OqNvi" />
+                                          </node>
+                                        </node>
+                                        <node concept="nsMwS" id="4xoHD1GpWgT" role="ns1xD">
+                                          <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
+                                          <node concept="1nq8_$" id="4xoHD1GpWgU" role="nsMwV">
+                                            <node concept="a7P8L" id="5o9$c3$p1fD" role="1nq8_t">
+                                              <ref role="a7OzE" node="4xoHD1GpWdy" resolve="TyArgCaps" />
+                                            </node>
+                                          </node>
+                                        </node>
                                       </node>
-                                      <node concept="iZEcu" id="4xoHD1GpWgN" role="2OqNvi" />
                                     </node>
                                   </node>
-                                  <node concept="ns1u0" id="4xoHD1GpWgO" role="3AunhB">
-                                    <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
-                                    <node concept="nsMwS" id="4xoHD1GpWgP" role="ns1xD">
-                                      <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                                      <node concept="2OqwBi" id="4xoHD1GpWgQ" role="nsMwV">
-                                        <node concept="37vLTw" id="4xoHD1GpWgR" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4xoHD1GpWcA" resolve="cls" />
+                                </node>
+                                <node concept="2OqwBi" id="5o9$c3$oU80" role="3clFbw">
+                                  <node concept="37vLTw" id="5o9$c3$oRYZ" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="4xoHD1GpWcM" resolve="tyArgs" />
+                                  </node>
+                                  <node concept="3GX2aA" id="5o9$c3$p1eO" role="2OqNvi" />
+                                </node>
+                                <node concept="9aQIb" id="5o9$c3$oZqo" role="9aQIa">
+                                  <node concept="3clFbS" id="5o9$c3$oZqp" role="9aQI4">
+                                    <node concept="3Aqczg" id="5o9$c3$oZrg" role="3cqZAp">
+                                      <node concept="3Aqt3T" id="5o9$c3$oZrh" role="3Aqpz8">
+                                        <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
+                                        <node concept="37jhX" id="5o9$c3$oZri" role="3AunhB">
+                                          <node concept="2OqwBi" id="5o9$c3$oZrj" role="37jj2">
+                                            <node concept="3A2sRY" id="5o9$c3$oZrk" role="2Oq$k0">
+                                              <ref role="3A2yKK" node="4xoHD1GpWgY" resolve="cc" />
+                                            </node>
+                                            <node concept="iZEcu" id="5o9$c3$oZrl" role="2OqNvi" />
+                                          </node>
                                         </node>
-                                        <node concept="iZEcu" id="4xoHD1GpWgS" role="2OqNvi" />
-                                      </node>
-                                    </node>
-                                    <node concept="nsMwS" id="4xoHD1GpWgT" role="ns1xD">
-                                      <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
-                                      <node concept="1nq8_$" id="4xoHD1GpWgU" role="nsMwV">
-                                        <node concept="a7P8L" id="4xoHD1GpWgV" role="1nq8_t">
-                                          <ref role="a7OzE" node="4xoHD1GpWdy" resolve="TyArgCaps" />
+                                        <node concept="ns1u0" id="5o9$c3$oZrm" role="3AunhB">
+                                          <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
+                                          <node concept="nsMwS" id="5o9$c3$oZrn" role="ns1xD">
+                                            <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                                            <node concept="2OqwBi" id="5o9$c3$oZro" role="nsMwV">
+                                              <node concept="37vLTw" id="5o9$c3$oZrp" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="4xoHD1GpWcA" resolve="cls" />
+                                              </node>
+                                              <node concept="iZEcu" id="5o9$c3$oZrq" role="2OqNvi" />
+                                            </node>
+                                          </node>
+                                          <node concept="nsMwS" id="5o9$c3$oZrr" role="ns1xD">
+                                            <ref role="nsMwP" node="JOGAOsVt2e" resolve="parameter" />
+                                            <node concept="1nq8_$" id="5o9$c3$oZrs" role="nsMwV">
+                                              <node concept="a7P8L" id="5o9$c3$p1gq" role="1nq8_t">
+                                                <ref role="a7OzE" node="4xoHD1GpWdu" resolve="TyArgs" />
+                                              </node>
+                                            </node>
+                                          </node>
                                         </node>
                                       </node>
                                     </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps
index f7bce8d4..89532140 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:3be3464b-7052-4e73-b8e9-dc5802b8d5a9(jetbrains.mps.baseLanguageExt.test.code.generics)">
+<model ref="r:3be3464b-7052-4e73-b8e9-dc5802b8d5a9(jetbrains.mps.baseLanguageExt.test.code.generics)" doNotGenerate="true">
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
@@ -10,8 +10,6 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
-    <import index="wcmu" ref="r:1070fac4-bb22-4bb6-b0bf-ec58df816edc(jetbrains.mps.typechecking.annotation.structure)" />
-    <import index="qb9i" ref="r:8991efa4-0db2-4f35-8467-4fdbae2564cc(jetbrains.mps.typechecking.annotation.intentions)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">