diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps
index 1df97cda..404829b9 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps
@@ -181,6 +181,9 @@
         <property id="7326790520856501351" name="severity" index="26X25f" />
         <child id="7326790520856501349" name="message" index="26X25d" />
       </concept>
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -1245,17 +1248,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="2q9s7fpQhq0" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LiY" role="iSaTp">
-                            <node concept="2OqwBi" id="2q9s7fpQhq1" role="37jj2">
-                              <node concept="2c44tf" id="2q9s7fpQhq2" role="2Oq$k0">
-                                <node concept="3uibUv" id="2q9s7fpQhq3" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="2q9s7fpQhq4" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIg" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Object" resolve="Object" />
                           </node>
                         </node>
                       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
index f2ae9f99..29a63693 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
@@ -250,6 +250,9 @@
         <reference id="6097203247219331496" name="extends" index="3tg4Y$" />
         <child id="1618328391714763070" name="macro" index="0oKgB" />
       </concept>
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -5503,17 +5506,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="1oUE7CX4Ntb" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Ljs" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$k" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$l" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$m" role="2c44tc">
-                                  <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$n" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIw" role="iSaTp">
+                            <ref role="h$OrH" to="33ny:~Collection" resolve="Collection" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="1oUE7CX4Ntd" role="ns1xD">
@@ -5589,17 +5583,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="1oUE7CX4NRA" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Ljt" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$o" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$p" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$q" role="2c44tc">
-                                  <ref role="3uigEE" to="33ny:~List" resolve="List" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$r" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIx" role="iSaTp">
+                            <ref role="h$OrH" to="33ny:~List" resolve="List" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="1oUE7CX4NRD" role="ns1xD">
@@ -5675,17 +5660,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="1oUE7CX4NUB" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lju" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$s" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$t" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$u" role="2c44tc">
-                                  <ref role="3uigEE" to="33ny:~LinkedList" resolve="LinkedList" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$v" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIy" role="iSaTp">
+                            <ref role="h$OrH" to="33ny:~LinkedList" resolve="LinkedList" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="1oUE7CX4NUE" role="ns1xD">
@@ -5761,17 +5737,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="1oUE7CX4NVa" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Ljv" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$w" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$x" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$y" role="2c44tc">
-                                  <ref role="3uigEE" to="33ny:~Deque" resolve="Deque" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$z" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIz" role="iSaTp">
+                            <ref role="h$OrH" to="33ny:~Deque" resolve="Deque" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="1oUE7CX4NVd" role="ns1xD">
@@ -5847,17 +5814,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="1oUE7CX4NZc" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Ljw" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$$" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$_" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$A" role="2c44tc">
-                                  <ref role="3uigEE" to="33ny:~Deque" resolve="Deque" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$B" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgI$" role="iSaTp">
+                            <ref role="h$OrH" to="33ny:~Deque" resolve="Deque" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="1oUE7CX4NZf" role="ns1xD">
@@ -5933,17 +5891,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="1oUE7CX4NZJ" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Ljx" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$C" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$D" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$E" role="2c44tc">
-                                  <ref role="3uigEE" to="33ny:~Deque" resolve="Deque" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$F" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgI_" role="iSaTp">
+                            <ref role="h$OrH" to="33ny:~Deque" resolve="Deque" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="1oUE7CX4NZM" role="ns1xD">
@@ -6019,17 +5968,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="1oUE7CX4O2k" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Ljy" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$G" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$H" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$I" role="2c44tc">
-                                  <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$J" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIA" role="iSaTp">
+                            <ref role="h$OrH" to="33ny:~Set" resolve="Set" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="1oUE7CX4O2n" role="ns1xD">
@@ -6105,17 +6045,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="1oUE7CX5kRc" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Ljz" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$K" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$L" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$M" role="2c44tc">
-                                  <ref role="3uigEE" to="33ny:~SortedSet" resolve="SortedSet" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$N" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIB" role="iSaTp">
+                            <ref role="h$OrH" to="33ny:~SortedSet" resolve="SortedSet" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="1oUE7CX5kRf" role="ns1xD">
@@ -6200,17 +6131,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="1oUE7CX5kO1" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lj$" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$O" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$P" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$Q" role="2c44tc">
-                                  <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$R" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIC" role="iSaTp">
+                            <ref role="h$OrH" to="33ny:~Map" resolve="Map" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="1oUE7CX5kO4" role="ns1xD">
@@ -6300,17 +6222,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="1oUE7CX5lrO" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lj_" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$S" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$T" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$U" role="2c44tc">
-                                  <ref role="3uigEE" to="33ny:~SortedMap" resolve="SortedMap" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$V" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgID" role="iSaTp">
+                            <ref role="h$OrH" to="33ny:~SortedMap" resolve="SortedMap" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="1oUE7CX5lrR" role="ns1xD">
@@ -6403,17 +6316,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="1oUE7CX4O90" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LjA" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$W" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$X" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$Y" role="2c44tc">
-                                  <ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$Z" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIE" role="iSaTp">
+                            <ref role="h$OrH" to="33ny:~Iterator" resolve="Iterator" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="1oUE7CX4O93" role="ns1xD">
@@ -6501,17 +6405,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="3Z1xyIwARfT" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LjB" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7_0" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7_1" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7_2" role="2c44tc">
-                                  <ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7_3" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIF" role="iSaTp">
+                            <ref role="h$OrH" to="33ny:~Iterator" resolve="Iterator" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="3Z1xyIwARfW" role="ns1xD">
@@ -20075,17 +19970,8 @@
                             <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                             <node concept="nsMwS" id="3Z1xyIwnvq0" role="ns1xD">
                               <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                              <node concept="37jhX" id="ZNYugu2Lks" role="iSaTp">
-                                <node concept="2OqwBi" id="3CulEO1Y7_4" role="37jj2">
-                                  <node concept="2c44tf" id="3CulEO1Y7_5" role="2Oq$k0">
-                                    <node concept="3uibUv" id="3CulEO1Y7_6" role="2c44tc">
-                                      <ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="3CulEO1Y7_7" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                  </node>
-                                </node>
+                              <node concept="h$QuP" id="ZNYuguvgIG" role="iSaTp">
+                                <ref role="h$OrH" to="wyt6:~Comparable" resolve="Comparable" />
                               </node>
                             </node>
                             <node concept="nsMwS" id="3Z1xyIwnvq3" role="ns1xD">
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.types.mps
index d87e5380..50069a0e 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.types.mps
@@ -37,11 +37,6 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
     </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
-        <child id="1196350785114" name="quotedNode" index="2c44tc" />
-      </concept>
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="8456919074574710634" name="jetbrains.mps.logic.structure.ExpressionItem" flags="ng" index="37jhX">
         <child id="8456919074574710741" name="code" index="37jj2" />
@@ -69,9 +64,6 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
@@ -82,6 +74,9 @@
       <concept id="1618328391714763069" name="jetbrains.mps.lang.coderules.structure.MacroTable" flags="ng" index="0oKg$">
         <child id="1618328391714763070" name="macro" index="0oKgB" />
       </concept>
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -540,17 +535,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="QTGPMEwS2c" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lqe" role="iSaTp">
-                            <node concept="2OqwBi" id="QTGPMEwS2d" role="37jj2">
-                              <node concept="2c44tf" id="QTGPMEwS2e" role="2Oq$k0">
-                                <node concept="3uibUv" id="QTGPMEwS2f" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="QTGPMEwS2g" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIk" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Iterable" resolve="Iterable" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="QTGPMEwS5l" role="ns1xD">
@@ -679,17 +665,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="QTGPMEwRUW" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lqg" role="iSaTp">
-                            <node concept="2OqwBi" id="QTGPMEwRUX" role="37jj2">
-                              <node concept="2c44tf" id="QTGPMEwRUY" role="2Oq$k0">
-                                <node concept="3uibUv" id="QTGPMEwRUZ" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="QTGPMEwRV0" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIl" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Iterable" resolve="Iterable" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="QTGPMEwRV1" role="ns1xD">
@@ -801,17 +778,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="3MFPGC50Fah" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lqh" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7_k" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7_l" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7_m" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7_n" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIm" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Iterable" resolve="Iterable" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="3MFPGC50Fak" role="ns1xD">
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 83145dbb..17974b9c 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
@@ -694,6 +694,9 @@
         <reference id="6533016889631295418" name="queryType" index="KG3u5" />
         <child id="7871500063838282362" name="code" index="fHCRw" />
       </concept>
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -1143,17 +1146,8 @@
                             <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                             <node concept="nsMwS" id="2vhmmFsFOhC" role="ns1xD">
                               <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                              <node concept="37jhX" id="ZNYugu2Lqz" role="iSaTp">
-                                <node concept="2OqwBi" id="3CulEO1Y7yK" role="37jj2">
-                                  <node concept="2c44tf" id="3CulEO1Y7yL" role="2Oq$k0">
-                                    <node concept="3uibUv" id="3CulEO1Y7yM" role="2c44tc">
-                                      <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="3CulEO1Y7yN" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                  </node>
-                                </node>
+                              <node concept="h$QuP" id="ZNYuguvgHN" role="iSaTp">
+                                <ref role="h$OrH" to="wyt6:~Class" resolve="Class" />
                               </node>
                             </node>
                             <node concept="nsMwS" id="2vhmmFsNmw_" role="ns1xD">
@@ -8069,17 +8063,8 @@
                             <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                             <node concept="nsMwS" id="6KIXGIaNF03" role="ns1xD">
                               <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                              <node concept="37jhX" id="ZNYugu2LqE" role="iSaTp">
-                                <node concept="2OqwBi" id="3CulEO1Y7yO" role="37jj2">
-                                  <node concept="2c44tf" id="3CulEO1Y7yP" role="2Oq$k0">
-                                    <node concept="3uibUv" id="3CulEO1Y7yQ" role="2c44tc">
-                                      <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="3CulEO1Y7yR" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                  </node>
-                                </node>
+                              <node concept="h$QuP" id="ZNYuguvgHO" role="iSaTp">
+                                <ref role="h$OrH" to="wyt6:~Iterable" resolve="Iterable" />
                               </node>
                             </node>
                             <node concept="nsMwS" id="6KIXGIaNF06" role="ns1xD">
@@ -12404,17 +12389,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="zL5ZaNsqCn" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqF" role="iSaTp">
-                            <node concept="2OqwBi" id="zL5ZaNsqSe" role="37jj2">
-                              <node concept="2c44tf" id="zL5ZaNsr97" role="2Oq$k0">
-                                <node concept="3uibUv" id="zL5ZaNsr98" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Void" resolve="Void" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="zL5ZaNsr6l" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHP" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Void" resolve="Void" />
                           </node>
                         </node>
                       </node>
