diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index ef4e5b23..2c457596 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -13671,7 +13671,7 @@
     </node>
     <node concept="2tJIrI" id="xaaVXv6ItX" role="jymVt" />
     <node concept="3clFb_" id="xaaVXv6Iqg" role="jymVt">
-      <property role="TrG5h" value="isPrincipal" />
+      <property role="TrG5h" value="isAuxiliary" />
       <property role="1EzhhJ" value="false" />
       <node concept="10P_77" id="xaaVXv6Iqh" role="3clF45" />
       <node concept="3Tm1VV" id="xaaVXv6Iqi" role="1B3o_S" />
@@ -13692,7 +13692,7 @@
               <node concept="2OqwBi" id="xaaVXv6IqB" role="3clFbG">
                 <node concept="30H73N" id="xaaVXv6IqC" role="2Oq$k0" />
                 <node concept="3TrcHB" id="xaaVXv6LFt" role="2OqNvi">
-                  <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="principal" />
+                  <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="auxiliary" />
                 </node>
               </node>
             </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index f4451ee3..b6c10ed2 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -4183,36 +4183,92 @@
           <ref role="2ZyFGn" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
         </node>
       </node>
-      <node concept="3EZMnI" id="xaaVXv4QaO" role="3EZMnx">
-        <node concept="VPM3Z" id="xaaVXv4QaQ" role="3F10Kt" />
-        <node concept="3F0ifn" id="xaaVXv4Rek" role="3EZMnx">
-          <property role="3F0ifm" value="principal" />
-          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
-          <node concept="VPM3Z" id="xaaVXv4ReE" role="3F10Kt">
-            <property role="VOm3f" value="true" />
+      <node concept="3F1sOY" id="36tQV5AmNOj" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:36tQV5AmIsx" resolve="input" />
+      </node>
+      <node concept="l2Vlx" id="36tQV5AmNNY" role="2iSdaV" />
+      <node concept="3EZMnI" id="3_DK4z3R77W" role="3EZMnx">
+        <node concept="VPM3Z" id="3_DK4z3R77Y" role="3F10Kt" />
+        <node concept="l2Vlx" id="3_DK4z3R781" role="2iSdaV" />
+        <node concept="1QoScp" id="3_DK4z3R9zM" role="3EZMnx">
+          <property role="1QpmdY" value="true" />
+          <node concept="pkWqt" id="3_DK4z3R9zN" role="3e4ffs">
+            <node concept="3clFbS" id="3_DK4z3R9zO" role="2VODD2">
+              <node concept="3clFbF" id="3_DK4z3RQvz" role="3cqZAp">
+                <node concept="2OqwBi" id="3_DK4z3RQKg" role="3clFbG">
+                  <node concept="pncrf" id="3_DK4z3RQvy" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="3_DK4z3RRHM" role="2OqNvi">
+                    <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="auxiliary" />
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
-          <node concept="VPxyj" id="xaaVXv4ReJ" role="3F10Kt">
-            <property role="VOm3f" value="false" />
+          <node concept="3F0ifn" id="3_DK4z3Rae2" role="1QoS34">
+            <property role="3F0ifm" value="auxiliary" />
+            <node concept="OXEIz" id="3_DK4z3RyWU" role="P5bDN">
+              <node concept="1oHujT" id="3_DK4z3Rzzb" role="OY2wv">
+                <property role="1oHujS" value="essential" />
+                <node concept="1oIgkG" id="3_DK4z3Rzzc" role="1oHujR">
+                  <node concept="3clFbS" id="3_DK4z3Rzzd" role="2VODD2">
+                    <node concept="3clFbF" id="3_DK4z3REIu" role="3cqZAp">
+                      <node concept="37vLTI" id="3_DK4z3RGK5" role="3clFbG">
+                        <node concept="3clFbT" id="3_DK4z3RHtt" role="37vLTx" />
+                        <node concept="2OqwBi" id="3_DK4z3RET2" role="37vLTJ">
+                          <node concept="3GMtW1" id="3_DK4z3REIt" role="2Oq$k0" />
+                          <node concept="3TrcHB" id="3_DK4z3RFKR" role="2OqNvi">
+                            <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="auxiliary" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
-        </node>
-        <node concept="l2Vlx" id="xaaVXv4QaT" role="2iSdaV" />
-        <node concept="pkWqt" id="xaaVXv4Qbq" role="pqm2j">
-          <node concept="3clFbS" id="xaaVXv4Qbr" role="2VODD2">
-            <node concept="3clFbF" id="xaaVXv4QbA" role="3cqZAp">
-              <node concept="2OqwBi" id="xaaVXv4Qst" role="3clFbG">
-                <node concept="pncrf" id="xaaVXv4Qb_" role="2Oq$k0" />
-                <node concept="3TrcHB" id="xaaVXv4R6T" role="2OqNvi">
-                  <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="principal" />
+          <node concept="3F0ifn" id="3_DK4z3RhZ$" role="1QoVPY">
+            <property role="ilYzB" value="&lt;essential&gt;" />
+            <node concept="OXEIz" id="3_DK4z3Rtmg" role="P5bDN">
+              <node concept="1oHujT" id="3_DK4z3RtWx" role="OY2wv">
+                <property role="1oHujS" value="auxiliary" />
+                <node concept="1oIgkG" id="3_DK4z3RtWy" role="1oHujR">
+                  <node concept="3clFbS" id="3_DK4z3RtWz" role="2VODD2">
+                    <node concept="3clFbF" id="3_DK4z3RLHr" role="3cqZAp">
+                      <node concept="37vLTI" id="3_DK4z3RNI_" role="3clFbG">
+                        <node concept="3clFbT" id="3_DK4z3ROle" role="37vLTx">
+                          <property role="3clFbU" value="true" />
+                        </node>
+                        <node concept="2OqwBi" id="3_DK4z3RLRZ" role="37vLTJ">
+                          <node concept="3GMtW1" id="3_DK4z3RLHq" role="2Oq$k0" />
+                          <node concept="3TrcHB" id="3_DK4z3RMJz" role="2OqNvi">
+                            <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="auxiliary" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="pkWqt" id="3_DK4z3Ruz7" role="pqm2j">
+            <node concept="3clFbS" id="3_DK4z3Ruz8" role="2VODD2">
+              <node concept="3clFbF" id="3_DK4z3RvdB" role="3cqZAp">
+                <node concept="2OqwBi" id="3_DK4z3RwAy" role="3clFbG">
+                  <node concept="2OqwBi" id="3_DK4z3Rvuk" role="2Oq$k0">
+                    <node concept="pncrf" id="3_DK4z3RvdA" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="3_DK4z3RwpI" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="3_DK4z3Ry8i" role="2OqNvi" />
                 </node>
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="3F1sOY" id="36tQV5AmNOj" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:36tQV5AmIsx" resolve="input" />
-      </node>
-      <node concept="l2Vlx" id="36tQV5AmNNY" role="2iSdaV" />
       <node concept="3EZMnI" id="36tQV5AmP0Z" role="3EZMnx">
         <node concept="VPM3Z" id="36tQV5AmP10" role="3F10Kt">
           <property role="VOm3f" value="false" />
