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 5c95383a..7cf94bf0 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
@@ -29,7 +29,6 @@
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" />
-    <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
     <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
@@ -5557,7 +5556,7 @@
       <node concept="16euLQ" id="5itBwM7reH5" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM86MyC" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+          <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
       <node concept="3clFbS" id="5itBwM7reH7" role="3clF47">
@@ -5584,7 +5583,7 @@
             <property role="TrG5h" value="result" />
             <node concept="_YKpA" id="4U$Q3dLVgBd" role="1tU5fm">
               <node concept="3uibUv" id="4U$Q3dLVhkK" role="_ZDj9">
-                <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+                <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
                 <node concept="16syzq" id="4U$Q3dLVhkL" role="11_B2D">
                   <ref role="16sUi3" node="5itBwM7reH5" resolve="T" />
                 </node>
@@ -5593,7 +5592,7 @@
             <node concept="2ShNRf" id="4U$Q3dLVhyB" role="33vP2m">
               <node concept="Tc6Ow" id="4U$Q3dLVhxD" role="2ShVmc">
                 <node concept="3uibUv" id="4U$Q3dLVhxE" role="HW$YZ">
-                  <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+                  <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
                   <node concept="16syzq" id="4U$Q3dLVhxF" role="11_B2D">
                     <ref role="16sUi3" node="5itBwM7reH5" resolve="T" />
                   </node>
@@ -5655,7 +5654,7 @@
       </node>
       <node concept="3vKaQO" id="4U$Q3dLVcDv" role="3clF45">
         <node concept="3uibUv" id="5itBwM7reH1" role="3O5elw">
-          <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+          <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
           <node concept="16syzq" id="5itBwM7reH2" role="11_B2D">
             <ref role="16sUi3" node="5itBwM7reH5" resolve="T" />
           </node>
@@ -5672,7 +5671,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="4MEOIDEgqbw" role="3clF45">
-        <ref role="3uigEE" to="psr6:5itBwM7auSJ" resolve="CallMacroTemplate" />
+        <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
         <node concept="16syzq" id="5itBwM8MSG6" role="11_B2D">
           <ref role="16sUi3" node="4MEOIDEgqco" resolve="T" />
         </node>
@@ -5742,7 +5741,7 @@
               <node concept="3cpWs6" id="631nQp3ZFze" role="3cqZAp">
                 <node concept="10QFUN" id="631nQp3ZFzf" role="3cqZAk">
                   <node concept="3uibUv" id="631nQp3ZFzg" role="10QFUM">
-                    <ref role="3uigEE" to="psr6:5itBwM7auSJ" resolve="CallMacroTemplate" />
+                    <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
                     <node concept="16syzq" id="631nQp3ZFzh" role="11_B2D">
                       <ref role="16sUi3" node="4MEOIDEgqco" resolve="T" />
                     </node>
@@ -5805,7 +5804,7 @@
       <node concept="16euLQ" id="4MEOIDEgqco" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM8MTuK" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+          <ref role="3uigEE" to="i348:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
         </node>
       </node>
     </node>
@@ -5923,7 +5922,7 @@
       <ref role="n9lRv" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
     </node>
     <node concept="3uibUv" id="2N2MQGCMIsX" role="1zkMxy">
-      <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+      <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
     </node>
     <node concept="17Uvod" id="2N2MQGCZANh" role="lGtFl">
       <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -5948,7 +5947,7 @@
     <node concept="3Tm1VV" id="2N2MQGCMVs4" role="1B3o_S" />
     <node concept="n94m4" id="2N2MQGCMVs5" role="lGtFl" />
     <node concept="3uibUv" id="2N2MQGCMVsu" role="1zkMxy">
-      <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+      <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
     </node>
     <node concept="2tJIrI" id="2N2MQGCMVK$" role="jymVt" />
     <node concept="3clFb_" id="6UWSvq4Vuf2" role="jymVt">
@@ -5956,7 +5955,7 @@
       <property role="1EzhhJ" value="false" />
       <node concept="3vKaQO" id="6UWSvq4Vuf3" role="3clF45">
         <node concept="3uibUv" id="6UWSvq4Vuf4" role="3O5elw">
-          <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+          <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
         </node>
       </node>
       <node concept="3Tm1VV" id="6UWSvq4Vuf5" role="1B3o_S" />
@@ -5966,13 +5965,13 @@
             <property role="TrG5h" value="macroTables" />
             <node concept="_YKpA" id="6UWSvq4VujC" role="1tU5fm">
               <node concept="3uibUv" id="6UWSvq4VuJF" role="_ZDj9">
-                <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+                <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
               </node>
             </node>
             <node concept="2ShNRf" id="6UWSvq4VuOy" role="33vP2m">
               <node concept="Tc6Ow" id="6UWSvq4VuOb" role="2ShVmc">
                 <node concept="3uibUv" id="6UWSvq4VuOc" role="HW$YZ">
-                  <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+                  <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
                 </node>
               </node>
             </node>
@@ -10132,7 +10131,7 @@
                                     <ref role="3cqZAo" node="5itBwM9qSbM" resolve="tok" />
                                   </node>
                                   <node concept="liA8E" id="5itBwM9qTvB" role="2OqNvi">
-                                    <ref role="37wK5l" to="psr6:5itBwM86qET" resolve="withLogical" />
+                                    <ref role="37wK5l" to="i348:5itBwM86qET" resolve="withLogical" />
                                     <node concept="10Nm6u" id="5itBwM9qTvC" role="37wK5m">
                                       <node concept="2b32R4" id="5itBwM9qTvD" role="lGtFl">
                                         <node concept="3JmXsc" id="5itBwM9qTvE" role="2P8S$">
@@ -10152,7 +10151,7 @@
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="5itBwM9qTvK" role="2OqNvi">
-                                  <ref role="37wK5l" to="psr6:5itBwM86qEL" resolve="withParam" />
+                                  <ref role="37wK5l" to="i348:5ynGfcflmng" resolve="withParam" />
                                   <node concept="10Nm6u" id="5itBwM9qTvL" role="37wK5m">
                                     <node concept="2b32R4" id="5itBwM9qTvM" role="lGtFl">
                                       <node concept="3JmXsc" id="5itBwM9qTvN" role="2P8S$">
@@ -10172,7 +10171,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="5itBwM9qTvT" role="2OqNvi">
-                                <ref role="37wK5l" to="psr6:5itBwM7bY2d" resolve="apply" />
+                                <ref role="37wK5l" to="i348:5itBwM7bY2d" resolve="apply" />
                               </node>
                             </node>
                           </node>
@@ -10180,7 +10179,7 @@
                         <node concept="37vLTG" id="5itBwM9qSbM" role="1bW2Oz">
                           <property role="TrG5h" value="tok" />
                           <node concept="3uibUv" id="5itBwM9qT6N" role="1tU5fm">
-                            <ref role="3uigEE" to="psr6:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+                            <ref role="3uigEE" to="i348:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
                           </node>
                         </node>
                       </node>
@@ -10441,7 +10440,7 @@
                                       <ref role="3cqZAo" node="5itBwMbdiLb" resolve="tok" />
                                     </node>
                                     <node concept="liA8E" id="5itBwMbdiL1" role="2OqNvi">
-                                      <ref role="37wK5l" to="psr6:5itBwM86qUR" resolve="withLogical" />
+                                      <ref role="37wK5l" to="i348:5itBwM86qUR" resolve="withLogical" />
                                       <node concept="10Nm6u" id="5itBwMbdiL2" role="37wK5m">
                                         <node concept="2b32R4" id="5itBwMbdiL3" role="lGtFl">
                                           <node concept="3JmXsc" id="5itBwMbdiL4" role="2P8S$">
@@ -10461,7 +10460,7 @@
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5itBwMbdiLa" role="2OqNvi">
-                                    <ref role="37wK5l" to="psr6:5itBwM7bY2d" resolve="apply" />
+                                    <ref role="37wK5l" to="i348:5itBwM7bY2d" resolve="apply" />
                                   </node>
                                 </node>
                               </node>
@@ -10469,7 +10468,7 @@
                             <node concept="37vLTG" id="5itBwMbdiLb" role="1bW2Oz">
                               <property role="TrG5h" value="tok" />
                               <node concept="3uibUv" id="5itBwMbdiLc" role="1tU5fm">
-                                <ref role="3uigEE" to="psr6:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+                                <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
                               </node>
                             </node>
                           </node>
@@ -13782,7 +13781,7 @@
       <property role="TrG5h" value="createMacroManifest" />
       <property role="1EzhhJ" value="false" />
       <node concept="3uibUv" id="2hteS6ClnqF" role="3clF45">
-        <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+        <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
       </node>
       <node concept="3Tm1VV" id="2hteS6ClnqG" role="1B3o_S" />
       <node concept="3clFbS" id="2hteS6ClnqI" role="3clF47">
@@ -15244,7 +15243,7 @@
           <node concept="2tJIrI" id="5itBwM5TiN7" role="jymVt" />
           <node concept="3Tm1VV" id="5itBwM5JjhB" role="1B3o_S" />
           <node concept="3uibUv" id="5itBwM8aqrA" role="EKbjA">
-            <ref role="3uigEE" to="psr6:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+            <ref role="3uigEE" to="i348:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
           </node>
           <node concept="2ZBi8u" id="5itBwM82QgH" role="lGtFl">
             <ref role="2rW$FS" node="7XmdqtdHiM8" resolve="macro_token_class" />
@@ -15256,7 +15255,7 @@
           <node concept="3Tm1VV" id="5itBwM7icrK" role="1B3o_S" />
           <node concept="3clFbS" id="5itBwM7icrL" role="3clF47">
             <node concept="XkiVB" id="5itBwM7if34" role="3cqZAp">
-              <ref role="37wK5l" to="psr6:5yr01fDEuEm" resolve="AbstractMacroTemplate" />
+              <ref role="37wK5l" to="i348:5yr01fDEuEm" resolve="AbstractMacroTemplate" />
               <node concept="2YIFZM" id="5itBwM7if35" role="37wK5m">
                 <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
                 <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
@@ -15342,13 +15341,13 @@
           </node>
         </node>
         <node concept="3uibUv" id="5itBwM7ebUF" role="1zkMxy">
-          <ref role="3uigEE" to="psr6:1hX44vNlvEV" resolve="AbstractMacroTemplate" />
+          <ref role="3uigEE" to="i348:1hX44vNlvEV" resolve="AbstractMacroTemplate" />
           <node concept="3uibUv" id="5itBwM7eeUX" role="11_B2D">
             <ref role="3uigEE" node="5itBwM5JjhA" resolve="__MacroTable._Call.Token" />
           </node>
         </node>
         <node concept="3uibUv" id="5itBwM7eoUk" role="EKbjA">
-          <ref role="3uigEE" to="psr6:5itBwM7auSJ" resolve="CallMacroTemplate" />
+          <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
           <node concept="3uibUv" id="5itBwM7eslN" role="11_B2D">
             <ref role="3uigEE" node="5itBwM5JjhA" resolve="__MacroTable._Call.Token" />
           </node>
@@ -15767,7 +15766,7 @@
             <ref role="2rW$FS" node="7XmdqtdHiM8" resolve="macro_token_class" />
           </node>
           <node concept="3uibUv" id="5itBwM8b8eg" role="EKbjA">
-            <ref role="3uigEE" to="psr6:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+            <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
           </node>
         </node>
         <node concept="2tJIrI" id="5itBwM6P5hY" role="jymVt" />
@@ -15776,7 +15775,7 @@
           <node concept="3Tm1VV" id="5itBwM7hMpB" role="1B3o_S" />
           <node concept="3clFbS" id="5itBwM7hMpC" role="3clF47">
             <node concept="XkiVB" id="5itBwM7hWDC" role="3cqZAp">
-              <ref role="37wK5l" to="psr6:5yr01fDEuEm" resolve="AbstractMacroTemplate" />
+              <ref role="37wK5l" to="i348:5yr01fDEuEm" resolve="AbstractMacroTemplate" />
               <node concept="2YIFZM" id="5itBwM7hWDD" role="37wK5m">
                 <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
                 <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