@@ -13076,17 +13052,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="4dm7SwSiDvq" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqG" role="iSaTp">
-                            <node concept="2OqwBi" id="4dm7SwSiDF4" role="37jj2">
-                              <node concept="2c44tf" id="4dm7SwSiEaK" role="2Oq$k0">
-                                <node concept="3uibUv" id="4dm7SwSiEaL" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="4dm7SwSiE89" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHQ" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~String" resolve="String" />
                           </node>
                         </node>
                       </node>
@@ -13137,17 +13104,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="4dm7SwSiEgb" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqH" role="iSaTp">
-                            <node concept="2OqwBi" id="4dm7SwSiEgc" role="37jj2">
-                              <node concept="2c44tf" id="4dm7SwSiEgd" role="2Oq$k0">
-                                <node concept="3uibUv" id="4dm7SwSiEge" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="4dm7SwSiEgf" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHR" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~String" resolve="String" />
                           </node>
                         </node>
                       </node>
@@ -13749,17 +13707,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="JOGAOsVt99" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqI" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7yS" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7yT" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7yU" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7yV" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHS" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Object" resolve="Object" />
                           </node>
                         </node>
                       </node>
@@ -14195,17 +14144,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="2i6cuYQqIos" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqJ" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7yW" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7yX" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7yY" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Cloneable" resolve="Cloneable" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7yZ" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHT" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Cloneable" resolve="Cloneable" />
                           </node>
                         </node>
                       </node>
@@ -14265,17 +14205,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="2i6cuYQqJau" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqK" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7z0" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7z1" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7z2" role="2c44tc">
-                                  <ref role="3uigEE" to="guwi:~Serializable" resolve="Serializable" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7z3" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHU" role="iSaTp">
+                            <ref role="h$OrH" to="guwi:~Serializable" resolve="Serializable" />
                           </node>
                         </node>
                       </node>
@@ -15292,17 +15223,8 @@
               <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
               <node concept="nsMwS" id="kHzC1TUgGE" role="ns1xD">
                 <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                <node concept="37jhX" id="ZNYugu2LqL" role="iSaTp">
-                  <node concept="2OqwBi" id="3CulEO1Y7z4" role="37jj2">
-                    <node concept="2c44tf" id="3CulEO1Y7z5" role="2Oq$k0">
-                      <node concept="3uibUv" id="3CulEO1Y7z6" role="2c44tc">
-                        <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                      </node>
-                    </node>
-                    <node concept="3TrEf2" id="3CulEO1Y7z7" role="2OqNvi">
-                      <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                    </node>
-                  </node>
+                <node concept="h$QuP" id="ZNYuguvgHV" role="iSaTp">
+                  <ref role="h$OrH" to="wyt6:~String" resolve="String" />
                 </node>
               </node>
               <node concept="nsMwS" id="kHzC1TUgGH" role="ns1xD">
@@ -19257,17 +19179,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="7AyqXCdDQqQ" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqO" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7z8" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7z9" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7za" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Byte" resolve="Byte" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zb" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHW" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Byte" resolve="Byte" />
                           </node>
                         </node>
                       </node>
@@ -19484,17 +19397,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="7AyqXCdDQuj" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqP" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7zc" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7zd" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7ze" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Short" resolve="Short" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zf" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHX" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Short" resolve="Short" />
                           </node>
                         </node>
                       </node>
@@ -19703,17 +19607,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="7AyqXCdDQB0" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqQ" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7zg" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7zh" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7zi" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zj" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHY" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Boolean" resolve="Boolean" />
                           </node>
                         </node>
                       </node>
@@ -19922,17 +19817,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="7AyqXCdDQFD" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqR" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7zk" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7zl" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7zm" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Character" resolve="Character" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zn" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHZ" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Character" resolve="Character" />
                           </node>
                         </node>
                       </node>
@@ -20149,17 +20035,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="7AyqXCdDQKf" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqS" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7zo" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7zp" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7zq" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Short" resolve="Short" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zr" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgI0" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Short" resolve="Short" />
                           </node>
                         </node>
                       </node>
@@ -20378,17 +20255,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="7AyqXCdDQOU" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqT" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7zs" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7zt" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7zu" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Byte" resolve="Byte" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zv" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgI1" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Byte" resolve="Byte" />
                           </node>
                         </node>
                       </node>
@@ -21410,17 +21278,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="JOGAOsVt97" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqU" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7zw" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7zx" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7zy" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zz" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgI2" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Object" resolve="Object" />
                           </node>
                         </node>
                       </node>
@@ -21489,17 +21348,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="JOGAOsVt95" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqV" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7z$" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7z_" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7zA" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zB" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgI3" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Object" resolve="Object" />
                           </node>
                         </node>
                       </node>
@@ -22561,17 +22411,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5XJPBczwmcV" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqW" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7zC" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7zD" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7zE" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zF" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgI4" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Boolean" resolve="Boolean" />
                           </node>
                         </node>
                       </node>
@@ -22627,17 +22468,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5XJPBczwlW_" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqX" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7zG" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7zH" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7zI" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Character" resolve="Character" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zJ" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgI5" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Character" resolve="Character" />
                           </node>
                         </node>
                       </node>
@@ -22693,17 +22525,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5XJPBczwlWT" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqY" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7zK" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7zL" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7zM" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Byte" resolve="Byte" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zN" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgI6" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Byte" resolve="Byte" />
                           </node>
                         </node>
                       </node>
@@ -22759,17 +22582,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5XJPBczwlXd" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LqZ" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7zO" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7zP" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7zQ" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Short" resolve="Short" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zR" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgI7" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Short" resolve="Short" />
                           </node>
                         </node>
                       </node>
@@ -22825,17 +22639,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5XJPBczwlXx" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lr0" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7zS" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7zT" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7zU" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zV" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgI8" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Integer" resolve="Integer" />
                           </node>
                         </node>
                       </node>
@@ -22891,17 +22696,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5XJPBczwlXP" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lr1" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7zW" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7zX" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7zY" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Long" resolve="Long" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7zZ" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgI9" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Long" resolve="Long" />
                           </node>
                         </node>
                       </node>
@@ -22957,17 +22753,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5XJPBczwlY9" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lr2" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$0" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$1" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$2" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Float" resolve="Float" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$3" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIa" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Float" resolve="Float" />
                           </node>
                         </node>
                       </node>
@@ -23023,17 +22810,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5XJPBczwlYt" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lr3" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$4" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$5" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$6" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Double" resolve="Double" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$7" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIb" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Double" resolve="Double" />
                           </node>
                         </node>
                       </node>
@@ -24082,17 +23860,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="541xd$P9Mna" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lr6" role="iSaTp">
-                            <node concept="2OqwBi" id="541xd$P9MG0" role="37jj2">
-                              <node concept="2c44tf" id="541xd$P9MR1" role="2Oq$k0">
-                                <node concept="3uibUv" id="541xd$P9MR2" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="541xd$P9MQR" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIc" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Object" resolve="Object" />
                           </node>
                         </node>
                       </node>
@@ -27798,17 +27567,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="2HYHa0WD9Yc" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lr7" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$8" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$9" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$a" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$b" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgId" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~String" resolve="String" />
                           </node>
                         </node>
                       </node>
@@ -27876,17 +27636,8 @@
                         <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="2HYHa0WD9ZB" role="ns1xD">
                           <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lr8" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7$c" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7$d" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7$e" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7$f" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIe" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~String" resolve="String" />
                           </node>
                         </node>
                       </node>
@@ -42829,17 +42580,8 @@
                             <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
                             <node concept="nsMwS" id="6EK6UBPtv0P" role="ns1xD">
                               <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                              <node concept="37jhX" id="ZNYugu2Lrh" role="iSaTp">
-                                <node concept="2OqwBi" id="3CulEO1Y7$g" role="37jj2">
-                                  <node concept="2c44tf" id="3CulEO1Y7$h" role="2Oq$k0">
-                                    <node concept="3uibUv" id="3CulEO1Y7$i" role="2c44tc">
-                                      <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="3CulEO1Y7$j" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                  </node>
-                                </node>
+                              <node concept="h$QuP" id="ZNYuguvgIf" role="iSaTp">
+                                <ref role="h$OrH" to="wyt6:~String" resolve="String" />
                               </node>
                             </node>
                             <node concept="nsMwS" id="3qUnz9vkYC1" role="ns1xD">
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps
index 3f4b5947..c930707d 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps
@@ -12,7 +12,6 @@
     <import index="kqnc" ref="r:92b96158-68e6-4f53-a32b-36e2b456fe01(jetbrains.mps.baseLanguageExt.types)" />
     <import index="tp68" ref="r:00000000-0000-4000-0000-011c895903ac(jetbrains.mps.baseLanguageInternal.structure)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
-    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -29,18 +28,10 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
     </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
-        <child id="1196350785114" name="quotedNode" index="2c44tc" />
-      </concept>
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="8456919074574710634" name="jetbrains.mps.logic.structure.ExpressionItem" flags="ng" index="37jhX">
         <child id="8456919074574710741" name="code" index="37jj2" />
@@ -93,6 +84,9 @@
         <property id="7326790520856501351" name="severity" index="26X25f" />
         <child id="7326790520856501349" name="message" index="26X25d" />
       </concept>
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -1192,17 +1186,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="7gMIJIxWlC0" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LuA" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7_o" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7_p" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7_q" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7_r" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgGR" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Class" resolve="Class" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="7gMIJIxWm0n" role="ns1xD">
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
index 11f1d443..7dfb75bf 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
@@ -186,6 +186,9 @@
         <property id="7326790520856501351" name="severity" index="26X25f" />
         <child id="7326790520856501349" name="message" index="26X25d" />
       </concept>
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -2597,17 +2600,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="61G6TdCWQRD" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lvj" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7_c" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7_d" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7_e" role="2c44tc">
-                                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7_f" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHH" role="iSaTp">
+                            <ref role="h$OrH" to="6exd:3OPtF03lco4" resolve="ListNode" />
                           </node>
                         </node>
                       </node>
@@ -2689,17 +2683,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="7kXqzcTKrrY" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lvk" role="iSaTp">
-                            <node concept="2OqwBi" id="7kXqzcTKrrZ" role="37jj2">
-                              <node concept="2c44tf" id="7kXqzcTKrs0" role="2Oq$k0">
-                                <node concept="3uibUv" id="7kXqzcTKrs1" role="2c44tc">
-                                  <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="7kXqzcTKrs2" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHI" role="iSaTp">
+                            <ref role="h$OrH" to="6exd:3OPtF03lco4" resolve="ListNode" />
                           </node>
                         </node>
                       </node>
