diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
index e7219c78..aaa7d0db 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
@@ -7622,9 +7622,17 @@
                                             </node>
                                             <node concept="1uHKPH" id="6dzPt95BbwW" role="2OqNvi" />
                                           </node>
-                                          <node concept="2c44tf" id="6dzPt95BcHT" role="37wK5m">
-                                            <node concept="3uibUv" id="6dzPt95BcHV" role="2c44tc">
-                                              <ref role="3uigEE" node="6dzPt95tB0K" resolve="DemoGeneric.A" />
+                                          <node concept="2pJPEk" id="5dFCr0y60Qm" role="37wK5m">
+                                            <node concept="2pJPED" id="5dFCr0y617X" role="2pJPEn">
+                                              <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                              <node concept="2pIpSj" id="5dFCr0y61bh" role="2pJxcM">
+                                                <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
+                                                <node concept="36biLy" id="5dFCr0y61ru" role="28nt2d">
+                                                  <node concept="3xONca" id="5dFCr0y61sZ" role="36biLW">
+                                                    <ref role="3xOPvv" node="5dFCr0y606k" resolve="A" />
+                                                  </node>
+                                                </node>
+                                              </node>
                                             </node>
                                           </node>
                                         </node>
@@ -7692,11 +7700,30 @@
                                     <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                                   </node>
                                 </node>
-                                <node concept="2c44tf" id="6dzPt95_vI_" role="37wK5m">
-                                  <node concept="3uibUv" id="6dzPt95_wgD" role="2c44tc">
-                                    <ref role="3uigEE" node="6dzPt95tB0T" resolve="DemoGeneric.G" />
-                                    <node concept="3uibUv" id="6dzPt95_wie" role="11_B2D">
-                                      <ref role="3uigEE" node="6dzPt95tB0K" resolve="DemoGeneric.A" />
+                                <node concept="2pJPEk" id="5dFCr0y61UZ" role="37wK5m">
+                                  <node concept="2pJPED" id="5dFCr0y62bi" role="2pJPEn">
+                                    <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                    <node concept="2pIpSj" id="5dFCr0y62bn" role="2pJxcM">
+                                      <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
+                                      <node concept="36biLy" id="5dFCr0y62Ql" role="28nt2d">
+                                        <node concept="3xONca" id="5dFCr0y62RQ" role="36biLW">
+                                          <ref role="3xOPvv" node="6dzPt95tPsh" resolve="GClsDecl" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="2pIpSj" id="5dFCr0y62uU" role="2pJxcM">
+                                      <ref role="2pIpSl" to="tpee:g91_B6F" resolve="parameter" />
+                                      <node concept="2pJPED" id="5dFCr0y62Jd" role="28nt2d">
+                                        <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                        <node concept="2pIpSj" id="5dFCr0y62KG" role="2pJxcM">
+                                          <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
+                                          <node concept="36biLy" id="5dFCr0y62Mf" role="28nt2d">
+                                            <node concept="3xONca" id="5dFCr0y62NK" role="36biLW">
+                                              <ref role="3xOPvv" node="5dFCr0y606k" resolve="A" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -7767,9 +7794,17 @@
                       </node>
                       <node concept="1uHKPH" id="6dzPt95ziVg" role="2OqNvi" />
                     </node>
-                    <node concept="2c44tf" id="6dzPt95vxk1" role="37wK5m">
-                      <node concept="3uibUv" id="6dzPt95vy30" role="2c44tc">
-                        <ref role="3uigEE" node="6dzPt95tB0M" resolve="DemoGeneric.B" />
+                    <node concept="2pJPEk" id="5dFCr0y63N5" role="37wK5m">
+                      <node concept="2pJPED" id="5dFCr0y643K" role="2pJPEn">
+                        <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
+                        <node concept="2pIpSj" id="5dFCr0y6474" role="2pJxcM">
+                          <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
+                          <node concept="36biLy" id="5dFCr0y64nF" role="28nt2d">
+                            <node concept="3xONca" id="5dFCr0y64pc" role="36biLW">
+                              <ref role="3xOPvv" node="5dFCr0y63cx" resolve="B" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -7811,6 +7846,9 @@
           <property role="2bfB8j" value="true" />
           <property role="TrG5h" value="A" />
           <node concept="3Tm6S6" id="6dzPt95tYc4" role="1B3o_S" />
+          <node concept="3xLA65" id="5dFCr0y606k" role="lGtFl">
+            <property role="TrG5h" value="A" />
+          </node>
         </node>
         <node concept="312cEu" id="6dzPt95tB0M" role="jymVt">
           <property role="2bfB8j" value="true" />
@@ -7819,6 +7857,9 @@
           <node concept="3uibUv" id="6dzPt95tB0O" role="1zkMxy">
             <ref role="3uigEE" node="6dzPt95tB0K" resolve="DemoGeneric.A" />
           </node>
+          <node concept="3xLA65" id="5dFCr0y63cx" role="lGtFl">
+            <property role="TrG5h" value="B" />
+          </node>
         </node>
         <node concept="312cEu" id="6dzPt95tB0P" role="jymVt">
           <property role="2bfB8j" value="true" />
@@ -7836,6 +7877,9 @@
           <node concept="16euLQ" id="MSv3owne$X" role="16eVyc">
             <property role="TrG5h" value="T" />
           </node>
+          <node concept="3xLA65" id="5dFCr0y64FB" role="lGtFl">
+            <property role="TrG5h" value="Box" />
+          </node>
         </node>
         <node concept="2tJIrI" id="6dzPt95tB0S" role="jymVt" />
         <node concept="312cEu" id="6dzPt95tB0T" role="jymVt">
@@ -8381,11 +8425,30 @@
                                             </node>
                                             <node concept="1uHKPH" id="MSv3ownCRt" role="2OqNvi" />
                                           </node>
