diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 62e1d11e..2778424c 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -5794,43 +5794,24 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="2N2MQGCMOAW" role="jymVt" />
-    <node concept="3clFb_" id="4U$Q3dLrLBS" role="jymVt">
-      <property role="TrG5h" value="tableRef" />
-      <node concept="3uibUv" id="4U$Q3dLrLBT" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-      </node>
-      <node concept="3Tm1VV" id="4U$Q3dLrLBU" role="1B3o_S" />
-      <node concept="3clFbS" id="4U$Q3dLrLBW" role="3clF47">
-        <node concept="3clFbF" id="4U$Q3dLrNcI" role="3cqZAp">
-          <node concept="2YIFZM" id="4U$Q3dLrNcK" role="3clFbG">
-            <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
-            <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-            <node concept="Xl_RD" id="4U$Q3dLrNcL" role="37wK5m">
-              <property role="Xl_RC" value="" />
-              <node concept="17Uvod" id="4U$Q3dLrNcM" role="lGtFl">
-                <property role="2qtEX9" value="value" />
-                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                <node concept="3zFVjK" id="4U$Q3dLrNcN" role="3zH0cK">
-                  <node concept="3clFbS" id="4U$Q3dLrNcO" role="2VODD2">
-                    <node concept="3clFbF" id="4U$Q3dLrNcP" role="3cqZAp">
-                      <node concept="2OqwBi" id="4U$Q3dLrNcQ" role="3clFbG">
-                        <node concept="2OqwBi" id="4U$Q3dLrNcR" role="2Oq$k0">
-                          <node concept="liA8E" id="4U$Q3dLrNcS" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                          </node>
-                          <node concept="2JrnkZ" id="4U$Q3dLrNcT" role="2Oq$k0">
-                            <node concept="2OqwBi" id="4U$Q3dLrNcX" role="2JrQYb">
-                              <node concept="1iwH7S" id="4U$Q3dLrNcY" role="2Oq$k0" />
-                              <node concept="12$id9" id="4U$Q3dLrNcZ" role="2OqNvi">
-                                <node concept="30H73N" id="4U$Q3dLrNd0" role="12$y8L" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="4U$Q3dLrNd2" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                        </node>
+    <node concept="2tJIrI" id="5itBwM8SNzQ" role="jymVt" />
+    <node concept="3clFb_" id="7mIqwW4ZQ9N" role="jymVt">
+      <property role="TrG5h" value="getFqName" />
+      <node concept="17QB3L" id="7mIqwW4ZQ9O" role="3clF45" />
+      <node concept="3Tm1VV" id="7mIqwW4ZQ9P" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW4ZQ9S" role="3clF47">
+        <node concept="3cpWs6" id="7mIqwW4ZQ9V" role="3cqZAp">
+          <node concept="Xl_RD" id="7mIqwW4ZQ9U" role="3cqZAk">
+            <node concept="17Uvod" id="7mIqwW4ZVPS" role="lGtFl">
+              <property role="2qtEX9" value="value" />
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <node concept="3zFVjK" id="7mIqwW4ZVPT" role="3zH0cK">
+                <node concept="3clFbS" id="7mIqwW4ZVPU" role="2VODD2">
+                  <node concept="3clFbF" id="7mIqwW4ZWGG" role="3cqZAp">
+                    <node concept="2OqwBi" id="7mIqwW4ZWWE" role="3clFbG">
+                      <node concept="30H73N" id="7mIqwW4ZWGF" role="2Oq$k0" />
+                      <node concept="2qgKlT" id="7mIqwW4ZXjl" role="2OqNvi">
+                        <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                       </node>
                     </node>
                   </node>
@@ -5840,94 +5821,70 @@
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="4U$Q3dLrLBX" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      <node concept="2AHcQZ" id="7mIqwW4ZQ9T" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="4U$Q3dLrKeC" role="jymVt" />
-    <node concept="3clFb_" id="4U$Q3dLrpxc" role="jymVt">
-      <property role="TrG5h" value="extendsRef" />
-      <node concept="3uibUv" id="4U$Q3dLrwb1" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-      </node>
-      <node concept="3Tm1VV" id="4U$Q3dLrpxf" role="1B3o_S" />
-      <node concept="3clFbS" id="4U$Q3dLrpxg" role="3clF47">
-        <node concept="3clFbF" id="4U$Q3dLrtr8" role="3cqZAp">
-          <node concept="2YIFZM" id="4U$Q3dLrtrr" role="3clFbG">
-            <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
-            <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-            <node concept="Xl_RD" id="4U$Q3dLrtsJ" role="37wK5m">
-              <property role="Xl_RC" value="" />
-              <node concept="17Uvod" id="4U$Q3dLrv2I" role="lGtFl">
-                <property role="2qtEX9" value="value" />
-                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                <node concept="3zFVjK" id="4U$Q3dLrv2J" role="3zH0cK">
-                  <node concept="3clFbS" id="4U$Q3dLrv2K" role="2VODD2">
-                    <node concept="3clFbF" id="4U$Q3dLrv9c" role="3cqZAp">
-                      <node concept="2OqwBi" id="4U$Q3dLrv9d" role="3clFbG">
-                        <node concept="2OqwBi" id="4U$Q3dLrv9e" role="2Oq$k0">
-                          <node concept="liA8E" id="4U$Q3dLrv9f" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                          </node>
-                          <node concept="2JrnkZ" id="4U$Q3dLrv9g" role="2Oq$k0">
-                            <node concept="2OqwBi" id="4U$Q3dLrvwN" role="2JrQYb">
-                              <node concept="1PxgMI" id="4U$Q3dLrvFF" role="2Oq$k0">
-                                <property role="1BlNFB" value="true" />
-                                <node concept="chp4Y" id="4U$Q3dLrvHa" role="3oSUPX">
-                                  <ref role="cht4Q" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
-                                </node>
-                                <node concept="2OqwBi" id="4U$Q3dLrv9h" role="1m5AlR">
-                                  <node concept="1iwH7S" id="4U$Q3dLrv9i" role="2Oq$k0" />
-                                  <node concept="12$id9" id="4U$Q3dLrv9j" role="2OqNvi">
-                                    <node concept="30H73N" id="4U$Q3dLrv9k" role="12$y8L" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="4U$Q3dLrvUv" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:5itBwM9Rt6C" resolve="extends" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="4U$Q3dLrv9l" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+    <node concept="2tJIrI" id="7mIqwW4ZS88" role="jymVt" />
+    <node concept="3clFb_" id="7mIqwW4ZQ9W" role="jymVt">
+      <property role="TrG5h" value="getExtendsFqName" />
+      <node concept="17QB3L" id="7mIqwW4ZQ9X" role="3clF45" />
+      <node concept="3Tm1VV" id="7mIqwW4ZQ9Y" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW4ZQa1" role="3clF47">
+        <node concept="3cpWs6" id="7mIqwW4ZQa4" role="3cqZAp">
+          <node concept="Xl_RD" id="7mIqwW4ZQa3" role="3cqZAk">
+            <property role="Xl_RC" value="" />
+            <node concept="17Uvod" id="7mIqwW4ZZeR" role="lGtFl">
+              <property role="2qtEX9" value="value" />
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <node concept="3zFVjK" id="7mIqwW4ZZeS" role="3zH0cK">
+                <node concept="3clFbS" id="7mIqwW4ZZeT" role="2VODD2">
+                  <node concept="3clFbF" id="7mIqwW500s1" role="3cqZAp">
+                    <node concept="2OqwBi" id="7mIqwW50114" role="3clFbG">
+                      <node concept="2OqwBi" id="7mIqwW500FZ" role="2Oq$k0">
+                        <node concept="30H73N" id="7mIqwW500s0" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="7mIqwW500ZT" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:5itBwM9Rt6C" resolve="extends" />
                         </node>
                       </node>
+                      <node concept="2qgKlT" id="7mIqwW501dQ" role="2OqNvi">
+                        <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1W57fq" id="4U$Q3dLrxha" role="lGtFl">
-            <node concept="3IZrLx" id="4U$Q3dLrxhb" role="3IZSJc">
-              <node concept="3clFbS" id="4U$Q3dLrxhc" role="2VODD2">
-                <node concept="3clFbF" id="4U$Q3dLrxpb" role="3cqZAp">
-                  <node concept="3y3z36" id="4U$Q3dLrxW1" role="3clFbG">
-                    <node concept="10Nm6u" id="4U$Q3dLry1C" role="3uHU7w" />
-                    <node concept="2OqwBi" id="4U$Q3dLrxCf" role="3uHU7B">
-                      <node concept="30H73N" id="4U$Q3dLrxpa" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="4U$Q3dLrxO6" role="2OqNvi">
+          <node concept="1W57fq" id="7mIqwW4ZYum" role="lGtFl">
+            <node concept="3IZrLx" id="7mIqwW4ZYun" role="3IZSJc">
+              <node concept="3clFbS" id="7mIqwW4ZYuo" role="2VODD2">
+                <node concept="3clFbF" id="7mIqwW501tI" role="3cqZAp">
+                  <node concept="2OqwBi" id="7mIqwW5022F" role="3clFbG">
+                    <node concept="2OqwBi" id="7mIqwW501J5" role="2Oq$k0">
+                      <node concept="30H73N" id="7mIqwW501tH" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="7mIqwW5021w" role="2OqNvi">
                         <ref role="3Tt5mk" to="wq2x:5itBwM9Rt6C" resolve="extends" />
                       </node>
                     </node>
+                    <node concept="3x8VRR" id="7mIqwW502da" role="2OqNvi" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="gft3U" id="4U$Q3dLryfG" role="UU_$l">
-              <node concept="3cpWs6" id="4U$Q3dLzbVi" role="gfFT$">
-                <node concept="10Nm6u" id="4U$Q3dLzd5n" role="3cqZAk" />
+            <node concept="gft3U" id="7mIqwW502m2" role="UU_$l">
+              <node concept="3cpWs6" id="7mIqwW503pa" role="gfFT$">
+                <node concept="10Nm6u" id="7mIqwW504pq" role="3cqZAk" />
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="4U$Q3dLrzPM" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      <node concept="2AHcQZ" id="7mIqwW4ZQa2" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="5itBwM8SNzQ" role="jymVt" />
+    <node concept="2tJIrI" id="7mIqwW4ZSZX" role="jymVt" />
     <node concept="3clFb_" id="5itBwM7reGY" role="jymVt">
       <property role="TrG5h" value="expandMacroTemplate" />
       <node concept="37vLTG" id="5itBwM7reGZ" role="3clF46">
@@ -6047,10 +6004,8 @@
     <node concept="3clFb_" id="4MEOIDEgqbt" role="jymVt">
       <property role="TrG5h" value="callMacroTemplate" />
       <node concept="37vLTG" id="4MEOIDEhHGm" role="3clF46">
-        <property role="TrG5h" value="templateRef" />
-        <node concept="3uibUv" id="5yr01fDuMBL" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
+        <property role="TrG5h" value="templateFqn" />
+        <node concept="17QB3L" id="7mIqwW53r8I" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="4MEOIDEgqbw" role="3clF45">
         <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
@@ -6087,18 +6042,11 @@
                 <property role="2qtEX9" value="value" />
                 <node concept="3zFVjK" id="2TBKtozZDTi" role="3zH0cK">
                   <node concept="3clFbS" id="2TBKtozZDTj" role="2VODD2">
-                    <node concept="3clFbF" id="2TBKtozZDTk" role="3cqZAp">
-                      <node concept="2OqwBi" id="2TBKtozZDTl" role="3clFbG">
-                        <node concept="2OqwBi" id="2TBKtozZDTm" role="2Oq$k0">
-                          <node concept="2JrnkZ" id="2TBKtozZDTn" role="2Oq$k0">
-                            <node concept="30H73N" id="2TBKtozZDTo" role="2JrQYb" />
-                          </node>
-                          <node concept="liA8E" id="2TBKtozZDTp" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="2TBKtozZDTq" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                    <node concept="3clFbF" id="7mIqwW53vVc" role="3cqZAp">
+                      <node concept="2OqwBi" id="7mIqwW53wLf" role="3clFbG">
+                        <node concept="30H73N" id="7mIqwW53vVb" role="2Oq$k0" />
+                        <node concept="2qgKlT" id="7mIqwW53z88" role="2OqNvi">
+                          <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                         </node>
                       </node>
                     </node>