@@ -2775,17 +2760,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="61G6TdCWQQm" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lvl" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7_8" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7_9" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7_a" role="2c44tc">
-                                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7_b" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHJ" role="iSaTp">
+                            <ref role="h$OrH" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
                           </node>
                         </node>
                       </node>
@@ -2867,17 +2843,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="7kXqzcTKrwl" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2Lvm" role="iSaTp">
-                            <node concept="2OqwBi" id="7kXqzcTKrwm" role="37jj2">
-                              <node concept="2c44tf" id="7kXqzcTKrwn" role="2Oq$k0">
-                                <node concept="3uibUv" id="7kXqzcTKrwo" role="2c44tc">
-                                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="7kXqzcTKrwp" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHK" role="iSaTp">
+                            <ref role="h$OrH" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
                           </node>
                         </node>
                       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.types.mps
index f0a301d5..4d8d5647 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.types.mps
@@ -72,11 +72,6 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
     </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
-        <child id="1196350785114" name="quotedNode" index="2c44tc" />
-      </concept>
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="8456919074574710634" name="jetbrains.mps.logic.structure.ExpressionItem" flags="ng" index="37jhX">
         <child id="8456919074574710741" name="code" index="37jj2" />
@@ -99,9 +94,6 @@
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
-        <reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
-      </concept>
       <concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
@@ -120,6 +112,9 @@
       </concept>
     </language>
     <language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -360,17 +355,8 @@
                                   <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                                   <node concept="nsMwS" id="3ZfjIHtCMWx" role="ns1xD">
                                     <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                                    <node concept="37jhX" id="ZNYugu2Lw9" role="iSaTp">
-                                      <node concept="2OqwBi" id="3ZfjIHtCN$$" role="37jj2">
-                                        <node concept="2c44tf" id="3ZfjIHtCNMa" role="2Oq$k0">
-                                          <node concept="3bZ5Sz" id="3ZfjIHtCNMb" role="2c44tc">
-                                            <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                          </node>
-                                        </node>
-                                        <node concept="3TrEf2" id="3ZfjIHtCNJP" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                        </node>
-                                      </node>
+                                    <node concept="h$QuP" id="ZNYuguK_C4" role="iSaTp">
+                                      <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                                     </node>
                                   </node>
                                 </node>
@@ -489,17 +475,8 @@
                                   <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                                   <node concept="nsMwS" id="3ZfjIHtCOEB" role="ns1xD">
                                     <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                                    <node concept="37jhX" id="ZNYugu2Lwb" role="iSaTp">
-                                      <node concept="2OqwBi" id="3ZfjIHtCOEC" role="37jj2">
-                                        <node concept="2c44tf" id="3ZfjIHtCOED" role="2Oq$k0">
-                                          <node concept="3bZ5Sz" id="3ZfjIHtCOEE" role="2c44tc">
-                                            <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                          </node>
-                                        </node>
-                                        <node concept="3TrEf2" id="3ZfjIHtCOEF" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                        </node>
-                                      </node>
+                                    <node concept="h$QuP" id="ZNYuguK_C5" role="iSaTp">
+                                      <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                                     </node>
                                   </node>
                                 </node>
@@ -755,17 +732,8 @@
                                   <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                                   <node concept="nsMwS" id="3ZfjIHtCRvb" role="ns1xD">
                                     <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                                    <node concept="37jhX" id="ZNYugu2Lwe" role="iSaTp">
-                                      <node concept="2OqwBi" id="3ZfjIHtCRI9" role="37jj2">
-                                        <node concept="2c44tf" id="3ZfjIHtCRIa" role="2Oq$k0">
-                                          <node concept="3bZ5Sz" id="3ZfjIHtCRIb" role="2c44tc">
-                                            <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                          </node>
-                                        </node>
-                                        <node concept="3TrEf2" id="3ZfjIHtCRIc" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                        </node>
-                                      </node>
+                                    <node concept="h$QuP" id="ZNYuguK_C6" role="iSaTp">
+                                      <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                                     </node>
                                   </node>
                                 </node>
@@ -954,17 +922,8 @@
                                   <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                                   <node concept="nsMwS" id="3ZfjIHtCSSt" role="ns1xD">
                                     <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                                    <node concept="37jhX" id="ZNYugu2Lwh" role="iSaTp">
-                                      <node concept="2OqwBi" id="3ZfjIHtCSSu" role="37jj2">
-                                        <node concept="2c44tf" id="3ZfjIHtCSSv" role="2Oq$k0">
-                                          <node concept="3bZ5Sz" id="3ZfjIHtCSSw" role="2c44tc">
-                                            <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                          </node>
-                                        </node>
-                                        <node concept="3TrEf2" id="3ZfjIHtCSSx" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                        </node>
-                                      </node>
+                                    <node concept="h$QuP" id="ZNYuguK_C7" role="iSaTp">
+                                      <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                                     </node>
                                   </node>
                                 </node>
@@ -1083,17 +1042,8 @@
                                   <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                                   <node concept="nsMwS" id="3ZfjIHtCTfs" role="ns1xD">
                                     <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                                    <node concept="37jhX" id="ZNYugu2Lwj" role="iSaTp">
-                                      <node concept="2OqwBi" id="3ZfjIHtCTft" role="37jj2">
-                                        <node concept="2c44tf" id="3ZfjIHtCTfu" role="2Oq$k0">
-                                          <node concept="3bZ5Sz" id="3ZfjIHtCTfv" role="2c44tc">
-                                            <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                          </node>
-                                        </node>
-                                        <node concept="3TrEf2" id="3ZfjIHtCTfw" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                        </node>
-                                      </node>
+                                    <node concept="h$QuP" id="ZNYuguK_C8" role="iSaTp">
+                                      <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                                     </node>
                                   </node>
                                 </node>
@@ -1253,17 +1203,8 @@
                                   <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                                   <node concept="nsMwS" id="3ZfjIHtCU4R" role="ns1xD">
                                     <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                                    <node concept="37jhX" id="ZNYugu2Lwl" role="iSaTp">
-                                      <node concept="2OqwBi" id="3ZfjIHtCU4S" role="37jj2">
-                                        <node concept="2c44tf" id="3ZfjIHtCU4T" role="2Oq$k0">
-                                          <node concept="3bZ5Sz" id="3ZfjIHtCU4U" role="2c44tc">
-                                            <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                          </node>
-                                        </node>
-                                        <node concept="3TrEf2" id="3ZfjIHtCU4V" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                        </node>
-                                      </node>
+                                    <node concept="h$QuP" id="ZNYuguK_C9" role="iSaTp">
+                                      <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                                     </node>
                                   </node>
                                 </node>
@@ -1499,17 +1440,8 @@
                                   <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                                   <node concept="nsMwS" id="3ZfjIHtCWo_" role="ns1xD">
                                     <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                                    <node concept="37jhX" id="ZNYugu2Lwn" role="iSaTp">
-                                      <node concept="2OqwBi" id="3ZfjIHtCWoA" role="37jj2">
-                                        <node concept="2c44tf" id="3ZfjIHtCWoB" role="2Oq$k0">
-                                          <node concept="3bZ5Sz" id="3ZfjIHtCWoC" role="2c44tc">
-                                            <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                          </node>
-                                        </node>
-                                        <node concept="3TrEf2" id="3ZfjIHtCWoD" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                        </node>
-                                      </node>
+                                    <node concept="h$QuP" id="ZNYuguK_Ca" role="iSaTp">
+                                      <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                                     </node>
                                   </node>
                                 </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
index e3522308..e451fda0 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
@@ -98,11 +98,6 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
-        <child id="1196350785114" name="quotedNode" index="2c44tc" />
-      </concept>
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="8456919074574710634" name="jetbrains.mps.logic.structure.ExpressionItem" flags="ng" index="37jhX">
         <child id="8456919074574710741" name="code" index="37jj2" />
@@ -125,9 +120,6 @@
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
-      <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
-        <reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
-      </concept>
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
@@ -163,6 +155,9 @@
         <reference id="6097203247219331496" name="extends" index="3tg4Y$" />
         <child id="1618328391714763070" name="macro" index="0oKgB" />
       </concept>
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -441,17 +436,8 @@
                                     <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                                     <node concept="nsMwS" id="3ZfjIHuv2d9" role="ns1xD">
                                       <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                                      <node concept="37jhX" id="ZNYugu2Lxr" role="iSaTp">
-                                        <node concept="2OqwBi" id="3ZfjIHuv2da" role="37jj2">
-                                          <node concept="2c44tf" id="3ZfjIHuv2db" role="2Oq$k0">
-                                            <node concept="3uibUv" id="3ZfjIHuv2dD" role="2c44tc">
-                                              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                            </node>
-                                          </node>
-                                          <node concept="3TrEf2" id="3ZfjIHuv2dd" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                          </node>
-                                        </node>
+                                      <node concept="h$QuP" id="ZNYuguvgIt" role="iSaTp">
+                                        <ref role="h$OrH" to="wyt6:~Object" resolve="Object" />
                                       </node>
                                     </node>
                                   </node>
@@ -1012,17 +998,8 @@
                         <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="3ZfjIHuvFIJ" role="ns1xD">
                           <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2Lxs" role="iSaTp">
-                            <node concept="2OqwBi" id="3ZfjIHuvGA9" role="37jj2">
-                              <node concept="2c44tf" id="3ZfjIHuvGNJ" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="3ZfjIHuvGNK" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3ZfjIHuvGLq" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_Cb" role="iSaTp">
+                            <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                           </node>
                         </node>
                       </node>
@@ -2240,17 +2217,8 @@
                         <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="3ZfjIHuw9eq" role="ns1xD">
                           <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2LxB" role="iSaTp">
-                            <node concept="2OqwBi" id="3ZfjIHuwa31" role="37jj2">
-                              <node concept="2c44tf" id="3ZfjIHuwa32" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="3ZfjIHuwa33" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3ZfjIHuwa34" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_Cc" role="iSaTp">
+                            <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                           </node>
                         </node>
                       </node>
@@ -2317,17 +2285,8 @@
                         <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="3ZfjIHuwaWo" role="ns1xD">
                           <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2LxC" role="iSaTp">
-                            <node concept="2OqwBi" id="3ZfjIHuwb8I" role="37jj2">
-                              <node concept="2c44tf" id="3ZfjIHuwbms" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="3ZfjIHuwbmt" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3ZfjIHuwbk7" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_Cd" role="iSaTp">
+                            <ref role="h$OrH" to="tpck:h0TrEE$" resolve="INamedConcept" />
                           </node>
                         </node>
                       </node>