@@ -15862,7 +15861,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="5itBwM78Os4" role="EKbjA">
-          <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+          <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
           <node concept="3uibUv" id="5itBwM78Sxy" role="11_B2D">
             <ref role="3uigEE" node="5itBwM6XBFY" resolve="__MacroTable._Expand.Token" />
           </node>
@@ -15958,7 +15957,7 @@
           </node>
         </node>
         <node concept="3uibUv" id="5itBwM7eBu_" role="1zkMxy">
-          <ref role="3uigEE" to="psr6:1hX44vNlvEV" resolve="AbstractMacroTemplate" />
+          <ref role="3uigEE" to="i348:1hX44vNlvEV" resolve="AbstractMacroTemplate" />
           <node concept="3uibUv" id="5itBwM7eDRo" role="11_B2D">
             <ref role="3uigEE" node="5itBwM6XBFY" resolve="__MacroTable._Expand.Token" />
           </node>
@@ -16120,7 +16119,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="5hSMZ_lNZiR" role="1zkMxy">
-        <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+        <ref role="3uigEE" to="i348:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
       </node>
       <node concept="17Uvod" id="5hSMZ_lNZiS" role="lGtFl">
         <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -16194,7 +16193,7 @@
               <node concept="3clFbF" id="5hSMZ_ljA5G" role="3cqZAp">
                 <node concept="2OqwBi" id="5hSMZ_ljA5H" role="3clFbG">
                   <node concept="liA8E" id="5hSMZ_ljA5I" role="2OqNvi">
-                    <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="getTerm" />
+                    <ref role="37wK5l" to="i348:4MEOIDFA4bP" resolve="getTerm" />
                   </node>
                   <node concept="1eOMI4" id="5hSMZ_ljA5J" role="2Oq$k0">
                     <node concept="2ShNRf" id="5hSMZ_ljA5K" role="1eOMHV">
@@ -16298,7 +16297,7 @@
                           </node>
                           <node concept="3Tm1VV" id="5hSMZ_ljA6u" role="1B3o_S" />
                           <node concept="3uibUv" id="5hSMZ_ljA6v" role="1L3L74">
-                            <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                            <ref role="3uigEE" to="i348:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
                           </node>
                           <node concept="17Uvod" id="5hSMZ_ljA6w" role="lGtFl">
                             <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/3421461530438559753/3421461530438559973" />
@@ -16352,7 +16351,7 @@
                     <property role="3clFbU" value="true" />
                   </node>
                   <node concept="3uibUv" id="5hSMZ_ljTTZ" role="2lIhxL">
-                    <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
+                    <ref role="3uigEE" to="i348:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
                   </node>
                   <node concept="17Uvod" id="5hSMZ_ljTU0" role="lGtFl">
                     <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/1173996401517/1173996588177" />
@@ -16389,7 +16388,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="5hSMZ_ljTU9" role="2OqNvi">
-                <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="getTerm" />
+                <ref role="37wK5l" to="i348:4MEOIDFA4bP" resolve="getTerm" />
               </node>
               <node concept="raruj" id="5hSMZ_ljTUa" role="lGtFl" />
             </node>
@@ -17525,7 +17524,7 @@
             <node concept="3bZ5Sz" id="4U$Q3dLR14H" role="1tU5fm" />
           </node>
           <node concept="3uibUv" id="4U$Q3dLR14I" role="3clF45">
-            <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+            <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
             <node concept="16syzq" id="4U$Q3dLR14J" role="11_B2D">
               <ref role="16sUi3" node="4U$Q3dLR15h" resolve="T" />
             </node>
@@ -17537,7 +17536,7 @@
                 <property role="TrG5h" value="result" />
                 <node concept="_YKpA" id="4U$Q3dLVpFd" role="1tU5fm">
                   <node concept="3uibUv" id="4U$Q3dLVpJi" role="_ZDj9">
-                    <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+                    <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
                     <node concept="16syzq" id="4U$Q3dLVpJj" role="11_B2D">
                       <ref role="16sUi3" node="4U$Q3dLR15h" resolve="T" />
                     </node>
@@ -17582,7 +17581,7 @@
                     <node concept="TSZUe" id="631nQp3Zyd6" role="2OqNvi">
                       <node concept="10QFUN" id="631nQp3Zyd7" role="25WWJ7">
                         <node concept="3uibUv" id="631nQp3Zyd8" role="10QFUM">
-                          <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+                          <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
                           <node concept="16syzq" id="631nQp3Zyd9" role="11_B2D">
                             <ref role="16sUi3" node="4U$Q3dLR15h" resolve="T" />
                           </node>
@@ -17654,7 +17653,7 @@
           <node concept="16euLQ" id="4U$Q3dLR15h" role="16eVyc">
             <property role="TrG5h" value="T" />
             <node concept="3uibUv" id="4U$Q3dLR15i" role="3ztrMU">
-              <ref role="3uigEE" to="psr6:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+              <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
             </node>
           </node>
         </node>
@@ -17688,7 +17687,7 @@
             <node concept="3bZ5Sz" id="4U$Q3dLqoGv" role="1tU5fm" />
           </node>
           <node concept="3uibUv" id="4U$Q3dLqoGw" role="3clF45">
-            <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+            <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
             <node concept="16syzq" id="4U$Q3dLqoGx" role="11_B2D">
               <ref role="16sUi3" node="4U$Q3dLqoH3" resolve="T" />
             </node>
@@ -17700,7 +17699,7 @@
                 <property role="TrG5h" value="result" />
                 <node concept="_YKpA" id="4U$Q3dLVtI1" role="1tU5fm">
                   <node concept="3uibUv" id="4U$Q3dLVtI2" role="_ZDj9">
-                    <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+                    <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
                     <node concept="16syzq" id="4U$Q3dLVtI3" role="11_B2D">
                       <ref role="16sUi3" node="4U$Q3dLqoH3" resolve="T" />
                     </node>
@@ -17745,7 +17744,7 @@
                     <node concept="TSZUe" id="631nQp3ZzIF" role="2OqNvi">
                       <node concept="10QFUN" id="631nQp3ZzIG" role="25WWJ7">
                         <node concept="3uibUv" id="631nQp3ZzIH" role="10QFUM">
-                          <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+                          <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
                           <node concept="16syzq" id="631nQp3ZzII" role="11_B2D">
                             <ref role="16sUi3" node="4U$Q3dLqoH3" resolve="T" />
                           </node>
@@ -17818,7 +17817,7 @@
           <node concept="16euLQ" id="4U$Q3dLqoH3" role="16eVyc">
             <property role="TrG5h" value="T" />
             <node concept="3uibUv" id="4U$Q3dLqoH4" role="3ztrMU">
-              <ref role="3uigEE" to="psr6:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+              <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
             </node>
           </node>
         </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
index 5c561449..4f230e34 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
@@ -23,7 +23,6 @@
     <import index="mte5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.ide.findusages.model.scopes(MPS.Core/)" />
     <import index="mk8z" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.progress(MPS.Core/)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
     <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
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 2da0f24b..74c5b932 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
@@ -27,7 +27,6 @@
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
-    <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
@@ -4413,7 +4412,7 @@
             <node concept="2ShNRf" id="7DvO2MamVt1" role="37vLTx">
               <node concept="Tc6Ow" id="7DvO2MamVs$" role="2ShVmc">
                 <node concept="3uibUv" id="7DvO2MamVs_" role="HW$YZ">
-                  <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+                  <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
                 </node>
                 <node concept="37vLTw" id="7DvO2MamWbg" role="I$8f6">
                   <ref role="3cqZAo" node="7DvO2MamV5v" resolve="macroManifests" />
@@ -4452,7 +4451,7 @@
         <property role="TrG5h" value="macroManifests" />
         <node concept="A3Dl8" id="7DvO2MamV5t" role="1tU5fm">
           <node concept="3uibUv" id="7DvO2MamV75" role="A3Ik2">
-            <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+            <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
           </node>
         </node>
       </node>
@@ -4468,7 +4467,7 @@
       <property role="TrG5h" value="macroTables" />
       <node concept="3vKaQO" id="4JJCDIn5Foj" role="3clF45">
         <node concept="3uibUv" id="4JJCDIn5FCm" role="3O5elw">
-          <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+          <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
         </node>
       </node>
       <node concept="3Tm1VV" id="4JJCDIn5F0q" role="1B3o_S" />
@@ -4488,7 +4487,7 @@
         <node concept="3bZ5Sz" id="4nxCIBqyBgc" role="1tU5fm" />
       </node>
       <node concept="3uibUv" id="4nxCIBqy_HE" role="3clF45">
-        <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
+        <ref role="3uigEE" to="i348:1hX44vNnjJ$" resolve="MacroTemplate" />
         <node concept="16syzq" id="1eKXYsjIcB2" role="11_B2D">
           <ref role="16sUi3" node="1eKXYsjIb$d" resolve="T" />
         </node>
@@ -4501,7 +4500,7 @@
               <node concept="3cpWsn" id="6UWSvq5a3OC" role="3cpWs9">
                 <property role="TrG5h" value="macroTemplate" />
                 <node concept="3uibUv" id="6UWSvq5a3On" role="1tU5fm">
-                  <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
+                  <ref role="3uigEE" to="i348:1hX44vNnjJ$" resolve="MacroTemplate" />
                   <node concept="16syzq" id="6UWSvq5a3Oq" role="11_B2D">
                     <ref role="16sUi3" node="1eKXYsjIb$d" resolve="T" />
                   </node>
@@ -4511,7 +4510,7 @@
                     <ref role="2Gs0qQ" node="6UWSvq5a0zl" resolve="macroTable" />
                   </node>
                   <node concept="liA8E" id="6UWSvq5a3OF" role="2OqNvi">
-                    <ref role="37wK5l" to="psr6:4KRwoelAtxl" resolve="macroTemplate" />
+                    <ref role="37wK5l" to="i348:4KRwoelAtxl" resolve="macroTemplate" />
                     <node concept="37vLTw" id="6UWSvq5a3OG" role="37wK5m">
                       <ref role="3cqZAo" node="4nxCIBqyARP" resolve="concept" />
                     </node>
@@ -4570,7 +4569,7 @@
       <node concept="16euLQ" id="1eKXYsjIb$d" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="1eKXYsjIcrC" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
+          <ref role="3uigEE" to="i348:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
         </node>
       </node>
     </node>
@@ -4584,7 +4583,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="6UWSvq4QqeB" role="3clF45">
-        <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
+        <ref role="3uigEE" to="i348:1hX44vNnjJ$" resolve="MacroTemplate" />
         <node concept="16syzq" id="6UWSvq4QqeC" role="11_B2D">
           <ref role="16sUi3" node="6UWSvq4QqeP" resolve="T" />
         </node>
@@ -4597,7 +4596,7 @@
               <node concept="3cpWsn" id="6UWSvq5a9vm" role="3cpWs9">
                 <property role="TrG5h" value="macroTemplate" />
                 <node concept="3uibUv" id="6UWSvq5a9vn" role="1tU5fm">
-                  <ref role="3uigEE" to="psr6:1hX44vNnjJ$" resolve="MacroTemplate" />
+                  <ref role="3uigEE" to="i348:1hX44vNnjJ$" resolve="MacroTemplate" />
                   <node concept="16syzq" id="6UWSvq5a9vo" role="11_B2D">
                     <ref role="16sUi3" node="6UWSvq4QqeP" resolve="T" />
                   </node>
@@ -4607,7 +4606,7 @@
                     <ref role="2Gs0qQ" node="6UWSvq5a9vA" resolve="macroTable" />
                   </node>
                   <node concept="liA8E" id="6UWSvq5a9vr" role="2OqNvi">
-                    <ref role="37wK5l" to="psr6:5itBwM8SJDJ" resolve="macroTemplate" />
+                    <ref role="37wK5l" to="i348:5itBwM8SJDJ" resolve="macroTemplate" />
                     <node concept="37vLTw" id="6UWSvq5aasz" role="37wK5m">
                       <ref role="3cqZAo" node="4MEOIDEhHGm" resolve="templateRef" />
                     </node>