@@ -6162,18 +6110,8 @@
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="2TBKtozZDTO" role="3KbGdf">
-            <node concept="2OqwBi" id="2TBKtozZDTP" role="2Oq$k0">
-              <node concept="37vLTw" id="2TBKtozZDTQ" role="2Oq$k0">
-                <ref role="3cqZAo" node="4MEOIDEhHGm" resolve="templateRef" />
-              </node>
-              <node concept="liA8E" id="2TBKtozZDTR" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
-              </node>
-            </node>
-            <node concept="liA8E" id="2TBKtozZDTS" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-            </node>
+          <node concept="37vLTw" id="7mIqwW53tYk" role="3KbGdf">
+            <ref role="3cqZAo" node="4MEOIDEhHGm" resolve="templateFqn" />
           </node>
         </node>
         <node concept="3cpWs6" id="6UWSvq58tkt" role="3cqZAp">
@@ -10305,46 +10243,30 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="5itBwM7X0P0" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:1VeWL_e3Rvy" resolve="callMacro" />
+                      <ref role="37wK5l" to="i348:7mIqwW50Qjs" resolve="callMacro" />
                       <node concept="10Nm6u" id="1VeWL_e4aBL" role="37wK5m">
                         <node concept="1sPUBX" id="1VeWL_e4aBM" role="lGtFl">
                           <ref role="v9R2y" node="2LxIQen0ctm" resolve="implicit_rule_input_reference" />
                         </node>
                       </node>
-                      <node concept="2YIFZM" id="5itBwM7X0UU" role="37wK5m">
-                        <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-                        <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
-                        <node concept="Xl_RD" id="5itBwM7X0UV" role="37wK5m">
-                          <property role="Xl_RC" value="" />
-                          <node concept="17Uvod" id="5itBwM7X0UW" role="lGtFl">
-                            <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                            <property role="2qtEX9" value="value" />
-                            <node concept="3zFVjK" id="5itBwM7X0UX" role="3zH0cK">
-                              <node concept="3clFbS" id="5itBwM7X0UY" role="2VODD2">
-                                <node concept="3clFbF" id="5itBwM8riGf" role="3cqZAp">
-                                  <node concept="2OqwBi" id="5itBwM8riGg" role="3clFbG">
-                                    <node concept="2OqwBi" id="5itBwM8riGh" role="2Oq$k0">
-                                      <node concept="liA8E" id="5itBwM8riGi" role="2OqNvi">
-                                        <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                                      </node>
-                                      <node concept="2JrnkZ" id="5itBwM8riGj" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="5itBwM8riGk" role="2JrQYb">
-                                          <node concept="1iwH7S" id="5itBwM8riGl" role="2Oq$k0" />
-                                          <node concept="12$id9" id="5itBwM8riGm" role="2OqNvi">
-                                            <node concept="2OqwBi" id="5itBwM8rjCB" role="12$y8L">
-                                              <node concept="30H73N" id="5itBwM8riGn" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="5itBwM8rk3r" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="wq2x:5itBwM7LtYS" resolve="template" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="5itBwM8riGo" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                      <node concept="Xl_RD" id="7mIqwW51dhC" role="37wK5m">
+                        <property role="Xl_RC" value="" />
+                        <node concept="17Uvod" id="7mIqwW51dYA" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                          <node concept="3zFVjK" id="7mIqwW51dYB" role="3zH0cK">
+                            <node concept="3clFbS" id="7mIqwW51dYC" role="2VODD2">
+                              <node concept="3clFbF" id="7mIqwW51eoj" role="3cqZAp">
+                                <node concept="2OqwBi" id="7mIqwW51fEM" role="3clFbG">
+                                  <node concept="2OqwBi" id="7mIqwW51eol" role="2Oq$k0">
+                                    <node concept="30H73N" id="7mIqwW51eom" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="7mIqwW51eon" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:5itBwM7LtYS" resolve="template" />
                                     </node>
                                   </node>
+                                  <node concept="2qgKlT" id="7mIqwW51g$Q" role="2OqNvi">
+                                    <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
@@ -10559,7 +10481,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="5itBwMbdiKx" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:5itBwM7VpML" resolve="expandMacro" />
+                      <ref role="37wK5l" to="i348:7mIqwW50wJB" resolve="expandMacro" />
                       <node concept="10Nm6u" id="At0yqMchOa" role="37wK5m">
                         <node concept="1sPUBX" id="At0yqMcjWx" role="lGtFl">
                           <ref role="v9R2y" node="2LxIQen0ctm" resolve="implicit_rule_input_reference" />
@@ -10581,40 +10503,24 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="2YIFZM" id="5itBwMbdiKE" role="37wK5m">
-                        <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-                        <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
-                        <node concept="Xl_RD" id="5itBwMbdiKF" role="37wK5m">
-                          <property role="Xl_RC" value="" />
-                          <node concept="17Uvod" id="5itBwMbdiKG" role="lGtFl">
-                            <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                            <property role="2qtEX9" value="value" />
-                            <node concept="3zFVjK" id="5itBwMbdiKH" role="3zH0cK">
-                              <node concept="3clFbS" id="5itBwMbdiKI" role="2VODD2">
-                                <node concept="3clFbF" id="5itBwMbdiKJ" role="3cqZAp">
-                                  <node concept="2OqwBi" id="5itBwMbdiKK" role="3clFbG">
-                                    <node concept="2OqwBi" id="5itBwMbdiKL" role="2Oq$k0">
-                                      <node concept="liA8E" id="5itBwMbdiKM" role="2OqNvi">
-                                        <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                                      </node>
-                                      <node concept="2JrnkZ" id="5itBwMbdiKN" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="5itBwMbdiKO" role="2JrQYb">
-                                          <node concept="1iwH7S" id="5itBwMbdiKP" role="2Oq$k0" />
-                                          <node concept="12$id9" id="5itBwMbdiKQ" role="2OqNvi">
-                                            <node concept="2OqwBi" id="5itBwMbdiKR" role="12$y8L">
-                                              <node concept="30H73N" id="5itBwMbdiKS" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="5itBwMbdiKT" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="5itBwMbdiKU" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                      <node concept="Xl_RD" id="7mIqwW514n2" role="37wK5m">
+                        <property role="Xl_RC" value="" />
+                        <node concept="17Uvod" id="7mIqwW514Qy" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                          <node concept="3zFVjK" id="7mIqwW514Qz" role="3zH0cK">
+                            <node concept="3clFbS" id="7mIqwW514Q$" role="2VODD2">
+                              <node concept="3clFbF" id="7mIqwW516mG" role="3cqZAp">
+                                <node concept="2OqwBi" id="7mIqwW517Ta" role="3clFbG">
+                                  <node concept="2OqwBi" id="7mIqwW516mI" role="2Oq$k0">
+                                    <node concept="30H73N" id="7mIqwW516mJ" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="7mIqwW516mK" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
                                     </node>
                                   </node>
+                                  <node concept="2qgKlT" id="7mIqwW519IZ" role="2OqNvi">
+                                    <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
@@ -12476,6 +12382,25 @@
               </node>
             </node>
           </node>
+          <node concept="Xl_RD" id="2GOEA2lV1L" role="37wK5m">
+            <property role="Xl_RC" value="name" />
+            <node concept="17Uvod" id="2GOEA2lV1M" role="lGtFl">
+              <property role="2qtEX9" value="value" />
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <node concept="3zFVjK" id="2GOEA2lV1N" role="3zH0cK">
+                <node concept="3clFbS" id="2GOEA2lV1O" role="2VODD2">
+                  <node concept="3clFbF" id="2GOEA2lV1P" role="3cqZAp">
+                    <node concept="2OqwBi" id="2GOEA2lV1Q" role="3clFbG">
+                      <node concept="30H73N" id="2GOEA2lV1R" role="2Oq$k0" />
+                      <node concept="2qgKlT" id="2GOEA2lWaz" role="2OqNvi">
+                        <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="2YIFZM" id="36tQV5AoEXV" role="37wK5m">
             <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
             <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
@@ -13113,6 +13038,10 @@
           <property role="TrG5h" value="name" />
           <node concept="17QB3L" id="6R6MIbU1l5D" role="1tU5fm" />
         </node>
+        <node concept="37vLTG" id="2GOEA2lXsU" role="3clF46">
+          <property role="TrG5h" value="fqName" />
+          <node concept="17QB3L" id="2GOEA2lXsV" role="1tU5fm" />
+        </node>
         <node concept="37vLTG" id="6R6MIbU1l5E" role="3clF46">
           <property role="TrG5h" value="templateRef" />
           <node concept="3uibUv" id="6R6MIbU1l5F" role="1tU5fm">
@@ -13130,6 +13059,9 @@
             <node concept="37vLTw" id="6R6MIbU1l63" role="37wK5m">
               <ref role="3cqZAo" node="6R6MIbU1l5C" resolve="name" />
             </node>
+            <node concept="37vLTw" id="2GOEA2lXlw" role="37wK5m">
+              <ref role="3cqZAo" node="2GOEA2lXsU" resolve="fqName" />
+            </node>
             <node concept="37vLTw" id="6R6MIbU1l64" role="37wK5m">
               <ref role="3cqZAo" node="6R6MIbU1l5E" resolve="templateRef" />
             </node>
@@ -15149,48 +15081,30 @@
             <ref role="3uigEE" node="5itBwM6XBFY" resolve="__MacroTable._Expand.Token" />
           </node>
         </node>
-        <node concept="3clFb_" id="5itBwM9$1EO" role="jymVt">
-          <property role="TrG5h" value="getPrototypeTemplateRef" />
-          <node concept="3uibUv" id="5itBwM9$1EP" role="3clF45">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-          </node>
-          <node concept="3Tm1VV" id="5itBwM9$1EQ" role="1B3o_S" />
-          <node concept="3clFbS" id="5itBwM9$1EV" role="3clF47">
-            <node concept="3clFbF" id="5itBwM9$3Lb" role="3cqZAp">
-              <node concept="2YIFZM" id="5itBwM9$3Pi" role="3clFbG">
-                <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
-                <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-                <node concept="Xl_RD" id="5itBwM9$3VV" role="37wK5m">
-                  <property role="Xl_RC" value="" />
-                  <node concept="17Uvod" id="5itBwM9$407" role="lGtFl">
-                    <property role="2qtEX9" value="value" />
-                    <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                    <node concept="3zFVjK" id="5itBwM9$408" role="3zH0cK">
-                      <node concept="3clFbS" id="5itBwM9$409" role="2VODD2">
-                        <node concept="3clFbF" id="5itBwM9$4q9" role="3cqZAp">
-                          <node concept="2OqwBi" id="5itBwM9$6QV" role="3clFbG">
-                            <node concept="2OqwBi" id="5itBwM9$6z7" role="2Oq$k0">
-                              <node concept="2JrnkZ" id="5itBwM9$6li" role="2Oq$k0">
-                                <node concept="2OqwBi" id="5itBwM9$4AF" role="2JrQYb">
-                                  <node concept="1iwH7S" id="5itBwM9$4q8" role="2Oq$k0" />
-                                  <node concept="12$id9" id="5itBwM9$4RL" role="2OqNvi">
-                                    <node concept="2OqwBi" id="5itBwM9$5pz" role="12$y8L">
-                                      <node concept="30H73N" id="5itBwM9$56y" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="5itBwM9$5W6" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="wq2x:5itBwM6gb4P" resolve="prototype" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="5itBwM9$6JF" role="2OqNvi">
-                                <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="5itBwM9$74G" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+        <node concept="3clFb_" id="7mIqwW51tle" role="jymVt">
+          <property role="TrG5h" value="getPrototypeTemplateFqName" />
+          <node concept="17QB3L" id="7mIqwW51tlf" role="3clF45" />
+          <node concept="3Tm1VV" id="7mIqwW51tlg" role="1B3o_S" />
+          <node concept="3clFbS" id="7mIqwW51tll" role="3clF47">
+            <node concept="3cpWs6" id="7mIqwW51tlo" role="3cqZAp">
+              <node concept="Xl_RD" id="7mIqwW51tln" role="3cqZAk">
+                <property role="Xl_RC" value="" />
+                <node concept="17Uvod" id="7mIqwW51wxh" role="lGtFl">
+                  <property role="2qtEX9" value="value" />
+                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                  <node concept="3zFVjK" id="7mIqwW51wxi" role="3zH0cK">
+                    <node concept="3clFbS" id="7mIqwW51wxj" role="2VODD2">
+                      <node concept="3clFbF" id="7mIqwW51xsd" role="3cqZAp">
+                        <node concept="2OqwBi" id="7mIqwW51yfV" role="3clFbG">
+                          <node concept="2OqwBi" id="7mIqwW51xsf" role="2Oq$k0">
+                            <node concept="30H73N" id="7mIqwW51xsg" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="7mIqwW51xsh" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:5itBwM6gb4P" resolve="prototype" />
                             </node>
                           </node>