@@ -2382,17 +2341,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="3ZfjIHuwclQ" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LxD" role="iSaTp">
-                            <node concept="2OqwBi" id="3ZfjIHuwclR" role="37jj2">
-                              <node concept="2c44tf" id="3ZfjIHuwclS" role="2Oq$k0">
-                                <node concept="3uibUv" id="3ZfjIHuwclT" role="2c44tc">
-                                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3ZfjIHuwclU" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIu" role="iSaTp">
+                            <ref role="h$OrH" to="wyt6:~Object" resolve="Object" />
                           </node>
                         </node>
                       </node>
@@ -2541,17 +2491,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="3ZfjIHuuYKN" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LxE" role="iSaTp">
-                            <node concept="2OqwBi" id="3ZfjIHuuZ0w" role="37jj2">
-                              <node concept="2c44tf" id="3ZfjIHuuZgV" role="2Oq$k0">
-                                <node concept="3uibUv" id="3ZfjIHuuZgW" role="2c44tc">
-                                  <ref role="3uigEE" to="q1l7:~TemplateQueryContext" resolve="TemplateQueryContext" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3ZfjIHuuZek" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIv" role="iSaTp">
+                            <ref role="h$OrH" to="q1l7:~TemplateQueryContext" resolve="TemplateQueryContext" />
                           </node>
                         </node>
                       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps
index 206698fc..d8044fc2 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps
@@ -232,6 +232,9 @@
         <property id="7326790520856501351" name="severity" index="26X25f" />
         <child id="7326790520856501349" name="message" index="26X25d" />
       </concept>
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -485,17 +488,8 @@
                             <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                             <node concept="nsMwS" id="3ZfjIHukV3G" role="ns1xD">
                               <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                              <node concept="37jhX" id="ZNYugu2Lz5" role="iSaTp">
-                                <node concept="2OqwBi" id="3ZfjIHukWJK" role="37jj2">
-                                  <node concept="2c44tf" id="3ZfjIHukWWX" role="2Oq$k0">
-                                    <node concept="3bZ5Sz" id="3ZfjIHukWWY" role="2c44tc">
-                                      <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="3ZfjIHukWUI" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                  </node>
-                                </node>
+                              <node concept="h$QuP" id="ZNYuguK_C3" role="iSaTp">
+                                <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                               </node>
                             </node>
                           </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps
index 05eec199..d3a78d63 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps
@@ -74,9 +74,6 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
@@ -91,11 +88,6 @@
         <child id="1144231408325" name="iteration" index="1Dwrff" />
       </concept>
     </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
-        <child id="1196350785114" name="quotedNode" index="2c44tc" />
-      </concept>
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="8456919074574710634" name="jetbrains.mps.logic.structure.ExpressionItem" flags="ng" index="37jhX">
         <child id="8456919074574710741" name="code" index="37jj2" />
@@ -151,6 +143,9 @@
       </concept>
     </language>
     <language id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules">
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -911,17 +906,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5zhVuyLcYjR" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LzX" role="iSaTp">
-                            <node concept="2OqwBi" id="5zhVuyLcYT3" role="37jj2">
-                              <node concept="2c44tf" id="5zhVuyLcZ9H" role="2Oq$k0">
-                                <node concept="3uibUv" id="5zhVuyLcZ9I" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5zhVuyLcZ7a" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHL" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SModel" resolve="SModel" />
                           </node>
                         </node>
                       </node>
@@ -947,17 +933,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5zhVuyLcZpx" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LzY" role="iSaTp">
-                            <node concept="2OqwBi" id="5zhVuyLcZpy" role="37jj2">
-                              <node concept="2c44tf" id="5zhVuyLcZpz" role="2Oq$k0">
-                                <node concept="3uibUv" id="5zhVuyLcZxr" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SNodeId" resolve="SNodeId" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5zhVuyLcZp_" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHM" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SNodeId" resolve="SNodeId" />
                           </node>
                         </node>
                       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
index cb8baf10..e7518e52 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
@@ -388,6 +388,9 @@
       <concept id="6928531011217258898" name="jetbrains.mps.lang.coderules.structure.LogicVariableConstraint" flags="ng" index="2aLIYG">
         <child id="6928531011217290187" name="variable" index="2aLmnP" />
       </concept>
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -1869,17 +1872,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6tm4iVtNQN0" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L$N" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7_s" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7_t" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7_u" role="2c44tc">
-                                  <ref role="3uigEE" to="c17a:~SReferenceLink" resolve="SReferenceLink" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7_v" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgGS" role="iSaTp">
+                            <ref role="h$OrH" to="c17a:~SReferenceLink" resolve="SReferenceLink" />
                           </node>
                         </node>
                       </node>
@@ -2191,17 +2185,8 @@
                                 <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                                 <node concept="nsMwS" id="6tm4iVtP_Q7" role="ns1xD">
                                   <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                                  <node concept="37jhX" id="ZNYugu2L$Q" role="iSaTp">
-                                    <node concept="2OqwBi" id="3CulEO1Y7_w" role="37jj2">
-                                      <node concept="2c44tf" id="3CulEO1Y7_x" role="2Oq$k0">
-                                        <node concept="3uibUv" id="3CulEO1Y7_y" role="2c44tc">
-                                          <ref role="3uigEE" to="c17a:~SContainmentLink" resolve="SContainmentLink" />
-                                        </node>
-                                      </node>
-                                      <node concept="3TrEf2" id="3CulEO1Y7_z" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                      </node>
-                                    </node>
+                                  <node concept="h$QuP" id="ZNYuguvgGT" role="iSaTp">
+                                    <ref role="h$OrH" to="c17a:~SContainmentLink" resolve="SContainmentLink" />
                                   </node>
                                 </node>
                               </node>
@@ -2236,17 +2221,8 @@
                                   <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                                   <node concept="nsMwS" id="6tm4iVtPA1H" role="ns1xD">
                                     <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                                    <node concept="37jhX" id="ZNYugu2L$R" role="iSaTp">
-                                      <node concept="2OqwBi" id="3CulEO1Y7_$" role="37jj2">
-                                        <node concept="2c44tf" id="3CulEO1Y7__" role="2Oq$k0">
-                                          <node concept="3uibUv" id="3CulEO1Y7_A" role="2c44tc">
-                                            <ref role="3uigEE" to="c17a:~SReferenceLink" resolve="SReferenceLink" />
-                                          </node>
-                                        </node>
-                                        <node concept="3TrEf2" id="3CulEO1Y7_B" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                        </node>
-                                      </node>
+                                    <node concept="h$QuP" id="ZNYuguvgGU" role="iSaTp">
+                                      <ref role="h$OrH" to="c17a:~SReferenceLink" resolve="SReferenceLink" />
                                     </node>
                                   </node>
                                 </node>
@@ -2539,17 +2515,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6tm4iVtQwbR" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L$U" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7_C" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7_D" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7_E" role="2c44tc">
-                                  <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7_F" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgGV" role="iSaTp">
+                            <ref role="h$OrH" to="lui2:~SRepository" resolve="SRepository" />
                           </node>
                         </node>
                       </node>
@@ -2795,17 +2762,8 @@
                                 <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                                 <node concept="nsMwS" id="6tm4iVtS4Gx" role="ns1xD">
                                   <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                                  <node concept="37jhX" id="ZNYugu2L$W" role="iSaTp">
-                                    <node concept="2OqwBi" id="3CulEO1Y7_G" role="37jj2">
-                                      <node concept="2c44tf" id="3CulEO1Y7_H" role="2Oq$k0">
-                                        <node concept="3uibUv" id="3CulEO1Y7_I" role="2c44tc">
-                                          <ref role="3uigEE" to="c17a:~SContainmentLink" resolve="SContainmentLink" />
-                                        </node>
-                                      </node>
-                                      <node concept="3TrEf2" id="3CulEO1Y7_J" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                      </node>
-                                    </node>
+                                  <node concept="h$QuP" id="ZNYuguvgGW" role="iSaTp">
+                                    <ref role="h$OrH" to="c17a:~SContainmentLink" resolve="SContainmentLink" />
                                   </node>
                                 </node>
                               </node>
@@ -2827,17 +2785,8 @@
                                   <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                                   <node concept="nsMwS" id="6tm4iVtS56S" role="ns1xD">
                                     <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                                    <node concept="37jhX" id="ZNYugu2L$X" role="iSaTp">
-                                      <node concept="2OqwBi" id="3CulEO1Y7_K" role="37jj2">
-                                        <node concept="2c44tf" id="3CulEO1Y7_L" role="2Oq$k0">
-                                          <node concept="3uibUv" id="3CulEO1Y7_M" role="2c44tc">
-                                            <ref role="3uigEE" to="c17a:~SReferenceLink" resolve="SReferenceLink" />
-                                          </node>
-                                        </node>
-                                        <node concept="3TrEf2" id="3CulEO1Y7_N" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                        </node>
-                                      </node>
+                                    <node concept="h$QuP" id="ZNYuguvgGX" role="iSaTp">
+                                      <ref role="h$OrH" to="c17a:~SReferenceLink" resolve="SReferenceLink" />
                                     </node>
                                   </node>
                                 </node>
@@ -3262,17 +3211,8 @@
                             <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                             <node concept="nsMwS" id="6tm4iVtQKRp" role="ns1xD">
                               <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                              <node concept="37jhX" id="ZNYugu2L$Y" role="iSaTp">
-                                <node concept="2OqwBi" id="3CulEO1Y7_O" role="37jj2">
-                                  <node concept="2c44tf" id="3CulEO1Y7_P" role="2Oq$k0">
-                                    <node concept="3uibUv" id="3CulEO1Y7_Q" role="2c44tc">
-                                      <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="3CulEO1Y7_R" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                  </node>
-                                </node>
+                              <node concept="h$QuP" id="ZNYuguvgGY" role="iSaTp">
+                                <ref role="h$OrH" to="lui2:~SRepository" resolve="SRepository" />
                               </node>
                             </node>
                           </node>
@@ -3357,17 +3297,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6tm4iVtQMZ$" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L$Z" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7_S" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7_T" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7_U" role="2c44tc">
-                                  <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7_V" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgGZ" role="iSaTp">
+                            <ref role="h$OrH" to="c17a:~SLanguage" resolve="SLanguage" />
                           </node>
                         </node>
                       </node>
@@ -3416,17 +3347,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6tm4iVtQQsC" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_0" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7_W" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7_X" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7_Y" role="2c44tc">
-                                  <ref role="3uigEE" to="w1kc:~Language" resolve="Language" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7_Z" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgH0" role="iSaTp">
+                            <ref role="h$OrH" to="w1kc:~Language" resolve="Language" />
                           </node>
                         </node>
                       </node>
@@ -3475,17 +3397,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6tm4iVtQV5A" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_1" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7A0" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7A1" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7A2" role="2c44tc">
-                                  <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7A3" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgH1" role="iSaTp">
+                            <ref role="h$OrH" to="lui2:~SModule" resolve="SModule" />
                           </node>
                         </node>
                       </node>