@@ -4666,7 +4665,7 @@
       <node concept="16euLQ" id="6UWSvq4QqeP" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="6UWSvq4QqeQ" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
+          <ref role="3uigEE" to="i348:1eKXYsjvsOy" resolve="MacroTemplate.Token" />
         </node>
       </node>
     </node>
@@ -4680,7 +4679,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="5itBwM7WF$q" role="3clF45">
-        <ref role="3uigEE" to="psr6:5itBwM7auSJ" resolve="CallMacroTemplate" />
+        <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
         <node concept="16syzq" id="5itBwM7WF$r" role="11_B2D">
           <ref role="16sUi3" node="5itBwM7WF$V" resolve="T" />
         </node>
@@ -4693,7 +4692,7 @@
               <node concept="3cpWsn" id="5itBwM8MNtV" role="3cpWs9">
                 <property role="TrG5h" value="macroTemplate" />
                 <node concept="3uibUv" id="5itBwM8MNtW" role="1tU5fm">
-                  <ref role="3uigEE" to="psr6:5itBwM7auSJ" resolve="CallMacroTemplate" />
+                  <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
                   <node concept="16syzq" id="5itBwM8MNtX" role="11_B2D">
                     <ref role="16sUi3" node="5itBwM7WF$V" resolve="T" />
                   </node>
@@ -4703,7 +4702,7 @@
                     <ref role="2Gs0qQ" node="5itBwM8MNub" resolve="macroTable" />
                   </node>
                   <node concept="liA8E" id="5itBwM8MNu0" role="2OqNvi">
-                    <ref role="37wK5l" to="psr6:4MEOIDEgpuf" resolve="callMacroTemplate" />
+                    <ref role="37wK5l" to="i348:4MEOIDEgpuf" resolve="callMacroTemplate" />
                     <node concept="37vLTw" id="5itBwM8MNu1" role="37wK5m">
                       <ref role="3cqZAo" node="5itBwM7WF$o" resolve="templateRef" />
                     </node>
@@ -4763,7 +4762,7 @@
       <node concept="16euLQ" id="5itBwM7WF$V" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM86U8g" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+          <ref role="3uigEE" to="i348:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
         </node>
       </node>
     </node>
@@ -4781,7 +4780,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="5itBwM7W0ZJ" role="3clF45">
-        <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+        <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
         <node concept="16syzq" id="5itBwM7W0ZK" role="11_B2D">
           <ref role="16sUi3" node="5itBwM7W10g" resolve="T" />
         </node>
@@ -4799,7 +4798,7 @@
                         <ref role="2Gs0qQ" node="4U$Q3dLV$zT" resolve="macroTemplate" />
                       </node>
                       <node concept="liA8E" id="5itBwM9$wcB" role="2OqNvi">
-                        <ref role="37wK5l" to="psr6:5itBwM9zYlU" resolve="getPrototypeTemplateRef" />
+                        <ref role="37wK5l" to="i348:5itBwM9zYlU" resolve="getPrototypeTemplateRef" />
                       </node>
                     </node>
                     <node concept="liA8E" id="5itBwM9tGkw" role="2OqNvi">
@@ -4823,7 +4822,7 @@
                   <ref role="2Gs0qQ" node="5itBwM7W106" resolve="macroTable" />
                 </node>
                 <node concept="liA8E" id="4U$Q3dLVzjU" role="2OqNvi">
-                  <ref role="37wK5l" to="psr6:5itBwM7qDtj" resolve="expandMacroTemplate" />
+                  <ref role="37wK5l" to="i348:5itBwM7qDtj" resolve="expandMacroTemplate" />
                   <node concept="37vLTw" id="4U$Q3dLVzjV" role="37wK5m">
                     <ref role="3cqZAo" node="5itBwM7W4wa" resolve="concept" />
                   </node>
@@ -4870,7 +4869,7 @@
       <node concept="16euLQ" id="5itBwM7W10g" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM86UN7" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+          <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
     </node>
@@ -4976,7 +4975,7 @@
                 <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
               </node>
               <node concept="3uibUv" id="4U$Q3dLrPOn" role="3rvSg0">
-                <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+                <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
               </node>
             </node>
             <node concept="2ShNRf" id="4U$Q3dLrPOH" role="33vP2m">
@@ -4985,7 +4984,7 @@
                   <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
                 </node>
                 <node concept="3uibUv" id="4U$Q3dLrPOK" role="3rHtpV">
-                  <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+                  <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
                 </node>
               </node>
             </node>
@@ -5025,7 +5024,7 @@
                           <ref role="2Gs0qQ" node="6UWSvq4VKfN" resolve="macroTable" />
                         </node>
                         <node concept="liA8E" id="4U$Q3dLrSyz" role="2OqNvi">
-                          <ref role="37wK5l" to="psr6:4U$Q3dLryvP" resolve="tableRef" />
+                          <ref role="37wK5l" to="i348:4U$Q3dLryvP" resolve="tableRef" />
                         </node>
                       </node>
                       <node concept="37vLTw" id="4U$Q3dLrQrN" role="3ElQJh">
@@ -5040,7 +5039,7 @@
                   <ref role="2Gs0qQ" node="7DvO2MamWSO" resolve="macroManifest" />
                 </node>
                 <node concept="liA8E" id="6UWSvq4VHk3" role="2OqNvi">
-                  <ref role="37wK5l" to="psr6:6UWSvq4Vu5V" resolve="macroTables" />
+                  <ref role="37wK5l" to="i348:6UWSvq4Vu5V" resolve="macroTables" />
                 </node>
               </node>
               <node concept="2GrKxI" id="6UWSvq4VKfN" role="2Gsz3X">
@@ -5089,13 +5088,13 @@
             <property role="TrG5h" value="queue" />
             <node concept="2BANLN" id="4U$Q3dM7NOb" role="1tU5fm">
               <node concept="3uibUv" id="4U$Q3dM7NOe" role="_ZDj9">
-                <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+                <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
               </node>
             </node>
             <node concept="2ShNRf" id="4U$Q3dM7NOB" role="33vP2m">
               <node concept="2Jqq0_" id="4U$Q3dM7NOC" role="2ShVmc">
                 <node concept="3uibUv" id="4U$Q3dM7NOD" role="HW$YZ">
-                  <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+                  <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
                 </node>
               </node>
             </node>
@@ -5106,13 +5105,13 @@
             <property role="TrG5h" value="extended" />
             <node concept="_YKpA" id="4U$Q3dM8Q1d" role="1tU5fm">
               <node concept="3uibUv" id="4U$Q3dM8Q1g" role="_ZDj9">
-                <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+                <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
               </node>
             </node>
             <node concept="2ShNRf" id="4U$Q3dM8Q1B" role="33vP2m">
               <node concept="Tc6Ow" id="4U$Q3dM8Q1C" role="2ShVmc">
                 <node concept="3uibUv" id="4U$Q3dM8Q1D" role="HW$YZ">
-                  <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+                  <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
                 </node>
               </node>
             </node>
@@ -5153,7 +5152,7 @@
                         <node concept="3AV6Ez" id="4U$Q3dLrY2X" role="2OqNvi" />
                       </node>
                       <node concept="liA8E" id="4U$Q3dLrY2Y" role="2OqNvi">
-                        <ref role="37wK5l" to="psr6:4U$Q3dLrIJl" resolve="extendsRef" />
+                        <ref role="37wK5l" to="i348:4U$Q3dLrIJl" resolve="extendsRef" />
                       </node>
                     </node>
                   </node>
@@ -5166,7 +5165,7 @@
                           <node concept="3cpWsn" id="4U$Q3dLss_R" role="3cpWs9">
                             <property role="TrG5h" value="ext" />
                             <node concept="3uibUv" id="4U$Q3dLss_r" role="1tU5fm">
-                              <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+                              <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
                             </node>
                             <node concept="3EllGN" id="4U$Q3dLss_S" role="33vP2m">
                               <node concept="37vLTw" id="4U$Q3dLss_T" role="3ElVtu">
@@ -5201,7 +5200,7 @@
                                   <ref role="3cqZAo" node="4U$Q3dLss_R" resolve="ext" />
                                 </node>
                                 <node concept="liA8E" id="4U$Q3dLs$zZ" role="2OqNvi">
-                                  <ref role="37wK5l" to="psr6:4U$Q3dLryvP" resolve="tableRef" />
+                                  <ref role="37wK5l" to="i348:4U$Q3dLryvP" resolve="tableRef" />
                                 </node>
                               </node>
                             </node>
@@ -5214,7 +5213,7 @@
                                 <ref role="3cqZAo" node="4U$Q3dLss_R" resolve="ext" />
                               </node>
                               <node concept="liA8E" id="4U$Q3dLsob5" role="2OqNvi">
-                                <ref role="37wK5l" to="psr6:4U$Q3dLrIJl" resolve="extendsRef" />
+                                <ref role="37wK5l" to="i348:4U$Q3dLrIJl" resolve="extendsRef" />
                               </node>
                             </node>
                             <node concept="37vLTw" id="4U$Q3dLskI3" role="37vLTJ">
@@ -5406,13 +5405,13 @@
       <node concept="3Tm6S6" id="4JJCDImRYzX" role="1B3o_S" />
       <node concept="_YKpA" id="4JJCDImRYIM" role="1tU5fm">
         <node concept="3uibUv" id="4JJCDImRYZI" role="_ZDj9">
-          <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+          <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
         </node>
       </node>
       <node concept="2ShNRf" id="4JJCDImRZ41" role="33vP2m">
         <node concept="Tc6Ow" id="4JJCDImRZ3N" role="2ShVmc">
           <node concept="3uibUv" id="4JJCDImRZ3O" role="HW$YZ">
-            <ref role="3uigEE" to="psr6:1pPth$m7IVF" resolve="AbstractMacroTable" />
+            <ref role="3uigEE" to="i348:1pPth$m7IVF" resolve="AbstractMacroTable" />
           </node>
         </node>
       </node>
@@ -5423,7 +5422,7 @@
       <node concept="3Tm6S6" id="1hX44vNniCk" role="1B3o_S" />
       <node concept="_YKpA" id="7DvO2MamVaf" role="1tU5fm">
         <node concept="3uibUv" id="7DvO2MamVag" role="_ZDj9">
-          <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+          <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
         </node>
       </node>
     </node>
@@ -6113,13 +6112,13 @@
             <property role="TrG5h" value="macroManifests" />
             <node concept="_YKpA" id="6UWSvq5d6QU" role="1tU5fm">
               <node concept="3uibUv" id="6UWSvq5d6QW" role="_ZDj9">
-                <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+                <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
               </node>
             </node>
             <node concept="2ShNRf" id="6UWSvq5d8fo" role="33vP2m">
               <node concept="Tc6Ow" id="6UWSvq5d8dH" role="2ShVmc">
                 <node concept="3uibUv" id="6UWSvq5d8dI" role="HW$YZ">
-                  <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+                  <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
                 </node>
               </node>
             </node>
@@ -6158,7 +6157,7 @@
               <node concept="3cpWsn" id="7wfdmjRl1_D" role="3cpWs9">
                 <property role="TrG5h" value="macroManifest" />
                 <node concept="3uibUv" id="7wfdmjRl1_$" role="1tU5fm">
-                  <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+                  <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
                 </node>
                 <node concept="2OqwBi" id="7wfdmjRl1_E" role="33vP2m">
                   <node concept="2GrUjf" id="NKt6yoTaa0" role="2Oq$k0">
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 d2279808..d95848b2 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
@@ -29,7 +29,6 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
     <import index="cmfw" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.event(MPS.OpenAPI/)" />
     <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
@@ -9334,7 +9333,7 @@
       <node concept="16euLQ" id="5itBwM7VEuJ" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM86BsU" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+          <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
       <node concept="3clFbS" id="5itBwM7VEuL" role="3clF47">