-                                          <node concept="2c44tf" id="MSv3ownCRu" role="37wK5m">
-                                            <node concept="3uibUv" id="MSv3ownTZM" role="2c44tc">
-                                              <ref role="3uigEE" node="MSv3owndHO" resolve="DemoGeneric.Box" />
-                                              <node concept="3uibUv" id="MSv3ownTZO" role="11_B2D">
-                                                <ref role="3uigEE" node="6dzPt95tB0K" resolve="DemoGeneric.A" />
+                                          <node concept="2pJPEk" id="5dFCr0y656v" role="37wK5m">
+                                            <node concept="2pJPED" id="5dFCr0y656w" role="2pJPEn">
+                                              <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                              <node concept="2pIpSj" id="5dFCr0y656x" role="2pJxcM">
+                                                <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
+                                                <node concept="36biLy" id="5dFCr0y656y" role="28nt2d">
+                                                  <node concept="3xONca" id="5dFCr0y65rW" role="36biLW">
+                                                    <ref role="3xOPvv" node="5dFCr0y64FB" resolve="Box" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="2pIpSj" id="5dFCr0y656$" role="2pJxcM">
+                                                <ref role="2pIpSl" to="tpee:g91_B6F" resolve="parameter" />
+                                                <node concept="2pJPED" id="5dFCr0y656_" role="28nt2d">
+                                                  <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                                  <node concept="2pIpSj" id="5dFCr0y656A" role="2pJxcM">
+                                                    <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
+                                                    <node concept="36biLy" id="5dFCr0y656B" role="28nt2d">
+                                                      <node concept="3xONca" id="5dFCr0y656C" role="36biLW">
+                                                        <ref role="3xOPvv" node="5dFCr0y606k" resolve="A" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
@@ -8454,11 +8517,30 @@
                                     <ref role="37wK5l" to="tpek:hEwIP$m" resolve="getOperand" />
                                   </node>
                                 </node>
-                                <node concept="2c44tf" id="MSv3ownCRU" role="37wK5m">
-                                  <node concept="3uibUv" id="MSv3ownCRV" role="2c44tc">
-                                    <ref role="3uigEE" node="6dzPt95tB0T" resolve="DemoGeneric.G" />
-                                    <node concept="3uibUv" id="MSv3ownCRW" role="11_B2D">
-                                      <ref role="3uigEE" node="6dzPt95tB0K" resolve="DemoGeneric.A" />
+                                <node concept="2pJPEk" id="5dFCr0y65MA" role="37wK5m">
+                                  <node concept="2pJPED" id="5dFCr0y65MB" role="2pJPEn">
+                                    <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                    <node concept="2pIpSj" id="5dFCr0y65MC" role="2pJxcM">
+                                      <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
+                                      <node concept="36biLy" id="5dFCr0y65MD" role="28nt2d">
+                                        <node concept="3xONca" id="5dFCr0y65ME" role="36biLW">
+                                          <ref role="3xOPvv" node="6dzPt95tPsh" resolve="GClsDecl" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="2pIpSj" id="5dFCr0y65MF" role="2pJxcM">
+                                      <ref role="2pIpSl" to="tpee:g91_B6F" resolve="parameter" />
+                                      <node concept="2pJPED" id="5dFCr0y65MG" role="28nt2d">
+                                        <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
+                                        <node concept="2pIpSj" id="5dFCr0y65MH" role="2pJxcM">
+                                          <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
+                                          <node concept="36biLy" id="5dFCr0y65MI" role="28nt2d">
+                                            <node concept="3xONca" id="5dFCr0y65MJ" role="36biLW">
+                                              <ref role="3xOPvv" node="5dFCr0y606k" resolve="A" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -8529,11 +8611,30 @@
                       </node>
                       <node concept="1uHKPH" id="MSv3ownCSn" role="2OqNvi" />
                     </node>
-                    <node concept="2c44tf" id="MSv3ownCSo" role="37wK5m">
-                      <node concept="3uibUv" id="MSv3ownSMY" role="2c44tc">
-                        <ref role="3uigEE" node="MSv3owndHO" resolve="DemoGeneric.Box" />
-                        <node concept="3uibUv" id="MSv3ownSMZ" role="11_B2D">
-                          <ref role="3uigEE" node="6dzPt95tB0M" resolve="DemoGeneric.B" />
+                    <node concept="2pJPEk" id="5dFCr0y6699" role="37wK5m">
+                      <node concept="2pJPED" id="5dFCr0y669a" role="2pJPEn">
+                        <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
+                        <node concept="2pIpSj" id="5dFCr0y669b" role="2pJxcM">
+                          <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
+                          <node concept="36biLy" id="5dFCr0y669c" role="28nt2d">
+                            <node concept="3xONca" id="5dFCr0y669d" role="36biLW">
+                              <ref role="3xOPvv" node="5dFCr0y64FB" resolve="Box" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2pIpSj" id="5dFCr0y669e" role="2pJxcM">
+                          <ref role="2pIpSl" to="tpee:g91_B6F" resolve="parameter" />
+                          <node concept="2pJPED" id="5dFCr0y669f" role="28nt2d">
+                            <ref role="2pJxaS" to="tpee:g7uibYu" resolve="ClassifierType" />
+                            <node concept="2pIpSj" id="5dFCr0y669g" role="2pJxcM">
+                              <ref role="2pIpSl" to="tpee:g7uigIF" resolve="classifier" />
+                              <node concept="36biLy" id="5dFCr0y669h" role="28nt2d">
+                                <node concept="3xONca" id="5dFCr0y66sY" role="36biLW">
+                                  <ref role="3xOPvv" node="5dFCr0y63cx" resolve="B" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>