@@ -3534,17 +3447,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6tm4iVtQSii" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_2" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7A4" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7A5" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7A6" role="2c44tc">
-                                  <ref role="3uigEE" to="lui2:~SModuleReference" resolve="SModuleReference" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7A7" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgH2" role="iSaTp">
+                            <ref role="h$OrH" to="lui2:~SModuleReference" resolve="SModuleReference" />
                           </node>
                         </node>
                       </node>
@@ -4085,17 +3989,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6RzTUCSWi5m" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_4" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7A8" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7A9" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7Aa" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7Ab" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgH3" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SModel" resolve="SModel" />
                           </node>
                         </node>
                       </node>
@@ -4150,17 +4045,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6RzTUCSWiQF" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_5" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7Ac" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7Ad" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7Ae" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7Af" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgH4" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SNode" resolve="SNode" />
                           </node>
                         </node>
                       </node>
@@ -4215,17 +4101,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6RzTUCSWjnd" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_6" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7Ag" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7Ah" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7Ai" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7Aj" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgH5" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SNode" resolve="SNode" />
                           </node>
                         </node>
                       </node>
@@ -4280,17 +4157,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6RzTUCSWk2W" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_7" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7Ak" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7Al" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7Am" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7An" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgH6" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SNodeReference" resolve="SNodeReference" />
                           </node>
                         </node>
                       </node>
@@ -4345,17 +4213,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6RzTUCSWkzA" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_8" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7Ao" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7Ap" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7Aq" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SModelReference" resolve="SModelReference" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7Ar" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgH7" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SModelReference" resolve="SModelReference" />
                           </node>
                         </node>
                       </node>
@@ -4410,17 +4269,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6RzTUCSWlrl" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_9" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7As" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7At" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7Au" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7Av" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgH8" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SNode" resolve="SNode" />
                           </node>
                         </node>
                       </node>
@@ -4516,17 +4366,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6RzTUCSWlPX" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_a" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7Aw" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7Ax" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7Ay" role="2c44tc">
-                                  <ref role="3uigEE" to="33ny:~List" resolve="List" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7Az" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgH9" role="iSaTp">
+                            <ref role="h$OrH" to="33ny:~List" resolve="List" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="6RzTUCSWnwl" role="ns1xD">
@@ -7792,17 +7633,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6RzTUCSXXBb" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_f" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7A$" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7A_" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7AA" role="2c44tc">
-                                  <ref role="3uigEE" to="c17a:~SContainmentLink" resolve="SContainmentLink" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7AB" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHa" role="iSaTp">
+                            <ref role="h$OrH" to="c17a:~SContainmentLink" resolve="SContainmentLink" />
                           </node>
                         </node>
                       </node>
@@ -9922,17 +9754,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6tm4iVtSgfr" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_k" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7AC" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7AD" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7AE" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7AF" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHb" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SNodeReference" resolve="SNodeReference" />
                           </node>
                         </node>
                       </node>
@@ -10751,17 +10574,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6RzTUCSV7fO" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_o" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7AG" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7AH" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7AI" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SNodeId" resolve="SNodeId" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7AJ" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHc" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SNodeId" resolve="SNodeId" />
                           </node>
                         </node>
                       </node>
@@ -11717,17 +11531,8 @@
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="6RzTUCSXRff" role="ns1xD">
                           <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2L_p" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1XI8D" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1XI8E" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="3CulEO1XI8F" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="hypd:5xDtKQA7vSu" resolve="Module" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1XI8G" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BE" role="iSaTp">
+                            <ref role="h$OrH" to="hypd:5xDtKQA7vSu" resolve="Module" />
                           </node>
                         </node>
                       </node>
@@ -13073,17 +12878,8 @@
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="6RzTUCTmDqj" role="ns1xD">
                           <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2L_u" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1YIp2" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1YIp3" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="3CulEO1YIp4" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1YIp5" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BF" role="iSaTp">
+                            <ref role="h$OrH" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
                           </node>
                         </node>
                       </node>
@@ -13356,17 +13152,8 @@
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="6RzTUCTmTND" role="ns1xD">
                           <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2L_v" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1XI8H" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1XI8I" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="3CulEO1XI8J" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1XI8K" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BG" role="iSaTp">
+                            <ref role="h$OrH" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
                           </node>
                         </node>
                       </node>
@@ -13581,17 +13368,8 @@
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="6RzTUCTmZK0" role="ns1xD">
                           <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2L_w" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1XI8L" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1XI8M" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="3CulEO1XI8N" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1XI8O" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BH" role="iSaTp">
+                            <ref role="h$OrH" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
                           </node>
                         </node>
                       </node>
@@ -13820,17 +13598,8 @@
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="6RzTUCTn5Xd" role="ns1xD">
                           <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2L_x" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1XI8P" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1XI8Q" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="3CulEO1XI8R" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1XI8S" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BI" role="iSaTp">
+                            <ref role="h$OrH" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
                           </node>
                         </node>
                       </node>
@@ -15678,17 +15447,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6tm4iVtQnIE" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_C" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7AK" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7AL" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7AM" role="2c44tc">
-                                  <ref role="3uigEE" to="c17a:~SReferenceLink" resolve="SReferenceLink" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7AN" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHd" role="iSaTp">
+                            <ref role="h$OrH" to="c17a:~SReferenceLink" resolve="SReferenceLink" />
                           </node>
                         </node>
                       </node>
@@ -15737,17 +15497,8 @@
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="6tm4iVtQphw" role="ns1xD">
                           <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2L_D" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1XI8T" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1XI8U" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="3CulEO1XI8V" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpce:f_TJgxE" resolve="LinkDeclaration" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1XI8W" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BJ" role="iSaTp">
+                            <ref role="h$OrH" to="tpce:f_TJgxE" resolve="LinkDeclaration" />
                           </node>
                         </node>
                       </node>
@@ -15966,17 +15717,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6tm4iVtNS$F" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_E" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7AO" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7AP" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7AQ" role="2c44tc">
-                                  <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7AR" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHe" role="iSaTp">
+                            <ref role="h$OrH" to="c17a:~SProperty" resolve="SProperty" />
                           </node>
                         </node>
                       </node>
@@ -16855,17 +16597,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6tm4iVtSiEo" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_F" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7AS" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7AT" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7AU" role="2c44tc">
-                                  <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7AV" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHf" role="iSaTp">
+                            <ref role="h$OrH" to="c17a:~SProperty" resolve="SProperty" />
                           </node>
                         </node>
                       </node>
@@ -17334,17 +17067,8 @@
                       <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                       <node concept="nsMwS" id="6tm4iVtVOxO" role="ns1xD">
                         <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                        <node concept="37jhX" id="ZNYugu2L_K" role="iSaTp">
-                          <node concept="2OqwBi" id="3CulEO1Y7AW" role="37jj2">
-                            <node concept="2c44tf" id="3CulEO1Y7AX" role="2Oq$k0">
-                              <node concept="3uibUv" id="3CulEO1Y7AY" role="2c44tc">
-                                <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="3CulEO1Y7AZ" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                            </node>
-                          </node>
+                        <node concept="h$QuP" id="ZNYuguvgHg" role="iSaTp">
+                          <ref role="h$OrH" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
                         </node>
                       </node>
                     </node>
@@ -17380,17 +17104,8 @@
                       <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                       <node concept="nsMwS" id="6tm4iVtVOT8" role="ns1xD">
                         <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                        <node concept="37jhX" id="ZNYugu2L_L" role="iSaTp">
-                          <node concept="2OqwBi" id="3CulEO1Y7B0" role="37jj2">
-                            <node concept="2c44tf" id="3CulEO1Y7B1" role="2Oq$k0">
-                              <node concept="3uibUv" id="3CulEO1Y7B2" role="2c44tc">
-                                <ref role="3uigEE" to="c17a:~SEnumeration" resolve="SEnumeration" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="3CulEO1Y7B3" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                            </node>
-                          </node>
+                        <node concept="h$QuP" id="ZNYuguvgHh" role="iSaTp">
+                          <ref role="h$OrH" to="c17a:~SEnumeration" resolve="SEnumeration" />
                         </node>
                       </node>
                     </node>
@@ -17426,17 +17141,8 @@
                       <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                       <node concept="nsMwS" id="6tm4iVtVPkh" role="ns1xD">
                         <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                        <node concept="37jhX" id="ZNYugu2L_M" role="iSaTp">
-                          <node concept="2OqwBi" id="3CulEO1Y7B4" role="37jj2">
-                            <node concept="2c44tf" id="3CulEO1Y7B5" role="2Oq$k0">
-                              <node concept="3uibUv" id="3CulEO1Y7B6" role="2c44tc">
-                                <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="3CulEO1Y7B7" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                            </node>
-                          </node>
+                        <node concept="h$QuP" id="ZNYuguvgHi" role="iSaTp">
+                          <ref role="h$OrH" to="mhbf:~SModel" resolve="SModel" />
                         </node>
                       </node>
                     </node>
@@ -17472,17 +17178,8 @@
                       <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                       <node concept="nsMwS" id="6tm4iVtVPC_" role="ns1xD">
                         <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                        <node concept="37jhX" id="ZNYugu2L_N" role="iSaTp">
-                          <node concept="2OqwBi" id="3CulEO1Y7B8" role="37jj2">
-                            <node concept="2c44tf" id="3CulEO1Y7B9" role="2Oq$k0">
-                              <node concept="3uibUv" id="3CulEO1Y7Ba" role="2c44tc">
-                                <ref role="3uigEE" to="w1kc:~SModelReference" resolve="SModelReference" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="3CulEO1Y7Bb" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                            </node>
-                          </node>
+                        <node concept="h$QuP" id="ZNYuguvgHj" role="iSaTp">
+                          <ref role="h$OrH" to="w1kc:~SModelReference" resolve="SModelReference" />
                         </node>
                       </node>
                     </node>
@@ -17518,17 +17215,8 @@
                       <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                       <node concept="nsMwS" id="6tm4iVtVQ9w" role="ns1xD">
                         <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                        <node concept="37jhX" id="ZNYugu2L_O" role="iSaTp">
-                          <node concept="2OqwBi" id="3CulEO1Y7Bc" role="37jj2">
-                            <node concept="2c44tf" id="3CulEO1Y7Bd" role="2Oq$k0">
-                              <node concept="3uibUv" id="3CulEO1Y7Be" role="2c44tc">
-                                <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="3CulEO1Y7Bf" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                            </node>
-                          </node>
+                        <node concept="h$QuP" id="ZNYuguvgHk" role="iSaTp">
+                          <ref role="h$OrH" to="mhbf:~SNode" resolve="SNode" />
                         </node>
                       </node>
                     </node>