+                          <node concept="2qgKlT" id="7mIqwW51y_T" role="2OqNvi">
+                            <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -15199,11 +15113,11 @@
               </node>
             </node>
           </node>
-          <node concept="2AHcQZ" id="5itBwM9$1EW" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+          <node concept="2AHcQZ" id="7mIqwW51tlm" role="2AJF6D">
+            <ref role="2AI5Lk" to="wyt6:~Override" />
           </node>
         </node>
-        <node concept="2tJIrI" id="5itBwM9$2jr" role="jymVt" />
+        <node concept="2tJIrI" id="7mIqwW51uF0" role="jymVt" />
         <node concept="3clFb_" id="5itBwM797EO" role="jymVt">
           <property role="TrG5h" value="createToken" />
           <node concept="37vLTG" id="At0yqLVcrK" role="3clF46">
@@ -15920,37 +15834,37 @@
           <node concept="2tJIrI" id="5dFCr0xEfYS" role="jymVt" />
           <node concept="3KIgzJ" id="6P1UyJpnUA8" role="jymVt">
             <node concept="3clFbS" id="6P1UyJpnUA9" role="3KIlGz">
-              <node concept="3cpWs6" id="6P1UyJpnUAa" role="3cqZAp">
-                <node concept="1oi1Uc" id="6P1UyJpnUAb" role="3cqZAk">
-                  <node concept="1oi5UN" id="6P1UyJpnUAc" role="1oi0x0">
-                    <node concept="1oi5Wm" id="6P1UyJpnUAd" role="1ojpOf">
+              <node concept="3cpWs6" id="4APe_wKgWQ_" role="3cqZAp">
+                <node concept="1oi1Uc" id="4APe_wKgWQA" role="3cqZAk">
+                  <node concept="1oi5UN" id="4APe_wKgWQB" role="1oi0x0">
+                    <node concept="1oi5Wm" id="4APe_wKgWQC" role="1ojpOf">
                       <property role="TrG5h" value="_declaration_" />
-                      <node concept="1oi5XN" id="6P1UyJpnUAe" role="1oi5zu">
+                      <node concept="1oi5XN" id="4APe_wKgWQD" role="1oi5zu">
                         <property role="1oi5yK" value="symbol" />
-                        <node concept="17Uvod" id="6P1UyJpnUAf" role="lGtFl">
+                        <node concept="17Uvod" id="4APe_wKgWQE" role="lGtFl">
                           <property role="P4ACc" value="35320f26-77cb-4c55-be9f-a97a27770af1/7571593955706137573/7571593955706137638" />
                           <property role="2qtEX9" value="value" />
-                          <node concept="3zFVjK" id="6P1UyJpnUAg" role="3zH0cK">
-                            <node concept="3clFbS" id="6P1UyJpnUAh" role="2VODD2">
-                              <node concept="3clFbF" id="6P1UyJpnUAi" role="3cqZAp">
-                                <node concept="2OqwBi" id="6P1UyJpnUAj" role="3clFbG">
-                                  <node concept="2qgKlT" id="6P1UyJpnUAk" role="2OqNvi">
+                          <node concept="3zFVjK" id="4APe_wKgWQF" role="3zH0cK">
+                            <node concept="3clFbS" id="4APe_wKgWQG" role="2VODD2">
+                              <node concept="3clFbF" id="4APe_wKgWQH" role="3cqZAp">
+                                <node concept="2OqwBi" id="4APe_wKgWQI" role="3clFbG">
+                                  <node concept="2qgKlT" id="4APe_wKgWQJ" role="2OqNvi">
                                     <ref role="37wK5l" to="x5bw:7c96q9t$Nk0" resolve="symbol" />
                                   </node>
-                                  <node concept="30H73N" id="6P1UyJpnUAl" role="2Oq$k0" />
+                                  <node concept="30H73N" id="4APe_wKgWQK" role="2Oq$k0" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="17Uvod" id="1RYTbd6oEZP" role="lGtFl">
+                      <node concept="17Uvod" id="4APe_wKgWQL" role="lGtFl">
                         <property role="2qtEX9" value="name" />
                         <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-                        <node concept="3zFVjK" id="1RYTbd6oEZQ" role="3zH0cK">
-                          <node concept="3clFbS" id="1RYTbd6oEZR" role="2VODD2">
-                            <node concept="3clFbF" id="1RYTbd6oFh7" role="3cqZAp">
-                              <node concept="10M0yZ" id="1RYTbd6oFmB" role="3clFbG">
+                        <node concept="3zFVjK" id="4APe_wKgWQM" role="3zH0cK">
+                          <node concept="3clFbS" id="4APe_wKgWQN" role="2VODD2">
+                            <node concept="3clFbF" id="4APe_wKgWQO" role="3cqZAp">
+                              <node concept="10M0yZ" id="4APe_wKgWQP" role="3clFbG">
                                 <ref role="3cqZAo" to="jpi6:1RYTbd6oE68" resolve="DECLARATION" />
                                 <ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
                               </node>
@@ -15959,15 +15873,15 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="1oi5Wm" id="6P1UyJpnUAm" role="1ojpOf">
+                    <node concept="1oi5Wm" id="4APe_wKgWQQ" role="1ojpOf">
                       <property role="TrG5h" value="name" />
-                      <node concept="1WS0z7" id="6P1UyJpnUAn" role="lGtFl">
-                        <node concept="3JmXsc" id="6P1UyJpnUAo" role="3Jn$fo">
-                          <node concept="3clFbS" id="6P1UyJpnUAp" role="2VODD2">
-                            <node concept="3clFbF" id="6P1UyJpnUAq" role="3cqZAp">
-                              <node concept="2OqwBi" id="6P1UyJpnUAr" role="3clFbG">
-                                <node concept="30H73N" id="6P1UyJpnUAs" role="2Oq$k0" />
-                                <node concept="2qgKlT" id="6P1UyJpnUAt" role="2OqNvi">
+                      <node concept="1WS0z7" id="4APe_wKgWQR" role="lGtFl">
+                        <node concept="3JmXsc" id="4APe_wKgWQS" role="3Jn$fo">
+                          <node concept="3clFbS" id="4APe_wKgWQT" role="2VODD2">
+                            <node concept="3clFbF" id="4APe_wKgWQU" role="3cqZAp">
+                              <node concept="2OqwBi" id="4APe_wKgWQV" role="3clFbG">
+                                <node concept="30H73N" id="4APe_wKgWQW" role="2Oq$k0" />
+                                <node concept="2qgKlT" id="4APe_wKgWQX" role="2OqNvi">
                                   <ref role="37wK5l" to="x5bw:7c96q9tALRr" resolve="valueFeatures" />
                                 </node>
                               </node>
@@ -15975,20 +15889,20 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="22Ky0T" id="6P1UyJpnUAu" role="lGtFl">
-                        <node concept="1rXfSq" id="5dFCr0xMZ2k" role="22Ky0K">
+                      <node concept="22Ky0T" id="4APe_wKgWQY" role="lGtFl">
+                        <node concept="1rXfSq" id="4APe_wKgWQZ" role="22Ky0K">
                           <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
-                          <node concept="1ZhdrF" id="5dFCr0xMZ2m" role="lGtFl">
+                          <node concept="1ZhdrF" id="4APe_wKgWR0" role="lGtFl">
                             <property role="2qtEX8" value="baseMethodDeclaration" />
                             <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                            <node concept="3$xsQk" id="5dFCr0xMZ2n" role="3$ytzL">
-                              <node concept="3clFbS" id="5dFCr0xMZ2o" role="2VODD2">
-                                <node concept="3clFbF" id="6P1UyJpnUA_" role="3cqZAp">
-                                  <node concept="2OqwBi" id="6P1UyJpnUAA" role="3clFbG">
-                                    <node concept="1iwH7S" id="6P1UyJpnUAB" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="6P1UyJpnUAC" role="2OqNvi">
+                            <node concept="3$xsQk" id="4APe_wKgWR1" role="3$ytzL">
+                              <node concept="3clFbS" id="4APe_wKgWR2" role="2VODD2">
+                                <node concept="3clFbF" id="4APe_wKgWR3" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4APe_wKgWR4" role="3clFbG">
+                                    <node concept="1iwH7S" id="4APe_wKgWR5" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="4APe_wKgWR6" role="2OqNvi">
                                       <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
-                                      <node concept="30H73N" id="6P1UyJpnUAD" role="1iwH7V" />
+                                      <node concept="30H73N" id="4APe_wKgWR7" role="1iwH7V" />
                                     </node>
                                   </node>
                                 </node>
@@ -15998,37 +15912,15 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="1oi5ST" id="6P1UyJpnUAP" role="1ojpOf">
+                    <node concept="1oi5ST" id="4APe_wKh0UQ" role="1ojpOf">
                       <property role="TrG5h" value="name" />
-                      <node concept="22Ky0T" id="6P1UyJpnUAX" role="lGtFl">
-                        <node concept="1rXfSq" id="5dFCr0xMZxE" role="22Ky0K">
-                          <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
-                          <node concept="1ZhdrF" id="5dFCr0xMZxG" role="lGtFl">
-                            <property role="2qtEX8" value="baseMethodDeclaration" />
-                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                            <node concept="3$xsQk" id="5dFCr0xMZxH" role="3$ytzL">
-                              <node concept="3clFbS" id="5dFCr0xMZxI" role="2VODD2">
-                                <node concept="3clFbF" id="6P1UyJpnUB4" role="3cqZAp">
-                                  <node concept="2OqwBi" id="6P1UyJpnUB5" role="3clFbG">
-                                    <node concept="1iwH7S" id="6P1UyJpnUB6" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="6P1UyJpnUB7" role="2OqNvi">
-                                      <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
-                                      <node concept="30H73N" id="6P1UyJpnUB8" role="1iwH7V" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1WS0z7" id="6P1UyJpnUAQ" role="lGtFl">
-                        <node concept="3JmXsc" id="6P1UyJpnUAR" role="3Jn$fo">
-                          <node concept="3clFbS" id="6P1UyJpnUAS" role="2VODD2">
-                            <node concept="3clFbF" id="6P1UyJpnUAT" role="3cqZAp">
-                              <node concept="2OqwBi" id="6P1UyJpnUAU" role="3clFbG">
-                                <node concept="30H73N" id="6P1UyJpnUAV" role="2Oq$k0" />
-                                <node concept="2qgKlT" id="6P1UyJpnUAW" role="2OqNvi">
+                      <node concept="1WS0z7" id="4APe_wKh4hL" role="lGtFl">
+                        <node concept="3JmXsc" id="4APe_wKh4hM" role="3Jn$fo">
+                          <node concept="3clFbS" id="4APe_wKh4hN" role="2VODD2">
+                            <node concept="3clFbF" id="4APe_wKh518" role="3cqZAp">
+                              <node concept="2OqwBi" id="4APe_wKh51a" role="3clFbG">
+                                <node concept="30H73N" id="4APe_wKh51b" role="2Oq$k0" />
+                                <node concept="2qgKlT" id="4APe_wKh51c" role="2OqNvi">
                                   <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="allChildFeatures" />
                                 </node>
                               </node>
@@ -16036,39 +15928,61 @@
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="1oi5ST" id="1RYTbd6Hzn7" role="1ojpOf">
-                      <property role="TrG5h" value="_specification_" />
-                      <node concept="1oi5UN" id="1RYTbd6Hzn8" role="1oi5TL">
-                        <node concept="1sPUBX" id="1RYTbd6Hzn9" role="lGtFl">
-                          <ref role="v9R2y" node="4lCLOtwvFAX" resolve="term_builder" />
-                          <node concept="v3LJS" id="1RYTbd6Hzna" role="v9R3O">
-                            <ref role="v3LJV" node="4lCLOtwvJyc" resolve="prototypeStack" />
-                          </node>
-                          <node concept="v3LJS" id="1RYTbd6Hznb" role="v9R3O">
-                            <ref role="v3LJV" node="6P1UyJpnSC$" resolve="originSrcNode" />
-                          </node>
-                          <node concept="3NFfHV" id="1RYTbd6Hznc" role="1sPUBK">
-                            <node concept="3clFbS" id="1RYTbd6Hznd" role="2VODD2">
-                              <node concept="3clFbF" id="1RYTbd6Hzne" role="3cqZAp">
-                                <node concept="2OqwBi" id="1RYTbd6Hznf" role="3clFbG">
-                                  <node concept="v3LJS" id="1RYTbd6Hzng" role="2Oq$k0">
-                                    <ref role="v3LJV" node="4lCLOtwvJyc" resolve="prototypeStack" />
+                      <node concept="22Ky0T" id="4APe_wKh4m6" role="lGtFl">
+                        <node concept="1rXfSq" id="4APe_wKh4U4" role="22Ky0K">
+                          <ref role="37wK5l" node="5hSMZ_lNZhp" resolve="feature" />
+                          <node concept="1ZhdrF" id="4APe_wKh4U5" role="lGtFl">
+                            <property role="2qtEX8" value="baseMethodDeclaration" />
+                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                            <node concept="3$xsQk" id="4APe_wKh4U6" role="3$ytzL">
+                              <node concept="3clFbS" id="4APe_wKh4U7" role="2VODD2">
+                                <node concept="3clFbF" id="4APe_wKh4U8" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4APe_wKh4U9" role="3clFbG">
+                                    <node concept="1iwH7S" id="4APe_wKh4Ua" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="4APe_wKh4Ub" role="2OqNvi">
+                                      <ref role="1iwH77" node="1L74NXG7ihq" resolve="dataformfeature_method" />
+                                      <node concept="30H73N" id="4APe_wKh4Uc" role="1iwH7V" />
+                                    </node>
                                   </node>