@@ -5020,7 +5076,7 @@
               <node concept="2OqwBi" id="xaaVXv4Sn0" role="2Oq$k0">
                 <node concept="0GJ7k" id="xaaVXv4S8L" role="2Oq$k0" />
                 <node concept="3TrcHB" id="xaaVXv4STL" role="2OqNvi">
-                  <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="principal" />
+                  <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="auxiliary" />
                 </node>
               </node>
               <node concept="tyxLq" id="xaaVXv4TFt" role="2OqNvi">
@@ -5038,7 +5094,7 @@
             <node concept="2OqwBi" id="xaaVXv4Ryf" role="3clFbG">
               <node concept="0GJ7k" id="xaaVXv4Rfw" role="2Oq$k0" />
               <node concept="3TrcHB" id="xaaVXv4S8B" role="2OqNvi">
-                <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="principal" />
+                <ref role="3TsBF5" to="wq2x:xaaVXv4NiS" resolve="auxiliary" />
               </node>
             </node>
           </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 64b449c5..917c1f9b 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -987,9 +987,8 @@
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="xaaVXv4NiS" role="1TKVEl">
       <property role="IQ2nx" value="597338001513854136" />
-      <property role="TrG5h" value="principal" />
+      <property role="TrG5h" value="auxiliary" />
       <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