@@ -17564,17 +17252,8 @@
                       <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                       <node concept="nsMwS" id="6tm4iVtVQMu" role="ns1xD">
                         <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                        <node concept="37jhX" id="ZNYugu2L_P" role="iSaTp">
-                          <node concept="2OqwBi" id="3CulEO1Y7Bg" role="37jj2">
-                            <node concept="2c44tf" id="3CulEO1Y7Bh" role="2Oq$k0">
-                              <node concept="3uibUv" id="3CulEO1Y7Bi" role="2c44tc">
-                                <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="3CulEO1Y7Bj" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                            </node>
-                          </node>
+                        <node concept="h$QuP" id="ZNYuguvgHl" role="iSaTp">
+                          <ref role="h$OrH" to="mhbf:~SNodeReference" resolve="SNodeReference" />
                         </node>
                       </node>
                     </node>
@@ -17610,17 +17289,8 @@
                       <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                       <node concept="nsMwS" id="6Dg__VJLk59" role="ns1xD">
                         <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                        <node concept="37jhX" id="ZNYugu2L_Q" role="iSaTp">
-                          <node concept="2OqwBi" id="3CulEO1Y7Bk" role="37jj2">
-                            <node concept="2c44tf" id="3CulEO1Y7Bl" role="2Oq$k0">
-                              <node concept="3uibUv" id="3CulEO1Y7Bm" role="2c44tc">
-                                <ref role="3uigEE" to="mhbf:~SReference" resolve="SReference" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="3CulEO1Y7Bn" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                            </node>
-                          </node>
+                        <node concept="h$QuP" id="ZNYuguvgHm" role="iSaTp">
+                          <ref role="h$OrH" to="mhbf:~SReference" resolve="SReference" />
                         </node>
                       </node>
                     </node>
@@ -17660,17 +17330,8 @@
                       <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                       <node concept="nsMwS" id="6Dg__VJLdl4" role="ns1xD">
                         <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                        <node concept="37jhX" id="ZNYugu2L_R" role="iSaTp">
-                          <node concept="2OqwBi" id="3CulEO1Y7Bo" role="37jj2">
-                            <node concept="2c44tf" id="3CulEO1Y7Bp" role="2Oq$k0">
-                              <node concept="3uibUv" id="3CulEO1Y7Bq" role="2c44tc">
-                                <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="3CulEO1Y7Br" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                            </node>
-                          </node>
+                        <node concept="h$QuP" id="ZNYuguvgHn" role="iSaTp">
+                          <ref role="h$OrH" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
                         </node>
                       </node>
                     </node>
@@ -17745,17 +17406,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6Dg__VJcBDz" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_S" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7Bs" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7Bt" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7Bu" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7Bv" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHo" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SNode" resolve="SNode" />
                           </node>
                         </node>
                       </node>
@@ -17823,17 +17475,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="4boCUQtw4XT" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_T" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7Bw" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7Bx" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7By" role="2c44tc">
-                                  <ref role="3uigEE" to="c17a:~SEnumeration" resolve="SEnumeration" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7Bz" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHp" role="iSaTp">
+                            <ref role="h$OrH" to="c17a:~SEnumeration" resolve="SEnumeration" />
                           </node>
                         </node>
                       </node>
@@ -17913,17 +17556,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6Dg__VJJmZg" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_U" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7B$" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7B_" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7BA" role="2c44tc">
-                                  <ref role="3uigEE" to="c17a:~SEnumerationLiteral" resolve="SEnumerationLiteral" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7BB" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHq" role="iSaTp">
+                            <ref role="h$OrH" to="c17a:~SEnumerationLiteral" resolve="SEnumerationLiteral" />
                           </node>
                         </node>
                       </node>
@@ -17990,17 +17624,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6Dg__VJLdls" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_V" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7BC" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7BD" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7BE" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7BF" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHr" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SModel" resolve="SModel" />
                           </node>
                         </node>
                       </node>
@@ -18067,17 +17692,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6Dg__VJLdlC" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_W" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7BG" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7BH" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7BI" role="2c44tc">
-                                  <ref role="3uigEE" to="w1kc:~SModelReference" resolve="SModelReference" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7BJ" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHs" role="iSaTp">
+                            <ref role="h$OrH" to="w1kc:~SModelReference" resolve="SModelReference" />
                           </node>
                         </node>
                       </node>
@@ -18144,17 +17760,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6Dg__VJLi1e" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_X" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7BK" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7BL" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7BM" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7BN" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHt" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SNode" resolve="SNode" />
                           </node>
                         </node>
                       </node>
@@ -18221,17 +17828,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6Dg__VJLdm0" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_Y" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7BO" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7BP" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7BQ" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7BR" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHu" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SNodeReference" resolve="SNodeReference" />
                           </node>
                         </node>
                       </node>
@@ -18298,17 +17896,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6Dg__VJLkrA" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2L_Z" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7BS" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7BT" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7BU" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SReference" resolve="SReference" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7BV" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHv" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SReference" resolve="SReference" />
                           </node>
                         </node>
                       </node>
@@ -18433,17 +18022,8 @@
                                     <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                                     <node concept="nsMwS" id="4boCUQtoRgp" role="ns1xD">
                                       <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                                      <node concept="37jhX" id="ZNYugu2LA0" role="iSaTp">
-                                        <node concept="2OqwBi" id="3CulEO1Y7BW" role="37jj2">
-                                          <node concept="2c44tf" id="3CulEO1Y7BX" role="2Oq$k0">
-                                            <node concept="3uibUv" id="3CulEO1Y7BY" role="2c44tc">
-                                              <ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
-                                            </node>
-                                          </node>
-                                          <node concept="3TrEf2" id="3CulEO1Y7BZ" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                          </node>
-                                        </node>
+                                      <node concept="h$QuP" id="ZNYuguvgHw" role="iSaTp">
+                                        <ref role="h$OrH" to="c17a:~SConcept" resolve="SConcept" />
                                       </node>
                                     </node>
                                   </node>
@@ -18466,17 +18046,8 @@
                                       <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                                       <node concept="nsMwS" id="4boCUQtoRIX" role="ns1xD">
                                         <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                                        <node concept="37jhX" id="ZNYugu2LA1" role="iSaTp">
-                                          <node concept="2OqwBi" id="3CulEO1Y7C0" role="37jj2">
-                                            <node concept="2c44tf" id="3CulEO1Y7C1" role="2Oq$k0">
-                                              <node concept="3uibUv" id="3CulEO1Y7C2" role="2c44tc">
-                                                <ref role="3uigEE" to="c17a:~SInterfaceConcept" resolve="SInterfaceConcept" />
-                                              </node>
-                                            </node>
-                                            <node concept="3TrEf2" id="3CulEO1Y7C3" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                            </node>
-                                          </node>
+                                        <node concept="h$QuP" id="ZNYuguvgHx" role="iSaTp">
+                                          <ref role="h$OrH" to="c17a:~SInterfaceConcept" resolve="SInterfaceConcept" />
                                         </node>
                                       </node>
                                     </node>
@@ -18583,17 +18154,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="y9gFNYJkVE" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LA2" role="iSaTp">
-                            <node concept="2OqwBi" id="y9gFNYJkVF" role="37jj2">
-                              <node concept="2c44tf" id="y9gFNYJkVG" role="2Oq$k0">
-                                <node concept="3uibUv" id="y9gFNYJl56" role="2c44tc">
-                                  <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="y9gFNYJkVI" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHy" role="iSaTp">
+                            <ref role="h$OrH" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
                           </node>
                         </node>
                       </node>
@@ -18859,17 +18421,8 @@
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="6Dg__VJIQyi" role="ns1xD">
                           <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2LA3" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1XI8X" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1XI8Y" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="3CulEO1XI8Z" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1XI90" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BK" role="iSaTp">
+                            <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                           </node>
                         </node>
                       </node>
@@ -18930,17 +18483,8 @@
                         <ref role="ns1xF" node="4$wPwNd_PNt" resolve="nodeptr" />
                         <node concept="nsMwS" id="3lXUvG04e$K" role="ns1xD">
                           <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2LA4" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1XI91" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1XI92" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="3CulEO1XI93" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1XI94" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BL" role="iSaTp">
+                            <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                           </node>
                         </node>
                       </node>
@@ -19001,17 +18545,8 @@
                         <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
                         <node concept="nsMwS" id="3lXUvG04jXS" role="ns1xD">
                           <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2LA5" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1XI95" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1XI96" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="3CulEO1XI97" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1XI98" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BM" role="iSaTp">
+                            <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                           </node>
                         </node>
                       </node>
@@ -19560,17 +19095,8 @@
                         <ref role="ns1xF" node="3bgqfmmKxBI" resolve="concept" />
                         <node concept="nsMwS" id="1stFrr$1Bt3" role="ns1xD">
                           <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2LA6" role="iSaTp">
-                            <node concept="2OqwBi" id="1stFrr$1Bt4" role="37jj2">
-                              <node concept="2c44tf" id="1stFrr$1Bt5" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="1stFrr$1Bt6" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="1stFrr$1Bt7" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BN" role="iSaTp">
+                            <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                           </node>
                         </node>
                       </node>
@@ -19631,17 +19157,8 @@
                         <ref role="ns1xF" node="3bgqfmmKNsS" resolve="conceptNode" />
                         <node concept="nsMwS" id="1stFrr$1Btw" role="ns1xD">
                           <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2LA7" role="iSaTp">
-                            <node concept="2OqwBi" id="1stFrr$1Btx" role="37jj2">
-                              <node concept="2c44tf" id="1stFrr$1Bty" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="1stFrr$1Btz" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="1stFrr$1Bt$" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BO" role="iSaTp">
+                            <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                           </node>
                         </node>
                       </node>
@@ -19881,17 +19398,8 @@
                       <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
                       <node concept="nsMwS" id="3lXUvG03I$w" role="ns1xD">
                         <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                        <node concept="37jhX" id="ZNYugu2LA8" role="iSaTp">
-                          <node concept="2OqwBi" id="3CulEO1XI99" role="37jj2">
-                            <node concept="2c44tf" id="3CulEO1XI9a" role="2Oq$k0">
-                              <node concept="3bZ5Sz" id="3CulEO1XI9b" role="2c44tc">
-                                <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="3CulEO1XI9c" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                            </node>
-                          </node>
+                        <node concept="h$QuP" id="ZNYuguK_BP" role="iSaTp">
+                          <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                         </node>
                       </node>
                     </node>
@@ -20232,17 +19740,8 @@
                         <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="32iFMN7ahl7" role="ns1xD">
                           <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2LA9" role="iSaTp">