@@ -9446,7 +9445,7 @@
           <node concept="3cpWsn" id="5itBwM7W9cI" role="3cpWs9">
             <property role="TrG5h" value="tpl" />
             <node concept="3uibUv" id="5itBwM7W9bP" role="1tU5fm">
-              <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+              <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
               <node concept="16syzq" id="5itBwM7W9bS" role="11_B2D">
                 <ref role="16sUi3" node="5itBwM7VEuJ" resolve="T" />
               </node>
@@ -9486,7 +9485,7 @@
                     <ref role="3cqZAo" node="5itBwM7W9cI" resolve="tpl" />
                   </node>
                   <node concept="liA8E" id="5itBwM7WhOJ" role="2OqNvi">
-                    <ref role="37wK5l" to="psr6:5itBwM78vMu" resolve="createToken" />
+                    <ref role="37wK5l" to="i348:5ynGfcflmnr" resolve="createToken" />
                     <node concept="37vLTw" id="5itBwM7WhOK" role="37wK5m">
                       <ref role="3cqZAo" node="5itBwM7VEuz" resolve="inputNode" />
                     </node>
@@ -9566,7 +9565,7 @@
       <node concept="16euLQ" id="5itBwMbbLTg" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwMbbLTh" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+          <ref role="3uigEE" to="i348:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
       <node concept="3clFbS" id="5itBwMbbLTi" role="3clF47">
@@ -9575,7 +9574,7 @@
           <node concept="3cpWsn" id="5itBwMbbRFQ" role="3cpWs9">
             <property role="TrG5h" value="tpl" />
             <node concept="3uibUv" id="5itBwMbbRFR" role="1tU5fm">
-              <ref role="3uigEE" to="psr6:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+              <ref role="3uigEE" to="i348:5itBwM75Jiy" resolve="ExpandMacroTemplate" />
               <node concept="16syzq" id="5itBwMbbRFS" role="11_B2D">
                 <ref role="16sUi3" node="5itBwMbbLTg" resolve="T" />
               </node>
@@ -9612,7 +9611,7 @@
                     <ref role="3cqZAo" node="5itBwMbbRFQ" resolve="tpl" />
                   </node>
                   <node concept="liA8E" id="5itBwMbbRG8" role="2OqNvi">
-                    <ref role="37wK5l" to="psr6:5itBwM78vMu" resolve="createToken" />
+                    <ref role="37wK5l" to="i348:5ynGfcflmnr" resolve="createToken" />
                     <node concept="10Nm6u" id="5itBwMbc2Mp" role="37wK5m" />
                     <node concept="Xjq3P" id="5itBwMbbRGa" role="37wK5m" />
                   </node>
@@ -9686,7 +9685,7 @@
       <node concept="16euLQ" id="5itBwM7VEv0" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM86CB5" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+          <ref role="3uigEE" to="i348:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
         </node>
       </node>
       <node concept="3clFbS" id="5itBwM7VEv2" role="3clF47">
@@ -9694,7 +9693,7 @@
           <node concept="3cpWsn" id="5itBwM7W$4$" role="3cpWs9">
             <property role="TrG5h" value="tpl" />
             <node concept="3uibUv" id="5itBwM7W$4_" role="1tU5fm">
-              <ref role="3uigEE" to="psr6:5itBwM7auSJ" resolve="CallMacroTemplate" />
+              <ref role="3uigEE" to="i348:5itBwM7auSJ" resolve="CallMacroTemplate" />
               <node concept="16syzq" id="5itBwM7W$4A" role="11_B2D">
                 <ref role="16sUi3" node="5itBwM7VEv0" resolve="T" />
               </node>
@@ -9728,7 +9727,7 @@
                     <ref role="3cqZAo" node="5itBwM7W$4$" resolve="tpl" />
                   </node>
                   <node concept="liA8E" id="5itBwM7W$4P" role="2OqNvi">
-                    <ref role="37wK5l" to="psr6:5itBwM7b6jI" resolve="createToken" />
+                    <ref role="37wK5l" to="i348:5ynGfcflmnm" resolve="createToken" />
                     <node concept="Xjq3P" id="5itBwM7W$4R" role="37wK5m" />
                   </node>
                 </node>
diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 1c4756fc..b021c7a3 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -23,7 +23,6 @@
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="ha02" ref="r:09e53496-6477-45e7-abd5-eaf3fac3b360(jetbrains.mps.logic.behavior)" />
-    <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
   </imports>
   <registry>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
index 2be6537e..9fc913b9 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -12,7 +12,6 @@
     <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
-    <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
@@ -1071,7 +1070,7 @@
     <node concept="3clFb_" id="NKt6yomP6t" role="jymVt">
       <property role="TrG5h" value="createMacroManifest" />
       <node concept="3uibUv" id="NKt6yomP6u" role="3clF45">
-        <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+        <ref role="3uigEE" to="i348:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
       </node>
       <node concept="3Tm1VV" id="NKt6yomP6v" role="1B3o_S" />
       <node concept="3clFbS" id="NKt6yomP6w" role="3clF47" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