-                                  <node concept="2Kt2Hk" id="1RYTbd6Hznh" role="2OqNvi" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="17Uvod" id="1RYTbd6Hzni" role="lGtFl">
+                    </node>
+                    <node concept="1oi5ST" id="4APe_wKgWRq" role="1ojpOf">
+                      <property role="TrG5h" value="_specification_" />
+                      <node concept="1oi5UN" id="4APe_wKgWRr" role="1oi5TL">
+                        <node concept="1sPUBX" id="4APe_wKgWRs" role="lGtFl">
+                          <ref role="v9R2y" node="4lCLOtwvFAX" resolve="term_builder" />
+                          <node concept="v3LJS" id="4APe_wKgWRt" role="v9R3O">
+                            <ref role="v3LJV" node="4lCLOtwvJyc" resolve="prototypeStack" />
+                          </node>
+                          <node concept="v3LJS" id="4APe_wKgWRu" role="v9R3O">
+                            <ref role="v3LJV" node="6P1UyJpnSC$" resolve="originSrcNode" />
+                          </node>
+                          <node concept="3NFfHV" id="4APe_wKgWRv" role="1sPUBK">
+                            <node concept="3clFbS" id="4APe_wKgWRw" role="2VODD2">
+                              <node concept="3clFbF" id="4APe_wKgWRx" role="3cqZAp">
+                                <node concept="2OqwBi" id="4APe_wKgWRy" role="3clFbG">
+                                  <node concept="v3LJS" id="4APe_wKgWRz" role="2Oq$k0">
+                                    <ref role="v3LJV" node="4lCLOtwvJyc" resolve="prototypeStack" />
+                                  </node>
+                                  <node concept="2Kt2Hk" id="4APe_wKgWR$" role="2OqNvi" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="17Uvod" id="4APe_wKgWR_" role="lGtFl">
                         <property role="2qtEX9" value="name" />
                         <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-                        <node concept="3zFVjK" id="1RYTbd6Hznj" role="3zH0cK">
-                          <node concept="3clFbS" id="1RYTbd6Hznk" role="2VODD2">
-                            <node concept="3clFbF" id="1RYTbd6Hznl" role="3cqZAp">
-                              <node concept="10M0yZ" id="1RYTbd6Hznm" role="3clFbG">
+                        <node concept="3zFVjK" id="4APe_wKgWRA" role="3zH0cK">
+                          <node concept="3clFbS" id="4APe_wKgWRB" role="2VODD2">
+                            <node concept="3clFbF" id="4APe_wKgWRC" role="3cqZAp">
+                              <node concept="10M0yZ" id="4APe_wKgWRD" role="3clFbG">
                                 <ref role="1PxDUh" to="jpi6:1RYTbd6oE5l" resolve="TermUtil" />
                                 <ref role="3cqZAo" to="jpi6:1RYTbd6oE9B" resolve="SPECIFICATION" />
                               </node>
@@ -16077,7 +15991,7 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="raruj" id="6P1UyJpnUB9" role="lGtFl" />
+                    <node concept="raruj" id="4APe_wKh1L1" role="lGtFl" />
                   </node>
                 </node>
               </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 695c70d8..e53fb753 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -2040,10 +2040,8 @@
     <node concept="3clFb_" id="5itBwM7WF$n" role="jymVt">
       <property role="TrG5h" value="callMacroTemplate" />
       <node concept="37vLTG" id="5itBwM7WF$o" role="3clF46">
-        <property role="TrG5h" value="templateRef" />
-        <node concept="3uibUv" id="5itBwM7WF$p" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
+        <property role="TrG5h" value="templateFqn" />
+        <node concept="17QB3L" id="7mIqwW52Ng5" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="5itBwM7WF$q" role="3clF45">
         <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
@@ -2069,7 +2067,7 @@
                     <ref role="2Gs0qQ" node="5itBwM8MNub" resolve="macroTable" />
                   </node>
                   <node concept="liA8E" id="5itBwM8MNu0" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:tbauFxRK5K" resolve="callMacroTemplate" />
+                    <ref role="37wK5l" to="i348:7mIqwW53gCg" resolve="callMacroTemplate" />
                     <node concept="37vLTw" id="5itBwM8MNu1" role="37wK5m">
                       <ref role="3cqZAo" node="5itBwM7WF$o" resolve="templateRef" />
                     </node>
@@ -2141,107 +2139,105 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="5itBwM7WF$m" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM7W0ZG" role="jymVt">
+    <node concept="2tJIrI" id="5itBwM7W0ZF" role="jymVt" />
+    <node concept="3clFb_" id="7mIqwW51Ay4" role="jymVt">
       <property role="TrG5h" value="expandMacroTemplate" />
-      <node concept="37vLTG" id="5itBwM7W4wa" role="3clF46">
+      <node concept="37vLTG" id="7mIqwW51Ay5" role="3clF46">
         <property role="TrG5h" value="concept" />
-        <node concept="3bZ5Sz" id="5itBwM7W4wb" role="1tU5fm" />
+        <node concept="3bZ5Sz" id="7mIqwW51Ay6" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="5itBwM9toE3" role="3clF46">
-        <property role="TrG5h" value="prototypeRef" />
-        <node concept="3uibUv" id="5itBwM9toE4" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
+      <node concept="37vLTG" id="7mIqwW51Ay7" role="3clF46">
+        <property role="TrG5h" value="prototypeFqn" />
+        <node concept="17QB3L" id="7mIqwW51D4B" role="1tU5fm" />
       </node>
-      <node concept="3uibUv" id="5itBwM7W0ZJ" role="3clF45">
+      <node concept="3uibUv" id="7mIqwW51Ay9" role="3clF45">
         <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
-        <node concept="16syzq" id="5itBwM7W0ZK" role="11_B2D">
-          <ref role="16sUi3" node="5itBwM7W10g" resolve="T" />
+        <node concept="16syzq" id="7mIqwW51Aya" role="11_B2D">
+          <ref role="16sUi3" node="7mIqwW51AyJ" resolve="T" />
         </node>
       </node>
-      <node concept="3Tm1VV" id="5itBwM7W0ZL" role="1B3o_S" />
-      <node concept="3clFbS" id="5itBwM7W0ZM" role="3clF47">
-        <node concept="2Gpval" id="5itBwM7W0ZN" role="3cqZAp">
-          <node concept="3clFbS" id="5itBwM7W0ZO" role="2LFqv$">
-            <node concept="2Gpval" id="4U$Q3dLV$zd" role="3cqZAp">
-              <node concept="3clFbS" id="4U$Q3dLVzjL" role="2LFqv$">
-                <node concept="3clFbJ" id="5itBwM7W0ZY" role="3cqZAp">
-                  <node concept="2OqwBi" id="5itBwM9tG6K" role="3clFbw">
-                    <node concept="2OqwBi" id="5itBwM9tAPr" role="2Oq$k0">
-                      <node concept="2GrUjf" id="4U$Q3dLVBJk" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="4U$Q3dLV$zT" resolve="macroTemplate" />
+      <node concept="3Tm1VV" id="7mIqwW51Ayb" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW51Ayc" role="3clF47">
+        <node concept="2Gpval" id="7mIqwW51Ayd" role="3cqZAp">
+          <node concept="3clFbS" id="7mIqwW51Aye" role="2LFqv$">
+            <node concept="2Gpval" id="7mIqwW51Ayf" role="3cqZAp">
+              <node concept="3clFbS" id="7mIqwW51Ayg" role="2LFqv$">
+                <node concept="3clFbJ" id="7mIqwW51Ayh" role="3cqZAp">
+                  <node concept="2OqwBi" id="7mIqwW51Ayi" role="3clFbw">
+                    <node concept="2OqwBi" id="7mIqwW51Ayj" role="2Oq$k0">
+                      <node concept="2GrUjf" id="7mIqwW51Ayk" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="7mIqwW51Ayw" resolve="macroTemplate" />
                       </node>
-                      <node concept="liA8E" id="5itBwM9$wcB" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:5itBwM9zYlU" resolve="getPrototypeTemplateRef" />
+                      <node concept="liA8E" id="7mIqwW51Ayl" role="2OqNvi">
+                        <ref role="37wK5l" to="i348:7mIqwW51r8J" resolve="getPrototypeTemplateFqName" />
                       </node>
                     </node>
-                    <node concept="liA8E" id="5itBwM9tGkw" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
-                      <node concept="37vLTw" id="5itBwM9tGzJ" role="37wK5m">
-                        <ref role="3cqZAo" node="5itBwM9toE3" resolve="prototypeRef" />
+                    <node concept="liA8E" id="7mIqwW51Aym" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                      <node concept="37vLTw" id="7mIqwW51Ayn" role="37wK5m">
+                        <ref role="3cqZAo" node="7mIqwW51Ay7" resolve="prototypeRef" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbS" id="5itBwM7W102" role="3clFbx">
-                    <node concept="3cpWs6" id="5itBwM7W103" role="3cqZAp">
-                      <node concept="2GrUjf" id="4U$Q3dLVBOo" role="3cqZAk">
-                        <ref role="2Gs0qQ" node="4U$Q3dLV$zT" resolve="macroTemplate" />
+                  <node concept="3clFbS" id="7mIqwW51Ayo" role="3clFbx">
+                    <node concept="3cpWs6" id="7mIqwW51Ayp" role="3cqZAp">
+                      <node concept="2GrUjf" id="7mIqwW51Ayq" role="3cqZAk">
+                        <ref role="2Gs0qQ" node="7mIqwW51Ayw" resolve="macroTemplate" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="2OqwBi" id="4U$Q3dLVzjS" role="2GsD0m">
-                <node concept="2GrUjf" id="4U$Q3dLVzjT" role="2Oq$k0">
-                  <ref role="2Gs0qQ" node="5itBwM7W106" resolve="macroTable" />
+              <node concept="2OqwBi" id="7mIqwW51Ayr" role="2GsD0m">
+                <node concept="2GrUjf" id="7mIqwW51Ays" role="2Oq$k0">
+                  <ref role="2Gs0qQ" node="7mIqwW51Ayy" resolve="macroTable" />
                 </node>
-                <node concept="liA8E" id="4U$Q3dLVzjU" role="2OqNvi">
+                <node concept="liA8E" id="7mIqwW51Ayt" role="2OqNvi">
                   <ref role="37wK5l" to="i348:tbauFxRK5_" resolve="expandMacroTemplate" />
-                  <node concept="37vLTw" id="4U$Q3dLVzjV" role="37wK5m">
-                    <ref role="3cqZAo" node="5itBwM7W4wa" resolve="concept" />
+                  <node concept="37vLTw" id="7mIqwW51Ayu" role="37wK5m">
+                    <ref role="3cqZAo" node="7mIqwW51Ay5" resolve="concept" />
                   </node>
-                  <node concept="16syzq" id="4U$Q3dLVzjW" role="3PaCim">
-                    <ref role="16sUi3" node="5itBwM7W10g" resolve="T" />
+                  <node concept="16syzq" id="7mIqwW51Ayv" role="3PaCim">
+                    <ref role="16sUi3" node="7mIqwW51AyJ" resolve="T" />
                   </node>
                 </node>
               </node>
-              <node concept="2GrKxI" id="4U$Q3dLV$zT" role="2Gsz3X">
+              <node concept="2GrKxI" id="7mIqwW51Ayw" role="2Gsz3X">
                 <property role="TrG5h" value="macroTemplate" />
               </node>
             </node>
           </node>
-          <node concept="37vLTw" id="5itBwM7W105" role="2GsD0m">
+          <node concept="37vLTw" id="7mIqwW51Ayx" role="2GsD0m">
             <ref role="3cqZAo" node="4JJCDImRYzW" resolve="macroTables" />
           </node>
-          <node concept="2GrKxI" id="5itBwM7W106" role="2Gsz3X">
+          <node concept="2GrKxI" id="7mIqwW51Ayy" role="2Gsz3X">
             <property role="TrG5h" value="macroTable" />
           </node>
         </node>
-        <node concept="3SKdUt" id="5X1yxJHVwHq" role="3cqZAp">
-          <node concept="1PaTwC" id="5X1yxJHVwHr" role="1aUNEU">
-            <node concept="3oM_SD" id="5X1yxJHVwHs" role="1PaTwD">
+        <node concept="3SKdUt" id="7mIqwW51Ayz" role="3cqZAp">
+          <node concept="1PaTwC" id="7mIqwW51Ay$" role="1aUNEU">
+            <node concept="3oM_SD" id="7mIqwW51Ay_" role="1PaTwD">
               <property role="3oM_SC" value="not" />
             </node>
-            <node concept="3oM_SD" id="5X1yxJHVxo6" role="1PaTwD">
+            <node concept="3oM_SD" id="7mIqwW51AyA" role="1PaTwD">
               <property role="3oM_SC" value="found" />
             </node>
           </node>
         </node>
-        <node concept="YS8fn" id="5X1yxJHVsv2" role="3cqZAp">
-          <node concept="2ShNRf" id="5X1yxJHVsv3" role="YScLw">
-            <node concept="1pGfFk" id="5X1yxJHVsv4" role="2ShVmc">
+        <node concept="YS8fn" id="7mIqwW51AyB" role="3cqZAp">
+          <node concept="2ShNRf" id="7mIqwW51AyC" role="YScLw">
+            <node concept="1pGfFk" id="7mIqwW51AyD" role="2ShVmc">
               <ref role="37wK5l" to="i348:5X1yxJHUoaI" resolve="TemplateApplicationException" />
-              <node concept="3cpWs3" id="5X1yxJHVuiy" role="37wK5m">
-                <node concept="3cpWs3" id="5X1yxJHVuiz" role="3uHU7B">
-                  <node concept="Xl_RD" id="5X1yxJHVui$" role="3uHU7B">
+              <node concept="3cpWs3" id="7mIqwW51AyE" role="37wK5m">
+                <node concept="3cpWs3" id="7mIqwW51AyF" role="3uHU7B">
+                  <node concept="Xl_RD" id="7mIqwW51AyG" role="3uHU7B">
                     <property role="Xl_RC" value="no expand macro template for concept \&quot;" />
                   </node>
-                  <node concept="37vLTw" id="5X1yxJHVui_" role="3uHU7w">
-                    <ref role="3cqZAo" node="5itBwM7W4wa" resolve="concept" />
+                  <node concept="37vLTw" id="7mIqwW51AyH" role="3uHU7w">
+                    <ref role="3cqZAo" node="7mIqwW51Ay5" resolve="concept" />
                   </node>
                 </node>
-                <node concept="Xl_RD" id="5X1yxJHVuiA" role="3uHU7w">
+                <node concept="Xl_RD" id="7mIqwW51AyI" role="3uHU7w">
                   <property role="Xl_RC" value="\&quot;" />
                 </node>
               </node>
@@ -2249,14 +2245,14 @@
           </node>
         </node>
       </node>
-      <node concept="16euLQ" id="5itBwM7W10g" role="16eVyc">
+      <node concept="16euLQ" id="7mIqwW51AyJ" role="16eVyc">
         <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="5itBwM86UN7" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+        <node concept="3uibUv" id="7mIqwW51AyK" role="3ztrMU">
+          <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="Token" />
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="5itBwM7W0ZF" role="jymVt" />
+    <node concept="2tJIrI" id="7mIqwW51Ay3" role="jymVt" />
     <node concept="2tJIrI" id="4nxCIBqyBjc" role="jymVt" />
     <node concept="3clFb_" id="1hX44vNnpfT" role="jymVt">
       <property role="TrG5h" value="init" />
@@ -2307,7 +2303,7 @@
                               <ref role="2Gs0qQ" node="6UWSvq4VKfN" resolve="macroTable" />
                             </node>
                             <node concept="liA8E" id="tbauFxRO$E" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:tbauFxRzFb" resolve="tableRef" />
+                              <ref role="37wK5l" to="i348:7mIqwW4ZFxX" resolve="getFqName" />
                             </node>
                           </node>
                           <node concept="37vLTw" id="zL5ZaNN7ql" role="3ElQJh">
@@ -2328,7 +2324,7 @@
                             <ref role="2Gs0qQ" node="6UWSvq4VKfN" resolve="macroTable" />
                           </node>
                           <node concept="liA8E" id="zL5ZaNN62O" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:tbauFxRzFb" resolve="tableRef" />
+                            <ref role="37wK5l" to="i348:7mIqwW4ZFxX" resolve="getFqName" />
                           </node>
                         </node>
                       </node>
@@ -2432,15 +2428,11 @@
           <node concept="3cpWsn" id="4U$Q3dLs0jm" role="3cpWs9">
             <property role="TrG5h" value="visitedRefs" />
             <node concept="2hMVRd" id="4U$Q3dLs0aA" role="1tU5fm">
-              <node concept="3uibUv" id="4U$Q3dLs0aD" role="2hN53Y">
-                <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-              </node>
+              <node concept="17QB3L" id="7mIqwW50o8P" role="2hN53Y" />
             </node>
             <node concept="2ShNRf" id="4U$Q3dLs0jn" role="33vP2m">
               <node concept="2i4dXS" id="4U$Q3dLs0jo" role="2ShVmc">
-                <node concept="3uibUv" id="4U$Q3dLs0jp" role="HW$YZ">
-                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                </node>
+                <node concept="17QB3L" id="7mIqwW50pmR" role="HW$YZ" />
               </node>
             </node>
           </node>
@@ -2451,10 +2443,8 @@
               <node concept="3clFbS" id="4U$Q3dLs6ho" role="3clFbx">
                 <node concept="3cpWs8" id="4U$Q3dLrY2S" role="3cqZAp">
                   <node concept="3cpWsn" id="4U$Q3dLrY2T" role="3cpWs9">
-                    <property role="TrG5h" value="extRef" />
-                    <node concept="3uibUv" id="4U$Q3dLrXZB" role="1tU5fm">
-                      <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                    </node>
+                    <property role="TrG5h" value="extFqn" />
+                    <node concept="17QB3L" id="7mIqwW50iVN" role="1tU5fm" />
                     <node concept="2OqwBi" id="4U$Q3dLrY2U" role="33vP2m">
                       <node concept="2OqwBi" id="4U$Q3dLrY2V" role="2Oq$k0">
                         <node concept="2GrUjf" id="4U$Q3dLrY2W" role="2Oq$k0">
@@ -2463,7 +2453,7 @@
                         <node concept="3AV6Ez" id="4U$Q3dLrY2X" role="2OqNvi" />
                       </node>
                       <node concept="liA8E" id="tbauFxRNPE" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:tbauFxRzOI" resolve="extendsRef" />
+                        <ref role="37wK5l" to="i348:7mIqwW4ZFTw" resolve="getExtendsFqName" />
                       </node>
                     </node>
                   </node>
@@ -2511,7 +2501,7 @@
                                   <ref role="3cqZAo" node="4U$Q3dLss_R" resolve="ext" />
                                 </node>
                                 <node concept="liA8E" id="tbauFxROEM" role="2OqNvi">
-                                  <ref role="37wK5l" to="i348:tbauFxRzFb" resolve="tableRef" />
+                                  <ref role="37wK5l" to="i348:7mIqwW4ZFxX" resolve="getFqName" />
                                 </node>
                               </node>
                             </node>
@@ -2524,7 +2514,7 @@
                                 <ref role="3cqZAo" node="4U$Q3dLss_R" resolve="ext" />
                               </node>
                               <node concept="liA8E" id="tbauFxROpX" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:tbauFxRzOI" resolve="extendsRef" />
+                                <ref role="37wK5l" to="i348:7mIqwW4ZFTw" resolve="getExtendsFqName" />
                               </node>
                             </node>
                             <node concept="37vLTw" id="4U$Q3dLskI3" role="37vLTJ">
@@ -2729,21 +2719,17 @@
       </node>
     </node>
     <node concept="312cEg" id="zL5ZaNN3YU" role="jymVt">
-      <property role="TrG5h" value="nodeRef2macroTable" />
+      <property role="TrG5h" value="nodeFqn2macroTable" />
       <node concept="3Tm6S6" id="zL5ZaNN3YV" role="1B3o_S" />
       <node concept="3rvAFt" id="zL5ZaNN4mn" role="1tU5fm">
-        <node concept="3uibUv" id="zL5ZaNN4ox" role="3rvQeY">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
+        <node concept="17QB3L" id="7mIqwW5082h" role="3rvQeY" />
         <node concept="3uibUv" id="zL5ZaNN4vM" role="3rvSg0">
           <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
         </node>
       </node>
       <node concept="2ShNRf" id="zL5ZaNN4LC" role="33vP2m">
         <node concept="3rGOSV" id="zL5ZaNN4KW" role="2ShVmc">
-          <node concept="3uibUv" id="zL5ZaNN4KX" role="3rHrn6">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-          </node>
+          <node concept="17QB3L" id="7mIqwW50dkf" role="3rHrn6" />
           <node concept="3uibUv" id="zL5ZaNN4KY" role="3rHtpV">
             <ref role="3uigEE" to="i348:tbauFxRzkz" resolve="MacroTable" />
           </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index dae90cac..183e16fb 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -11481,10 +11481,8 @@
         <node concept="3Tqbb2" id="At0yqM7N1q" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="At0yqM7N1r" role="3clF46">
-        <property role="TrG5h" value="prototypeTemplateRef" />
-        <node concept="3uibUv" id="At0yqM7N1s" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
+        <property role="TrG5h" value="prototypeTemplateFqn" />
+        <node concept="17QB3L" id="7mIqwW51MQl" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="At0yqM7N1t" role="3clF46">
         <property role="TrG5h" value="proc" />
@@ -11633,7 +11631,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="At0yqM7Pos" role="2OqNvi">
-                <ref role="37wK5l" to="hano:5itBwM7W0ZG" resolve="expandMacroTemplate" />
+                <ref role="37wK5l" to="hano:7mIqwW51Ay4" resolve="expandMacroTemplate" />
                 <node concept="2OqwBi" id="At0yqM7Pot" role="37wK5m">
                   <node concept="37vLTw" id="At0yqM811a" role="2Oq$k0">
                     <ref role="3cqZAo" node="At0yqM7N1p" resolve="macroInput" />