-                            <node concept="2OqwBi" id="32iFMN7ahl8" role="37jj2">
-                              <node concept="2c44tf" id="32iFMN7ahl9" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="32iFMN7ahla" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="32iFMN7ahlb" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BQ" role="iSaTp">
+                            <ref role="h$OrH" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
                           </node>
                         </node>
                       </node>
@@ -20462,17 +19961,8 @@
                       <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
                       <node concept="nsMwS" id="5cBWTAdOAAw" role="ns1xD">
                         <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                        <node concept="37jhX" id="ZNYugu2LAa" role="iSaTp">
-                          <node concept="2OqwBi" id="5cBWTAdOACm" role="37jj2">
-                            <node concept="2c44tf" id="5cBWTAdOACn" role="2Oq$k0">
-                              <node concept="3bZ5Sz" id="5cBWTAdOACo" role="2c44tc">
-                                <ref role="3bZ5Sy" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="5cBWTAdOACp" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                            </node>
-                          </node>
+                        <node concept="h$QuP" id="ZNYuguK_BR" role="iSaTp">
+                          <ref role="h$OrH" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
                         </node>
                       </node>
                     </node>
@@ -20510,17 +20000,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5cBWTAdM$Ql" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LAb" role="iSaTp">
-                            <node concept="2OqwBi" id="5cBWTAdM$Qm" role="37jj2">
-                              <node concept="2c44tf" id="5cBWTAdM$Qn" role="2Oq$k0">
-                                <node concept="3uibUv" id="32iFMN7k1yj" role="2c44tc">
-                                  <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5cBWTAdM$Qp" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHz" role="iSaTp">
+                            <ref role="h$OrH" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
                           </node>
                         </node>
                       </node>
@@ -20558,17 +20039,8 @@
                       <ref role="ns1xF" node="3bgqfmmKxBI" resolve="concept" />
                       <node concept="nsMwS" id="2hQbw6I4E4g" role="ns1xD">
                         <ref role="nsMwP" node="3lXUvG03UmI" resolve="concept" />
-                        <node concept="37jhX" id="ZNYugu2LAc" role="iSaTp">
-                          <node concept="2OqwBi" id="2hQbw6I4E4h" role="37jj2">
-                            <node concept="2c44tf" id="2hQbw6I4E4i" role="2Oq$k0">
-                              <node concept="3bZ5Sz" id="2hQbw6I4E4j" role="2c44tc">
-                                <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="2hQbw6I4E4k" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                            </node>
-                          </node>
+                        <node concept="h$QuP" id="ZNYuguK_BS" role="iSaTp">
+                          <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                         </node>
                       </node>
                     </node>
@@ -20606,17 +20078,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="2hQbw6I4E4z" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LAd" role="iSaTp">
-                            <node concept="2OqwBi" id="2hQbw6I4E4$" role="37jj2">
-                              <node concept="2c44tf" id="2hQbw6I4E4_" role="2Oq$k0">
-                                <node concept="3uibUv" id="32iFMN7k1y6" role="2c44tc">
-                                  <ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="2hQbw6I4E4B" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgH$" role="iSaTp">
+                            <ref role="h$OrH" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
                           </node>
                         </node>
                       </node>
@@ -20687,17 +20150,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5cBWTAdNrZq" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LAe" role="iSaTp">
-                            <node concept="2OqwBi" id="5cBWTAdNrZr" role="37jj2">
-                              <node concept="2c44tf" id="5cBWTAdNrZs" role="2Oq$k0">
-                                <node concept="3uibUv" id="5cBWTAdNsLb" role="2c44tc">
-                                  <ref role="3uigEE" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5cBWTAdNrZu" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgH_" role="iSaTp">
+                            <ref role="h$OrH" to="w1kc:~SNodePointer" resolve="SNodePointer" />
                           </node>
                         </node>
                       </node>
@@ -20783,17 +20237,8 @@
                           <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
                           <node concept="nsMwS" id="6Dg__VJeXDV" role="ns1xD">
                             <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                            <node concept="37jhX" id="ZNYugu2LAf" role="iSaTp">
-                              <node concept="2OqwBi" id="3CulEO1XI9d" role="37jj2">
-                                <node concept="2c44tf" id="3CulEO1XI9e" role="2Oq$k0">
-                                  <node concept="3bZ5Sz" id="3CulEO1XI9f" role="2c44tc">
-                                    <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="3CulEO1XI9g" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                </node>
-                              </node>
+                            <node concept="h$QuP" id="ZNYuguK_BT" role="iSaTp">
+                              <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                             </node>
                           </node>
                         </node>
@@ -20825,17 +20270,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6tm4iVu1pH$" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LAg" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7C4" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7C5" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7C6" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7C7" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHA" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SNode" resolve="SNode" />
                           </node>
                         </node>
                       </node>
@@ -20894,17 +20330,8 @@
                           <ref role="ns1xF" node="7LI_gNMWw2A" resolve="node" />
                           <node concept="nsMwS" id="6Dg__VJJnGA" role="ns1xD">
                             <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                            <node concept="37jhX" id="ZNYugu2LAh" role="iSaTp">
-                              <node concept="2OqwBi" id="3CulEO1XI9h" role="37jj2">
-                                <node concept="2c44tf" id="3CulEO1XI9i" role="2Oq$k0">
-                                  <node concept="3bZ5Sz" id="3CulEO1XI9j" role="2c44tc">
-                                    <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="3CulEO1XI9k" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                </node>
-                              </node>
+                            <node concept="h$QuP" id="ZNYuguK_BU" role="iSaTp">
+                              <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                             </node>
                           </node>
                         </node>
@@ -20936,17 +20363,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6Dg__VJJnGN" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LAi" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7C8" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7C9" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7Ca" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7Cb" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHB" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SNode" resolve="SNode" />
                           </node>
                         </node>
                       </node>
@@ -21001,17 +20419,8 @@
                       <ref role="ns1xF" node="3bgqfmmLhUu" resolve="nodeList" />
                       <node concept="nsMwS" id="6Dg__VJeht8" role="ns1xD">
                         <ref role="nsMwP" node="7LI_gNMWxb4" resolve="concept" />
-                        <node concept="37jhX" id="ZNYugu2LAj" role="iSaTp">
-                          <node concept="2OqwBi" id="3CulEO1XI9l" role="37jj2">
-                            <node concept="2c44tf" id="3CulEO1XI9m" role="2Oq$k0">
-                              <node concept="3bZ5Sz" id="3CulEO1XI9n" role="2c44tc">
-                                <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="3CulEO1XI9o" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                            </node>
-                          </node>
+                        <node concept="h$QuP" id="ZNYuguK_BV" role="iSaTp">
+                          <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                         </node>
                       </node>
                     </node>
@@ -21041,17 +20450,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6Dg__VJegEk" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LAk" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7Cc" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7Cd" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7Ce" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7Cf" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHC" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SNode" resolve="SNode" />
                           </node>
                         </node>
                       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.testExt/models/jetbrains.mps.lang.testExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.testExt/models/jetbrains.mps.lang.testExt.types.mps
index 9ebb9a00..3bdd4a2a 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.testExt/models/jetbrains.mps.lang.testExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.testExt/models/jetbrains.mps.lang.testExt.types.mps
@@ -74,9 +74,6 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
@@ -94,11 +91,6 @@
       </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
-        <child id="1196350785114" name="quotedNode" index="2c44tc" />
-      </concept>
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="8456919074574710634" name="jetbrains.mps.logic.structure.ExpressionItem" flags="ng" index="37jhX">
         <child id="8456919074574710741" name="code" index="37jj2" />
@@ -166,6 +158,9 @@
         <property id="7326790520856501351" name="severity" index="26X25f" />
         <child id="7326790520856501349" name="message" index="26X25d" />
       </concept>
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -530,17 +525,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="e_eLhyE9W_" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LHO" role="iSaTp">
-                            <node concept="2OqwBi" id="6RMeEk2SY$Q" role="37jj2">
-                              <node concept="2c44tf" id="6RMeEk2SYKI" role="2Oq$k0">
-                                <node concept="3uibUv" id="6RMeEk2SYKJ" role="2c44tc">
-                                  <ref role="3uigEE" to="cj4x:~EditorComponent" resolve="EditorComponent" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="6RMeEk2SYK7" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIh" role="iSaTp">
+                            <ref role="h$OrH" to="cj4x:~EditorComponent" resolve="EditorComponent" />
                           </node>
                         </node>
                       </node>
@@ -677,17 +663,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6RMeEk2Tfhx" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LHP" role="iSaTp">
-                            <node concept="2OqwBi" id="6RMeEk2Tfhy" role="37jj2">
-                              <node concept="2c44tf" id="6RMeEk2Tfhz" role="2Oq$k0">
-                                <node concept="3uibUv" id="6RMeEk2TfyF" role="2c44tc">
-                                  <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="6RMeEk2Tfh_" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIi" role="iSaTp">
+                            <ref role="h$OrH" to="mhbf:~SModel" resolve="SModel" />
                           </node>
                         </node>
                       </node>
@@ -736,17 +713,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="6RMeEk2TfOV" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LHQ" role="iSaTp">
-                            <node concept="2OqwBi" id="6RMeEk2TfOW" role="37jj2">
-                              <node concept="2c44tf" id="6RMeEk2TfOX" role="2Oq$k0">
-                                <node concept="3uibUv" id="6RMeEk2Tg1V" role="2c44tc">
-                                  <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="6RMeEk2TfOZ" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIj" role="iSaTp">
+                            <ref role="h$OrH" to="z1c3:~Project" resolve="Project" />
                           </node>
                         </node>
                       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
index 5724c48c..c7a8fa8f 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps
@@ -106,11 +106,6 @@
       </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
-    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
-        <child id="1196350785114" name="quotedNode" index="2c44tc" />
-      </concept>
-    </language>
     <language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
       <concept id="8456919074574710634" name="jetbrains.mps.logic.structure.ExpressionItem" flags="ng" index="37jhX">
         <child id="8456919074574710741" name="code" index="37jj2" />
@@ -143,9 +138,6 @@
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
-      <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
-        <reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
-      </concept>
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
@@ -197,6 +189,9 @@
         <reference id="6097203247219331496" name="extends" index="3tg4Y$" />
         <child id="1618328391714763070" name="macro" index="0oKgB" />
       </concept>
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -707,17 +702,8 @@
                               <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                               <node concept="nsMwS" id="5zhVuyL74$G" role="ns1xD">
                                 <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                                <node concept="37jhX" id="ZNYugu2LI9" role="iSaTp">