-      <node concept="asaX9" id="6E2cNicXaKy" role="lGtFl" />
     </node>
     <node concept="1TJgyj" id="36tQV5AmIsx" role="1TKVEi">
       <property role="20lmBu" value="fLJjDmT/aggregation" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index fddf3afc..73e87bb0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -6376,7 +6376,7 @@
         <node concept="3Tqbb2" id="tIwzd1I3Xq" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="xaaVXvi$r8" role="3clF46">
-        <property role="TrG5h" value="skipPrincipal" />
+        <property role="TrG5h" value="skipAuxiliary" />
         <node concept="10P_77" id="xaaVXvi$Eh" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="1eEe91OYhWx" role="3clF46">
@@ -6477,36 +6477,20 @@
         <node concept="3clFbH" id="4vBwiiV8924" role="3cqZAp" />
         <node concept="1DcWWT" id="tIwzd1I3Ww" role="3cqZAp">
           <node concept="3clFbS" id="tIwzd1I3Wx" role="2LFqv$">
-            <node concept="3SKdUt" id="42eP3ws0HmN" role="3cqZAp">
-              <node concept="1PaTwC" id="589APehYxQX" role="3ndbpf">
-                <node concept="3oM_SD" id="589APehYxQY" role="1PaTwD">
-                  <property role="3oM_SC" value="FIXME" />
-                </node>
-                <node concept="3oM_SD" id="589APehYxQZ" role="1PaTwD">
-                  <property role="3oM_SC" value="drop" />
-                </node>
-                <node concept="3oM_SD" id="589APehYxR0" role="1PaTwD">
-                  <property role="3oM_SC" value="this" />
-                </node>
-                <node concept="3oM_SD" id="589APehYxR1" role="1PaTwD">
-                  <property role="3oM_SC" value="feature" />
-                </node>
-              </node>
-            </node>
             <node concept="3clFbJ" id="xaaVXvp4el" role="3cqZAp">
               <node concept="3clFbS" id="xaaVXvp4en" role="3clFbx">
                 <node concept="3N13vt" id="xaaVXvp7Cl" role="3cqZAp" />
               </node>
               <node concept="1Wc70l" id="xaaVXvp7fb" role="3clFbw">
                 <node concept="37vLTw" id="xaaVXvp7rI" role="3uHU7B">
-                  <ref role="3cqZAo" node="xaaVXvi$r8" resolve="skipPrincipal" />
+                  <ref role="3cqZAo" node="xaaVXvi$r8" resolve="skipAuxiliary" />
                 </node>
                 <node concept="2OqwBi" id="xaaVXvp6wJ" role="3uHU7w">
                   <node concept="37vLTw" id="xaaVXvp4ng" role="2Oq$k0">
                     <ref role="3cqZAo" node="tIwzd1I3Xj" resolve="tpl" />
                   </node>
                   <node concept="liA8E" id="xaaVXvp77z" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:xaaVXv6GTE" resolve="isPrincipal" />
+                    <ref role="37wK5l" to="i348:xaaVXv6GTE" resolve="isAuxiliary" />
                   </node>
                 </node>
               </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index d245d240..dcf3c5ec 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -585,7 +585,7 @@
     <node concept="2tJIrI" id="xaaVXvjccD" role="jymVt" />
     <node concept="3clFb_" id="xaaVXv6GTE" role="jymVt">
       <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="isPrincipal" />
+      <property role="TrG5h" value="isAuxiliary" />
       <node concept="10P_77" id="xaaVXv6LWZ" role="3clF45" />
       <node concept="3Tm1VV" id="xaaVXv6GTG" role="1B3o_S" />
       <node concept="3clFbS" id="xaaVXv6GTI" role="3clF47">
@@ -887,13 +887,10 @@
     </node>
     <node concept="2tJIrI" id="xaaVXvjc6l" role="jymVt" />
     <node concept="3clFb_" id="xaaVXv6GSk" role="jymVt">