@@ -11713,123 +11711,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="At0yqM7O$9" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM7VEuy" role="jymVt">
-      <property role="TrG5h" value="expandMacro" />
-      <node concept="37vLTG" id="5itBwM7VEuz" role="3clF46">
-        <property role="TrG5h" value="macroInput" />
-        <node concept="3Tqbb2" id="5itBwM7VEu$" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5itBwM7VEu_" role="3clF46">
-        <property role="TrG5h" value="prototypeTemplateRef" />
-        <node concept="3uibUv" id="5itBwM7VEuA" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5itBwM7VEuB" role="3clF46">
-        <property role="TrG5h" value="proc" />
-        <node concept="3uibUv" id="5itBwM7VEuC" role="1tU5fm">
-          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
-          <node concept="3qUtgH" id="5itBwM7XcWF" role="11_B2D">
-            <node concept="16syzq" id="5itBwM7XebV" role="3qUvdb">
-              <ref role="16sUi3" node="5itBwM7VEuJ" resolve="T" />
-            </node>
-          </node>
-          <node concept="3uibUv" id="5itBwM7VEuF" role="11_B2D">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="5itBwM7VEuG" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="5itBwM7VEuH" role="1B3o_S" />
-      <node concept="16euLQ" id="5itBwM7VEuJ" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="5itBwM86BsU" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="5itBwM7VEuL" role="3clF47">
-        <node concept="3clFbF" id="At0yqM9SWz" role="3cqZAp">
-          <node concept="1rXfSq" id="At0yqM9SWx" role="3clFbG">
-            <ref role="37wK5l" node="At0yqM7N1m" resolve="expandMacro" />
-            <node concept="10Nm6u" id="At0yqM9URz" role="37wK5m" />
-            <node concept="37vLTw" id="At0yqM9Vz6" role="37wK5m">
-              <ref role="3cqZAo" node="5itBwM7VEuz" resolve="macroInput" />
-            </node>
-            <node concept="37vLTw" id="At0yqM9WRK" role="37wK5m">
-              <ref role="3cqZAo" node="5itBwM7VEu_" resolve="prototypeTemplateRef" />
-            </node>
-            <node concept="37vLTw" id="At0yqM9XA5" role="37wK5m">
-              <ref role="3cqZAo" node="5itBwM7VEuB" resolve="proc" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7VEuM" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5itBwM7VGqB" role="jymVt" />
-    <node concept="3clFb_" id="5itBwMbbLT3" role="jymVt">
-      <property role="TrG5h" value="expandMacro" />
-      <node concept="37vLTG" id="5itBwMbbLT4" role="3clF46">
-        <property role="TrG5h" value="macroConceptInput" />
-        <node concept="3bZ5Sz" id="5itBwMbbLT5" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5itBwMbbLT6" role="3clF46">
-        <property role="TrG5h" value="prototypeTemplateRef" />
-        <node concept="3uibUv" id="5itBwMbbLT7" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5itBwMbbLT8" role="3clF46">
-        <property role="TrG5h" value="proc" />
-        <node concept="3uibUv" id="5itBwMbbLT9" role="1tU5fm">
-          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
-          <node concept="3qUtgH" id="5itBwMbbLTa" role="11_B2D">
-            <node concept="16syzq" id="5itBwMbbLTb" role="3qUvdb">
-              <ref role="16sUi3" node="5itBwMbbLTg" resolve="T" />
-            </node>
-          </node>
-          <node concept="3uibUv" id="5itBwMbbLTc" role="11_B2D">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="5itBwMbbLTd" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="5itBwMbbLTe" role="1B3o_S" />
-      <node concept="16euLQ" id="5itBwMbbLTg" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="5itBwMbbLTh" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="5itBwMbbLTi" role="3clF47">
-        <node concept="3clFbH" id="5itBwMbbRFu" role="3cqZAp" />
-        <node concept="3clFbF" id="C1f6iEyDE_" role="3cqZAp">
-          <node concept="1rXfSq" id="C1f6iEyDEz" role="3clFbG">
-            <ref role="37wK5l" node="C1f6iEy$1j" resolve="expandMacro" />
-            <node concept="10Nm6u" id="C1f6iEyFVn" role="37wK5m" />
-            <node concept="37vLTw" id="C1f6iEyGJJ" role="37wK5m">
-              <ref role="3cqZAo" node="5itBwMbbLT4" resolve="macroConceptInput" />
-            </node>
-            <node concept="37vLTw" id="C1f6iEyIxp" role="37wK5m">
-              <ref role="3cqZAo" node="5itBwMbbLT6" resolve="prototypeTemplateRef" />
-            </node>
-            <node concept="37vLTw" id="C1f6iEyJPL" role="37wK5m">
-              <ref role="3cqZAo" node="5itBwMbbLT8" resolve="proc" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwMbbLTj" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="C1f6iEyyPX" role="jymVt" />
     <node concept="3clFb_" id="C1f6iEy$1j" role="jymVt">
       <property role="TrG5h" value="expandMacro" />
       <node concept="37vLTG" id="C1f6iEy$1k" role="3clF46">
@@ -11841,10 +11722,8 @@
         <node concept="3bZ5Sz" id="C1f6iEy$1n" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="C1f6iEy$1o" role="3clF46">
-        <property role="TrG5h" value="prototypeTemplateRef" />
-        <node concept="3uibUv" id="C1f6iEy$1p" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
+        <property role="TrG5h" value="prototypeTemplateFqn" />
+        <node concept="17QB3L" id="7mIqwW51RD8" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="C1f6iEy$1q" role="3clF46">
         <property role="TrG5h" value="proc" />
@@ -11891,7 +11770,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="C1f6iEyAqD" role="2OqNvi">
-                <ref role="37wK5l" to="hano:5itBwM7W0ZG" resolve="expandMacroTemplate" />
+                <ref role="37wK5l" to="hano:7mIqwW51Ay4" resolve="expandMacroTemplate" />
                 <node concept="37vLTw" id="C1f6iEyAqE" role="37wK5m">
                   <ref role="3cqZAo" node="C1f6iEy$1m" resolve="macroConceptInput" />
                 </node>
@@ -11966,57 +11845,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5itBwMbbNrF" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM7VEuP" role="jymVt">
-      <property role="TrG5h" value="callMacro" />
-      <node concept="37vLTG" id="5itBwM7VEuQ" role="3clF46">
-        <property role="TrG5h" value="callMacroTemplateRef" />
-        <node concept="3uibUv" id="5itBwM7VEuR" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5itBwM7VEuS" role="3clF46">
-        <property role="TrG5h" value="proc" />
-        <node concept="3uibUv" id="5itBwM7VEuT" role="1tU5fm">
-          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
-          <node concept="3qUtgH" id="5itBwM7Xg1G" role="11_B2D">
-            <node concept="16syzq" id="5itBwM7Xhek" role="3qUvdb">
-              <ref role="16sUi3" node="5itBwM7VEv0" resolve="T" />
-            </node>
-          </node>
-          <node concept="3uibUv" id="5itBwM7VEuW" role="11_B2D">
-            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="5itBwM7VEuX" role="3clF45">
-        <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-      </node>
-      <node concept="3Tm1VV" id="5itBwM7VEuY" role="1B3o_S" />
-      <node concept="16euLQ" id="5itBwM7VEv0" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="5itBwM86CB5" role="3ztrMU">
-          <ref role="3uigEE" to="i348:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="5itBwM7VEv2" role="3clF47">
-        <node concept="3clFbF" id="1VeWL_e58dz" role="3cqZAp">
-          <node concept="1rXfSq" id="1VeWL_e58dy" role="3clFbG">
-            <ref role="37wK5l" node="1VeWL_e4YPc" resolve="callMacro" />
-            <node concept="10Nm6u" id="1VeWL_e59MB" role="37wK5m" />
-            <node concept="37vLTw" id="1VeWL_e5b_h" role="37wK5m">
-              <ref role="3cqZAo" node="5itBwM7VEuQ" resolve="callMacroTemplateRef" />
-            </node>
-            <node concept="37vLTw" id="1VeWL_e5dnO" role="37wK5m">
-              <ref role="3cqZAo" node="5itBwM7VEuS" resolve="proc" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7VEv3" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5itBwM7VFqM" role="jymVt" />
     <node concept="3Tm1VV" id="7DvO2M9IiOz" role="1B3o_S" />
     <node concept="3clFb_" id="1VeWL_e4YPc" role="jymVt">
       <property role="TrG5h" value="callMacro" />
@@ -12025,10 +11853,8 @@
         <node concept="3Tqbb2" id="1VeWL_e4YPe" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="1VeWL_e4YPf" role="3clF46">
-        <property role="TrG5h" value="callMacroTemplateRef" />
-        <node concept="3uibUv" id="1VeWL_e4YPg" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
+        <property role="TrG5h" value="callMacroTemplateFqn" />
+        <node concept="17QB3L" id="7mIqwW52IkR" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="1VeWL_e4YPh" role="3clF46">
         <property role="TrG5h" value="proc" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 0b66c813..ee8e95ca 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -325,11 +325,15 @@
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
         <child id="8465538089690331502" name="body" index="TZ5H$" />
+        <child id="5383422241790532083" name="tags" index="3nqlJM" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
       <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
         <child id="8970989240999019149" name="part" index="1dT_Ay" />
       </concept>
+      <concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI">
+        <child id="2667874559098216723" name="text" index="3HnX3l" />
+      </concept>
       <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
         <property id="8970989240999019144" name="text" index="1dT_AB" />
       </concept>
@@ -507,6 +511,10 @@
         <property role="TrG5h" value="name" />
         <node concept="17QB3L" id="1ffsG7bUbGX" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="2GOEA2lNlf" role="3clF46">
+        <property role="TrG5h" value="fqName" />
+        <node concept="17QB3L" id="2GOEA2lNK8" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="62MNP_kY7Gw" role="3clF46">
         <property role="TrG5h" value="templateRef" />
         <node concept="3uibUv" id="62MNP_kY7PQ" role="1tU5fm">
@@ -529,6 +537,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="2GOEA2lNRU" role="3cqZAp">
+          <node concept="37vLTI" id="2GOEA2lNRW" role="3clFbG">
+            <node concept="2OqwBi" id="2GOEA2lO_V" role="37vLTJ">
+              <node concept="Xjq3P" id="2GOEA2lOG_" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2GOEA2lO_Y" role="2OqNvi">
+                <ref role="2Oxat5" node="2GOEA2lNRQ" resolve="fqName" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2GOEA2lNS0" role="37vLTx">
+              <ref role="3cqZAo" node="2GOEA2lNlf" resolve="fqName" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="62MNP_kY7Vf" role="3cqZAp">
           <node concept="37vLTI" id="62MNP_kY7Vh" role="3clFbG">
             <node concept="2OqwBi" id="62MNP_kY7Vl" role="37vLTJ">
@@ -705,6 +726,22 @@
       </node>
     </node>
     <node concept="2tJIrI" id="62MNP_kY89h" role="jymVt" />
+    <node concept="3clFb_" id="2GOEA2lItX" role="jymVt">
+      <property role="TrG5h" value="fqName" />
+      <node concept="3Tm1VV" id="2GOEA2lItZ" role="1B3o_S" />
+      <node concept="17QB3L" id="2GOEA2lIu0" role="3clF45" />
+      <node concept="3clFbS" id="2GOEA2lIu2" role="3clF47">
+        <node concept="3cpWs6" id="2GOEA2lIu5" role="3cqZAp">
+          <node concept="37vLTw" id="2GOEA2lRPj" role="3cqZAk">
+            <ref role="3cqZAo" node="2GOEA2lNRQ" resolve="fqName" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="2GOEA2lIu3" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2GOEA2lJGE" role="jymVt" />
     <node concept="3clFb_" id="1ffsG7bUgP4" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="toString" />
@@ -770,6 +807,12 @@
         <ref role="16sUi3" node="1ffsG7bUbY4" resolve="T" />
       </node>
     </node>
+    <node concept="312cEg" id="2GOEA2lNRQ" role="jymVt">
+      <property role="TrG5h" value="fqName" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="2GOEA2lNRR" role="1B3o_S" />
+      <node concept="17QB3L" id="2GOEA2lNRT" role="1tU5fm" />
+    </node>
     <node concept="312cEg" id="62MNP_kY7Vb" role="jymVt">
       <property role="TrG5h" value="templateRef" />
       <node concept="3Tm6S6" id="62MNP_kY7Vc" role="1B3o_S" />
@@ -2448,7 +2491,6 @@
     <node concept="2tJIrI" id="2LxIQemVXlp" role="jymVt" />
     <node concept="3clFb_" id="5itBwM7VpML" role="jymVt">
       <property role="TrG5h" value="expandMacro" />
-      <property role="1EzhhJ" value="true" />
       <node concept="37vLTG" id="At0yqM7Ip_" role="3clF46">
         <property role="TrG5h" value="ruleInput" />
         <node concept="3Tqbb2" id="At0yqM7JeP" role="1tU5fm" />
@@ -2481,18 +2523,78 @@
         <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
       </node>
       <node concept="3Tm1VV" id="5itBwM7VpMO" role="1B3o_S" />
-      <node concept="3clFbS" id="5itBwM7VpMP" role="3clF47" />
+      <node concept="3clFbS" id="5itBwM7VpMP" role="3clF47">
+        <node concept="YS8fn" id="7mIqwW522sO" role="3cqZAp">
+          <node concept="2ShNRf" id="7mIqwW523$i" role="YScLw">
+            <node concept="1pGfFk" id="7mIqwW525AC" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="16euLQ" id="5itBwM7VxqJ" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM86yQp" role="3ztrMU">
           <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
+      <node concept="2AHcQZ" id="7mIqwW50_9g" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <node concept="2B6LJw" id="7mIqwW50C50" role="2B76xF">
+          <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+          <node concept="3clFbT" id="7mIqwW50Chv" role="2B70Vg">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7mIqwW50yLW" role="jymVt" />
+    <node concept="3clFb_" id="7mIqwW50wJB" role="jymVt">
+      <property role="TrG5h" value="expandMacro" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="37vLTG" id="7mIqwW50wJC" role="3clF46">
+        <property role="TrG5h" value="ruleInput" />
+        <node concept="3Tqbb2" id="7mIqwW50wJD" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7mIqwW50wJE" role="3clF46">
+        <property role="TrG5h" value="macroInput" />
+        <node concept="3Tqbb2" id="7mIqwW50wJF" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7mIqwW50wJG" role="3clF46">
+        <property role="TrG5h" value="prototypeTemplateFqn" />
+        <node concept="17QB3L" id="7mIqwW50Fj_" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7mIqwW50wJI" role="3clF46">
+        <property role="TrG5h" value="proc" />
+        <node concept="3uibUv" id="7mIqwW50wJJ" role="1tU5fm">
+          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
+          <node concept="3qUtgH" id="7mIqwW50wJK" role="11_B2D">
+            <node concept="16syzq" id="7mIqwW50wJL" role="3qUvdb">
+              <ref role="16sUi3" node="7mIqwW50wJQ" resolve="T" />
+            </node>
+          </node>
+          <node concept="3uibUv" id="7mIqwW50wJM" role="11_B2D">
+            <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="7mIqwW50wJN" role="3clF45">
+        <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
+      </node>
+      <node concept="3Tm1VV" id="7mIqwW50wJO" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW50wJP" role="3clF47" />
+      <node concept="16euLQ" id="7mIqwW50wJQ" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="7mIqwW50wJR" role="3ztrMU">
+          <ref role="3uigEE" node="5itBwM86qUH" resolve="Token" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="5itBwM7V_XB" role="jymVt" />
     <node concept="3clFb_" id="At0yqM7GVe" role="jymVt">
       <property role="TrG5h" value="expandMacro" />
-      <property role="1EzhhJ" value="true" />
+      <property role="DiZV1" value="true" />
       <node concept="37vLTG" id="At0yqM7GVf" role="3clF46">
         <property role="TrG5h" value="macroInput" />
         <node concept="3Tqbb2" id="At0yqM7GVg" role="1tU5fm" />
@@ -2521,7 +2623,16 @@
         <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
       </node>
       <node concept="3Tm1VV" id="At0yqM7GVp" role="1B3o_S" />
-      <node concept="3clFbS" id="At0yqM7GVq" role="3clF47" />
+      <node concept="3clFbS" id="At0yqM7GVq" role="3clF47">
+        <node concept="YS8fn" id="7mIqwW528Qr" role="3cqZAp">
+          <node concept="2ShNRf" id="7mIqwW528Qs" role="YScLw">
+            <node concept="1pGfFk" id="7mIqwW528Qt" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="16euLQ" id="At0yqM7GVr" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="At0yqM7GVs" role="3ztrMU">
@@ -2541,7 +2652,7 @@
     <node concept="2tJIrI" id="At0yqM7GVd" role="jymVt" />
     <node concept="3clFb_" id="At0yqM7GUY" role="jymVt">
       <property role="TrG5h" value="expandMacro" />
-      <property role="1EzhhJ" value="true" />
+      <property role="DiZV1" value="true" />
       <node concept="37vLTG" id="At0yqM7GUZ" role="3clF46">
         <property role="TrG5h" value="macroConceptInput" />
         <node concept="3bZ5Sz" id="At0yqM7GV0" role="1tU5fm" />
@@ -2570,7 +2681,16 @@
         <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
       </node>
       <node concept="3Tm1VV" id="At0yqM7GV9" role="1B3o_S" />
-      <node concept="3clFbS" id="At0yqM7GVa" role="3clF47" />
+      <node concept="3clFbS" id="At0yqM7GVa" role="3clF47">
+        <node concept="YS8fn" id="7mIqwW52szS" role="3cqZAp">
+          <node concept="2ShNRf" id="7mIqwW52szT" role="YScLw">
+            <node concept="1pGfFk" id="7mIqwW52szU" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="16euLQ" id="At0yqM7GVb" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="At0yqM7GVc" role="3ztrMU">
@@ -2590,7 +2710,7 @@
     <node concept="2tJIrI" id="C1f6iEysUF" role="jymVt" />
     <node concept="3clFb_" id="C1f6iEyrah" role="jymVt">
       <property role="TrG5h" value="expandMacro" />
-      <property role="1EzhhJ" value="true" />
+      <property role="DiZV1" value="true" />
       <node concept="37vLTG" id="C1f6iEyuh2" role="3clF46">
         <property role="TrG5h" value="ruleInput" />
         <node concept="3Tqbb2" id="C1f6iEyvAg" role="1tU5fm" />
@@ -2623,7 +2743,16 @@
         <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
       </node>
       <node concept="3Tm1VV" id="C1f6iEyras" role="1B3o_S" />
-      <node concept="3clFbS" id="C1f6iEyrat" role="3clF47" />
+      <node concept="3clFbS" id="C1f6iEyrat" role="3clF47">
+        <node concept="YS8fn" id="7mIqwW52DXr" role="3cqZAp">
+          <node concept="2ShNRf" id="7mIqwW52DXs" role="YScLw">
+            <node concept="1pGfFk" id="7mIqwW52DXt" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="16euLQ" id="C1f6iEyrau" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="C1f6iEyrav" role="3ztrMU">
@@ -2636,12 +2765,73 @@
             <property role="1dT_AB" value="Overloaded variant of the default expandMacro method accepting the concept instead of the macro input node." />
           </node>
         </node>
+        <node concept="TZ5HI" id="7mIqwW50KIf" role="3nqlJM">
+          <node concept="TZ5HA" id="7mIqwW50KIg" role="3HnX3l" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7mIqwW50KIh" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <node concept="2B6LJw" id="7mIqwW50Pjh" role="2B76xF">
+          <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+          <node concept="3clFbT" id="7mIqwW50Pvu" role="2B70Vg">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7mIqwW50INR" role="jymVt" />
+    <node concept="3clFb_" id="7mIqwW50G9b" role="jymVt">
+      <property role="TrG5h" value="expandMacro" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="37vLTG" id="7mIqwW50G9c" role="3clF46">
+        <property role="TrG5h" value="ruleInput" />
+        <node concept="3Tqbb2" id="7mIqwW50G9d" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7mIqwW50G9e" role="3clF46">
+        <property role="TrG5h" value="macroConceptInput" />
+        <node concept="3bZ5Sz" id="7mIqwW50G9f" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7mIqwW50G9g" role="3clF46">
+        <property role="TrG5h" value="prototypeTemplateFqn" />
+        <node concept="17QB3L" id="7mIqwW50Px9" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7mIqwW50G9i" role="3clF46">
+        <property role="TrG5h" value="proc" />
+        <node concept="3uibUv" id="7mIqwW50G9j" role="1tU5fm">
+          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
+          <node concept="3qUtgH" id="7mIqwW50G9k" role="11_B2D">
+            <node concept="16syzq" id="7mIqwW50G9l" role="3qUvdb">
+              <ref role="16sUi3" node="7mIqwW50G9q" resolve="T" />
+            </node>
+          </node>
+          <node concept="3uibUv" id="7mIqwW50G9m" role="11_B2D">
+            <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="7mIqwW50G9n" role="3clF45">
+        <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
+      </node>
+      <node concept="3Tm1VV" id="7mIqwW50G9o" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW50G9p" role="3clF47" />
+      <node concept="16euLQ" id="7mIqwW50G9q" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="7mIqwW50G9r" role="3ztrMU">
+          <ref role="3uigEE" node="5itBwM86qUH" resolve="Token" />
+        </node>
+      </node>
+      <node concept="P$JXv" id="7mIqwW50G9s" role="lGtFl">
+        <node concept="TZ5HA" id="7mIqwW50G9t" role="TZ5H$">
+          <node concept="1dT_AC" id="7mIqwW50G9u" role="1dT_Ay">
+            <property role="1dT_AB" value="Overloaded variant of the default expandMacro method accepting the concept instead of the macro input node." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="At0yqM7GUX" role="jymVt" />
     <node concept="3clFb_" id="5itBwM7V_fy" role="jymVt">
       <property role="TrG5h" value="callMacro" />
-      <property role="1EzhhJ" value="true" />
+      <property role="DiZV1" value="true" />
       <node concept="37vLTG" id="5itBwM7V_f_" role="3clF46">
         <property role="TrG5h" value="callMacroTemplateRef" />
         <node concept="3uibUv" id="5itBwM7V_fA" role="1tU5fm">
@@ -2666,7 +2856,16 @@
         <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
       </node>
       <node concept="3Tm1VV" id="5itBwM7V_fH" role="1B3o_S" />
-      <node concept="3clFbS" id="5itBwM7V_fI" role="3clF47" />
+      <node concept="3clFbS" id="5itBwM7V_fI" role="3clF47">
+        <node concept="YS8fn" id="7mIqwW53LMY" role="3cqZAp">
+          <node concept="2ShNRf" id="7mIqwW53LMZ" role="YScLw">
+            <node concept="1pGfFk" id="7mIqwW53LN0" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="16euLQ" id="5itBwM7V_fJ" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM86u8n" role="3ztrMU">
@@ -2686,7 +2885,7 @@
     <node concept="2tJIrI" id="1VeWL_e3V_9" role="jymVt" />
     <node concept="3clFb_" id="1VeWL_e3Rvy" role="jymVt">
       <property role="TrG5h" value="callMacro" />
-      <property role="1EzhhJ" value="true" />
+      <property role="DiZV1" value="true" />
       <node concept="37vLTG" id="1VeWL_e44YA" role="3clF46">
         <property role="TrG5h" value="ruleInput" />
         <node concept="3Tqbb2" id="1VeWL_e46z_" role="1tU5fm" />
@@ -2715,13 +2914,69 @@
         <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
       </node>
       <node concept="3Tm1VV" id="1VeWL_e3RvF" role="1B3o_S" />
-      <node concept="3clFbS" id="1VeWL_e3RvG" role="3clF47" />
+      <node concept="3clFbS" id="1VeWL_e3RvG" role="3clF47">
+        <node concept="YS8fn" id="7mIqwW53E8V" role="3cqZAp">
+          <node concept="2ShNRf" id="7mIqwW53FBI" role="YScLw">
+            <node concept="1pGfFk" id="7mIqwW53HTX" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="16euLQ" id="1VeWL_e3RvH" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="1VeWL_e3RvI" role="3ztrMU">
           <ref role="3uigEE" node="5itBwM86qnn" resolve="Token" />
         </node>
       </node>
+      <node concept="2AHcQZ" id="7mIqwW50U$w" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <node concept="2B6LJw" id="7mIqwW50XOZ" role="2B76xF">
+          <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+          <node concept="3clFbT" id="7mIqwW50Y1Y" role="2B70Vg">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7mIqwW50S_F" role="jymVt" />
+    <node concept="3clFb_" id="7mIqwW50Qjs" role="jymVt">
+      <property role="TrG5h" value="callMacro" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="37vLTG" id="7mIqwW50Qjt" role="3clF46">
+        <property role="TrG5h" value="ruleInput" />
+        <node concept="3Tqbb2" id="7mIqwW50Qju" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7mIqwW50Qjv" role="3clF46">
+        <property role="TrG5h" value="callMacroTemplateFqn" />
+        <node concept="17QB3L" id="7mIqwW50Y5F" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7mIqwW50Qjx" role="3clF46">
+        <property role="TrG5h" value="proc" />
+        <node concept="3uibUv" id="7mIqwW50Qjy" role="1tU5fm">
+          <ref role="3uigEE" to="82uw:~Function" resolve="Function" />
+          <node concept="3qUtgH" id="7mIqwW50Qjz" role="11_B2D">
+            <node concept="16syzq" id="7mIqwW50Qj$" role="3qUvdb">
+              <ref role="16sUi3" node="7mIqwW50QjD" resolve="T" />
+            </node>
+          </node>
+          <node concept="3uibUv" id="7mIqwW50Qj_" role="11_B2D">
+            <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="7mIqwW50QjA" role="3clF45">
+        <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
+      </node>
+      <node concept="3Tm1VV" id="7mIqwW50QjB" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW50QjC" role="3clF47" />
+      <node concept="16euLQ" id="7mIqwW50QjD" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="7mIqwW50QjE" role="3ztrMU">
+          <ref role="3uigEE" node="5itBwM86qnn" resolve="Token" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="5itBwM7VoD8" role="jymVt" />
     <node concept="3clFb_" id="61G6TdBpSf1" role="jymVt">
@@ -7692,6 +7947,13 @@
       <node concept="3Tm1VV" id="6R6MIbU9_nt" role="1B3o_S" />
       <node concept="3clFbS" id="6R6MIbU9_nu" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="2GOEA2kHro" role="jymVt" />
+    <node concept="3clFb_" id="2GOEA2kJzP" role="jymVt">
+      <property role="TrG5h" value="fqName" />
+      <node concept="3clFbS" id="2GOEA2kJzS" role="3clF47" />
+      <node concept="3Tm1VV" id="2GOEA2kJzT" role="1B3o_S" />
+      <node concept="17QB3L" id="2GOEA2kITE" role="3clF45" />
+    </node>
     <node concept="2tJIrI" id="6R6MIbU9_i0" role="jymVt" />
     <node concept="3Tm1VV" id="6R6MIbU9$OE" role="1B3o_S" />
   </node>
@@ -7708,24 +7970,25 @@
       <node concept="3clFbS" id="1pPth$m7ZRA" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="18kNIl1vCHT" role="jymVt" />
-    <node concept="3clFb_" id="4U$Q3dLryvP" role="jymVt">
-      <property role="TrG5h" value="tableRef" />
+    <node concept="3clFb_" id="7mIqwW4ZOY0" role="jymVt">
+      <property role="TrG5h" value="getFqName" />
       <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="4U$Q3dLryHV" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      <node concept="17QB3L" id="7mIqwW4ZOY1" role="3clF45" />
+      <node concept="3Tm1VV" id="7mIqwW4ZOY2" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW4ZOY4" role="3clF47" />
+      <node concept="2AHcQZ" id="7mIqwW4ZOY5" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
       </node>
-      <node concept="3Tm1VV" id="4U$Q3dLryvS" role="1B3o_S" />
-      <node concept="3clFbS" id="4U$Q3dLryvT" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="4U$Q3dLrJfT" role="jymVt" />
-    <node concept="3clFb_" id="4U$Q3dLrIJl" role="jymVt">
-      <property role="TrG5h" value="extendsRef" />
+    <node concept="3clFb_" id="7mIqwW4ZOY8" role="jymVt">
+      <property role="TrG5h" value="getExtendsFqName" />
       <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="4U$Q3dLrIJm" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      <node concept="17QB3L" id="7mIqwW4ZOY9" role="3clF45" />
+      <node concept="3Tm1VV" id="7mIqwW4ZOYa" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW4ZOYc" role="3clF47" />
+      <node concept="2AHcQZ" id="7mIqwW4ZOYd" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
       </node>
-      <node concept="3Tm1VV" id="4U$Q3dLrIJn" role="1B3o_S" />
-      <node concept="3clFbS" id="4U$Q3dLrIJo" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="4U$Q3dLryje" role="jymVt" />
     <node concept="3Tm1VV" id="1pPth$m7IVG" role="1B3o_S" />
@@ -7754,31 +8017,32 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6UWSvq4Vn68" role="jymVt" />
-    <node concept="3clFb_" id="4MEOIDEgpuf" role="jymVt">
-      <property role="1EzhhJ" value="true" />
+    <node concept="3clFb_" id="7mIqwW53n8o" role="jymVt">
       <property role="TrG5h" value="callMacroTemplate" />
-      <node concept="3uibUv" id="4MEOIDEgpug" role="3clF45">
+      <property role="1EzhhJ" value="true" />
+      <node concept="37vLTG" id="7mIqwW53n8p" role="3clF46">
+        <property role="TrG5h" value="templateFqn" />
+        <node concept="17QB3L" id="7mIqwW53n8q" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="7mIqwW53n8r" role="3clF45">
         <ref role="3uigEE" node="5itBwM7auSJ" resolve="CallMacroTemplate" />
-        <node concept="16syzq" id="4MEOIDEgpuh" role="11_B2D">
-          <ref role="16sUi3" node="4MEOIDEgpum" resolve="T" />
+        <node concept="16syzq" id="7mIqwW53n8s" role="11_B2D">
+          <ref role="16sUi3" node="7mIqwW53n8v" resolve="T" />
         </node>
       </node>
-      <node concept="3Tm1VV" id="4MEOIDEgpui" role="1B3o_S" />
-      <node concept="3clFbS" id="4MEOIDEgpuj" role="3clF47" />
-      <node concept="16euLQ" id="4MEOIDEgpum" role="16eVyc">
+      <node concept="3Tm1VV" id="7mIqwW53n8t" role="1B3o_S" />
+      <node concept="16euLQ" id="7mIqwW53n8v" role="16eVyc">
         <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="5itBwM8MPLU" role="3ztrMU">
-          <ref role="3uigEE" node="5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+        <node concept="3uibUv" id="7mIqwW53n8w" role="3ztrMU">
+          <ref role="3uigEE" node="5itBwM86qnn" resolve="Token" />
         </node>
       </node>
-      <node concept="37vLTG" id="4MEOIDEhHGm" role="3clF46">
-        <property role="TrG5h" value="templateRef" />
-        <node concept="3uibUv" id="5yr01fDuNi6" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
+      <node concept="3clFbS" id="7mIqwW53n8x" role="3clF47" />
+      <node concept="2AHcQZ" id="7mIqwW53n8y" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="5itBwM7qCDt" role="jymVt" />
+    <node concept="2tJIrI" id="7mIqwW53nCi" role="jymVt" />
     <node concept="3clFb_" id="4MEOIDEWLkY" role="jymVt">
       <property role="TrG5h" value="allMacroTemplateRefs" />
       <property role="1EzhhJ" value="true" />
@@ -8104,9 +8368,35 @@
         <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
       </node>
       <node concept="3Tm1VV" id="5itBwM9zYlW" role="1B3o_S" />
-      <node concept="3clFbS" id="5itBwM9zYlX" role="3clF47" />
+      <node concept="3clFbS" id="5itBwM9zYlX" role="3clF47">
+        <node concept="YS8fn" id="7mIqwW51q25" role="3cqZAp">
+          <node concept="2ShNRf" id="7mIqwW51q5d" role="YScLw">
+            <node concept="1pGfFk" id="7mIqwW51r2I" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7mIqwW51pLq" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <node concept="2B6LJw" id="7mIqwW51pOW" role="2B76xF">
+          <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+          <node concept="3clFbT" id="7mIqwW51pTc" role="2B70Vg">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="2JFqV2" id="7mIqwW51pWA" role="2frcjj" />
     </node>
     <node concept="2tJIrI" id="5itBwM86qTH" role="jymVt" />
+    <node concept="3clFb_" id="7mIqwW51r8J" role="jymVt">
+      <property role="TrG5h" value="getPrototypeTemplateFqName" />
+      <node concept="17QB3L" id="7mIqwW51rej" role="3clF45" />
+      <node concept="3Tm1VV" id="7mIqwW51r8M" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW51r8N" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="7mIqwW51pHn" role="jymVt" />
     <node concept="3clFb_" id="5ynGfcflmnr" role="jymVt">
       <property role="TrG5h" value="createToken" />
       <node concept="37vLTG" id="At0yqLVcgZ" role="3clF46">
@@ -8484,7 +8774,26 @@
         <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
       </node>
       <node concept="3Tm1VV" id="tbauFxRzFd" role="1B3o_S" />
-      <node concept="3clFbS" id="tbauFxRzFe" role="3clF47" />
+      <node concept="3clFbS" id="tbauFxRzFe" role="3clF47">
+        <node concept="YS8fn" id="7mIqwW4ZHLT" role="3cqZAp">
+          <node concept="2ShNRf" id="7mIqwW4ZHQl" role="YScLw">
+            <node concept="1pGfFk" id="7mIqwW4ZIPN" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7mIqwW4ZFfs" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <node concept="2B6LJw" id="7mIqwW52TNE" role="2B76xF">
+          <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+          <node concept="3clFbT" id="7mIqwW52TQz" role="2B70Vg">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="2JFqV2" id="7mIqwW4ZHzR" role="2frcjj" />
     </node>
     <node concept="2tJIrI" id="tbauFxRzF3" role="jymVt" />
     <node concept="3clFb_" id="tbauFxRzOI" role="jymVt">
@@ -8493,9 +8802,42 @@
         <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
       </node>
       <node concept="3Tm1VV" id="tbauFxRzOK" role="1B3o_S" />
-      <node concept="3clFbS" id="tbauFxRzOL" role="3clF47" />
+      <node concept="3clFbS" id="tbauFxRzOL" role="3clF47">
+        <node concept="YS8fn" id="7mIqwW4ZJ58" role="3cqZAp">
+          <node concept="2ShNRf" id="7mIqwW4ZJ9A" role="YScLw">
+            <node concept="1pGfFk" id="7mIqwW4ZKBv" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7mIqwW4ZFmB" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <node concept="2B6LJw" id="7mIqwW52TQU" role="2B76xF">
+          <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+          <node concept="3clFbT" id="7mIqwW52TQV" role="2B70Vg">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="2JFqV2" id="7mIqwW4ZIX$" role="2frcjj" />
     </node>
     <node concept="2tJIrI" id="tbauFxRKfP" role="jymVt" />
+    <node concept="3clFb_" id="7mIqwW4ZFxX" role="jymVt">
+      <property role="TrG5h" value="getFqName" />
+      <node concept="17QB3L" id="7mIqwW4ZFBI" role="3clF45" />
+      <node concept="3Tm1VV" id="7mIqwW4ZFy0" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW4ZFy1" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="7mIqwW4ZFte" role="jymVt" />
+    <node concept="3clFb_" id="7mIqwW4ZFTw" role="jymVt">
+      <property role="TrG5h" value="getExtendsFqName" />
+      <node concept="17QB3L" id="7mIqwW4ZFZA" role="3clF45" />
+      <node concept="3Tm1VV" id="7mIqwW4ZFTz" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW4ZFT$" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="7mIqwW4ZFP6" role="jymVt" />
     <node concept="3clFb_" id="tbauFxRK5_" role="jymVt">
       <property role="TrG5h" value="expandMacroTemplate" />
       <node concept="37vLTG" id="tbauFxRK5A" role="3clF46">
@@ -8529,7 +8871,16 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="tbauFxRK5N" role="1B3o_S" />
-      <node concept="3clFbS" id="tbauFxRK5O" role="3clF47" />
+      <node concept="3clFbS" id="tbauFxRK5O" role="3clF47">
+        <node concept="YS8fn" id="7mIqwW53lvj" role="3cqZAp">
+          <node concept="2ShNRf" id="7mIqwW53l$L" role="YScLw">
+            <node concept="1pGfFk" id="7mIqwW53myP" role="2ShVmc">
+              <property role="373rjd" value="true" />
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="16euLQ" id="tbauFxRK5P" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="tbauFxRK5Q" role="3ztrMU">
@@ -8542,8 +8893,40 @@
           <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
         </node>
       </node>
+      <node concept="2AHcQZ" id="7mIqwW52TSB" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <node concept="2B6LJw" id="7mIqwW52XSR" role="2B76xF">
+          <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+          <node concept="3clFbT" id="7mIqwW52XSS" role="2B70Vg">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="2JFqV2" id="7mIqwW53jIb" role="2frcjj" />
     </node>
     <node concept="2tJIrI" id="tbauFxRzM4" role="jymVt" />
+    <node concept="3clFb_" id="7mIqwW53gCg" role="jymVt">
+      <property role="TrG5h" value="callMacroTemplate" />
+      <node concept="37vLTG" id="7mIqwW53j81" role="3clF46">
+        <property role="TrG5h" value="templateFqn" />
+        <node concept="17QB3L" id="7mIqwW53jdL" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="7mIqwW53jud" role="3clF45">
+        <ref role="3uigEE" node="5itBwM7auSJ" resolve="CallMacroTemplate" />
+        <node concept="16syzq" id="7mIqwW53jzg" role="11_B2D">
+          <ref role="16sUi3" node="7mIqwW53jp1" resolve="T" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7mIqwW53gCj" role="1B3o_S" />
+      <node concept="3clFbS" id="7mIqwW53gCk" role="3clF47" />
+      <node concept="16euLQ" id="7mIqwW53jp1" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="7mIqwW53jtG" role="3ztrMU">
+          <ref role="3uigEE" node="5itBwM86qnn" resolve="Token" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7mIqwW53eWE" role="jymVt" />
     <node concept="3Tm1VV" id="tbauFxRzk$" role="1B3o_S" />
   </node>
   <node concept="3HP615" id="tbauFxRORi">
@@ -9127,6 +9510,21 @@
         </node>
       </node>
     </node>
+    <node concept="3clFb_" id="2GOEA2kLFI" role="jymVt">
+      <property role="TrG5h" value="fqName" />
+      <node concept="3Tm1VV" id="2GOEA2kLFK" role="1B3o_S" />
+      <node concept="17QB3L" id="2GOEA2kLFL" role="3clF45" />
+      <node concept="3clFbS" id="2GOEA2kLFN" role="3clF47">
+        <node concept="3cpWs6" id="2GOEA2kLFQ" role="3cqZAp">
+          <node concept="37vLTw" id="2GOEA2l3Fe" role="3cqZAk">
+            <ref role="3cqZAo" node="5F2qBBEurqp" resolve="name" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="2GOEA2kLFO" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" />
+      </node>
+    </node>
     <node concept="3clFb_" id="5F2qBBEue0$" role="jymVt">
       <property role="TrG5h" value="getTemplateRef" />
       <node concept="3uibUv" id="5F2qBBEue0_" role="3clF45">