deleted file mode 100644
index d847140c..00000000
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
+++ /dev/null
@@ -1,638 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)">
-  <persistence version="9" />
-  <languages>
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
-    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="12" />
-  </languages>
-  <imports>
-    <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
-  </imports>
-  <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
-        <child id="1219921048460" name="componentType" index="8Xvag" />
-      </concept>
-      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
-        <child id="1068498886297" name="rValue" index="37vLTx" />
-        <child id="1068498886295" name="lValue" index="37vLTJ" />
-      </concept>
-      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
-        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
-      </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
-        <child id="1188208488637" name="annotation" index="2AJF6D" />
-      </concept>
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
-        <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
-      </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
-      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
-      <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
-        <child id="1164991057263" name="throwable" index="YScLw" />
-      </concept>
-      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
-        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
-        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
-      </concept>
-      <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
-        <child id="1214996921760" name="bound" index="3ztrMU" />
-      </concept>
-      <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
-        <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
-      </concept>
-      <concept id="1109283449304" name="jetbrains.mps.baseLanguage.structure.TypeVariableReference" flags="in" index="16syzq">
-        <reference id="1109283546497" name="typeVariableDeclaration" index="16sUi3" />
-      </concept>
-      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
-        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
-      </concept>
-      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
-      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
-        <child id="5680397130376446158" name="type" index="1tU5fm" />
-      </concept>
-      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
-        <child id="1068580123133" name="returnType" index="3clF45" />
-        <child id="1068580123134" name="parameter" index="3clF46" />
-        <child id="1068580123135" name="body" index="3clF47" />
-      </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
-        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
-      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
-        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
-      </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
-      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
-        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
-      </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-        <child id="1109201940907" name="parameter" index="11_B2D" />
-      </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
-        <child id="1178549979242" name="visibility" index="1B3o_S" />
-      </concept>
-      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
-        <child id="1107797138135" name="extendedInterface" index="3HQHJm" />
-      </concept>
-      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
-      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
-      <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
-        <child id="5686963296372573084" name="elementType" index="3O5elw" />
-      </concept>
-    </language>
-  </registry>
-  <node concept="312cEu" id="1pPth$m7IVF">
-    <property role="TrG5h" value="AbstractMacroTable" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="4nxCIBqhYxW" role="jymVt" />
-    <node concept="3clFb_" id="1pPth$m7ZRy" role="jymVt">
-      <property role="TrG5h" value="name" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="17QB3L" id="1pPth$m7ZX$" role="3clF45" />
-      <node concept="3Tm1VV" id="1pPth$m7ZR_" role="1B3o_S" />
-      <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" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="4U$Q3dLryHV" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-      </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" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="4U$Q3dLrIJm" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-      </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" />
-    <node concept="3clFb_" id="4KRwoelAtxl" role="jymVt">
-      <property role="TrG5h" value="macroTemplate" />
-      <node concept="3uibUv" id="4KRwoelAyo8" role="3clF45">
-        <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
-        <node concept="16syzq" id="4KRwoelDRZs" role="11_B2D">
-          <ref role="16sUi3" node="4KRwoelDRX0" resolve="T" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4KRwoelAtxp" role="1B3o_S" />
-      <node concept="3clFbS" id="4KRwoelAtxq" role="3clF47">
-        <node concept="YS8fn" id="631nQp3ZlPl" role="3cqZAp">
-          <node concept="2ShNRf" id="631nQp3ZlPP" role="YScLw">
-            <node concept="1pGfFk" id="631nQp3Zn5D" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="4KRwoelAyUd" role="3clF46">
-        <property role="TrG5h" value="concept" />
-        <node concept="3bZ5Sz" id="4KRwoelAyUc" role="1tU5fm" />
-      </node>
-      <node concept="16euLQ" id="4KRwoelDRX0" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="1eKXYsjxDj6" role="3ztrMU">
-          <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7qAd7" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5itBwM8SKbL" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM8SJDJ" role="jymVt">
-      <property role="TrG5h" value="macroTemplate" />
-      <node concept="3uibUv" id="5itBwM8SJDK" role="3clF45">
-        <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
-        <node concept="16syzq" id="5itBwM8SJDL" role="11_B2D">
-          <ref role="16sUi3" node="5itBwM8SJDQ" resolve="T" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="5itBwM8SJDM" role="1B3o_S" />
-      <node concept="3clFbS" id="5itBwM8SJDN" role="3clF47">
-        <node concept="YS8fn" id="631nQp3ZLIO" role="3cqZAp">
-          <node concept="2ShNRf" id="631nQp3ZLIP" role="YScLw">
-            <node concept="1pGfFk" id="631nQp3ZLIQ" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="5itBwM8SK_e" role="3clF46">
-        <property role="TrG5h" value="templateRef" />
-        <node concept="3uibUv" id="5itBwM8SK_f" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="16euLQ" id="5itBwM8SJDQ" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="5itBwM8SJDR" role="3ztrMU">
-          <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM8SJDS" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4MEOIDEgpw7" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM7qDtj" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="expandMacroTemplate" />
-      <node concept="37vLTG" id="5itBwM7qKJP" role="3clF46">
-        <property role="TrG5h" value="concept" />
-        <node concept="3bZ5Sz" id="5itBwM7qLaK" role="1tU5fm" />
-      </node>
-      <node concept="3Tm1VV" id="5itBwM7qDtm" role="1B3o_S" />
-      <node concept="3clFbS" id="5itBwM7qDtn" role="3clF47" />
-      <node concept="16euLQ" id="5itBwM7qF7O" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="5itBwM86KXZ" role="3ztrMU">
-          <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
-        </node>
-      </node>
-      <node concept="3vKaQO" id="4U$Q3dLVb19" role="3clF45">
-        <node concept="3uibUv" id="5itBwM7qIjS" role="3O5elw">
-          <ref role="3uigEE" node="5itBwM75Jiy" resolve="ExpandMacroTemplate" />
-          <node concept="16syzq" id="5itBwM7qJ7n" role="11_B2D">
-            <ref role="16sUi3" node="5itBwM7qF7O" resolve="T" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6UWSvq4Vn68" role="jymVt" />
-    <node concept="3clFb_" id="4MEOIDEgpuf" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="callMacroTemplate" />
-      <node concept="3uibUv" id="4MEOIDEgpug" 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>
-      </node>
-      <node concept="3Tm1VV" id="4MEOIDEgpui" role="1B3o_S" />
-      <node concept="3clFbS" id="4MEOIDEgpuj" role="3clF47" />
-      <node concept="16euLQ" id="4MEOIDEgpum" role="16eVyc">
-        <property role="TrG5h" value="T" />
-        <node concept="3uibUv" id="5itBwM8MPLU" role="3ztrMU">
-          <ref role="3uigEE" node="5itBwM86qnn" resolve="CallMacroTemplate.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>
-    </node>
-    <node concept="2tJIrI" id="5itBwM7qCDt" role="jymVt" />
-    <node concept="3clFb_" id="6UWSvq4Vn1v" role="jymVt">
-      <property role="TrG5h" value="allMacroConcepts" />
-      <node concept="3vKaQO" id="6UWSvq4Vn1w" role="3clF45">
-        <node concept="3bZ5Sz" id="6UWSvq4VpUS" role="3O5elw" />
-      </node>
-      <node concept="3Tm1VV" id="6UWSvq4Vn1y" role="1B3o_S" />
-      <node concept="3clFbS" id="6UWSvq4Vn1z" role="3clF47">
-        <node concept="YS8fn" id="631nQp3ZXzf" role="3cqZAp">
-          <node concept="2ShNRf" id="631nQp3ZXzg" role="YScLw">
-            <node concept="1pGfFk" id="631nQp3ZXzh" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM7qscB" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4MEOIDEWLmE" role="jymVt" />
-    <node concept="3clFb_" id="4MEOIDEWLkY" role="jymVt">
-      <property role="TrG5h" value="allMacroTemplateRefs" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3vKaQO" id="4MEOIDEWLkZ" role="3clF45">
-        <node concept="3uibUv" id="5yr01fDuVLk" role="3O5elw">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4MEOIDEWLl1" role="1B3o_S" />
-      <node concept="3clFbS" id="4MEOIDEWLl2" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="4KRwoelAvaR" role="jymVt" />
-  </node>
-  <node concept="312cEu" id="2N2MQGCMVqD">
-    <property role="TrG5h" value="AbstractMacroManifest" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="6UWSvq4Vu5u" role="jymVt" />
-    <node concept="3clFb_" id="6UWSvq4Vu5V" role="jymVt">
-      <property role="TrG5h" value="macroTables" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3vKaQO" id="6UWSvq4Vu6$" role="3clF45">
-        <node concept="3uibUv" id="6UWSvq4Vu7$" role="3O5elw">
-          <ref role="3uigEE" node="1pPth$m7IVF" resolve="AbstractMacroTable" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="6UWSvq4Vu5Y" role="1B3o_S" />
-      <node concept="3clFbS" id="6UWSvq4Vu5Z" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="2N2MQGCMNOd" role="jymVt" />
-    <node concept="3Tm1VV" id="2N2MQGCMVqE" role="1B3o_S" />
-  </node>
-  <node concept="312cEu" id="1hX44vNlvEV">
-    <property role="TrG5h" value="AbstractMacroTemplate" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="1hX44vNlvFZ" role="jymVt" />
-    <node concept="3HP615" id="1eKXYsjvSZy" role="jymVt">
-      <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="MacroTemplateAction" />
-      <node concept="3clFb_" id="1eKXYsjvTXf" role="jymVt">
-        <property role="TrG5h" value="doAction" />
-        <node concept="37vLTG" id="1eKXYsjvTZZ" role="3clF46">
-          <property role="TrG5h" value="template" />
-          <node concept="3uibUv" id="1eKXYsjvU1s" role="1tU5fm">
-            <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
-            <node concept="16syzq" id="1eKXYsjvU6M" role="11_B2D">
-              <ref role="16sUi3" node="1eKXYsjvTOg" resolve="Cfg" />
-            </node>
-          </node>
-        </node>
-        <node concept="16syzq" id="1eKXYsjwskj" role="3clF45">
-          <ref role="16sUi3" node="1eKXYsjws1d" resolve="R" />
-        </node>
-        <node concept="3Tm1VV" id="1eKXYsjvTXi" role="1B3o_S" />
-        <node concept="3clFbS" id="1eKXYsjvTXj" role="3clF47" />
-        <node concept="16euLQ" id="1eKXYsjvTOg" role="16eVyc">
-          <property role="TrG5h" value="Cfg" />
-          <node concept="3uibUv" id="1eKXYsjvTPL" role="3ztrMU">
-            <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="2Y70AYExG0f" role="jymVt" />
-      <node concept="3clFb_" id="2Y70AYExG1D" role="jymVt">
-        <property role="TrG5h" value="defaultValue" />
-        <node concept="16syzq" id="2Y70AYExG4Q" role="3clF45">
-          <ref role="16sUi3" node="1eKXYsjws1d" resolve="R" />
-        </node>
-        <node concept="3Tm1VV" id="2Y70AYExG1G" role="1B3o_S" />
-        <node concept="3clFbS" id="2Y70AYExG1H" role="3clF47" />
-      </node>
-      <node concept="3Tm1VV" id="1eKXYsjxjKN" role="1B3o_S" />
-      <node concept="16euLQ" id="1eKXYsjws1d" role="16eVyc">
-        <property role="TrG5h" value="R" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5itBwM7glQO" role="jymVt" />
-    <node concept="3clFbW" id="5yr01fDEuEm" role="jymVt">
-      <node concept="37vLTG" id="5yr01fDEuFQ" role="3clF46">
-        <property role="TrG5h" value="macroTemplateRef" />
-        <node concept="3uibUv" id="5yr01fDEuKu" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="5yr01fDEuEo" role="3clF45" />
-      <node concept="3Tm1VV" id="5yr01fDEuEp" role="1B3o_S" />
-      <node concept="3clFbS" id="5yr01fDEuEq" role="3clF47">
-        <node concept="3clFbF" id="5yr01fDEuP6" role="3cqZAp">
-          <node concept="37vLTI" id="5yr01fDEuP8" role="3clFbG">
-            <node concept="2OqwBi" id="5yr01fDEuW9" role="37vLTJ">
-              <node concept="Xjq3P" id="5yr01fDEuXs" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5yr01fDEuWc" role="2OqNvi">
-                <ref role="2Oxat5" node="5yr01fDEuP2" resolve="macroTemplateRef" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="5yr01fDEuPc" role="37vLTx">
-              <ref role="3cqZAo" node="5yr01fDEuFQ" resolve="macroTemplateRef" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5itBwM7dHzn" role="jymVt" />
-    <node concept="3clFb_" id="5yr01fDEv3T" role="jymVt">
-      <property role="TrG5h" value="getTemplateRef" />
-      <node concept="3uibUv" id="5yr01fDEvaQ" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-      </node>
-      <node concept="3Tm1VV" id="5itBwM9tuPl" role="1B3o_S" />
-      <node concept="3clFbS" id="5yr01fDEv3X" role="3clF47">
-        <node concept="3clFbF" id="5yr01fDEvuy" role="3cqZAp">
-          <node concept="37vLTw" id="5yr01fDEvux" role="3clFbG">
-            <ref role="3cqZAo" node="5yr01fDEuP2" resolve="macroTemplateRef" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="5itBwM9tEgh" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4MEOIDG7xoH" role="jymVt" />
-    <node concept="3Tm1VV" id="1hX44vNlvEW" role="1B3o_S" />
-    <node concept="16euLQ" id="1hX44vNlw2n" role="16eVyc">
-      <property role="TrG5h" value="Cfg" />
-      <node concept="3uibUv" id="1eKXYsjvytI" role="3ztrMU">
-        <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-      </node>
-    </node>
-    <node concept="3uibUv" id="1hX44vNnjSd" role="EKbjA">
-      <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
-      <node concept="16syzq" id="1eKXYsjvyP6" role="11_B2D">
-        <ref role="16sUi3" node="1hX44vNlw2n" resolve="Cfg" />
-      </node>
-    </node>
-    <node concept="312cEg" id="5yr01fDEuP2" role="jymVt">
-      <property role="TrG5h" value="macroTemplateRef" />
-      <node concept="3Tm6S6" id="5yr01fDEuP3" role="1B3o_S" />
-      <node concept="3uibUv" id="5yr01fDEuP5" role="1tU5fm">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-      </node>
-    </node>
-  </node>
-  <node concept="3HP615" id="1hX44vNnjJ$">
-    <property role="TrG5h" value="MacroTemplate" />
-    <node concept="2tJIrI" id="1hX44vNnkEr" role="jymVt" />
-    <node concept="3HP615" id="1eKXYsjvsOy" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Token" />
-      <node concept="2tJIrI" id="5itBwM7bY24" role="jymVt" />
-      <node concept="3clFb_" id="5itBwM7bY2d" role="jymVt">
-        <property role="TrG5h" value="apply" />
-        <node concept="3uibUv" id="5itBwM7bY2e" role="3clF45">
-          <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-        </node>
-        <node concept="3Tm1VV" id="5itBwM7bY2f" role="1B3o_S" />
-        <node concept="3clFbS" id="5itBwM7bY2g" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="5itBwM7bQMg" role="jymVt" />
-      <node concept="3Tm1VV" id="1eKXYsjvsOz" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="1eKXYsjvsN9" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM9tCq1" role="jymVt">
-      <property role="TrG5h" value="getTemplateRef" />
-      <node concept="3uibUv" id="5itBwM9tDzV" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-      </node>
-      <node concept="3Tm1VV" id="5itBwM9tCq4" role="1B3o_S" />
-      <node concept="3clFbS" id="5itBwM9tCq5" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5DUvKnrzig5" role="jymVt" />
-    <node concept="3Tm1VV" id="1hX44vNnjJ_" role="1B3o_S" />
-    <node concept="16euLQ" id="1eKXYsjvsL$" role="16eVyc">
-      <property role="TrG5h" value="T" />
-      <node concept="3uibUv" id="1eKXYsjvsTm" role="3ztrMU">
-        <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-      </node>
-    </node>
-  </node>
-  <node concept="312cEu" id="4MEOIDFA48I">
-    <property role="TrG5h" value="AbstractTermDeclaration" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="4MEOIDFA4bd" role="jymVt" />
-    <node concept="3clFb_" id="4MEOIDFA4bP" role="jymVt">
-      <property role="TrG5h" value="getTerm" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="4MEOIDFA4e5" role="3clF45">
-        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-      </node>
-      <node concept="3Tm1VV" id="4MEOIDFA4bS" role="1B3o_S" />
-      <node concept="3clFbS" id="4MEOIDFA4bT" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="4MEOIDFA4bf" role="jymVt" />
-    <node concept="3Tm1VV" id="4MEOIDFA48J" role="1B3o_S" />
-  </node>
-  <node concept="3HP615" id="5itBwM75Jiy">
-    <property role="TrG5h" value="ExpandMacroTemplate" />
-    <node concept="2tJIrI" id="5itBwM75KSu" role="jymVt" />
-    <node concept="3HP615" id="5itBwM86qUH" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Token" />
-      <node concept="2tJIrI" id="5itBwM86qUI" role="jymVt" />
-      <node concept="3clFb_" id="5itBwM86qUR" role="jymVt">
-        <property role="TrG5h" value="withLogical" />
-        <node concept="37vLTG" id="5itBwM86qUS" role="3clF46">
-          <property role="TrG5h" value="logical" />
-          <node concept="8X2XB" id="5itBwM86qUT" role="1tU5fm">
-            <node concept="3uibUv" id="5itBwM86qUU" role="8Xvag">
-              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-            </node>
-          </node>
-        </node>
-        <node concept="3uibUv" id="5itBwM86wru" role="3clF45">
-          <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
-        </node>
-        <node concept="3Tm1VV" id="5itBwM86qUW" role="1B3o_S" />
-        <node concept="3clFbS" id="5itBwM86qUX" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="5itBwM86qUY" role="jymVt" />
-      <node concept="3Tm1VV" id="5itBwM86qUZ" role="1B3o_S" />
-      <node concept="3uibUv" id="5itBwM86qV0" role="3HQHJm">
-        <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5itBwM9zYtQ" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM9zYlU" role="jymVt">
-      <property role="TrG5h" value="getPrototypeTemplateRef" />
-      <node concept="3uibUv" id="5itBwM9zYlV" role="3clF45">
-        <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>
-    <node concept="2tJIrI" id="5itBwM86qTH" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM78vMu" role="jymVt">
-      <property role="TrG5h" value="createToken" />
-      <node concept="37vLTG" id="5itBwM78ycI" role="3clF46">
-        <property role="TrG5h" value="input" />
-        <node concept="3Tqbb2" id="5itBwM78yZL" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="5itBwM78zqd" role="3clF46">
-        <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="5itBwM78$AE" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-        </node>
-      </node>
-      <node concept="16syzq" id="5itBwM7WsnX" role="3clF45">
-        <ref role="16sUi3" node="5itBwM75LFm" resolve="T" />
-      </node>
-      <node concept="3Tm1VV" id="5itBwM78vMx" role="1B3o_S" />
-      <node concept="3clFbS" id="5itBwM78vMy" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5itBwM75QRQ" role="jymVt" />
-    <node concept="3Tm1VV" id="5itBwM75Jiz" role="1B3o_S" />
-    <node concept="16euLQ" id="5itBwM75LFm" role="16eVyc">
-      <property role="TrG5h" value="T" />
-      <node concept="3uibUv" id="5itBwM86rjR" role="3ztrMU">
-        <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
-      </node>
-    </node>
-    <node concept="3uibUv" id="5itBwM7cB81" role="3HQHJm">
-      <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
-      <node concept="16syzq" id="5itBwM7cB_U" role="11_B2D">
-        <ref role="16sUi3" node="5itBwM75LFm" resolve="T" />
-      </node>
-    </node>
-  </node>
-  <node concept="3HP615" id="5itBwM7auSJ">
-    <property role="TrG5h" value="CallMacroTemplate" />
-    <node concept="2tJIrI" id="5itBwM7awS2" role="jymVt" />
-    <node concept="3HP615" id="5itBwM86qnn" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Token" />
-      <node concept="2tJIrI" id="5itBwM86qtB" role="jymVt" />
-      <node concept="3clFb_" id="5itBwM86qEL" role="jymVt">
-        <property role="TrG5h" value="withParam" />
-        <node concept="37vLTG" id="5itBwM86qEM" role="3clF46">
-          <property role="TrG5h" value="value" />
-          <node concept="8X2XB" id="5itBwM86qEN" role="1tU5fm">
-            <node concept="3uibUv" id="5itBwM86qEO" role="8Xvag">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
-        <node concept="3uibUv" id="5itBwM86wcf" role="3clF45">
-          <ref role="3uigEE" node="5itBwM86qnn" resolve="CallMacroTemplate.Token" />
-        </node>
-        <node concept="3Tm1VV" id="5itBwM86qEQ" role="1B3o_S" />
-        <node concept="3clFbS" id="5itBwM86qER" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="5itBwM86qES" role="jymVt" />
-      <node concept="3clFb_" id="5itBwM86qET" role="jymVt">
-        <property role="TrG5h" value="withLogical" />
-        <node concept="37vLTG" id="5itBwM86qEU" role="3clF46">
-          <property role="TrG5h" value="logical" />
-          <node concept="8X2XB" id="5itBwM86qEV" role="1tU5fm">
-            <node concept="3uibUv" id="5itBwM86qEW" role="8Xvag">
-              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
-            </node>
-          </node>
-        </node>
-        <node concept="3uibUv" id="5itBwM86wit" role="3clF45">
-          <ref role="3uigEE" node="5itBwM86qnn" resolve="CallMacroTemplate.Token" />
-        </node>
-        <node concept="3Tm1VV" id="5itBwM86qEY" role="1B3o_S" />
-        <node concept="3clFbS" id="5itBwM86qEZ" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="5itBwM86quw" role="jymVt" />
-      <node concept="3Tm1VV" id="5itBwM86qno" role="1B3o_S" />
-      <node concept="3uibUv" id="5itBwM86q$H" role="3HQHJm">
-        <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5itBwM86qmr" role="jymVt" />
-    <node concept="3clFb_" id="5itBwM7b6jI" role="jymVt">
-      <property role="TrG5h" value="createToken" />
-      <node concept="37vLTG" id="5itBwM7b8HC" role="3clF46">
-        <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="5itBwM7b97n" role="1tU5fm">
-          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-        </node>
-      </node>
-      <node concept="16syzq" id="5itBwM7Wtx2" role="3clF45">
-        <ref role="16sUi3" node="5itBwM7awuy" resolve="T" />
-      </node>
-      <node concept="3Tm1VV" id="5itBwM7b6jL" role="1B3o_S" />
-      <node concept="3clFbS" id="5itBwM7b6jM" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="5itBwM7cJ7C" role="jymVt" />
-    <node concept="3Tm1VV" id="5itBwM7auSK" role="1B3o_S" />
-    <node concept="16euLQ" id="5itBwM7awuy" role="16eVyc">
-      <property role="TrG5h" value="T" />
-      <node concept="3uibUv" id="5itBwM86rvl" role="3ztrMU">
-        <ref role="3uigEE" node="5itBwM86qnn" resolve="CallMacroTemplate.Token" />
-      </node>
-    </node>
-    <node concept="3uibUv" id="5itBwM7kOW9" role="3HQHJm">
-      <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
-      <node concept="16syzq" id="5itBwM7kQhK" role="11_B2D">
-        <ref role="16sUi3" node="5itBwM7awuy" resolve="T" />
-      </node>
-    </node>
-  </node>
-</model>
-
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 41d04545..6f201ef6 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
@@ -27,7 +27,6 @@
     <import index="i8bi" ref="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