-      <property role="TrG5h" value="isPrincipal" />
+      <property role="TrG5h" value="isAuxiliary" />
       <node concept="10P_77" id="xaaVXv6LX8" role="3clF45" />
       <node concept="3Tm1VV" id="xaaVXv6GSo" role="1B3o_S" />
       <node concept="3clFbS" id="xaaVXv6GSp" role="3clF47" />
-      <node concept="2AHcQZ" id="6E2cNicW82Y" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
     </node>
     <node concept="2tJIrI" id="67SsWaEmb4N" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUndvp" role="jymVt">
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 def2243f..2793d985 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
@@ -751,6 +751,7 @@
         <child id="7674753015762572651" name="body" index="3xSepv" />
       </concept>
       <concept id="3575255234174969615" name="jetbrains.mps.lang.coderules.structure.RuleTemplate" flags="ng" index="1nLNMY">
+        <property id="597338001513854136" name="auxiliary" index="1nmhW7" />
         <child id="3575255234174969633" name="input" index="1nLNMg" />
         <child id="3575255234174969628" name="code" index="1nLNMH" />
       </concept>
@@ -43315,6 +43316,7 @@
     </node>
     <node concept="1nLNMY" id="4btN1w5KhEZ" role="1nK1Vg">
       <property role="TrG5h" value="check_ClassifierTypeArgs" />
+      <property role="1nmhW7" value="true" />
       <node concept="2t___k" id="4btN1w5KirX" role="1nLNMg">
         <ref role="2t_S0q" to="tpee:g7uibYu" resolve="ClassifierType" />
         <node concept="3A20r5" id="4btN1w5KirY" role="2t_VXX">
@@ -43939,6 +43941,7 @@
     </node>
     <node concept="1nLNMY" id="5mvKPwwqDjU" role="1nK1Vg">
       <property role="TrG5h" value="check_TypeVariableDeclBounds" />
+      <property role="1nmhW7" value="true" />
       <node concept="3clFbS" id="5mvKPwwqDjV" role="1nLNMH">
         <node concept="3cpWs8" id="36PPzUCy2Sp" role="3cqZAp">
           <node concept="3cpWsn" id="36PPzUCy2Sq" role="3cpWs9">
@@ -44117,6 +44120,7 @@
     </node>
     <node concept="1nLNMY" id="29sKO70xbTB" role="1nK1Vg">
       <property role="TrG5h" value="check_ClassifierOverridingMethods" />
+      <property role="1nmhW7" value="true" />
       <node concept="3clFbS" id="29sKO70xbTC" role="1nLNMH">
         <node concept="3cpWs8" id="36PPzUCy4jY" role="3cqZAp">
           <node concept="3cpWsn" id="36PPzUCy4k1" role="3cpWs9">
@@ -44659,7 +44663,7 @@
                                             <property role="3oM_SC" value="Check" />
                                           </node>
                                           <node concept="3oM_SD" id="1GAclsBNgS6" role="1PaTwD">
-                                            <property role="3oM_SC" value="compatability" />
+                                            <property role="3oM_SC" value="compatibility" />
                                           </node>
                                           <node concept="3oM_SD" id="1GAclsBNgS7" role="1PaTwD">
                                             <property role="3oM_SC" value="of" />
@@ -44691,7 +44695,7 @@
                                             <property role="3oM_SC" value="a" />
                                           </node>
                                           <node concept="3oM_SD" id="1GAclsBNgSh" role="1PaTwD">
-                                            <property role="3oM_SC" value="subsignature" />
+                                            <property role="3oM_SC" value="sub-signature" />
                                           </node>
                                           <node concept="3oM_SD" id="1GAclsBNgSi" role="1PaTwD">
                                             <property role="3oM_SC" value="of" />
@@ -45969,6 +45973,7 @@
     <ref role="2YbDB9" node="4btN1w5Jfyx" resolve="Generics" />
     <node concept="1nLNMY" id="6EK6UBPp82t" role="1nK1Vg">
       <property role="TrG5h" value="check_EnumConstantDecl" />
+      <property role="1nmhW7" value="true" />
       <node concept="3clFbS" id="6EK6UBPp82u" role="1nLNMH">
         <node concept="3cpWs8" id="dabFeLVKkM" role="3cqZAp">
           <node concept="3cpWsn" id="dabFeLVKkP" role="3cpWs9">
@@ -46567,91 +46572,6 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbH" id="6UxFjlrHb8S" role="3cqZAp" />
-                      <node concept="3SKdUt" id="6EK6UBPqlCD" role="3cqZAp">
-                        <node concept="1PaTwC" id="6EK6UBPqlCE" role="3ndbpf">
-                          <node concept="3oM_SD" id="6EK6UBPqlCG" role="1PaTwD">
-                            <property role="3oM_SC" value="can" />
-                          </node>
-                          <node concept="3oM_SD" id="6UxFjlrHb8h" role="1PaTwD">
-                            <property role="3oM_SC" value="produce" />
-                          </node>
-                          <node concept="3oM_SD" id="6UxFjlrHb8t" role="1PaTwD">
-                            <property role="3oM_SC" value="here" />
-                          </node>
-                          <node concept="3oM_SD" id="6UxFjlrHb8E" role="1PaTwD">
-                            <property role="3oM_SC" value="more" />
-                          </node>
-                          <node concept="3oM_SD" id="29sKO70tz7O" role="1PaTwD">
-                            <property role="3oM_SC" value="specific" />
-                          </node>
-                          <node concept="3oM_SD" id="29sKO70tz7Y" role="1PaTwD">
-                            <property role="3oM_SC" value="type" />
-                          </node>
-                          <node concept="3oM_SD" id="29sKO70tz89" role="1PaTwD">
-                            <property role="3oM_SC" value="with" />
-                          </node>
-                          <node concept="3oM_SD" id="29sKO70tz8l" role="1PaTwD">
-                            <property role="3oM_SC" value="all" />
-                          </node>
-                          <node concept="3oM_SD" id="6EK6UBPqlGp" role="1PaTwD">
-                            <property role="3oM_SC" value="type" />
-                          </node>
-                          <node concept="3oM_SD" id="6EK6UBPqlGs" role="1PaTwD">
-                            <property role="3oM_SC" value="var" />
-                          </node>
-                          <node concept="3oM_SD" id="29sKO70tz8I" role="1PaTwD">
-                            <property role="3oM_SC" value="substitutions" />
-                          </node>
-                          <node concept="3oM_SD" id="6EK6UBPqlGM" role="1PaTwD">
-                            <property role="3oM_SC" value="in" />
-                          </node>
-                          <node concept="3oM_SD" id="6EK6UBPqlGU" role="1PaTwD">
-                            <property role="3oM_SC" value="place" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1X3_iC" id="29sKO70tySh" role="lGtFl">
-                        <property role="3V$3am" value="statement" />
-                        <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                        <node concept="3Aqczg" id="6EK6UBPpI2g" role="8Wnug">
-                          <node concept="3A8Hvi" id="6EK6UBPpI2a" role="3Aqpz8">
-                            <node concept="a7P8L" id="6EK6UBPqlzD" role="3A8wtg">
-                              <ref role="a7OzE" node="6EK6UBPq1lF" resolve="ConstT" />
-                            </node>
-                            <node concept="9KH4l" id="6EK6UBPpI3q" role="3A8w4Q">
-                              <node concept="37jhX" id="6EK6UBPpI3y" role="9KHbC">
-                                <node concept="1nq8_$" id="6EK6UBPpI3x" role="37jj2">
-                                  <node concept="37jhX" id="6EK6UBPqlzM" role="1nq8_t">
-                                    <node concept="1nq8_$" id="6EK6UBPqlzL" role="37jj2">
-                                      <node concept="a7P8L" id="6EK6UBPqlzK" role="1nq8_t">
-                                        <ref role="a7OzE" node="6EK6UBPqlwI" resolve="ClsT" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1X3_iC" id="6UxFjlrHbcy" role="lGtFl">
-                        <property role="3V$3am" value="statement" />
-                        <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                        <node concept="3Aqczg" id="6EK6UBPpJsX" role="8Wnug">
-                          <node concept="3Aqt3T" id="6EK6UBPpJsV" role="3Aqpz8">
-                            <ref role="3AqCNq" node="34$A1MfhdDv" resolve="typeOf" />
-                            <node concept="37jhX" id="6EK6UBPpJuj" role="3AunhB">
-                              <node concept="3A2sRY" id="6EK6UBPpJuh" role="37jj2">
-                                <ref role="3A2yKK" node="6EK6UBPp82y" resolve="econst" />
-                              </node>
-                            </node>
-                            <node concept="a7P8L" id="6EK6UBPq1on" role="3AunhB">
-                              <ref role="a7OzE" node="6EK6UBPq1lF" resolve="ConstT" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
                     </node>
                   </node>
                 </node>
diff --git a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
index 69b0a48a..77b7685a 100644
--- a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
+++ b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
@@ -106,6 +106,12 @@
       <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
         <child id="763829979718664967" name="files" index="3rtmxm" />
       </concept>
+      <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
+        <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
+        <property id="8137134783396676838" name="extracted" index="1HemKv" />
+        <property id="2889113830911481881" name="deployFolderName" index="3ZfqAx" />
+        <child id="8137134783396676835" name="location" index="1HemKq" />
+      </concept>
       <concept id="4278635856200794926" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyExtendLanguage" flags="ng" index="1Busua">
         <reference id="4278635856200794928" name="language" index="1Busuk" />
       </concept>
@@ -269,6 +275,33 @@
             <ref role="3bR37D" to="zqd8:NKt6ynvPIP" resolve="jetbrains.mps.lang.typechecking" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1GAclsBfDrD" role="3bR37C">
+          <node concept="3bR9La" id="1GAclsBfDrE" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYK" resolve="jetbrains.mps.baseLanguage.util" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="1GAclsBfDrN" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="1GAclsBfDrO" role="1HemKq">
+            <node concept="398BVA" id="1GAclsBfDrF" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
+              <node concept="2Ry0Ak" id="1GAclsBfDrG" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1GAclsBfDrH" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt" />
+                  <node concept="2Ry0Ak" id="1GAclsBfDrI" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="1GAclsBfDrP" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3DveV8qz3Qm" role="2G$12L">
         <property role="TrG5h" value="jetbrains.mps.baseLanguage.javadocExt" />
@@ -350,6 +383,28 @@
             <ref role="3bR37D" to="zqd8:NKt6yomVLS" resolve="jetbrains.mps.lang.typechecking.runtime" />
           </node>
         </node>
+        <node concept="1BupzO" id="1GAclsBfDrY" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="1GAclsBfDrZ" role="1HemKq">
+            <node concept="398BVA" id="1GAclsBfDrQ" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
+              <node concept="2Ry0Ak" id="1GAclsBfDrR" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="1GAclsBfDrS" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguage.javadocExt" />
+                  <node concept="2Ry0Ak" id="1GAclsBfDrT" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="1GAclsBfDs0" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="69UmpDmJW8I" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -427,6 +482,28 @@
             <ref role="3bR37D" to="zqd8:7mB3viLwG3m" resolve="jetbrains.mps.coderules.typechecking.test" />
           </node>
         </node>
+        <node concept="1BupzO" id="1GAclsBfDs9" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="1GAclsBfDsa" role="1HemKq">
+            <node concept="398BVA" id="1GAclsBfDs1" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
+              <node concept="2Ry0Ak" id="1GAclsBfDs2" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="1GAclsBfDs3" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt.test" />
+                  <node concept="2Ry0Ak" id="1GAclsBfDs4" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="1GAclsBfDsb" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="69UmpDmJW3w" role="2G$12L">
         <property role="TrG5h" value="typechecking.samples.baseLanguage" />
@@ -495,6 +572,28 @@
             <ref role="3bR37D" node="69UmpDmJW8I" resolve="jetbrains.mps.baseLanguageExt.test" />
           </node>
         </node>
+        <node concept="1BupzO" id="1GAclsBfDsk" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="1GAclsBfDsl" role="1HemKq">
+            <node concept="398BVA" id="1GAclsBfDsc" role="3LXTmr">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.mpscore_home" />
+              <node concept="2Ry0Ak" id="1GAclsBfDsd" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="1GAclsBfDse" role="2Ry0An">
+                  <property role="2Ry0Am" value="typechecking.samples.baseLanguage" />
+                  <node concept="2Ry0Ak" id="1GAclsBfDsf" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="1GAclsBfDsm" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="22LTRH" id="69UmpDmJWeu" role="1hWBAP">