-                                  <node concept="2OqwBi" id="5zhVuyL74$H" role="37jj2">
-                                    <node concept="2c44tf" id="5zhVuyL74$I" role="2Oq$k0">
-                                      <node concept="3bZ5Sz" id="5zhVuyL74$J" role="2c44tc">
-                                        <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                      </node>
-                                    </node>
-                                    <node concept="3TrEf2" id="5zhVuyL74$K" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                    </node>
-                                  </node>
+                                <node concept="h$QuP" id="ZNYuguK_BW" role="iSaTp">
+                                  <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                                 </node>
                               </node>
                             </node>
@@ -877,17 +863,8 @@
                               <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                               <node concept="nsMwS" id="5zhVuyL7CZW" role="ns1xD">
                                 <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                                <node concept="37jhX" id="ZNYugu2LIa" role="iSaTp">
-                                  <node concept="2OqwBi" id="5zhVuyL7CZX" role="37jj2">
-                                    <node concept="2c44tf" id="5zhVuyL7CZY" role="2Oq$k0">
-                                      <node concept="3bZ5Sz" id="5zhVuyL7CZZ" role="2c44tc">
-                                        <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                      </node>
-                                    </node>
-                                    <node concept="3TrEf2" id="5zhVuyL7D00" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                                    </node>
-                                  </node>
+                                <node concept="h$QuP" id="ZNYuguK_BX" role="iSaTp">
+                                  <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                                 </node>
                               </node>
                             </node>
@@ -1966,17 +1943,8 @@
                         <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="5zhVuyL88QU" role="ns1xD">
                           <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2LIe" role="iSaTp">
-                            <node concept="2OqwBi" id="5zhVuyL891w" role="37jj2">
-                              <node concept="2c44tf" id="5zhVuyL89f2" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="5zhVuyL89f3" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5zhVuyL89cL" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BY" role="iSaTp">
+                            <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                           </node>
                         </node>
                       </node>
@@ -2311,17 +2279,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5zhVuyL8nGO" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LIf" role="iSaTp">
-                            <node concept="2OqwBi" id="5zhVuyL8nSI" role="37jj2">
-                              <node concept="2c44tf" id="5zhVuyL8o95" role="2Oq$k0">
-                                <node concept="3uibUv" id="5zhVuyL8o96" role="2c44tc">
-                                  <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5zhVuyL8o6y" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHD" role="iSaTp">
+                            <ref role="h$OrH" to="c17a:~SProperty" resolve="SProperty" />
                           </node>
                         </node>
                       </node>
@@ -2387,17 +2346,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5zhVuyL8odG" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LIg" role="iSaTp">
-                            <node concept="2OqwBi" id="5zhVuyL8odH" role="37jj2">
-                              <node concept="2c44tf" id="5zhVuyL8odI" role="2Oq$k0">
-                                <node concept="3uibUv" id="5zhVuyL8oyT" role="2c44tc">
-                                  <ref role="3uigEE" to="c17a:~SAbstractLink" resolve="SAbstractLink" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5zhVuyL8odK" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHE" role="iSaTp">
+                            <ref role="h$OrH" to="c17a:~SAbstractLink" resolve="SAbstractLink" />
                           </node>
                         </node>
                       </node>
@@ -3533,17 +3483,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5zhVuyL95Kt" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LIh" role="iSaTp">
-                            <node concept="2OqwBi" id="5zhVuyL95W2" role="37jj2">
-                              <node concept="2c44tf" id="5zhVuyL96cG" role="2Oq$k0">
-                                <node concept="3uibUv" id="5zhVuyL96cH" role="2c44tc">
-                                  <ref role="3uigEE" to="u78q:~EquationInfo" resolve="EquationInfo" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5zhVuyL96a9" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHF" role="iSaTp">
+                            <ref role="h$OrH" to="u78q:~EquationInfo" resolve="EquationInfo" />
                           </node>
                         </node>
                       </node>
@@ -3687,17 +3628,8 @@
                         <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="5zhVuyL98jI" role="ns1xD">
                           <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2LIi" role="iSaTp">
-                            <node concept="2OqwBi" id="5zhVuyL98ua" role="37jj2">
-                              <node concept="2c44tf" id="5zhVuyL98Fp" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="5zhVuyL98Fq" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5zhVuyL98D8" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_BZ" role="iSaTp">
+                            <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                           </node>
                         </node>
                       </node>
@@ -3746,17 +3678,8 @@
                         <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="5zhVuyL998O" role="ns1xD">
                           <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2LIj" role="iSaTp">
-                            <node concept="2OqwBi" id="5zhVuyL998P" role="37jj2">
-                              <node concept="2c44tf" id="5zhVuyL998Q" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="5zhVuyL998R" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5zhVuyL998S" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_C0" role="iSaTp">
+                            <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                           </node>
                         </node>
                       </node>
@@ -3868,17 +3791,8 @@
                         <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="5zhVuyL9G3s" role="ns1xD">
                           <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2LIk" role="iSaTp">
-                            <node concept="2OqwBi" id="5zhVuyL9G3t" role="37jj2">
-                              <node concept="2c44tf" id="5zhVuyL9G3u" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="5zhVuyL9G3v" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5zhVuyL9G3w" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_C1" role="iSaTp">
+                            <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                           </node>
                         </node>
                       </node>
@@ -3927,17 +3841,8 @@
                         <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
                         <node concept="nsMwS" id="5zhVuyL9Gc6" role="ns1xD">
                           <ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
-                          <node concept="37jhX" id="ZNYugu2LIl" role="iSaTp">
-                            <node concept="2OqwBi" id="5zhVuyL9Gc7" role="37jj2">
-                              <node concept="2c44tf" id="5zhVuyL9Gc8" role="2Oq$k0">
-                                <node concept="3bZ5Sz" id="5zhVuyL9Gc9" role="2c44tc">
-                                  <ref role="3bZ5Sy" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5zhVuyL9Gca" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tp25:5MFgGQnlLNJ" resolve="conceptDeclaraton" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguK_C2" role="iSaTp">
+                            <ref role="h$OrH" to="tpck:gw2VY9q" resolve="BaseConcept" />
                           </node>
                         </node>
                       </node>
@@ -4420,17 +4325,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="5zhVuyL9xog" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LIn" role="iSaTp">
-                            <node concept="2OqwBi" id="5zhVuyL9xzP" role="37jj2">
-                              <node concept="2c44tf" id="5zhVuyL9xOv" role="2Oq$k0">
-                                <node concept="3uibUv" id="5zhVuyL9xOw" role="2c44tc">
-                                  <ref role="3uigEE" to="u78q:~TypeChecker" resolve="TypeChecker" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5zhVuyL9xLW" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgHG" role="iSaTp">
+                            <ref role="h$OrH" to="u78q:~TypeChecker" resolve="TypeChecker" />
                           </node>
                         </node>
                       </node>
diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
index 12e40ad0..4b978d94 100644
--- a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
@@ -181,6 +181,9 @@
         <property id="7326790520856501351" name="severity" index="26X25f" />
         <child id="7326790520856501349" name="message" index="26X25d" />
       </concept>
+      <concept id="1149537088067116625" name="jetbrains.mps.lang.coderules.structure.NodeRefItem" flags="ng" index="h$QuP">
+        <reference id="1149537088067125001" name="ref" index="h$OrH" />
+      </concept>
       <concept id="861509610434242029" name="jetbrains.mps.lang.coderules.structure.TermConstructor" flags="ng" index="ns1u0">
         <reference id="861509610434243078" name="decl" index="ns1xF" />
         <child id="861509610434243076" name="override" index="ns1xD" />
@@ -971,17 +974,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="7kXqzcTLKs4" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LJv" role="iSaTp">
-                            <node concept="2OqwBi" id="7kXqzcTLKJ3" role="37jj2">
-                              <node concept="2c44tf" id="7kXqzcTLKU2" role="2Oq$k0">
-                                <node concept="3uibUv" id="7kXqzcTLKU3" role="2c44tc">
-                                  <ref role="3uigEE" to="bj13:~Logical" resolve="Logical" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="7kXqzcTLKTU" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIn" role="iSaTp">
+                            <ref role="h$OrH" to="bj13:~Logical" resolve="Logical" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="7kXqzcTLKUL" role="ns1xD">
@@ -1956,17 +1950,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="3CulEO39IaC" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LJw" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO39IaD" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO39IaE" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO39IaF" role="2c44tc">
-                                  <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO39IaG" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIo" role="iSaTp">
+                            <ref role="h$OrH" to="bj13:~MetaLogical" resolve="MetaLogical" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="3CulEO39IaH" role="ns1xD">
@@ -2071,17 +2056,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="3CulEO39Jhh" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LJx" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO39Jhl" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO39Jhm" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO39Jko" role="2c44tc">
-                                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO39Jho" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIp" role="iSaTp">
+                            <ref role="h$OrH" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
                           </node>
                         </node>
                       </node>
@@ -2104,17 +2080,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="3CulEO39IES" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LJy" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO39IET" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO39IEU" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO39IEV" role="2c44tc">
-                                  <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO39IEW" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIq" role="iSaTp">
+                            <ref role="h$OrH" to="bj13:~MetaLogical" resolve="MetaLogical" />
                           </node>
                         </node>
                         <node concept="nsMwS" id="3CulEO39IEX" role="ns1xD">
@@ -2167,17 +2134,8 @@
                       <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                       <node concept="nsMwS" id="7LI_gNMpYy2" role="ns1xD">
                         <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                        <node concept="37jhX" id="ZNYugu2LJz" role="iSaTp">
-                          <node concept="2OqwBi" id="3CulEO1Y7yG" role="37jj2">
-                            <node concept="2c44tf" id="3CulEO1Y7yH" role="2Oq$k0">
-                              <node concept="3uibUv" id="3CulEO1Y7yI" role="2c44tc">
-                                <ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
-                              </node>
-                            </node>
-                            <node concept="3TrEf2" id="3CulEO1Y7yJ" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                            </node>
-                          </node>
+                        <node concept="h$QuP" id="ZNYuguvgIr" role="iSaTp">
+                          <ref role="h$OrH" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
                         </node>
                       </node>
                     </node>
@@ -2360,17 +2318,8 @@
                         <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
                         <node concept="nsMwS" id="61G6TdCWQQm" role="ns1xD">
                           <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                          <node concept="37jhX" id="ZNYugu2LJ$" role="iSaTp">
-                            <node concept="2OqwBi" id="3CulEO1Y7_8" role="37jj2">
-                              <node concept="2c44tf" id="3CulEO1Y7_9" role="2Oq$k0">
-                                <node concept="3uibUv" id="3CulEO1Y7_a" role="2c44tc">
-                                  <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="3CulEO1Y7_b" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
+                          <node concept="h$QuP" id="ZNYuguvgIs" role="iSaTp">
+                            <ref role="h$OrH" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
                           </node>
                         </node>
                       </node>