-    <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -387,6 +386,7 @@
   <node concept="312cEu" id="4OKkcnfu_xe">
     <property role="TrG5h" value="AbstractRuleTemplateManifest" />
     <property role="1sVAO0" value="true" />
+    <property role="3GE5qa" value="rule" />
     <node concept="2tJIrI" id="1ggxSI7z1Os" role="jymVt" />
     <node concept="3clFb_" id="7P_FdVPtq7Z" role="jymVt">
       <property role="TrG5h" value="queryTemplates" />
@@ -426,7 +426,7 @@
   </node>
   <node concept="Qs71p" id="4OKkcnfu_Ag">
     <property role="TrG5h" value="RuleTemplateMehodKind" />
-    <property role="3GE5qa" value="template" />
+    <property role="3GE5qa" value="" />
     <node concept="QsSxf" id="4OKkcnfu_Ah" role="Qtgdg">
       <property role="TrG5h" value="HEAD_KEPT" />
       <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
@@ -447,7 +447,7 @@
   </node>
   <node concept="2ABs$o" id="4OKkcnfu_Am">
     <property role="TrG5h" value="RuleTemplateMethod" />
-    <property role="3GE5qa" value="template" />
+    <property role="3GE5qa" value="" />
     <node concept="2ACnGN" id="4OKkcnfu_An" role="3MN40a">
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
@@ -494,7 +494,7 @@
   <node concept="312cEu" id="1ffsG7bUbCM">
     <property role="TrG5h" value="AbstraceRuleTemplate" />
     <property role="1sVAO0" value="true" />
-    <property role="3GE5qa" value="template" />
+    <property role="3GE5qa" value="rule" />
     <node concept="2tJIrI" id="1ffsG7bUbEG" role="jymVt" />
     <node concept="3clFbW" id="1ffsG7bUbEV" role="jymVt">
       <node concept="37vLTG" id="4MqhgXUnerW" role="3clF46">
@@ -787,7 +787,7 @@
   </node>
   <node concept="3HP615" id="1ffsG7bW_V4">
     <property role="TrG5h" value="RuleTemplate" />
-    <property role="3GE5qa" value="template" />
+    <property role="3GE5qa" value="rule" />
     <node concept="2tJIrI" id="67SsWaEm4a8" role="jymVt" />
     <node concept="3HP615" id="2RRx4MZ6_68" role="jymVt">
       <property role="TrG5h" value="Token" />
@@ -879,6 +879,7 @@
   </node>
   <node concept="3HP615" id="4MqhgXU9fm3">
     <property role="TrG5h" value="RulesListTemplate" />
+    <property role="3GE5qa" value="rule" />
     <node concept="2tJIrI" id="4MqhgXU9fmh" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUN1Pe" role="jymVt">
       <property role="TrG5h" value="name" />
@@ -916,7 +917,7 @@
     <node concept="3Tm1VV" id="4MqhgXU9fm4" role="1B3o_S" />
   </node>
   <node concept="3HP615" id="36tQV5AurZW">
-    <property role="3GE5qa" value="template" />
+    <property role="3GE5qa" value="rule" />
     <property role="TrG5h" value="ConstraintRuleTemplate" />
     <node concept="2tJIrI" id="36tQV5Aus0e" role="jymVt" />
     <node concept="3clFb_" id="36tQV5Aus0w" role="jymVt">
@@ -935,7 +936,7 @@
     <node concept="3Tm1VV" id="36tQV5AurZX" role="1B3o_S" />
   </node>
   <node concept="3HP615" id="6OXbTD$iNPP">
-    <property role="3GE5qa" value="template" />
+    <property role="3GE5qa" value="query" />
     <property role="TrG5h" value="QueryTemplate" />
     <node concept="2tJIrI" id="6OXbTD$iO0e" role="jymVt" />
     <node concept="3HP615" id="6R6MIbU8M46" role="jymVt">
@@ -1063,10 +1064,12 @@
   </node>
   <node concept="3HP615" id="4t7Xo7inshN">
     <property role="TrG5h" value="QueryKind" />
+    <property role="3GE5qa" value="query" />
     <node concept="3Tm1VV" id="4t7Xo7inshO" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="5uFPQ7BZsAX">
     <property role="TrG5h" value="AbstractConstraint" />
+    <property role="3GE5qa" value="constraint" />
     <node concept="2tJIrI" id="5uFPQ7BZsC9" role="jymVt" />
     <node concept="3clFbW" id="5uFPQ7BZtsU" role="jymVt">
       <node concept="37vLTG" id="5uFPQ7BZtxe" role="3clF46">
@@ -2041,7 +2044,7 @@
       <node concept="16euLQ" id="5itBwM7VxqJ" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM86yQp" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+          <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
     </node>
@@ -2081,7 +2084,7 @@
       <node concept="16euLQ" id="5itBwMbbE4$" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwMbbE4_" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+          <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
         </node>
       </node>
     </node>
@@ -2117,7 +2120,7 @@
       <node concept="16euLQ" id="5itBwM7V_fJ" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="5itBwM86u8n" role="3ztrMU">
-          <ref role="3uigEE" to="psr6:5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+          <ref role="3uigEE" node="5itBwM86qnn" resolve="CallMacroTemplate.Token" />
         </node>
       </node>
     </node>
@@ -2487,6 +2490,7 @@
   <node concept="312cEu" id="7nPD14OaO1O">
     <property role="TrG5h" value="RuleEx" />
     <property role="1sVAO0" value="true" />
+    <property role="3GE5qa" value="rule" />
     <node concept="2tJIrI" id="7nPD14OaO2C" role="jymVt" />
     <node concept="3clFb_" id="6tnA4677QqC" role="jymVt">
       <property role="1EzhhJ" value="true" />
@@ -2571,6 +2575,7 @@
   </node>
   <node concept="312cEu" id="7eGEHDlc$ap">
     <property role="TrG5h" value="RuleBuilder" />
+    <property role="3GE5qa" value="rule" />
     <node concept="2tJIrI" id="6lpwCiZjgvw" role="jymVt" />
     <node concept="Wx3nA" id="5yr01fDteq2" role="jymVt">
       <property role="TrG5h" value="EMPTY" />
@@ -5547,6 +5552,7 @@
   </node>
   <node concept="312cEu" id="4sSe4$oM01W">
     <property role="TrG5h" value="ConstraintBuilder" />
+    <property role="3GE5qa" value="constraint" />
     <node concept="2tJIrI" id="4sSe4$oSHLP" role="jymVt" />
     <node concept="Wx3nA" id="4sSe4$oSjkE" role="jymVt">
       <property role="TrG5h" value="EMPTY_ARGS" />
@@ -5758,6 +5764,7 @@
   </node>
   <node concept="312cEu" id="7eGEHDlc$dD">
     <property role="TrG5h" value="RuleImpl" />
+    <property role="3GE5qa" value="rule" />
     <node concept="2tJIrI" id="cmlg9NPBs6" role="jymVt" />
     <node concept="3clFbW" id="7eGEHDlc$dF" role="jymVt">
       <node concept="3cqZAl" id="7eGEHDlc$dG" role="3clF45" />
@@ -6480,7 +6487,7 @@
     </node>
   </node>
   <node concept="312cEu" id="6R6MIbU8KKa">
-    <property role="3GE5qa" value="template" />
+    <property role="3GE5qa" value="query" />
     <property role="TrG5h" value="AbstractQueryTemplate" />
     <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="6R6MIbU8KQu" role="jymVt" />
@@ -6627,7 +6634,7 @@
     </node>
   </node>
   <node concept="3HP615" id="6R6MIbU9$OD">
-    <property role="3GE5qa" value="template" />
+    <property role="3GE5qa" value="" />
     <property role="TrG5h" value="Template" />
     <node concept="2tJIrI" id="6R6MIbU9_i3" role="jymVt" />
     <node concept="3HP615" id="mJ_D14woL$" role="jymVt">
@@ -6648,5 +6655,523 @@
     <node concept="2tJIrI" id="6R6MIbU9_i0" role="jymVt" />
     <node concept="3Tm1VV" id="6R6MIbU9$OE" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="2N2MQGCMVqD">
+    <property role="TrG5h" value="AbstractMacroManifest" />
+    <property role="1sVAO0" value="true" />
+    <property role="3GE5qa" value="macro" />
+    <node concept="2tJIrI" id="6UWSvq4Vu5u" role="jymVt" />
+    <node concept="3clFb_" id="6UWSvq4Vu5V" role="jymVt">
+      <property role="TrG5h" value="macroTables" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="3vKaQO" id="6UWSvq4Vu6$" role="3clF45">
+        <node concept="3uibUv" id="6UWSvq4Vu7$" role="3O5elw">
+          <ref role="3uigEE" node="1pPth$m7IVF" resolve="AbstractMacroTable" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6UWSvq4Vu5Y" role="1B3o_S" />
+      <node concept="3clFbS" id="6UWSvq4Vu5Z" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="2N2MQGCMNOd" role="jymVt" />
+    <node concept="3Tm1VV" id="2N2MQGCMVqE" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="1pPth$m7IVF">
+    <property role="TrG5h" value="AbstractMacroTable" />
+    <property role="1sVAO0" value="true" />
+    <property role="3GE5qa" value="macro" />
+    <node concept="2tJIrI" id="4nxCIBqhYxW" role="jymVt" />
+    <node concept="3clFb_" id="1pPth$m7ZRy" role="jymVt">
+      <property role="TrG5h" value="name" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="17QB3L" id="1pPth$m7ZX$" role="3clF45" />
+      <node concept="3Tm1VV" id="1pPth$m7ZR_" role="1B3o_S" />
+      <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" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="3uibUv" id="4U$Q3dLryHV" role="3clF45">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </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" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="3uibUv" id="4U$Q3dLrIJm" role="3clF45">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </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" />
+    <node concept="3clFb_" id="4KRwoelAtxl" role="jymVt">
+      <property role="TrG5h" value="macroTemplate" />
+      <node concept="3uibUv" id="4KRwoelAyo8" role="3clF45">
+        <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
+        <node concept="16syzq" id="4KRwoelDRZs" role="11_B2D">
+          <ref role="16sUi3" node="4KRwoelDRX0" resolve="T" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4KRwoelAtxp" role="1B3o_S" />
+      <node concept="3clFbS" id="4KRwoelAtxq" role="3clF47">
+        <node concept="YS8fn" id="631nQp3ZlPl" role="3cqZAp">
+          <node concept="2ShNRf" id="631nQp3ZlPP" role="YScLw">
+            <node concept="1pGfFk" id="631nQp3Zn5D" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4KRwoelAyUd" role="3clF46">
+        <property role="TrG5h" value="concept" />
+        <node concept="3bZ5Sz" id="4KRwoelAyUc" role="1tU5fm" />
+      </node>
+      <node concept="16euLQ" id="4KRwoelDRX0" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="1eKXYsjxDj6" role="3ztrMU">
+          <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5itBwM7qAd7" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5itBwM8SKbL" role="jymVt" />
+    <node concept="3clFb_" id="5itBwM8SJDJ" role="jymVt">
+      <property role="TrG5h" value="macroTemplate" />
+      <node concept="3uibUv" id="5itBwM8SJDK" role="3clF45">
+        <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
+        <node concept="16syzq" id="5itBwM8SJDL" role="11_B2D">
+          <ref role="16sUi3" node="5itBwM8SJDQ" resolve="T" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5itBwM8SJDM" role="1B3o_S" />
+      <node concept="3clFbS" id="5itBwM8SJDN" role="3clF47">
+        <node concept="YS8fn" id="631nQp3ZLIO" role="3cqZAp">
+          <node concept="2ShNRf" id="631nQp3ZLIP" role="YScLw">
+            <node concept="1pGfFk" id="631nQp3ZLIQ" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="5itBwM8SK_e" role="3clF46">
+        <property role="TrG5h" value="templateRef" />
+        <node concept="3uibUv" id="5itBwM8SK_f" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="16euLQ" id="5itBwM8SJDQ" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="5itBwM8SJDR" role="3ztrMU">
+          <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5itBwM8SJDS" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4MEOIDEgpw7" role="jymVt" />
+    <node concept="3clFb_" id="5itBwM7qDtj" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="expandMacroTemplate" />
+      <node concept="37vLTG" id="5itBwM7qKJP" role="3clF46">
+        <property role="TrG5h" value="concept" />
+        <node concept="3bZ5Sz" id="5itBwM7qLaK" role="1tU5fm" />
+      </node>
+      <node concept="3Tm1VV" id="5itBwM7qDtm" role="1B3o_S" />
+      <node concept="3clFbS" id="5itBwM7qDtn" role="3clF47" />
+      <node concept="16euLQ" id="5itBwM7qF7O" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="5itBwM86KXZ" role="3ztrMU">
+          <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+        </node>
+      </node>
+      <node concept="3vKaQO" id="4U$Q3dLVb19" role="3clF45">
+        <node concept="3uibUv" id="5itBwM7qIjS" role="3O5elw">
+          <ref role="3uigEE" node="5itBwM75Jiy" resolve="ExpandMacroTemplate" />
+          <node concept="16syzq" id="5itBwM7qJ7n" role="11_B2D">
+            <ref role="16sUi3" node="5itBwM7qF7O" resolve="T" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6UWSvq4Vn68" role="jymVt" />
+    <node concept="3clFb_" id="4MEOIDEgpuf" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="callMacroTemplate" />
+      <node concept="3uibUv" id="4MEOIDEgpug" 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>
+      </node>
+      <node concept="3Tm1VV" id="4MEOIDEgpui" role="1B3o_S" />
+      <node concept="3clFbS" id="4MEOIDEgpuj" role="3clF47" />
+      <node concept="16euLQ" id="4MEOIDEgpum" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="5itBwM8MPLU" role="3ztrMU">
+          <ref role="3uigEE" node="5itBwM86qnn" resolve="CallMacroTemplate.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>
+    </node>
+    <node concept="2tJIrI" id="5itBwM7qCDt" role="jymVt" />
+    <node concept="3clFb_" id="6UWSvq4Vn1v" role="jymVt">
+      <property role="TrG5h" value="allMacroConcepts" />
+      <node concept="3vKaQO" id="6UWSvq4Vn1w" role="3clF45">
+        <node concept="3bZ5Sz" id="6UWSvq4VpUS" role="3O5elw" />
+      </node>
+      <node concept="3Tm1VV" id="6UWSvq4Vn1y" role="1B3o_S" />
+      <node concept="3clFbS" id="6UWSvq4Vn1z" role="3clF47">
+        <node concept="YS8fn" id="631nQp3ZXzf" role="3cqZAp">
+          <node concept="2ShNRf" id="631nQp3ZXzg" role="YScLw">
+            <node concept="1pGfFk" id="631nQp3ZXzh" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5itBwM7qscB" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4MEOIDEWLmE" role="jymVt" />
+    <node concept="3clFb_" id="4MEOIDEWLkY" role="jymVt">
+      <property role="TrG5h" value="allMacroTemplateRefs" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="3vKaQO" id="4MEOIDEWLkZ" role="3clF45">
+        <node concept="3uibUv" id="5yr01fDuVLk" role="3O5elw">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4MEOIDEWLl1" role="1B3o_S" />
+      <node concept="3clFbS" id="4MEOIDEWLl2" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="4KRwoelAvaR" role="jymVt" />
+  </node>
+  <node concept="312cEu" id="1hX44vNlvEV">
+    <property role="TrG5h" value="AbstractMacroTemplate" />
+    <property role="1sVAO0" value="true" />
+    <property role="3GE5qa" value="macro" />
+    <node concept="2tJIrI" id="1hX44vNlvFZ" role="jymVt" />
+    <node concept="3HP615" id="1eKXYsjvSZy" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="MacroTemplateAction" />
+      <node concept="3clFb_" id="1eKXYsjvTXf" role="jymVt">
+        <property role="TrG5h" value="doAction" />
+        <node concept="37vLTG" id="1eKXYsjvTZZ" role="3clF46">
+          <property role="TrG5h" value="template" />
+          <node concept="3uibUv" id="1eKXYsjvU1s" role="1tU5fm">
+            <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
+            <node concept="16syzq" id="1eKXYsjvU6M" role="11_B2D">
+              <ref role="16sUi3" node="1eKXYsjvTOg" resolve="Cfg" />
+            </node>
+          </node>
+        </node>
+        <node concept="16syzq" id="1eKXYsjwskj" role="3clF45">
+          <ref role="16sUi3" node="1eKXYsjws1d" resolve="R" />
+        </node>
+        <node concept="3Tm1VV" id="1eKXYsjvTXi" role="1B3o_S" />
+        <node concept="3clFbS" id="1eKXYsjvTXj" role="3clF47" />
+        <node concept="16euLQ" id="1eKXYsjvTOg" role="16eVyc">
+          <property role="TrG5h" value="Cfg" />
+          <node concept="3uibUv" id="1eKXYsjvTPL" role="3ztrMU">
+            <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2Y70AYExG0f" role="jymVt" />
+      <node concept="3clFb_" id="2Y70AYExG1D" role="jymVt">
+        <property role="TrG5h" value="defaultValue" />
+        <node concept="16syzq" id="2Y70AYExG4Q" role="3clF45">
+          <ref role="16sUi3" node="1eKXYsjws1d" resolve="R" />
+        </node>
+        <node concept="3Tm1VV" id="2Y70AYExG1G" role="1B3o_S" />
+        <node concept="3clFbS" id="2Y70AYExG1H" role="3clF47" />
+      </node>
+      <node concept="3Tm1VV" id="1eKXYsjxjKN" role="1B3o_S" />
+      <node concept="16euLQ" id="1eKXYsjws1d" role="16eVyc">
+        <property role="TrG5h" value="R" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5itBwM7glQO" role="jymVt" />
+    <node concept="3clFbW" id="5yr01fDEuEm" role="jymVt">
+      <node concept="37vLTG" id="5yr01fDEuFQ" role="3clF46">
+        <property role="TrG5h" value="macroTemplateRef" />
+        <node concept="3uibUv" id="5yr01fDEuKu" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="5yr01fDEuEo" role="3clF45" />
+      <node concept="3Tm1VV" id="5yr01fDEuEp" role="1B3o_S" />
+      <node concept="3clFbS" id="5yr01fDEuEq" role="3clF47">
+        <node concept="3clFbF" id="5yr01fDEuP6" role="3cqZAp">
+          <node concept="37vLTI" id="5yr01fDEuP8" role="3clFbG">
+            <node concept="2OqwBi" id="5yr01fDEuW9" role="37vLTJ">
+              <node concept="Xjq3P" id="5yr01fDEuXs" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5yr01fDEuWc" role="2OqNvi">
+                <ref role="2Oxat5" node="5yr01fDEuP2" resolve="macroTemplateRef" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5yr01fDEuPc" role="37vLTx">
+              <ref role="3cqZAo" node="5yr01fDEuFQ" resolve="macroTemplateRef" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5itBwM7dHzn" role="jymVt" />
+    <node concept="3clFb_" id="5yr01fDEv3T" role="jymVt">
+      <property role="TrG5h" value="getTemplateRef" />
+      <node concept="3uibUv" id="5yr01fDEvaQ" role="3clF45">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+      <node concept="3Tm1VV" id="5itBwM9tuPl" role="1B3o_S" />
+      <node concept="3clFbS" id="5yr01fDEv3X" role="3clF47">
+        <node concept="3clFbF" id="5yr01fDEvuy" role="3cqZAp">
+          <node concept="37vLTw" id="5yr01fDEvux" role="3clFbG">
+            <ref role="3cqZAo" node="5yr01fDEuP2" resolve="macroTemplateRef" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5itBwM9tEgh" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4MEOIDG7xoH" role="jymVt" />
+    <node concept="3Tm1VV" id="1hX44vNlvEW" role="1B3o_S" />
+    <node concept="16euLQ" id="1hX44vNlw2n" role="16eVyc">
+      <property role="TrG5h" value="Cfg" />
+      <node concept="3uibUv" id="1eKXYsjvytI" role="3ztrMU">
+        <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
+      </node>
+    </node>
+    <node concept="3uibUv" id="1hX44vNnjSd" role="EKbjA">
+      <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
+      <node concept="16syzq" id="1eKXYsjvyP6" role="11_B2D">
+        <ref role="16sUi3" node="1hX44vNlw2n" resolve="Cfg" />
+      </node>
+    </node>
+    <node concept="312cEg" id="5yr01fDEuP2" role="jymVt">
+      <property role="TrG5h" value="macroTemplateRef" />
+      <node concept="3Tm6S6" id="5yr01fDEuP3" role="1B3o_S" />
+      <node concept="3uibUv" id="5yr01fDEuP5" role="1tU5fm">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="4MEOIDFA48I">
+    <property role="TrG5h" value="AbstractTermDeclaration" />
+    <property role="1sVAO0" value="true" />
+    <node concept="2tJIrI" id="4MEOIDFA4bd" role="jymVt" />
+    <node concept="3clFb_" id="4MEOIDFA4bP" role="jymVt">
+      <property role="TrG5h" value="getTerm" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="3uibUv" id="4MEOIDFA4e5" role="3clF45">
+        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+      </node>
+      <node concept="3Tm1VV" id="4MEOIDFA4bS" role="1B3o_S" />
+      <node concept="3clFbS" id="4MEOIDFA4bT" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="4MEOIDFA4bf" role="jymVt" />
+    <node concept="3Tm1VV" id="4MEOIDFA48J" role="1B3o_S" />
+  </node>
+  <node concept="3HP615" id="5itBwM7auSJ">
+    <property role="TrG5h" value="CallMacroTemplate" />
+    <property role="3GE5qa" value="macro" />
+    <node concept="2tJIrI" id="5itBwM7awS2" role="jymVt" />
+    <node concept="3HP615" id="5itBwM86qnn" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Token" />
+      <node concept="2tJIrI" id="5itBwM86qtB" role="jymVt" />
+      <node concept="3clFb_" id="5ynGfcflmng" role="jymVt">
+        <property role="TrG5h" value="withParam" />
+        <node concept="37vLTG" id="5ynGfcflmnh" role="3clF46">
+          <property role="TrG5h" value="value" />
+          <node concept="8X2XB" id="5ynGfcflmni" role="1tU5fm">
+            <node concept="3uibUv" id="5ynGfcflmnj" role="8Xvag">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="5itBwM86wcf" role="3clF45">
+          <ref role="3uigEE" node="5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+        </node>
+        <node concept="3Tm1VV" id="5ynGfcflmnk" role="1B3o_S" />
+        <node concept="3clFbS" id="5ynGfcflmnl" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="5itBwM86qES" role="jymVt" />
+      <node concept="3clFb_" id="5itBwM86qET" role="jymVt">
+        <property role="TrG5h" value="withLogical" />
+        <node concept="37vLTG" id="5itBwM86qEU" role="3clF46">
+          <property role="TrG5h" value="logical" />
+          <node concept="8X2XB" id="5itBwM86qEV" role="1tU5fm">
+            <node concept="3uibUv" id="5itBwM86qEW" role="8Xvag">
+              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="5itBwM86wit" role="3clF45">
+          <ref role="3uigEE" node="5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+        </node>
+        <node concept="3Tm1VV" id="5itBwM86qEY" role="1B3o_S" />
+        <node concept="3clFbS" id="5itBwM86qEZ" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="5itBwM86quw" role="jymVt" />
+      <node concept="3Tm1VV" id="5itBwM86qno" role="1B3o_S" />
+      <node concept="3uibUv" id="5itBwM86q$H" role="3HQHJm">
+        <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5itBwM86qmr" role="jymVt" />
+    <node concept="3clFb_" id="5ynGfcflmnm" role="jymVt">
+      <property role="TrG5h" value="createToken" />
+      <node concept="37vLTG" id="5ynGfcflmnn" role="3clF46">
+        <property role="TrG5h" value="session" />
+        <node concept="3uibUv" id="5ynGfcflmno" role="1tU5fm">
+          <ref role="3uigEE" node="18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+        </node>
+      </node>
+      <node concept="16syzq" id="5itBwM7Wtx2" role="3clF45">
+        <ref role="16sUi3" node="5itBwM7awuy" resolve="T" />
+      </node>
+      <node concept="3Tm1VV" id="5ynGfcflmnp" role="1B3o_S" />
+      <node concept="3clFbS" id="5ynGfcflmnq" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="5itBwM7cJ7C" role="jymVt" />
+    <node concept="3Tm1VV" id="5itBwM7auSK" role="1B3o_S" />
+    <node concept="16euLQ" id="5itBwM7awuy" role="16eVyc">
+      <property role="TrG5h" value="T" />
+      <node concept="3uibUv" id="5itBwM86rvl" role="3ztrMU">
+        <ref role="3uigEE" node="5itBwM86qnn" resolve="CallMacroTemplate.Token" />
+      </node>
+    </node>
+    <node concept="3uibUv" id="5itBwM7kOW9" role="3HQHJm">
+      <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
+      <node concept="16syzq" id="5itBwM7kQhK" role="11_B2D">
+        <ref role="16sUi3" node="5itBwM7awuy" resolve="T" />
+      </node>
+    </node>
+  </node>
+  <node concept="3HP615" id="5itBwM75Jiy">
+    <property role="TrG5h" value="ExpandMacroTemplate" />
+    <property role="3GE5qa" value="macro" />
+    <node concept="2tJIrI" id="5itBwM75KSu" role="jymVt" />
+    <node concept="3HP615" id="5itBwM86qUH" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Token" />
+      <node concept="2tJIrI" id="5itBwM86qUI" role="jymVt" />
+      <node concept="3clFb_" id="5itBwM86qUR" role="jymVt">
+        <property role="TrG5h" value="withLogical" />
+        <node concept="37vLTG" id="5itBwM86qUS" role="3clF46">
+          <property role="TrG5h" value="logical" />
+          <node concept="8X2XB" id="5itBwM86qUT" role="1tU5fm">
+            <node concept="3uibUv" id="5itBwM86qUU" role="8Xvag">
+              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="5itBwM86wru" role="3clF45">
+          <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+        </node>
+        <node concept="3Tm1VV" id="5itBwM86qUW" role="1B3o_S" />
+        <node concept="3clFbS" id="5itBwM86qUX" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="5itBwM86qUY" role="jymVt" />
+      <node concept="3Tm1VV" id="5itBwM86qUZ" role="1B3o_S" />
+      <node concept="3uibUv" id="5itBwM86qV0" role="3HQHJm">
+        <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5itBwM9zYtQ" role="jymVt" />
+    <node concept="3clFb_" id="5itBwM9zYlU" role="jymVt">
+      <property role="TrG5h" value="getPrototypeTemplateRef" />
+      <node concept="3uibUv" id="5itBwM9zYlV" role="3clF45">
+        <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>
+    <node concept="2tJIrI" id="5itBwM86qTH" role="jymVt" />
+    <node concept="3clFb_" id="5ynGfcflmnr" role="jymVt">
+      <property role="TrG5h" value="createToken" />
+      <node concept="37vLTG" id="5itBwM78ycI" role="3clF46">
+        <property role="TrG5h" value="input" />
+        <node concept="3Tqbb2" id="5itBwM78yZL" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="5ynGfcflmns" role="3clF46">
+        <property role="TrG5h" value="session" />
+        <node concept="3uibUv" id="5ynGfcflmnt" role="1tU5fm">
+          <ref role="3uigEE" node="18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+        </node>
+      </node>
+      <node concept="16syzq" id="5ynGfcflmnu" role="3clF45">
+        <ref role="16sUi3" node="5itBwM75LFm" resolve="T" />
+      </node>
+      <node concept="3Tm1VV" id="5ynGfcflmnv" role="1B3o_S" />
+      <node concept="3clFbS" id="5ynGfcflmnw" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="5itBwM75QRQ" role="jymVt" />
+    <node concept="3Tm1VV" id="5itBwM75Jiz" role="1B3o_S" />
+    <node concept="16euLQ" id="5itBwM75LFm" role="16eVyc">
+      <property role="TrG5h" value="T" />
+      <node concept="3uibUv" id="5itBwM86rjR" role="3ztrMU">
+        <ref role="3uigEE" node="5itBwM86qUH" resolve="ExpandMacroTemplate.Token" />
+      </node>
+    </node>
+    <node concept="3uibUv" id="5itBwM7cB81" role="3HQHJm">
+      <ref role="3uigEE" node="1hX44vNnjJ$" resolve="MacroTemplate" />
+      <node concept="16syzq" id="5itBwM7cB_U" role="11_B2D">
+        <ref role="16sUi3" node="5itBwM75LFm" resolve="T" />
+      </node>
+    </node>
+  </node>
+  <node concept="3HP615" id="1hX44vNnjJ$">
+    <property role="TrG5h" value="MacroTemplate" />
+    <property role="3GE5qa" value="macro" />
+    <node concept="2tJIrI" id="1hX44vNnkEr" role="jymVt" />
+    <node concept="3HP615" id="1eKXYsjvsOy" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Token" />
+      <node concept="2tJIrI" id="5itBwM7bY24" role="jymVt" />
+      <node concept="3clFb_" id="5itBwM7bY2d" role="jymVt">
+        <property role="TrG5h" value="apply" />
+        <node concept="3uibUv" id="5itBwM7bY2e" role="3clF45">
+          <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
+        </node>
+        <node concept="3Tm1VV" id="5itBwM7bY2f" role="1B3o_S" />
+        <node concept="3clFbS" id="5itBwM7bY2g" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="5itBwM7bQMg" role="jymVt" />
+      <node concept="3Tm1VV" id="1eKXYsjvsOz" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="1eKXYsjvsN9" role="jymVt" />
+    <node concept="3clFb_" id="5itBwM9tCq1" role="jymVt">
+      <property role="TrG5h" value="getTemplateRef" />
+      <node concept="3uibUv" id="5itBwM9tDzV" role="3clF45">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+      <node concept="3Tm1VV" id="5itBwM9tCq4" role="1B3o_S" />
+      <node concept="3clFbS" id="5itBwM9tCq5" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="5DUvKnrzig5" role="jymVt" />
+    <node concept="3Tm1VV" id="1hX44vNnjJ_" role="1B3o_S" />
+    <node concept="16euLQ" id="1eKXYsjvsL$" role="16eVyc">
+      <property role="TrG5h" value="T" />
+      <node concept="3uibUv" id="1eKXYsjvsTm" role="3ztrMU">
+        <ref role="3uigEE" node="1eKXYsjvsOy" resolve="MacroTemplate.Token" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
index 8530adf1..cbb2a8d6 100644
--- a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
@@ -12,7 +12,6 @@
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
-    <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
     <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
     <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
index fce0eec6..a6314331 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
@@ -13,7 +13,6 @@
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.coderules.macro)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="i5cy" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.atomic(JDK/)" />
     <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />