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 2c457596..f99c6923 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
@@ -149,6 +149,7 @@
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
@@ -4953,6 +4954,11 @@
       <ref role="2rTdP9" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
       <ref role="2rZz_L" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
     </node>
+    <node concept="2rT7sh" id="5itBwM61GZv" role="2rTMjI">
+      <property role="TrG5h" value="param_field" />
+      <ref role="2rTdP9" to="wq2x:5itBwM5i6X6" resolve="CallMacroParameterDeclaration" />
+      <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
+    </node>
     <node concept="3lhOvk" id="2N2MQGCMWNw" role="3lj3bC">
       <ref role="30HIoZ" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
       <ref role="3lhOvi" node="2N2MQGCMHqo" resolve="_MacroTable" />
@@ -6221,11 +6227,18 @@
               <node concept="3JmXsc" id="1GNw78$a43u" role="3Jn$fo">
                 <node concept="3clFbS" id="1GNw78$a43v" role="2VODD2">
                   <node concept="3clFbF" id="1GNw78$a43w" role="3cqZAp">
-                    <node concept="2OqwBi" id="1GNw78$a43x" role="3clFbG">
-                      <node concept="3Tsc0h" id="1GNw78$a43y" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
+                    <node concept="2OqwBi" id="5itBwM5CsXG" role="3clFbG">
+                      <node concept="2OqwBi" id="1GNw78$a43x" role="2Oq$k0">
+                        <node concept="3Tsc0h" id="1GNw78$a43y" role="2OqNvi">
+                          <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
+                        </node>
+                        <node concept="30H73N" id="1GNw78$a43z" role="2Oq$k0" />
+                      </node>
+                      <node concept="v3k3i" id="5itBwM5CvAy" role="2OqNvi">
+                        <node concept="chp4Y" id="5itBwM5Cw95" role="v3oSu">
+                          <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
+                        </node>
                       </node>
-                      <node concept="30H73N" id="1GNw78$a43z" role="2Oq$k0" />
                     </node>
                   </node>
                 </node>
@@ -6314,10 +6327,17 @@
             <node concept="3JmXsc" id="6UWSvq4V$zv" role="3Jn$fo">
               <node concept="3clFbS" id="6UWSvq4V$zx" role="2VODD2">
                 <node concept="3clFbF" id="6UWSvq4V_wP" role="3cqZAp">
-                  <node concept="2OqwBi" id="6UWSvq4V_J_" role="3clFbG">
-                    <node concept="30H73N" id="6UWSvq4V_wO" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="6UWSvq4V_ZJ" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
+                  <node concept="2OqwBi" id="5itBwM5CfeV" role="3clFbG">
+                    <node concept="2OqwBi" id="6UWSvq4V_J_" role="2Oq$k0">
+                      <node concept="30H73N" id="6UWSvq4V_wO" role="2Oq$k0" />
+                      <node concept="3Tsc0h" id="6UWSvq4V_ZJ" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
+                      </node>
+                    </node>
+                    <node concept="v3k3i" id="5itBwM5CibQ" role="2OqNvi">
+                      <node concept="chp4Y" id="5itBwM5CjQg" role="v3oSu">
+                        <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -6450,10 +6470,17 @@
               <node concept="3JmXsc" id="4MEOIDEhXIV" role="3Jn$fo">
                 <node concept="3clFbS" id="4MEOIDEhXIX" role="2VODD2">
                   <node concept="3clFbF" id="4MEOIDEhYfL" role="3cqZAp">
-                    <node concept="2OqwBi" id="4MEOIDEhYNh" role="3clFbG">
-                      <node concept="30H73N" id="4MEOIDEhYfK" role="2Oq$k0" />
-                      <node concept="3Tsc0h" id="4MEOIDEhZ$2" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
+                    <node concept="2OqwBi" id="5itBwM5Gqto" role="3clFbG">
+                      <node concept="2OqwBi" id="4MEOIDEhYNh" role="2Oq$k0">
+                        <node concept="30H73N" id="4MEOIDEhYfK" role="2Oq$k0" />
+                        <node concept="3Tsc0h" id="4MEOIDEhZ$2" role="2OqNvi">
+                          <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
+                        </node>
+                      </node>
+                      <node concept="v3k3i" id="5itBwM5GsGn" role="2OqNvi">
+                        <node concept="chp4Y" id="5itBwM5GtAf" role="v3oSu">
+                          <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -6551,11 +6578,18 @@
             <node concept="3JmXsc" id="4MEOIDEWLFN" role="3Jn$fo">
               <node concept="3clFbS" id="4MEOIDEWLFO" role="2VODD2">
                 <node concept="3clFbF" id="4MEOIDEWLFP" role="3cqZAp">
-                  <node concept="2OqwBi" id="4MEOIDEWLFQ" role="3clFbG">
-                    <node concept="3Tsc0h" id="4MEOIDEWLFR" role="2OqNvi">
-                      <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
+                  <node concept="2OqwBi" id="5itBwM5Fp4s" role="3clFbG">
+                    <node concept="2OqwBi" id="4MEOIDEWLFQ" role="2Oq$k0">
+                      <node concept="3Tsc0h" id="4MEOIDEWLFR" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
+                      </node>
+                      <node concept="30H73N" id="4MEOIDEWLFS" role="2Oq$k0" />
+                    </node>
+                    <node concept="v3k3i" id="5itBwM5Frtu" role="2OqNvi">
+                      <node concept="chp4Y" id="5itBwM5FsJw" role="v3oSu">
+                        <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
+                      </node>
                     </node>
-                    <node concept="30H73N" id="4MEOIDEWLFS" role="2Oq$k0" />
                   </node>
                 </node>
               </node>
@@ -6579,7 +6613,11 @@
         <ref role="v9R2y" node="1GNw78$HcGL" resolve="frag_MacroTable_MacroTemplate" />
       </node>
     </node>
-    <node concept="2tJIrI" id="1GNw78$IwZE" role="jymVt" />
+    <node concept="2tJIrI" id="1GNw78$IwZE" role="jymVt">
+      <node concept="5jKBG" id="5itBwM5KGOr" role="lGtFl">
+        <ref role="v9R2y" node="5itBwM5DDFP" resolve="frag_MacroTable_CallMacroTemplate" />
+      </node>
+    </node>
     <node concept="3Tm1VV" id="2N2MQGCMHqp" role="1B3o_S" />
     <node concept="n94m4" id="2N2MQGCMHqq" role="lGtFl">
       <ref role="n9lRv" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
@@ -10777,11 +10815,18 @@
           <node concept="3JmXsc" id="4JJCDIm$BmN" role="3Jn$fo">
             <node concept="3clFbS" id="4JJCDIm$BmO" role="2VODD2">
               <node concept="3clFbF" id="4JJCDIm$BmU" role="3cqZAp">
-                <node concept="2OqwBi" id="4JJCDIm$BmP" role="3clFbG">
-                  <node concept="3Tsc0h" id="4JJCDIm$BmS" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
+                <node concept="2OqwBi" id="5itBwM5CDiL" role="3clFbG">
+                  <node concept="2OqwBi" id="4JJCDIm$BmP" role="2Oq$k0">
+                    <node concept="3Tsc0h" id="4JJCDIm$BmS" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
+                    </node>
+                    <node concept="30H73N" id="4JJCDIm$BmT" role="2Oq$k0" />
+                  </node>
+                  <node concept="v3k3i" id="5itBwM5CFAg" role="2OqNvi">
+                    <node concept="chp4Y" id="5itBwM5CI6B" role="v3oSu">
+                      <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
+                    </node>
                   </node>
-                  <node concept="30H73N" id="4JJCDIm$BmT" role="2Oq$k0" />
                 </node>
               </node>
             </node>
@@ -12055,72 +12100,111 @@
                 </node>
               </node>
               <node concept="raruj" id="7kTeLbPzYR4" role="lGtFl" />
-              <node concept="1W57fq" id="7kTeLbPzYR5" role="lGtFl">
-                <node concept="3IZrLx" id="7kTeLbPzYR6" role="3IZSJc">
-                  <node concept="3clFbS" id="7kTeLbPzYR7" role="2VODD2">
-                    <node concept="3cpWs8" id="7kTeLbPzYR8" role="3cqZAp">
-                      <node concept="3cpWsn" id="7kTeLbPzYR9" role="3cpWs9">
-                        <property role="TrG5h" value="head" />
-                        <node concept="3Tqbb2" id="7kTeLbPzYRa" role="1tU5fm">
-                          <ref role="ehGHo" to="wq2x:6p0DfM0a3gA" resolve="Head" />
-                        </node>
-                        <node concept="2OqwBi" id="7kTeLbPzYRb" role="33vP2m">
-                          <node concept="30H73N" id="7kTeLbPzYRc" role="2Oq$k0" />
-                          <node concept="2Xjw5R" id="7kTeLbPzYRd" role="2OqNvi">
-                            <node concept="1xMEDy" id="7kTeLbPzYRe" role="1xVPHs">
-                              <node concept="chp4Y" id="7kTeLbPzYRf" role="ri$Ld">
-                                <ref role="cht4Q" to="wq2x:6p0DfM0a3gA" resolve="Head" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="7kTeLbPzYRg" role="3cqZAp">
-                      <node concept="1Wc70l" id="7kTeLbPzYRh" role="3clFbG">
-                        <node concept="2OqwBi" id="7kTeLbPzYRi" role="3uHU7B">
-                          <node concept="37vLTw" id="7kTeLbPzYRj" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7kTeLbPzYR9" resolve="head" />
-                          </node>
-                          <node concept="3x8VRR" id="7kTeLbPzYRk" role="2OqNvi" />
-                        </node>
-                        <node concept="2OqwBi" id="7kTeLbPzYRl" role="3uHU7w">
-                          <node concept="37vLTw" id="7kTeLbPzYRm" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7kTeLbPzYR9" resolve="head" />
-                          </node>
-                          <node concept="3TrcHB" id="7kTeLbPzYRn" role="2OqNvi">
-                            <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
-                          </node>
-                        </node>
-                      </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="5itBwM5OJBx" role="30HLyM">
+        <node concept="3clFbS" id="5itBwM5OJBy" role="2VODD2">
+          <node concept="3cpWs8" id="5itBwM5OKgg" role="3cqZAp">
+            <node concept="3cpWsn" id="5itBwM5OKgh" role="3cpWs9">
+              <property role="TrG5h" value="head" />
+              <node concept="3Tqbb2" id="5itBwM5OKgi" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:6p0DfM0a3gA" resolve="Head" />
+              </node>
+              <node concept="2OqwBi" id="5itBwM5OKgj" role="33vP2m">
+                <node concept="30H73N" id="5itBwM5OKgk" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="5itBwM5OKgl" role="2OqNvi">
+                  <node concept="1xMEDy" id="5itBwM5OKgm" role="1xVPHs">
+                    <node concept="chp4Y" id="5itBwM5OKgn" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:6p0DfM0a3gA" resolve="Head" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="7kTeLbPzYRo" role="3cqZAp">
-              <node concept="2OqwBi" id="7kTeLbPzYRp" role="3clFbG">
-                <node concept="liA8E" id="7kTeLbPzYRq" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$bq" resolve="appendHeadReplaced" />
-                  <node concept="10Nm6u" id="7kTeLbPzYRr" role="37wK5m">
-                    <node concept="29HgVG" id="7kTeLbPzYRs" role="lGtFl" />
+          </node>
+          <node concept="3clFbF" id="5itBwM5OKgo" role="3cqZAp">
+            <node concept="1Wc70l" id="5itBwM5OKgp" role="3clFbG">
+              <node concept="2OqwBi" id="5itBwM5OKgq" role="3uHU7B">
+                <node concept="37vLTw" id="5itBwM5OKgr" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5itBwM5OKgh" resolve="head" />
+                </node>
+                <node concept="3x8VRR" id="5itBwM5OKgs" role="2OqNvi" />
+              </node>
+              <node concept="2OqwBi" id="5itBwM5OKgt" role="3uHU7w">
+                <node concept="37vLTw" id="5itBwM5OKgu" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5itBwM5OKgh" resolve="head" />
+                </node>
+                <node concept="3TrcHB" id="5itBwM5OKgv" role="2OqNvi">
+                  <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="5itBwM5OFSb" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="wq2x:6p0DfM0ajMA" resolve="AbstractConstraint" />
+      <node concept="1Koe21" id="5itBwM5OFSc" role="1lVwrX">
+        <node concept="3clFb_" id="5itBwM5OFSd" role="1Koe22">
+          <property role="TrG5h" value="method" />
+          <node concept="3cqZAl" id="5itBwM5OFSe" role="3clF45" />
+          <node concept="3Tm6S6" id="5itBwM5OFSf" role="1B3o_S" />
+          <node concept="3clFbS" id="5itBwM5OFSg" role="3clF47">
+            <node concept="3cpWs8" id="5itBwM5OFSh" role="3cqZAp">
+              <node concept="3cpWsn" id="5itBwM5OFSi" role="3cpWs9">
+                <property role="TrG5h" value="builder" />
+                <node concept="3uibUv" id="5itBwM5OFSj" role="1tU5fm">
+                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                </node>
+                <node concept="2ShNRf" id="5itBwM5OFSk" role="33vP2m">
+                  <node concept="1pGfFk" id="5itBwM5OFSl" role="2ShVmc">
+                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <node concept="10Nm6u" id="5itBwM5OFSm" role="37wK5m" />
+                    <node concept="Xl_RD" id="5itBwM5OFSn" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                    </node>
                   </node>
                 </node>
-                <node concept="37vLTw" id="7kTeLbPzYRt" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7kTeLbPzYQG" resolve="builder" />
-                  <node concept="1sPUBX" id="7kTeLbPzYRu" role="lGtFl">
+              </node>
+            </node>
+            <node concept="3clFbH" id="5itBwM5OFSo" role="3cqZAp" />
+            <node concept="3SKdUt" id="5itBwM5OFSp" role="3cqZAp">
+              <node concept="1PaTwC" id="5itBwM5OFSq" role="3ndbpf">
+                <node concept="3oM_SD" id="5itBwM5OFSr" role="1PaTwD">
+                  <property role="3oM_SC" value="rule" />
+                </node>
+                <node concept="3oM_SD" id="5itBwM5OFSs" role="1PaTwD">
+                  <property role="3oM_SC" value="parts" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5itBwM5OFT1" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5OFT2" role="3clFbG">
+                <node concept="liA8E" id="5itBwM5OFT3" role="2OqNvi">
+                  <ref role="37wK5l" to="i348:7eGEHDlc$bq" resolve="appendHeadReplaced" />
+                  <node concept="10Nm6u" id="5itBwM5OFT4" role="37wK5m">
+                    <node concept="29HgVG" id="5itBwM5OFT5" role="lGtFl" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="5itBwM5OFT6" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5itBwM5OFSi" resolve="builder" />
+                  <node concept="1sPUBX" id="5itBwM5OFT7" role="lGtFl">
                     <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
-                    <node concept="3NFfHV" id="7kTeLbPzYRv" role="1sPUBK">
-                      <node concept="3clFbS" id="7kTeLbPzYRw" role="2VODD2">
-                        <node concept="3clFbF" id="7kTeLbPzYRx" role="3cqZAp">
-                          <node concept="2OqwBi" id="7kTeLbPzYRy" role="3clFbG">
-                            <node concept="30H73N" id="7kTeLbPzYRz" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="7kTeLbPzYR$" role="2OqNvi">
-                              <node concept="3gmYPX" id="7kTeLbPzYR_" role="1xVPHs">
-                                <node concept="3gn64h" id="7kTeLbPzYRA" role="3gmYPZ">
+                    <node concept="3NFfHV" id="5itBwM5OFT8" role="1sPUBK">
+                      <node concept="3clFbS" id="5itBwM5OFT9" role="2VODD2">
+                        <node concept="3clFbF" id="5itBwM5OFTa" role="3cqZAp">
+                          <node concept="2OqwBi" id="5itBwM5OFTb" role="3clFbG">
+                            <node concept="30H73N" id="5itBwM5OFTc" role="2Oq$k0" />
+                            <node concept="2Xjw5R" id="5itBwM5OFTd" role="2OqNvi">
+                              <node concept="3gmYPX" id="5itBwM5OFTe" role="1xVPHs">
+                                <node concept="3gn64h" id="5itBwM5OFTf" role="3gmYPZ">
                                   <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
                                 </node>
-                                <node concept="3gn64h" id="7kTeLbPzYRB" role="3gmYPZ">
+                                <node concept="3gn64h" id="5itBwM5OFTg" role="3gmYPZ">
                                   <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                 </node>
                               </node>
@@ -12132,21 +12216,21 @@
                   </node>
                 </node>
               </node>
-              <node concept="raruj" id="7kTeLbPzYRC" role="lGtFl" />
-              <node concept="1W57fq" id="7kTeLbPzYRD" role="lGtFl">
-                <node concept="3IZrLx" id="7kTeLbPzYRE" role="3IZSJc">
-                  <node concept="3clFbS" id="7kTeLbPzYRF" role="2VODD2">
-                    <node concept="3cpWs8" id="7kTeLbPzYRG" role="3cqZAp">
-                      <node concept="3cpWsn" id="7kTeLbPzYRH" role="3cpWs9">
+              <node concept="raruj" id="5itBwM5OFTh" role="lGtFl" />
+              <node concept="1W57fq" id="5itBwM5OFTi" role="lGtFl">
+                <node concept="3IZrLx" id="5itBwM5OFTj" role="3IZSJc">
+                  <node concept="3clFbS" id="5itBwM5OFTk" role="2VODD2">
+                    <node concept="3cpWs8" id="5itBwM5OFTl" role="3cqZAp">
+                      <node concept="3cpWsn" id="5itBwM5OFTm" role="3cpWs9">
                         <property role="TrG5h" value="head" />
-                        <node concept="3Tqbb2" id="7kTeLbPzYRI" role="1tU5fm">
+                        <node concept="3Tqbb2" id="5itBwM5OFTn" role="1tU5fm">
                           <ref role="ehGHo" to="wq2x:6p0DfM0a3gA" resolve="Head" />
                         </node>
-                        <node concept="2OqwBi" id="7kTeLbPzYRJ" role="33vP2m">
-                          <node concept="30H73N" id="7kTeLbPzYRK" role="2Oq$k0" />
-                          <node concept="2Xjw5R" id="7kTeLbPzYRL" role="2OqNvi">
-                            <node concept="1xMEDy" id="7kTeLbPzYRM" role="1xVPHs">
-                              <node concept="chp4Y" id="7kTeLbPzYRN" role="ri$Ld">
+                        <node concept="2OqwBi" id="5itBwM5OFTo" role="33vP2m">
+                          <node concept="30H73N" id="5itBwM5OFTp" role="2Oq$k0" />
+                          <node concept="2Xjw5R" id="5itBwM5OFTq" role="2OqNvi">
+                            <node concept="1xMEDy" id="5itBwM5OFTr" role="1xVPHs">
+                              <node concept="chp4Y" id="5itBwM5OFTs" role="ri$Ld">
                                 <ref role="cht4Q" to="wq2x:6p0DfM0a3gA" resolve="Head" />
                               </node>
                             </node>
@@ -12154,23 +12238,23 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbF" id="7kTeLbPzYRO" role="3cqZAp">
-                      <node concept="1Wc70l" id="7kTeLbPzYRP" role="3clFbG">
-                        <node concept="3fqX7Q" id="7kTeLbPzYRQ" role="3uHU7w">
-                          <node concept="2OqwBi" id="7kTeLbPzYRR" role="3fr31v">
-                            <node concept="37vLTw" id="7kTeLbPzYRS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7kTeLbPzYRH" resolve="head" />
+                    <node concept="3clFbF" id="5itBwM5OFTt" role="3cqZAp">
+                      <node concept="1Wc70l" id="5itBwM5OFTu" role="3clFbG">
+                        <node concept="3fqX7Q" id="5itBwM5OFTv" role="3uHU7w">
+                          <node concept="2OqwBi" id="5itBwM5OFTw" role="3fr31v">
+                            <node concept="37vLTw" id="5itBwM5OFTx" role="2Oq$k0">
+                              <ref role="3cqZAo" node="5itBwM5OFTm" resolve="head" />
                             </node>
-                            <node concept="3TrcHB" id="7kTeLbPzYRT" role="2OqNvi">
+                            <node concept="3TrcHB" id="5itBwM5OFTy" role="2OqNvi">
                               <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
                             </node>
                           </node>
                         </node>
-                        <node concept="2OqwBi" id="7kTeLbPzYRU" role="3uHU7B">
-                          <node concept="37vLTw" id="7kTeLbPzYRV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7kTeLbPzYRH" resolve="head" />
+                        <node concept="2OqwBi" id="5itBwM5OFTz" role="3uHU7B">
+                          <node concept="37vLTw" id="5itBwM5OFT$" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5itBwM5OFTm" resolve="head" />
                           </node>
-                          <node concept="3x8VRR" id="7kTeLbPzYRW" role="2OqNvi" />
+                          <node concept="3x8VRR" id="5itBwM5OFT_" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
@@ -12178,154 +12262,305 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="7kTeLbPzYRX" role="3cqZAp">
-              <node concept="2OqwBi" id="7kTeLbPzYRY" role="3clFbG">
-                <node concept="liA8E" id="7kTeLbPzYRZ" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$aX" resolve="appendGuard" />
-                  <node concept="10Nm6u" id="7kTeLbPzYS0" role="37wK5m">
-                    <node concept="29HgVG" id="7kTeLbPzYS1" role="lGtFl" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="7kTeLbPzYS2" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7kTeLbPzYQG" resolve="builder" />
-                  <node concept="1sPUBX" id="7kTeLbPzYS3" role="lGtFl">
-                    <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
-                    <node concept="3NFfHV" id="7kTeLbPzYS4" role="1sPUBK">
-                      <node concept="3clFbS" id="7kTeLbPzYS5" role="2VODD2">
-                        <node concept="3clFbF" id="7kTeLbPzYS6" role="3cqZAp">
-                          <node concept="2OqwBi" id="7kTeLbPzYS7" role="3clFbG">
-                            <node concept="30H73N" id="7kTeLbPzYS8" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="7kTeLbPzYS9" role="2OqNvi">
-                              <node concept="3gmYPX" id="7kTeLbPzYSa" role="1xVPHs">
-                                <node concept="3gn64h" id="7kTeLbPzYSb" role="3gmYPZ">
-                                  <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                </node>
-                                <node concept="3gn64h" id="7kTeLbPzYSc" role="3gmYPZ">
-                                  <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="5itBwM5OVmR" role="30HLyM">
+        <node concept="3clFbS" id="5itBwM5OVmS" role="2VODD2">
+          <node concept="3cpWs8" id="5itBwM5OVBC" role="3cqZAp">
+            <node concept="3cpWsn" id="5itBwM5OVBD" role="3cpWs9">
+              <property role="TrG5h" value="head" />
+              <node concept="3Tqbb2" id="5itBwM5OVBE" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:6p0DfM0a3gA" resolve="Head" />
               </node>
-              <node concept="raruj" id="7kTeLbPzYSd" role="lGtFl" />
-              <node concept="1W57fq" id="7kTeLbPzYSe" role="lGtFl">
-                <node concept="3IZrLx" id="7kTeLbPzYSf" role="3IZSJc">
-                  <node concept="3clFbS" id="7kTeLbPzYSg" role="2VODD2">
-                    <node concept="3clFbF" id="7kTeLbPzYSh" role="3cqZAp">
-                      <node concept="2OqwBi" id="7kTeLbPzYSi" role="3clFbG">
-                        <node concept="2OqwBi" id="7kTeLbPzYSj" role="2Oq$k0">
-                          <node concept="30H73N" id="7kTeLbPzYSk" role="2Oq$k0" />
-                          <node concept="2Xjw5R" id="7kTeLbPzYSl" role="2OqNvi">
-                            <node concept="1xMEDy" id="7kTeLbPzYSm" role="1xVPHs">
-                              <node concept="chp4Y" id="7kTeLbPzYSn" role="ri$Ld">
-                                <ref role="cht4Q" to="wq2x:6p0DfM0a3Qe" resolve="Guard" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3x8VRR" id="7kTeLbPzYSo" role="2OqNvi" />
-                      </node>
+              <node concept="2OqwBi" id="5itBwM5OVBF" role="33vP2m">
+                <node concept="30H73N" id="5itBwM5OVBG" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="5itBwM5OVBH" role="2OqNvi">
+                  <node concept="1xMEDy" id="5itBwM5OVBI" role="1xVPHs">
+                    <node concept="chp4Y" id="5itBwM5OVBJ" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:6p0DfM0a3gA" resolve="Head" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="7kTeLbPzYSp" role="3cqZAp">
-              <node concept="2OqwBi" id="7kTeLbPzYSq" role="3clFbG">
-                <node concept="liA8E" id="7kTeLbPzYSr" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7eGEHDlc$aw" resolve="appendBody" />
-                  <node concept="10Nm6u" id="7kTeLbPzYSs" role="37wK5m">
-                    <node concept="29HgVG" id="7kTeLbPzYSt" role="lGtFl" />
+          </node>
+          <node concept="3clFbF" id="5itBwM5OVBK" role="3cqZAp">
+            <node concept="1Wc70l" id="5itBwM5OVBL" role="3clFbG">
+              <node concept="3fqX7Q" id="5itBwM5OVBM" role="3uHU7w">
+                <node concept="2OqwBi" id="5itBwM5OVBN" role="3fr31v">
+                  <node concept="37vLTw" id="5itBwM5OVBO" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5itBwM5OVBD" resolve="head" />
                   </node>
-                </node>
-                <node concept="37vLTw" id="7kTeLbPzYSu" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7kTeLbPzYQG" resolve="builder" />
-                  <node concept="1sPUBX" id="7kTeLbPzYSv" role="lGtFl">
-                    <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
-                    <node concept="3NFfHV" id="7kTeLbPzYSw" role="1sPUBK">
-                      <node concept="3clFbS" id="7kTeLbPzYSx" role="2VODD2">
-                        <node concept="3clFbF" id="7kTeLbPzYSy" role="3cqZAp">
-                          <node concept="2OqwBi" id="7kTeLbPzYSz" role="3clFbG">
-                            <node concept="30H73N" id="7kTeLbPzYS$" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="7kTeLbPzYS_" role="2OqNvi">
-                              <node concept="3gmYPX" id="7kTeLbPzYSA" role="1xVPHs">
-                                <node concept="3gn64h" id="7kTeLbPzYSB" role="3gmYPZ">
-                                  <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                </node>
-                                <node concept="3gn64h" id="7kTeLbPzYSC" role="3gmYPZ">
-                                  <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
+                  <node concept="3TrcHB" id="5itBwM5OVBP" role="2OqNvi">
+                    <ref role="3TsBF5" to="wq2x:6p0DfM0bSv$" resolve="keep" />
                   </node>
                 </node>
               </node>
-              <node concept="raruj" id="7kTeLbPzYSD" role="lGtFl" />
-              <node concept="1W57fq" id="7kTeLbPzYSE" role="lGtFl">
-                <node concept="3IZrLx" id="7kTeLbPzYSF" role="3IZSJc">
-                  <node concept="3clFbS" id="7kTeLbPzYSG" role="2VODD2">
-                    <node concept="3clFbF" id="7kTeLbPzYSH" role="3cqZAp">
-                      <node concept="2OqwBi" id="7kTeLbPzYSI" role="3clFbG">
-                        <node concept="2OqwBi" id="7kTeLbPzYSJ" role="2Oq$k0">
-                          <node concept="30H73N" id="7kTeLbPzYSK" role="2Oq$k0" />
-                          <node concept="2Xjw5R" id="7kTeLbPzYSL" role="2OqNvi">
-                            <node concept="1xMEDy" id="7kTeLbPzYSM" role="1xVPHs">
-                              <node concept="chp4Y" id="7kTeLbPzYSN" role="ri$Ld">
-                                <ref role="cht4Q" to="wq2x:6p0DfM0a3TO" resolve="Body" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3x8VRR" id="7kTeLbPzYSO" role="2OqNvi" />
-                      </node>
+              <node concept="2OqwBi" id="5itBwM5OVBQ" role="3uHU7B">
+                <node concept="37vLTw" id="5itBwM5OVBR" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5itBwM5OVBD" resolve="head" />
+                </node>
+                <node concept="3x8VRR" id="5itBwM5OVBS" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="5itBwM5OPrZ" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="wq2x:6p0DfM0ajMA" resolve="AbstractConstraint" />
+      <node concept="1Koe21" id="5itBwM5OPs0" role="1lVwrX">
+        <node concept="3clFb_" id="5itBwM5OPs1" role="1Koe22">
+          <property role="TrG5h" value="method" />
+          <node concept="3cqZAl" id="5itBwM5OPs2" role="3clF45" />
+          <node concept="3Tm6S6" id="5itBwM5OPs3" role="1B3o_S" />
+          <node concept="3clFbS" id="5itBwM5OPs4" role="3clF47">
+            <node concept="3cpWs8" id="5itBwM5OPs5" role="3cqZAp">
+              <node concept="3cpWsn" id="5itBwM5OPs6" role="3cpWs9">
+                <property role="TrG5h" value="builder" />
+                <node concept="3uibUv" id="5itBwM5OPs7" role="1tU5fm">
+                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                </node>
+                <node concept="2ShNRf" id="5itBwM5OPs8" role="33vP2m">
+                  <node concept="1pGfFk" id="5itBwM5OPs9" role="2ShVmc">
+                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <node concept="10Nm6u" id="5itBwM5OPsa" role="37wK5m" />
+                    <node concept="Xl_RD" id="5itBwM5OPsb" role="37wK5m">
+                      <property role="Xl_RC" value="" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="7kTeLbPzYSP" role="3cqZAp" />
-            <node concept="3SKdUt" id="7kTeLbPzYSQ" role="3cqZAp">
-              <node concept="1PaTwC" id="589APehYww0" role="3ndbpf">
-                <node concept="3oM_SD" id="589APehYww1" role="1PaTwD">
+            <node concept="3clFbH" id="5itBwM5OPsc" role="3cqZAp" />
+            <node concept="3SKdUt" id="5itBwM5OPsd" role="3cqZAp">
+              <node concept="1PaTwC" id="5itBwM5OPse" role="3ndbpf">
+                <node concept="3oM_SD" id="5itBwM5OPsf" role="1PaTwD">
                   <property role="3oM_SC" value="rule" />
                 </node>
-                <node concept="3oM_SD" id="589APehYww2" role="1PaTwD">
+                <node concept="3oM_SD" id="5itBwM5OPsg" role="1PaTwD">
+                  <property role="3oM_SC" value="parts" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5itBwM5OPtq" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5OPtr" role="3clFbG">
+                <node concept="liA8E" id="5itBwM5OPts" role="2OqNvi">
+                  <ref role="37wK5l" to="i348:7eGEHDlc$aX" resolve="appendGuard" />
+                  <node concept="10Nm6u" id="5itBwM5OPtt" role="37wK5m">
+                    <node concept="29HgVG" id="5itBwM5OPtu" role="lGtFl" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="5itBwM5OPtv" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5itBwM5OPs6" resolve="builder" />
+                  <node concept="1sPUBX" id="5itBwM5OPtw" role="lGtFl">
+                    <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
+                    <node concept="3NFfHV" id="5itBwM5OPtx" role="1sPUBK">
+                      <node concept="3clFbS" id="5itBwM5OPty" role="2VODD2">
+                        <node concept="3clFbF" id="5itBwM5OPtz" role="3cqZAp">
+                          <node concept="2OqwBi" id="5itBwM5OPt$" role="3clFbG">
+                            <node concept="30H73N" id="5itBwM5OPt_" role="2Oq$k0" />
+                            <node concept="2Xjw5R" id="5itBwM5OPtA" role="2OqNvi">
+                              <node concept="3gmYPX" id="5itBwM5OPtB" role="1xVPHs">
+                                <node concept="3gn64h" id="5itBwM5OPtC" role="3gmYPZ">
+                                  <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
+                                </node>
+                                <node concept="3gn64h" id="5itBwM5OPtD" role="3gmYPZ">
+                                  <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="5itBwM5OPtE" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="5itBwM5P4C3" role="30HLyM">
+        <node concept="3clFbS" id="5itBwM5P4C4" role="2VODD2">
+          <node concept="3clFbF" id="5itBwM5P5ju" role="3cqZAp">
+            <node concept="2OqwBi" id="5itBwM5P5jv" role="3clFbG">
+              <node concept="2OqwBi" id="5itBwM5P5jw" role="2Oq$k0">
+                <node concept="30H73N" id="5itBwM5P5jx" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="5itBwM5P5jy" role="2OqNvi">
+                  <node concept="1xMEDy" id="5itBwM5P5jz" role="1xVPHs">
+                    <node concept="chp4Y" id="5itBwM5P5j$" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:6p0DfM0a3Qe" resolve="Guard" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3x8VRR" id="5itBwM5P5j_" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="5itBwM5Pc$M" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="wq2x:6p0DfM0ajMA" resolve="AbstractConstraint" />
+      <node concept="1Koe21" id="5itBwM5Pc$N" role="1lVwrX">
+        <node concept="3clFb_" id="5itBwM5Pc$O" role="1Koe22">
+          <property role="TrG5h" value="method" />
+          <node concept="3cqZAl" id="5itBwM5Pc$P" role="3clF45" />
+          <node concept="3Tm6S6" id="5itBwM5Pc$Q" role="1B3o_S" />
+          <node concept="3clFbS" id="5itBwM5Pc$R" role="3clF47">
+            <node concept="3cpWs8" id="5itBwM5Pc$S" role="3cqZAp">
+              <node concept="3cpWsn" id="5itBwM5Pc$T" role="3cpWs9">
+                <property role="TrG5h" value="builder" />
+                <node concept="3uibUv" id="5itBwM5Pc$U" role="1tU5fm">
+                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                </node>
+                <node concept="2ShNRf" id="5itBwM5Pc$V" role="33vP2m">
+                  <node concept="1pGfFk" id="5itBwM5Pc$W" role="2ShVmc">
+                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <node concept="10Nm6u" id="5itBwM5Pc$X" role="37wK5m" />
+                    <node concept="Xl_RD" id="5itBwM5Pc$Y" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="5itBwM5Pc$Z" role="3cqZAp" />
+            <node concept="3SKdUt" id="5itBwM5Pc_0" role="3cqZAp">
+              <node concept="1PaTwC" id="5itBwM5Pc_1" role="3ndbpf">
+                <node concept="3oM_SD" id="5itBwM5Pc_2" role="1PaTwD">
+                  <property role="3oM_SC" value="rule" />
+                </node>
+                <node concept="3oM_SD" id="5itBwM5Pc_3" role="1PaTwD">
+                  <property role="3oM_SC" value="parts" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5itBwM5Pc_4" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5Pc_5" role="3clFbG">
+                <node concept="liA8E" id="5itBwM5Pc_6" role="2OqNvi">
+                  <ref role="37wK5l" to="i348:7eGEHDlc$aw" resolve="appendBody" />
+                  <node concept="10Nm6u" id="5itBwM5Pc_7" role="37wK5m">
+                    <node concept="29HgVG" id="5itBwM5Pc_8" role="lGtFl" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="5itBwM5Pc_9" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5itBwM5Pc$T" resolve="builder" />
+                  <node concept="1sPUBX" id="5itBwM5Pc_a" role="lGtFl">
+                    <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
+                    <node concept="3NFfHV" id="5itBwM5Pc_b" role="1sPUBK">
+                      <node concept="3clFbS" id="5itBwM5Pc_c" role="2VODD2">
+                        <node concept="3clFbF" id="5itBwM5Pc_d" role="3cqZAp">
+                          <node concept="2OqwBi" id="5itBwM5Pc_e" role="3clFbG">
+                            <node concept="30H73N" id="5itBwM5Pc_f" role="2Oq$k0" />
+                            <node concept="2Xjw5R" id="5itBwM5Pc_g" role="2OqNvi">
+                              <node concept="3gmYPX" id="5itBwM5Pc_h" role="1xVPHs">
+                                <node concept="3gn64h" id="5itBwM5Pc_i" role="3gmYPZ">
+                                  <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
+                                </node>
+                                <node concept="3gn64h" id="5itBwM5Pc_j" role="3gmYPZ">
+                                  <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="raruj" id="5itBwM5Pc_k" role="lGtFl" />
+            </node>
+            <node concept="3clFbH" id="5itBwM5Pc_w" role="3cqZAp" />
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="5itBwM5Pf0R" role="30HLyM">
+        <node concept="3clFbS" id="5itBwM5Pf0S" role="2VODD2">
+          <node concept="3clFbF" id="5itBwM5Pg0k" role="3cqZAp">
+            <node concept="2OqwBi" id="5itBwM5Pg0l" role="3clFbG">
+              <node concept="2OqwBi" id="5itBwM5Pg0m" role="2Oq$k0">
+                <node concept="30H73N" id="5itBwM5Pg0n" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="5itBwM5Pg0o" role="2OqNvi">
+                  <node concept="1xMEDy" id="5itBwM5Pg0p" role="1xVPHs">
+                    <node concept="chp4Y" id="5itBwM5Pg0q" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:6p0DfM0a3TO" resolve="Body" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3x8VRR" id="5itBwM5Pg0r" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="5itBwM5P1R2" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="wq2x:6p0DfM0ajMA" resolve="AbstractConstraint" />
+      <node concept="1Koe21" id="5itBwM5P1R3" role="1lVwrX">
+        <node concept="3clFb_" id="5itBwM5P1R4" role="1Koe22">
+          <property role="TrG5h" value="method" />
+          <node concept="3cqZAl" id="5itBwM5P1R5" role="3clF45" />
+          <node concept="3Tm6S6" id="5itBwM5P1R6" role="1B3o_S" />
+          <node concept="3clFbS" id="5itBwM5P1R7" role="3clF47">
+            <node concept="3cpWs8" id="5itBwM5P1R8" role="3cqZAp">
+              <node concept="3cpWsn" id="5itBwM5P1R9" role="3cpWs9">
+                <property role="TrG5h" value="builder" />
+                <node concept="3uibUv" id="5itBwM5P1Ra" role="1tU5fm">
+                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                </node>
+                <node concept="2ShNRf" id="5itBwM5P1Rb" role="33vP2m">
+                  <node concept="1pGfFk" id="5itBwM5P1Rc" role="2ShVmc">
+                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <node concept="10Nm6u" id="5itBwM5P1Rd" role="37wK5m" />
+                    <node concept="Xl_RD" id="5itBwM5P1Re" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="5itBwM5P1Rf" role="3cqZAp" />
+            <node concept="3SKdUt" id="5itBwM5P1Sd" role="3cqZAp">
+              <node concept="1PaTwC" id="5itBwM5P1Se" role="3ndbpf">
+                <node concept="3oM_SD" id="5itBwM5P1Sf" role="1PaTwD">
+                  <property role="3oM_SC" value="rule" />
+                </node>
+                <node concept="3oM_SD" id="5itBwM5P1Sg" role="1PaTwD">
                   <property role="3oM_SC" value="methods" />
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="7kTeLbPzYSS" role="3cqZAp">
-              <node concept="2OqwBi" id="7kTeLbPzYST" role="3clFbG">
-                <node concept="liA8E" id="7kTeLbPzYSU" role="2OqNvi">
+            <node concept="3clFbF" id="5itBwM5P1Sh" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5P1Si" role="3clFbG">
+                <node concept="liA8E" id="5itBwM5P1Sj" role="2OqNvi">
                   <ref role="37wK5l" to="i348:7eGEHDlc$bR" resolve="appendHeadKept" />
-                  <node concept="10Nm6u" id="7kTeLbPzYSV" role="37wK5m">
-                    <node concept="29HgVG" id="7kTeLbPzYSW" role="lGtFl" />
+                  <node concept="10Nm6u" id="5itBwM5P1Sk" role="37wK5m">
+                    <node concept="29HgVG" id="5itBwM5P1Sl" role="lGtFl" />
                   </node>
                 </node>
-                <node concept="37vLTw" id="7kTeLbPzYSX" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7kTeLbPzYQG" resolve="builder" />
-                  <node concept="1sPUBX" id="7kTeLbPzYSY" role="lGtFl">
+                <node concept="37vLTw" id="5itBwM5P1Sm" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5itBwM5P1R9" resolve="builder" />
+                  <node concept="1sPUBX" id="5itBwM5P1Sn" role="lGtFl">
                     <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
-                    <node concept="3NFfHV" id="7kTeLbPzYSZ" role="1sPUBK">
-                      <node concept="3clFbS" id="7kTeLbPzYT0" role="2VODD2">
-                        <node concept="3clFbF" id="7kTeLbPzYT1" role="3cqZAp">
-                          <node concept="2OqwBi" id="7kTeLbPzYT2" role="3clFbG">
-                            <node concept="30H73N" id="7kTeLbPzYT3" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="7kTeLbPzYT4" role="2OqNvi">
-                              <node concept="3gmYPX" id="7kTeLbPzYT5" role="1xVPHs">
-                                <node concept="3gn64h" id="7kTeLbPzYT6" role="3gmYPZ">
+                    <node concept="3NFfHV" id="5itBwM5P1So" role="1sPUBK">
+                      <node concept="3clFbS" id="5itBwM5P1Sp" role="2VODD2">
+                        <node concept="3clFbF" id="5itBwM5P1Sq" role="3cqZAp">
+                          <node concept="2OqwBi" id="5itBwM5P1Sr" role="3clFbG">
+                            <node concept="30H73N" id="5itBwM5P1Ss" role="2Oq$k0" />
+                            <node concept="2Xjw5R" id="5itBwM5P1St" role="2OqNvi">
+                              <node concept="3gmYPX" id="5itBwM5P1Su" role="1xVPHs">
+                                <node concept="3gn64h" id="5itBwM5P1Sv" role="3gmYPZ">
                                   <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
                                 </node>
-                                <node concept="3gn64h" id="7kTeLbPzYT7" role="3gmYPZ">
+                                <node concept="3gn64h" id="5itBwM5P1Sw" role="3gmYPZ">
                                   <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                 </node>
                               </node>
@@ -12337,27 +12572,27 @@
                   </node>
                 </node>
               </node>
-              <node concept="raruj" id="7kTeLbPzYT8" role="lGtFl" />
-              <node concept="1W57fq" id="7kTeLbPzYT9" role="lGtFl">
-                <node concept="3IZrLx" id="7kTeLbPzYTa" role="3IZSJc">
-                  <node concept="3clFbS" id="7kTeLbPzYTb" role="2VODD2">
-                    <node concept="3clFbF" id="7kTeLbPzYTc" role="3cqZAp">
-                      <node concept="3clFbC" id="7kTeLbPzYTd" role="3clFbG">
-                        <node concept="2YIFZM" id="7kTeLbPzYTe" role="3uHU7B">
+              <node concept="raruj" id="5itBwM5P1Sx" role="lGtFl" />
+              <node concept="1W57fq" id="5itBwM5P1Sy" role="lGtFl">
+                <node concept="3IZrLx" id="5itBwM5P1Sz" role="3IZSJc">
+                  <node concept="3clFbS" id="5itBwM5P1S$" role="2VODD2">
+                    <node concept="3clFbF" id="5itBwM5P1S_" role="3cqZAp">
+                      <node concept="3clFbC" id="5itBwM5P1SA" role="3clFbG">
+                        <node concept="2YIFZM" id="5itBwM5P1SB" role="3uHU7B">
                           <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
                           <ref role="1Pybhc" to="hy7p:746Sd4ujSKb" resolve="RuleTemplateUtil" />
-                          <node concept="2OqwBi" id="7kTeLbPzYTf" role="37wK5m">
-                            <node concept="30H73N" id="7kTeLbPzYTg" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="7kTeLbPzYTh" role="2OqNvi">
-                              <node concept="1xMEDy" id="7kTeLbPzYTi" role="1xVPHs">
-                                <node concept="chp4Y" id="7kTeLbPzYTj" role="ri$Ld">
+                          <node concept="2OqwBi" id="5itBwM5P1SC" role="37wK5m">
+                            <node concept="30H73N" id="5itBwM5P1SD" role="2Oq$k0" />
+                            <node concept="2Xjw5R" id="5itBwM5P1SE" role="2OqNvi">
+                              <node concept="1xMEDy" id="5itBwM5P1SF" role="1xVPHs">
+                                <node concept="chp4Y" id="5itBwM5P1SG" role="ri$Ld">
                                   <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Rm8GO" id="7kTeLbPzYTk" role="3uHU7w">
+                        <node concept="Rm8GO" id="5itBwM5P1SH" role="3uHU7w">
                           <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
                           <ref role="Rm8GQ" to="i348:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
                         </node>
@@ -12367,29 +12602,96 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="7kTeLbPzYTl" role="3cqZAp">
-              <node concept="2OqwBi" id="7kTeLbPzYTm" role="3clFbG">
-                <node concept="liA8E" id="7kTeLbPzYTn" role="2OqNvi">
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="5itBwM5PsfS" role="30HLyM">
+        <node concept="3clFbS" id="5itBwM5PsfT" role="2VODD2">
+          <node concept="3clFbF" id="5itBwM5PsfZ" role="3cqZAp">
+            <node concept="3clFbC" id="5itBwM5Psg0" role="3clFbG">
+              <node concept="2YIFZM" id="5itBwM5Psg1" role="3uHU7B">
+                <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
+                <ref role="1Pybhc" to="hy7p:746Sd4ujSKb" resolve="RuleTemplateUtil" />
+                <node concept="2OqwBi" id="5itBwM5Psg2" role="37wK5m">
+                  <node concept="30H73N" id="5itBwM5Psg3" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="5itBwM5Psg4" role="2OqNvi">
+                    <node concept="1xMEDy" id="5itBwM5Psg5" role="1xVPHs">
+                      <node concept="chp4Y" id="5itBwM5Psg6" role="ri$Ld">
+                        <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="Rm8GO" id="5itBwM5Psg7" role="3uHU7w">
+                <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                <ref role="Rm8GQ" to="i348:4OKkcnfu_Ah" resolve="HEAD_KEPT" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="5itBwM5Ppqu" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="wq2x:6p0DfM0ajMA" resolve="AbstractConstraint" />
+      <node concept="1Koe21" id="5itBwM5Ppqv" role="1lVwrX">
+        <node concept="3clFb_" id="5itBwM5Ppqw" role="1Koe22">
+          <property role="TrG5h" value="method" />
+          <node concept="3cqZAl" id="5itBwM5Ppqx" role="3clF45" />
+          <node concept="3Tm6S6" id="5itBwM5Ppqy" role="1B3o_S" />
+          <node concept="3clFbS" id="5itBwM5Ppqz" role="3clF47">
+            <node concept="3cpWs8" id="5itBwM5Ppq$" role="3cqZAp">
+              <node concept="3cpWsn" id="5itBwM5Ppq_" role="3cpWs9">
+                <property role="TrG5h" value="builder" />
+                <node concept="3uibUv" id="5itBwM5PpqA" role="1tU5fm">
+                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                </node>
+                <node concept="2ShNRf" id="5itBwM5PpqB" role="33vP2m">
+                  <node concept="1pGfFk" id="5itBwM5PpqC" role="2ShVmc">
+                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <node concept="10Nm6u" id="5itBwM5PpqD" role="37wK5m" />
+                    <node concept="Xl_RD" id="5itBwM5PpqE" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="5itBwM5PpqF" role="3cqZAp" />
+            <node concept="3SKdUt" id="5itBwM5PpqG" role="3cqZAp">
+              <node concept="1PaTwC" id="5itBwM5PpqH" role="3ndbpf">
+                <node concept="3oM_SD" id="5itBwM5PpqI" role="1PaTwD">
+                  <property role="3oM_SC" value="rule" />
+                </node>
+                <node concept="3oM_SD" id="5itBwM5PpqJ" role="1PaTwD">
+                  <property role="3oM_SC" value="methods" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5itBwM5Pprd" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5Ppre" role="3clFbG">
+                <node concept="liA8E" id="5itBwM5Pprf" role="2OqNvi">
                   <ref role="37wK5l" to="i348:7eGEHDlc$bq" resolve="appendHeadReplaced" />
-                  <node concept="10Nm6u" id="7kTeLbPzYTo" role="37wK5m">
-                    <node concept="29HgVG" id="7kTeLbPzYTp" role="lGtFl" />
+                  <node concept="10Nm6u" id="5itBwM5Pprg" role="37wK5m">
+                    <node concept="29HgVG" id="5itBwM5Pprh" role="lGtFl" />
                   </node>
                 </node>
-                <node concept="37vLTw" id="7kTeLbPzYTq" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7kTeLbPzYQG" resolve="builder" />
-                  <node concept="1sPUBX" id="7kTeLbPzYTr" role="lGtFl">
+                <node concept="37vLTw" id="5itBwM5Ppri" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5itBwM5Ppq_" resolve="builder" />
+                  <node concept="1sPUBX" id="5itBwM5Pprj" role="lGtFl">
                     <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
-                    <node concept="3NFfHV" id="7kTeLbPzYTs" role="1sPUBK">
-                      <node concept="3clFbS" id="7kTeLbPzYTt" role="2VODD2">
-                        <node concept="3clFbF" id="7kTeLbPzYTu" role="3cqZAp">
-                          <node concept="2OqwBi" id="7kTeLbPzYTv" role="3clFbG">
-                            <node concept="30H73N" id="7kTeLbPzYTw" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="7kTeLbPzYTx" role="2OqNvi">
-                              <node concept="3gmYPX" id="7kTeLbPzYTy" role="1xVPHs">
-                                <node concept="3gn64h" id="7kTeLbPzYTz" role="3gmYPZ">
+                    <node concept="3NFfHV" id="5itBwM5Pprk" role="1sPUBK">
+                      <node concept="3clFbS" id="5itBwM5Pprl" role="2VODD2">
+                        <node concept="3clFbF" id="5itBwM5Pprm" role="3cqZAp">
+                          <node concept="2OqwBi" id="5itBwM5Pprn" role="3clFbG">
+                            <node concept="30H73N" id="5itBwM5Ppro" role="2Oq$k0" />
+                            <node concept="2Xjw5R" id="5itBwM5Pprp" role="2OqNvi">
+                              <node concept="3gmYPX" id="5itBwM5Pprq" role="1xVPHs">
+                                <node concept="3gn64h" id="5itBwM5Pprr" role="3gmYPZ">
                                   <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
                                 </node>
-                                <node concept="3gn64h" id="7kTeLbPzYT$" role="3gmYPZ">
+                                <node concept="3gn64h" id="5itBwM5Pprs" role="3gmYPZ">
                                   <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                 </node>
                               </node>
@@ -12401,60 +12703,98 @@
                   </node>
                 </node>
               </node>
-              <node concept="raruj" id="7kTeLbPzYT_" role="lGtFl" />
-              <node concept="1W57fq" id="7kTeLbPzYTA" role="lGtFl">
-                <node concept="3IZrLx" id="7kTeLbPzYTB" role="3IZSJc">
-                  <node concept="3clFbS" id="7kTeLbPzYTC" role="2VODD2">
-                    <node concept="3clFbF" id="7kTeLbPzYTD" role="3cqZAp">
-                      <node concept="3clFbC" id="7kTeLbPzYTE" role="3clFbG">
-                        <node concept="2YIFZM" id="7kTeLbPzYTF" role="3uHU7B">
-                          <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
-                          <ref role="1Pybhc" to="hy7p:746Sd4ujSKb" resolve="RuleTemplateUtil" />
-                          <node concept="2OqwBi" id="7kTeLbPzYTG" role="37wK5m">
-                            <node concept="30H73N" id="7kTeLbPzYTH" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="7kTeLbPzYTI" role="2OqNvi">
-                              <node concept="1xMEDy" id="7kTeLbPzYTJ" role="1xVPHs">
-                                <node concept="chp4Y" id="7kTeLbPzYTK" role="ri$Ld">
-                                  <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Rm8GO" id="7kTeLbPzYTL" role="3uHU7w">
-                          <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
-                          <ref role="Rm8GQ" to="i348:4OKkcnfu_Ai" resolve="HEAD_REPLACED" />
-                        </node>
+              <node concept="raruj" id="5itBwM5Pprt" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="5itBwM5PyN1" role="30HLyM">
+        <node concept="3clFbS" id="5itBwM5PyN2" role="2VODD2">
+          <node concept="3clFbF" id="5itBwM5PyN8" role="3cqZAp">
+            <node concept="3clFbC" id="5itBwM5PyN9" role="3clFbG">
+              <node concept="2YIFZM" id="5itBwM5PyNa" role="3uHU7B">
+                <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
+                <ref role="1Pybhc" to="hy7p:746Sd4ujSKb" resolve="RuleTemplateUtil" />
+                <node concept="2OqwBi" id="5itBwM5PyNb" role="37wK5m">
+                  <node concept="30H73N" id="5itBwM5PyNc" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="5itBwM5PyNd" role="2OqNvi">
+                    <node concept="1xMEDy" id="5itBwM5PyNe" role="1xVPHs">
+                      <node concept="chp4Y" id="5itBwM5PyNf" role="ri$Ld">
+                        <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                       </node>
                     </node>
-                    <node concept="3clFbH" id="7kTeLbPzYTM" role="3cqZAp" />
+                  </node>
+                </node>
+              </node>
+              <node concept="Rm8GO" id="5itBwM5PyNg" role="3uHU7w">
+                <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                <ref role="Rm8GQ" to="i348:4OKkcnfu_Ai" resolve="HEAD_REPLACED" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="5itBwM5Pw0M" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="wq2x:6p0DfM0ajMA" resolve="AbstractConstraint" />
+      <node concept="1Koe21" id="5itBwM5Pw0N" role="1lVwrX">
+        <node concept="3clFb_" id="5itBwM5Pw0O" role="1Koe22">
+          <property role="TrG5h" value="method" />
+          <node concept="3cqZAl" id="5itBwM5Pw0P" role="3clF45" />
+          <node concept="3Tm6S6" id="5itBwM5Pw0Q" role="1B3o_S" />
+          <node concept="3clFbS" id="5itBwM5Pw0R" role="3clF47">
+            <node concept="3cpWs8" id="5itBwM5Pw0S" role="3cqZAp">
+              <node concept="3cpWsn" id="5itBwM5Pw0T" role="3cpWs9">
+                <property role="TrG5h" value="builder" />
+                <node concept="3uibUv" id="5itBwM5Pw0U" role="1tU5fm">
+                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                </node>
+                <node concept="2ShNRf" id="5itBwM5Pw0V" role="33vP2m">
+                  <node concept="1pGfFk" id="5itBwM5Pw0W" role="2ShVmc">
+                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <node concept="10Nm6u" id="5itBwM5Pw0X" role="37wK5m" />
+                    <node concept="Xl_RD" id="5itBwM5Pw0Y" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="7kTeLbPzYTN" role="3cqZAp">
-              <node concept="2OqwBi" id="7kTeLbPzYTO" role="3clFbG">
-                <node concept="liA8E" id="7kTeLbPzYTP" role="2OqNvi">
+            <node concept="3clFbH" id="5itBwM5Pw0Z" role="3cqZAp" />
+            <node concept="3SKdUt" id="5itBwM5Pw10" role="3cqZAp">
+              <node concept="1PaTwC" id="5itBwM5Pw11" role="3ndbpf">
+                <node concept="3oM_SD" id="5itBwM5Pw12" role="1PaTwD">
+                  <property role="3oM_SC" value="rule" />
+                </node>
+                <node concept="3oM_SD" id="5itBwM5Pw13" role="1PaTwD">
+                  <property role="3oM_SC" value="methods" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5itBwM5Pw1y" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5Pw1z" role="3clFbG">
+                <node concept="liA8E" id="5itBwM5Pw1$" role="2OqNvi">
                   <ref role="37wK5l" to="i348:7eGEHDlc$aX" resolve="appendGuard" />
-                  <node concept="10Nm6u" id="7kTeLbPzYTQ" role="37wK5m">
-                    <node concept="29HgVG" id="7kTeLbPzYTR" role="lGtFl" />
+                  <node concept="10Nm6u" id="5itBwM5Pw1_" role="37wK5m">
+                    <node concept="29HgVG" id="5itBwM5Pw1A" role="lGtFl" />
                   </node>
                 </node>
-                <node concept="37vLTw" id="7kTeLbPzYTS" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7kTeLbPzYQG" resolve="builder" />
-                  <node concept="1sPUBX" id="7kTeLbPzYTT" role="lGtFl">
+                <node concept="37vLTw" id="5itBwM5Pw1B" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5itBwM5Pw0T" resolve="builder" />
+                  <node concept="1sPUBX" id="5itBwM5Pw1C" role="lGtFl">
                     <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
-                    <node concept="3NFfHV" id="7kTeLbPzYTU" role="1sPUBK">
-                      <node concept="3clFbS" id="7kTeLbPzYTV" role="2VODD2">
-                        <node concept="3clFbF" id="7kTeLbPzYTW" role="3cqZAp">
-                          <node concept="2OqwBi" id="7kTeLbPzYTX" role="3clFbG">
-                            <node concept="30H73N" id="7kTeLbPzYTY" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="7kTeLbPzYTZ" role="2OqNvi">
-                              <node concept="3gmYPX" id="7kTeLbPzYU0" role="1xVPHs">
-                                <node concept="3gn64h" id="7kTeLbPzYU1" role="3gmYPZ">
+                    <node concept="3NFfHV" id="5itBwM5Pw1D" role="1sPUBK">
+                      <node concept="3clFbS" id="5itBwM5Pw1E" role="2VODD2">
+                        <node concept="3clFbF" id="5itBwM5Pw1F" role="3cqZAp">
+                          <node concept="2OqwBi" id="5itBwM5Pw1G" role="3clFbG">
+                            <node concept="30H73N" id="5itBwM5Pw1H" role="2Oq$k0" />
+                            <node concept="2Xjw5R" id="5itBwM5Pw1I" role="2OqNvi">
+                              <node concept="3gmYPX" id="5itBwM5Pw1J" role="1xVPHs">
+                                <node concept="3gn64h" id="5itBwM5Pw1K" role="3gmYPZ">
                                   <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
                                 </node>
-                                <node concept="3gn64h" id="7kTeLbPzYU2" role="3gmYPZ">
+                                <node concept="3gn64h" id="5itBwM5Pw1L" role="3gmYPZ">
                                   <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                 </node>
                               </node>
@@ -12466,59 +12806,98 @@
                   </node>
                 </node>
               </node>
-              <node concept="raruj" id="7kTeLbPzYU3" role="lGtFl" />
-              <node concept="1W57fq" id="7kTeLbPzYU4" role="lGtFl">
-                <node concept="3IZrLx" id="7kTeLbPzYU5" role="3IZSJc">
-                  <node concept="3clFbS" id="7kTeLbPzYU6" role="2VODD2">
-                    <node concept="3clFbF" id="7kTeLbPzYU7" role="3cqZAp">
-                      <node concept="3clFbC" id="7kTeLbPzYU8" role="3clFbG">
-                        <node concept="2YIFZM" id="7kTeLbPzYU9" role="3uHU7B">
-                          <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
-                          <ref role="1Pybhc" to="hy7p:746Sd4ujSKb" resolve="RuleTemplateUtil" />
-                          <node concept="2OqwBi" id="7kTeLbPzYUa" role="37wK5m">
-                            <node concept="30H73N" id="7kTeLbPzYUb" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="7kTeLbPzYUc" role="2OqNvi">
-                              <node concept="1xMEDy" id="7kTeLbPzYUd" role="1xVPHs">
-                                <node concept="chp4Y" id="7kTeLbPzYUe" role="ri$Ld">
-                                  <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Rm8GO" id="7kTeLbPzYUf" role="3uHU7w">
-                          <ref role="Rm8GQ" to="i348:4OKkcnfu_Aj" resolve="GUARD" />
-                          <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
-                        </node>
+              <node concept="raruj" id="5itBwM5Pw1M" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="5itBwM5PF3J" role="30HLyM">
+        <node concept="3clFbS" id="5itBwM5PF3K" role="2VODD2">
+          <node concept="3clFbF" id="5itBwM5PFta" role="3cqZAp">
+            <node concept="3clFbC" id="5itBwM5PFtb" role="3clFbG">
+              <node concept="2YIFZM" id="5itBwM5PFtc" role="3uHU7B">
+                <ref role="1Pybhc" to="hy7p:746Sd4ujSKb" resolve="RuleTemplateUtil" />
+                <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
+                <node concept="2OqwBi" id="5itBwM5PFtd" role="37wK5m">
+                  <node concept="30H73N" id="5itBwM5PFte" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="5itBwM5PFtf" role="2OqNvi">
+                    <node concept="1xMEDy" id="5itBwM5PFtg" role="1xVPHs">
+                      <node concept="chp4Y" id="5itBwM5PFth" role="ri$Ld">
+                        <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="Rm8GO" id="5itBwM5PFti" role="3uHU7w">
+                <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+                <ref role="Rm8GQ" to="i348:4OKkcnfu_Aj" resolve="GUARD" />
+              </node>
             </node>
-            <node concept="3clFbF" id="7kTeLbPzYUg" role="3cqZAp">
-              <node concept="2OqwBi" id="7kTeLbPzYUh" role="3clFbG">
-                <node concept="liA8E" id="7kTeLbPzYUi" role="2OqNvi">
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="5itBwM5PCre" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="wq2x:6p0DfM0ajMA" resolve="AbstractConstraint" />
+      <node concept="1Koe21" id="5itBwM5PCrf" role="1lVwrX">
+        <node concept="3clFb_" id="5itBwM5PCrg" role="1Koe22">
+          <property role="TrG5h" value="method" />
+          <node concept="3cqZAl" id="5itBwM5PCrh" role="3clF45" />
+          <node concept="3Tm6S6" id="5itBwM5PCri" role="1B3o_S" />
+          <node concept="3clFbS" id="5itBwM5PCrj" role="3clF47">
+            <node concept="3cpWs8" id="5itBwM5PCrk" role="3cqZAp">
+              <node concept="3cpWsn" id="5itBwM5PCrl" role="3cpWs9">
+                <property role="TrG5h" value="builder" />
+                <node concept="3uibUv" id="5itBwM5PCrm" role="1tU5fm">
+                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                </node>
+                <node concept="2ShNRf" id="5itBwM5PCrn" role="33vP2m">
+                  <node concept="1pGfFk" id="5itBwM5PCro" role="2ShVmc">
+                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <node concept="10Nm6u" id="5itBwM5PCrp" role="37wK5m" />
+                    <node concept="Xl_RD" id="5itBwM5PCrq" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="5itBwM5PCrr" role="3cqZAp" />
+            <node concept="3SKdUt" id="5itBwM5PCrs" role="3cqZAp">
+              <node concept="1PaTwC" id="5itBwM5PCrt" role="3ndbpf">
+                <node concept="3oM_SD" id="5itBwM5PCru" role="1PaTwD">
+                  <property role="3oM_SC" value="rule" />
+                </node>
+                <node concept="3oM_SD" id="5itBwM5PCrv" role="1PaTwD">
+                  <property role="3oM_SC" value="methods" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="5itBwM5PCrX" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5PCrY" role="3clFbG">
+                <node concept="liA8E" id="5itBwM5PCrZ" role="2OqNvi">
                   <ref role="37wK5l" to="i348:7eGEHDlc$aw" resolve="appendBody" />
-                  <node concept="10Nm6u" id="7kTeLbPzYUj" role="37wK5m">
-                    <node concept="29HgVG" id="7kTeLbPzYUk" role="lGtFl" />
+                  <node concept="10Nm6u" id="5itBwM5PCs0" role="37wK5m">
+                    <node concept="29HgVG" id="5itBwM5PCs1" role="lGtFl" />
                   </node>
                 </node>
-                <node concept="37vLTw" id="7kTeLbPzYUl" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7kTeLbPzYQG" resolve="builder" />
-                  <node concept="1sPUBX" id="7kTeLbPzYUm" role="lGtFl">
+                <node concept="37vLTw" id="5itBwM5PCs2" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5itBwM5PCrl" resolve="builder" />
+                  <node concept="1sPUBX" id="5itBwM5PCs3" role="lGtFl">
                     <ref role="v9R2y" node="1L74NXE_$78" resolve="builder_variable" />
-                    <node concept="3NFfHV" id="7kTeLbPzYUn" role="1sPUBK">
-                      <node concept="3clFbS" id="7kTeLbPzYUo" role="2VODD2">
-                        <node concept="3clFbF" id="7kTeLbPzYUp" role="3cqZAp">
-                          <node concept="2OqwBi" id="7kTeLbPzYUq" role="3clFbG">
-                            <node concept="30H73N" id="7kTeLbPzYUr" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="7kTeLbPzYUs" role="2OqNvi">
-                              <node concept="3gmYPX" id="7kTeLbPzYUt" role="1xVPHs">
-                                <node concept="3gn64h" id="7kTeLbPzYUu" role="3gmYPZ">
+                    <node concept="3NFfHV" id="5itBwM5PCs4" role="1sPUBK">
+                      <node concept="3clFbS" id="5itBwM5PCs5" role="2VODD2">
+                        <node concept="3clFbF" id="5itBwM5PCs6" role="3cqZAp">
+                          <node concept="2OqwBi" id="5itBwM5PCs7" role="3clFbG">
+                            <node concept="30H73N" id="5itBwM5PCs8" role="2Oq$k0" />
+                            <node concept="2Xjw5R" id="5itBwM5PCs9" role="2OqNvi">
+                              <node concept="3gmYPX" id="5itBwM5PCsa" role="1xVPHs">
+                                <node concept="3gn64h" id="5itBwM5PCsb" role="3gmYPZ">
                                   <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
                                 </node>
-                                <node concept="3gn64h" id="7kTeLbPzYUv" role="3gmYPZ">
+                                <node concept="3gn64h" id="5itBwM5PCsc" role="3gmYPZ">
                                   <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                                 </node>
                               </node>
@@ -12530,67 +12909,85 @@
                   </node>
                 </node>
               </node>
-              <node concept="raruj" id="7kTeLbPzYUw" role="lGtFl" />
-              <node concept="1W57fq" id="7kTeLbPzYUx" role="lGtFl">
-                <node concept="3IZrLx" id="7kTeLbPzYUy" role="3IZSJc">
-                  <node concept="3clFbS" id="7kTeLbPzYUz" role="2VODD2">
-                    <node concept="3clFbF" id="7kTeLbPzYU$" role="3cqZAp">
-                      <node concept="3clFbC" id="7kTeLbPzYU_" role="3clFbG">
-                        <node concept="2YIFZM" id="7kTeLbPzYUA" role="3uHU7B">
-                          <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
-                          <ref role="1Pybhc" to="hy7p:746Sd4ujSKb" resolve="RuleTemplateUtil" />
-                          <node concept="2OqwBi" id="7kTeLbPzYUB" role="37wK5m">
-                            <node concept="30H73N" id="7kTeLbPzYUC" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="7kTeLbPzYUD" role="2OqNvi">
-                              <node concept="1xMEDy" id="7kTeLbPzYUE" role="1xVPHs">
-                                <node concept="chp4Y" id="7kTeLbPzYUF" role="ri$Ld">
-                                  <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Rm8GO" id="7kTeLbPzYUG" role="3uHU7w">
-                          <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
-                          <ref role="Rm8GQ" to="i348:4OKkcnfu_Ak" resolve="BODY" />
-                        </node>
+              <node concept="raruj" id="5itBwM5PCsd" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="5itBwM5PL10" role="30HLyM">
+        <node concept="3clFbS" id="5itBwM5PL11" role="2VODD2">
+          <node concept="3clFbF" id="5itBwM5PL8l" role="3cqZAp">
+            <node concept="3clFbC" id="5itBwM5PL8m" role="3clFbG">
+              <node concept="2YIFZM" id="5itBwM5PL8n" role="3uHU7B">
+                <ref role="1Pybhc" to="hy7p:746Sd4ujSKb" resolve="RuleTemplateUtil" />
+                <ref role="37wK5l" to="hy7p:746Sd4ujSOx" resolve="templateMethodKind" />
+                <node concept="2OqwBi" id="5itBwM5PL8o" role="37wK5m">
+                  <node concept="30H73N" id="5itBwM5PL8p" role="2Oq$k0" />
+                  <node concept="2Xjw5R" id="5itBwM5PL8q" role="2OqNvi">
+                    <node concept="1xMEDy" id="5itBwM5PL8r" role="1xVPHs">
+                      <node concept="chp4Y" id="5itBwM5PL8s" role="ri$Ld">
+                        <ref role="cht4Q" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="Rm8GO" id="5itBwM5PL8t" role="3uHU7w">
+                <ref role="Rm8GQ" to="i348:4OKkcnfu_Ak" resolve="BODY" />
+                <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
+              </node>
             </node>
-            <node concept="3clFbH" id="7kTeLbPzYUH" role="3cqZAp" />
-            <node concept="3SKdUt" id="7kTeLbPzYUI" role="3cqZAp">
-              <node concept="1PaTwC" id="589APehYww3" role="3ndbpf">
-                <node concept="3oM_SD" id="589APehYww4" role="1PaTwD">
-                  <property role="3oM_SC" value="type" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="5itBwM5PHX2" role="3aUrZf">
+      <property role="36QftV" value="true" />
+      <ref role="30HIoZ" to="wq2x:6p0DfM0ajMA" resolve="AbstractConstraint" />
+      <node concept="1Koe21" id="5itBwM5PHX3" role="1lVwrX">
+        <node concept="3clFb_" id="5itBwM5PHX4" role="1Koe22">
+          <property role="TrG5h" value="method" />
+          <node concept="3cqZAl" id="5itBwM5PHX5" role="3clF45" />
+          <node concept="3Tm6S6" id="5itBwM5PHX6" role="1B3o_S" />
+          <node concept="3clFbS" id="5itBwM5PHX7" role="3clF47">
+            <node concept="3cpWs8" id="5itBwM5PHX8" role="3cqZAp">
+              <node concept="3cpWsn" id="5itBwM5PHX9" role="3cpWs9">
+                <property role="TrG5h" value="builder" />
+                <node concept="3uibUv" id="5itBwM5PHXa" role="1tU5fm">
+                  <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
                 </node>
-                <node concept="3oM_SD" id="589APehYww5" role="1PaTwD">
-                  <property role="3oM_SC" value="initializer" />
+                <node concept="2ShNRf" id="5itBwM5PHXb" role="33vP2m">
+                  <node concept="1pGfFk" id="5itBwM5PHXc" role="2ShVmc">
+                    <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                    <node concept="10Nm6u" id="5itBwM5PHXd" role="37wK5m" />
+                    <node concept="Xl_RD" id="5itBwM5PHXe" role="37wK5m">
+                      <property role="Xl_RC" value="" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="7kTeLbPzYUK" role="3cqZAp">
-              <node concept="2OqwBi" id="7kTeLbPzYUL" role="3clFbG">
-                <node concept="37vLTw" id="7kTeLbPzYUM" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7kTeLbPzYQG" resolve="builder" />
-                  <node concept="1ZhdrF" id="7kTeLbPzYUN" role="lGtFl">
+            <node concept="3clFbH" id="5itBwM5PHXf" role="3cqZAp" />
+            <node concept="3clFbF" id="5itBwM5PHXQ" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5PHXR" role="3clFbG">
+                <node concept="37vLTw" id="5itBwM5PHXS" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5itBwM5PHX9" resolve="builder" />
+                  <node concept="1ZhdrF" id="5itBwM5PHXT" role="lGtFl">
                     <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
                     <property role="2qtEX8" value="variableDeclaration" />
-                    <node concept="3$xsQk" id="7kTeLbPzYUO" role="3$ytzL">
-                      <node concept="3clFbS" id="7kTeLbPzYUP" role="2VODD2">
-                        <node concept="3clFbF" id="7kTeLbPzYUQ" role="3cqZAp">
-                          <node concept="2OqwBi" id="7kTeLbPzYUR" role="3clFbG">
-                            <node concept="1iwH7S" id="7kTeLbPzYUS" role="2Oq$k0" />
-                            <node concept="1iwH70" id="7kTeLbPzYUT" role="2OqNvi">
+                    <node concept="3$xsQk" id="5itBwM5PHXU" role="3$ytzL">
+                      <node concept="3clFbS" id="5itBwM5PHXV" role="2VODD2">
+                        <node concept="3clFbF" id="5itBwM5PHXW" role="3cqZAp">
+                          <node concept="2OqwBi" id="5itBwM5PHXX" role="3clFbG">
+                            <node concept="1iwH7S" id="5itBwM5PHXY" role="2Oq$k0" />
+                            <node concept="1iwH70" id="5itBwM5PHXZ" role="2OqNvi">
                               <ref role="1iwH77" node="4vbeH84GUyf" resolve="builder_variable" />
-                              <node concept="2OqwBi" id="7kTeLbPzYUU" role="1iwH7V">
-                                <node concept="30H73N" id="7kTeLbPzYUV" role="2Oq$k0" />
-                                <node concept="2Xjw5R" id="7kTeLbPzYUW" role="2OqNvi">
-                                  <node concept="1xMEDy" id="7kTeLbPzYUX" role="1xVPHs">
-                                    <node concept="chp4Y" id="7kTeLbPzYUY" role="ri$Ld">
-                                      <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="MacroDeclaration" />
+                              <node concept="2OqwBi" id="5itBwM5PHY0" role="1iwH7V">
+                                <node concept="30H73N" id="5itBwM5PHY1" role="2Oq$k0" />
+                                <node concept="2Xjw5R" id="5itBwM5PHY2" role="2OqNvi">
+                                  <node concept="1xMEDy" id="5itBwM5PHY3" role="1xVPHs">
+                                    <node concept="chp4Y" id="5itBwM5Qb_n" role="ri$Ld">
+                                      <ref role="cht4Q" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
                                     </node>
                                   </node>
                                 </node>
@@ -12602,35 +12999,33 @@
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="7kTeLbPzYUZ" role="2OqNvi">
+                <node concept="liA8E" id="5itBwM5PHY5" role="2OqNvi">
                   <ref role="37wK5l" to="i348:7eGEHDlc$aw" resolve="appendBody" />
-                  <node concept="10Nm6u" id="7kTeLbPzYV0" role="37wK5m">
-                    <node concept="29HgVG" id="7kTeLbPzYV1" role="lGtFl" />
+                  <node concept="10Nm6u" id="5itBwM5PHY6" role="37wK5m">
+                    <node concept="29HgVG" id="5itBwM5PHY7" role="lGtFl" />
                   </node>
                 </node>
               </node>
-              <node concept="raruj" id="7kTeLbPzYV2" role="lGtFl" />
-              <node concept="1W57fq" id="7kTeLbPzYV3" role="lGtFl">
-                <node concept="3IZrLx" id="7kTeLbPzYV4" role="3IZSJc">
-                  <node concept="3clFbS" id="7kTeLbPzYV5" role="2VODD2">
-                    <node concept="3clFbF" id="7kTeLbPzYV6" role="3cqZAp">
-                      <node concept="2OqwBi" id="7kTeLbPzYV7" role="3clFbG">
-                        <node concept="2OqwBi" id="7kTeLbPzYV8" role="2Oq$k0">
-                          <node concept="30H73N" id="7kTeLbPzYV9" role="2Oq$k0" />
-                          <node concept="2Xjw5R" id="7kTeLbPzYVa" role="2OqNvi">
-                            <node concept="1xMEDy" id="7kTeLbPzYVb" role="1xVPHs">
-                              <node concept="chp4Y" id="7kTeLbPzYVc" role="ri$Ld">
-                                <ref role="cht4Q" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3x8VRR" id="7kTeLbPzYVd" role="2OqNvi" />
-                      </node>
+              <node concept="raruj" id="5itBwM5PHY8" role="lGtFl" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="5itBwM5PS1q" role="30HLyM">
+        <node concept="3clFbS" id="5itBwM5PS1r" role="2VODD2">
+          <node concept="3clFbF" id="5itBwM5PS1x" role="3cqZAp">
+            <node concept="2OqwBi" id="5itBwM5PS1y" role="3clFbG">
+              <node concept="2OqwBi" id="5itBwM5PS1z" role="2Oq$k0">
+                <node concept="30H73N" id="5itBwM5PS1$" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="5itBwM5PS1_" role="2OqNvi">
+                  <node concept="1xMEDy" id="5itBwM5PS1A" role="1xVPHs">
+                    <node concept="chp4Y" id="5itBwM5RevN" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="3x8VRR" id="5itBwM5PS1C" role="2OqNvi" />
             </node>
           </node>
         </node>
@@ -16510,5 +16905,521 @@
       <node concept="10Nm6u" id="aZPZmI9WGE" role="gfFT$" />
     </node>
   </node>
+  <node concept="13MO4I" id="5itBwM5DDFP">
+    <property role="3GE5qa" value="macro" />
+    <property role="TrG5h" value="frag_MacroTable_CallMacroTemplate" />
+    <ref role="3gUMe" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
+    <node concept="312cEu" id="5itBwM5DJef" role="13RCb5">
+      <property role="TrG5h" value="__MacroTable" />
+      <node concept="2tJIrI" id="5itBwM5DLuz" role="jymVt" />
+      <node concept="312cEu" id="5itBwM5DOW6" role="jymVt">
+        <property role="TrG5h" value="_Template" />
+        <node concept="2tJIrI" id="5itBwM5E2K3" role="jymVt" />
+        <node concept="312cEu" id="5itBwM5JjhA" role="jymVt">
+          <property role="2bfB8j" value="true" />
+          <property role="TrG5h" value="Token" />
+          <node concept="2tJIrI" id="5itBwM5TipI" role="jymVt" />
+          <node concept="2tJIrI" id="5itBwM5Tm6W" role="jymVt" />
+          <node concept="3clFbW" id="5itBwM5TmEO" role="jymVt">
+            <node concept="37vLTG" id="5itBwM60U_p" role="3clF46">
+              <property role="TrG5h" value="session" />
+              <node concept="3uibUv" id="5itBwM60VoO" role="1tU5fm">
+                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              </node>
+            </node>
+            <node concept="3cqZAl" id="5itBwM5TmEQ" role="3clF45" />
+            <node concept="3Tm1VV" id="5itBwM5TmER" role="1B3o_S" />
+            <node concept="3clFbS" id="5itBwM5TmES" role="3clF47">
+              <node concept="3clFbF" id="5itBwM60WcR" role="3cqZAp">
+                <node concept="37vLTI" id="5itBwM60WTA" role="3clFbG">
+                  <node concept="37vLTw" id="5itBwM60Xmr" role="37vLTx">
+                    <ref role="3cqZAo" node="5itBwM60U_p" resolve="session" />
+                  </node>
+                  <node concept="2OqwBi" id="5itBwM60Wir" role="37vLTJ">
+                    <node concept="Xjq3P" id="5itBwM60WcQ" role="2Oq$k0" />
+                    <node concept="2OwXpG" id="5itBwM60WoE" role="2OqNvi">
+                      <ref role="2Oxat5" node="5itBwM5SoMw" resolve="session" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2tJIrI" id="5itBwM5TAlM" role="jymVt" />
+          <node concept="3clFb_" id="5itBwM5TBjZ" role="jymVt">
+            <property role="TrG5h" value="withParam" />
+            <node concept="37vLTG" id="5itBwM5TE8Q" role="3clF46">
+              <property role="TrG5h" value="value" />
+              <node concept="3uibUv" id="5itBwM5TUTA" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
+            </node>
+            <node concept="3uibUv" id="5itBwM5TCDO" role="3clF45">
+              <ref role="3uigEE" node="36tQV5AxhJd" resolve="Token" />
+            </node>
+            <node concept="3Tm1VV" id="5itBwM5TBk2" role="1B3o_S" />
+            <node concept="3clFbS" id="5itBwM5TBk3" role="3clF47">
+              <node concept="3clFbF" id="5itBwM63l7R" role="3cqZAp">
+                <node concept="37vLTI" id="5itBwM63l7S" role="3clFbG">
+                  <node concept="1eOMI4" id="5itBwM63l7T" role="37vLTx">
+                    <node concept="10QFUN" id="5itBwM63l7U" role="1eOMHV">
+                      <node concept="37vLTw" id="5itBwM63l7V" role="10QFUP">
+                        <ref role="3cqZAo" node="5itBwM5TE8Q" resolve="value" />
+                      </node>
+                      <node concept="3uibUv" id="5itBwM63l7W" role="10QFUM">
+                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                        <node concept="29HgVG" id="5itBwM63l7X" role="lGtFl">
+                          <node concept="3NFfHV" id="5itBwM63l7Y" role="3NFExx">
+                            <node concept="3clFbS" id="5itBwM63l7Z" role="2VODD2">
+                              <node concept="3clFbF" id="5itBwM63l80" role="3cqZAp">
+                                <node concept="2OqwBi" id="5itBwM63l81" role="3clFbG">
+                                  <node concept="30H73N" id="5itBwM63l82" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="5itBwM63xWo" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="wq2x:5itBwM5ifE5" resolve="type" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="5itBwM63l84" role="37vLTJ">
+                    <node concept="Xjq3P" id="5itBwM63l85" role="2Oq$k0" />
+                    <node concept="2OwXpG" id="5itBwM63l86" role="2OqNvi">
+                      <ref role="2Oxat5" node="5itBwM60YWo" resolve="param" />
+                      <node concept="1ZhdrF" id="5itBwM63l87" role="lGtFl">
+                        <property role="2qtEX8" value="fieldDeclaration" />
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
+                        <node concept="3$xsQk" id="5itBwM63l88" role="3$ytzL">
+                          <node concept="3clFbS" id="5itBwM63l89" role="2VODD2">
+                            <node concept="3clFbF" id="5itBwM63l8a" role="3cqZAp">
+                              <node concept="2OqwBi" id="5itBwM63l8b" role="3clFbG">
+                                <node concept="1iwH7S" id="5itBwM63l8c" role="2Oq$k0" />
+                                <node concept="1iwH70" id="5itBwM63l8d" role="2OqNvi">
+                                  <ref role="1iwH77" node="5itBwM61GZv" resolve="param_field" />
+                                  <node concept="30H73N" id="5itBwM63l8e" role="1iwH7V" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1WS0z7" id="5itBwM63n3G" role="lGtFl">
+                  <node concept="3JmXsc" id="5itBwM63n3H" role="3Jn$fo">
+                    <node concept="3clFbS" id="5itBwM63n3I" role="2VODD2">
+                      <node concept="3clFbF" id="5itBwM63o77" role="3cqZAp">
+                        <node concept="2OqwBi" id="5itBwM63oGK" role="3clFbG">
+                          <node concept="30H73N" id="5itBwM63o76" role="2Oq$k0" />
+                          <node concept="3Tsc0h" id="5itBwM63pMC" role="2OqNvi">
+                            <ref role="3TtcxE" to="wq2x:5itBwM5irVx" resolve="parameter" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="5itBwM5TW7S" role="3cqZAp">
+                <node concept="Xjq3P" id="5itBwM5TW7R" role="3clFbG" />
+              </node>
+            </node>
+          </node>
+          <node concept="2tJIrI" id="5itBwM5Vdqo" role="jymVt" />
+          <node concept="3clFb_" id="5itBwM5Vf_n" role="jymVt">
+            <property role="TrG5h" value="withLogical" />
+            <node concept="37vLTG" id="5itBwM5VkQs" role="3clF46">
+              <property role="TrG5h" value="logical" />
+              <node concept="8X2XB" id="5itBwM5VmUS" role="1tU5fm">
+                <node concept="3uibUv" id="5itBwM5VmwW" role="8Xvag">
+                  <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+                </node>
+              </node>
+            </node>
+            <node concept="3uibUv" id="5itBwM5VgXF" role="3clF45">
+              <ref role="3uigEE" node="36tQV5AxhJd" resolve="Token" />
+            </node>
+            <node concept="3Tm1VV" id="5itBwM5Vf_q" role="1B3o_S" />
+            <node concept="3clFbS" id="5itBwM5Vf_r" role="3clF47">
+              <node concept="3clFbF" id="5itBwM5XJnY" role="3cqZAp">
+                <node concept="37vLTI" id="5itBwM5XKd$" role="3clFbG">
+                  <node concept="AH0OO" id="5itBwM5XR$b" role="37vLTx">
+                    <node concept="3cmrfG" id="5itBwM5XSoT" role="AHEQo">
+                      <property role="3cmrfH" value="0" />
+                      <node concept="17Uvod" id="5itBwM5XTe9" role="lGtFl">
+                        <property role="2qtEX9" value="value" />
+                        <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
+                        <node concept="3zFVjK" id="5itBwM5XTea" role="3zH0cK">
+                          <node concept="3clFbS" id="5itBwM5XTeb" role="2VODD2">
+                            <node concept="3clFbF" id="5itBwM5ZSfk" role="3cqZAp">
+                              <node concept="2OqwBi" id="5itBwM5ZSxw" role="3clFbG">
+                                <node concept="1iwH7S" id="5itBwM5ZSfj" role="2Oq$k0" />
+                                <node concept="1qCSth" id="5itBwM5ZSZW" role="2OqNvi">
+                                  <property role="1qCSqd" value="idx" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="5itBwM5XKEY" role="AHHXb">
+                      <ref role="3cqZAo" node="5itBwM5VkQs" resolve="logical" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="5itBwM5XJuu" role="37vLTJ">
+                    <node concept="Xjq3P" id="5itBwM5XJnX" role="2Oq$k0" />
+                    <node concept="2OwXpG" id="5itBwM5XJXv" role="2OqNvi">
+                      <ref role="2Oxat5" node="5itBwM5Uik9" resolve="logical" />
+                      <node concept="1ZhdrF" id="5itBwM5XXop" role="lGtFl">
+                        <property role="2qtEX8" value="fieldDeclaration" />
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
+                        <node concept="3$xsQk" id="5itBwM5XXoq" role="3$ytzL">
+                          <node concept="3clFbS" id="5itBwM5XXor" role="2VODD2">
+                            <node concept="3clFbF" id="5itBwM5XZhM" role="3cqZAp">
+                              <node concept="2OqwBi" id="5itBwM5XZuW" role="3clFbG">
+                                <node concept="1iwH7S" id="5itBwM5XZhL" role="2Oq$k0" />
+                                <node concept="1iwH70" id="5itBwM5Y0Ks" role="2OqNvi">
+                                  <ref role="1iwH77" node="452KZTbtpTP" resolve="logical_field" />
+                                  <node concept="30H73N" id="5itBwM5Y5No" role="1iwH7V" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1WS0z7" id="5itBwM5XMmP" role="lGtFl">
+                  <property role="1qytDF" value="idx" />
+                  <node concept="3JmXsc" id="5itBwM5XMmQ" role="3Jn$fo">
+                    <node concept="3clFbS" id="5itBwM5XMmR" role="2VODD2">
+                      <node concept="3clFbF" id="5itBwM5XMQb" role="3cqZAp">
+                        <node concept="2OqwBi" id="5itBwM5YsPl" role="3clFbG">
+                          <node concept="2OqwBi" id="5itBwM5XNax" role="2Oq$k0">
+                            <node concept="30H73N" id="5itBwM5XMQa" role="2Oq$k0" />
+                            <node concept="3Tsc0h" id="5itBwM5XOim" role="2OqNvi">
+                              <ref role="3TtcxE" to="wq2x:5itBwM5$rCX" resolve="logical" />
+                            </node>
+                          </node>
+                          <node concept="3goQfb" id="5itBwM5YwiI" role="2OqNvi">
+                            <node concept="1bVj0M" id="5itBwM5YwiK" role="23t8la">
+                              <node concept="3clFbS" id="5itBwM5YwiL" role="1bW5cS">
+                                <node concept="3clFbF" id="5itBwM5YCM1" role="3cqZAp">
+                                  <node concept="2OqwBi" id="5itBwM5YD_N" role="3clFbG">
+                                    <node concept="37vLTw" id="5itBwM5YCM0" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="5itBwM5YwiM" resolve="it" />
+                                    </node>
+                                    <node concept="3Tsc0h" id="5itBwM5YEWW" role="2OqNvi">
+                                      <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="Rh6nW" id="5itBwM5YwiM" role="1bW2Oz">
+                                <property role="TrG5h" value="it" />
+                                <node concept="2jxLKc" id="5itBwM5YwiN" role="1tU5fm" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="5itBwM5Z_Xc" role="3cqZAp">
+                <node concept="Xjq3P" id="5itBwM5Z_Xa" role="3clFbG" />
+              </node>
+            </node>
+          </node>
+          <node concept="2tJIrI" id="5itBwM5SdwL" role="jymVt" />
+          <node concept="3clFb_" id="5itBwM5E5aB" role="jymVt">
+            <property role="TrG5h" value="apply" />
+            <node concept="37vLTG" id="5itBwM5E6w_" role="3clF46">
+              <property role="TrG5h" value="p" />
+              <property role="3TUv4t" value="true" />
+              <node concept="3uibUv" id="5itBwM5E7qM" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                <node concept="29HgVG" id="5itBwM5EcMj" role="lGtFl">
+                  <node concept="3NFfHV" id="5itBwM5EdAF" role="3NFExx">
+                    <node concept="3clFbS" id="5itBwM5EdAG" role="2VODD2">
+                      <node concept="3clFbF" id="5itBwM5Ee4f" role="3cqZAp">
+                        <node concept="2OqwBi" id="5itBwM5EekA" role="3clFbG">
+                          <node concept="30H73N" id="5itBwM5Ee4e" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="5itBwM5Ef1C" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:5itBwM5ifE5" resolve="type" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1WS0z7" id="5itBwM5E8BL" role="lGtFl">
+                <node concept="3JmXsc" id="5itBwM5E8BM" role="3Jn$fo">
+                  <node concept="3clFbS" id="5itBwM5E8BN" role="2VODD2">
+                    <node concept="3clFbF" id="5itBwM5E94y" role="3cqZAp">
+                      <node concept="2OqwBi" id="5itBwM5E9mQ" role="3clFbG">
+                        <node concept="30H73N" id="5itBwM5E94x" role="2Oq$k0" />
+                        <node concept="3Tsc0h" id="5itBwM5Ea5O" role="2OqNvi">
+                          <ref role="3TtcxE" to="wq2x:5itBwM5irVx" resolve="parameter" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="17Uvod" id="5itBwM5Ekfn" role="lGtFl">
+                <property role="2qtEX9" value="name" />
+                <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                <node concept="3zFVjK" id="5itBwM5Ekfo" role="3zH0cK">
+                  <node concept="3clFbS" id="5itBwM5Ekfp" role="2VODD2">
+                    <node concept="3clFbF" id="5itBwM5EkUK" role="3cqZAp">
+                      <node concept="2OqwBi" id="5itBwM5El9J" role="3clFbG">
+                        <node concept="30H73N" id="5itBwM5EkUJ" role="2Oq$k0" />
+                        <node concept="3TrcHB" id="5itBwM5Elrk" role="2OqNvi">
+                          <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3uibUv" id="5itBwM5Jp4x" role="3clF45">
+              <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            </node>
+            <node concept="3Tm1VV" id="5itBwM5E5aE" role="1B3o_S" />
+            <node concept="3clFbS" id="5itBwM5MGqi" role="3clF47">
+              <node concept="3cpWs8" id="5itBwM63Ow8" role="3cqZAp">
+                <node concept="3cpWsn" id="5itBwM63Owb" role="3cpWs9">
+                  <property role="TrG5h" value="_session" />
+                  <node concept="3uibUv" id="5itBwM63Owc" role="1tU5fm">
+                    <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+                  </node>
+                  <node concept="37vLTw" id="5itBwM63Owd" role="33vP2m">
+                    <ref role="3cqZAo" node="5itBwM5SoMw" resolve="session" />
+                  </node>
+                  <node concept="2ZBi8u" id="5itBwM63Owe" role="lGtFl">
+                    <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="5itBwM5S4wW" role="3cqZAp">
+                <node concept="3cpWsn" id="5itBwM5S4wZ" role="3cpWs9">
+                  <property role="TrG5h" value="builder" />
+                  <node concept="3uibUv" id="5itBwM5S4x0" role="1tU5fm">
+                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  </node>
+                  <node concept="2ShNRf" id="5itBwM5S4x1" role="33vP2m">
+                    <node concept="1pGfFk" id="5itBwM5S4x2" role="2ShVmc">
+                      <ref role="37wK5l" to="i348:5yr01fE1Jnt" resolve="RuleBuilder" />
+                      <node concept="37vLTw" id="5itBwM5Srje" role="37wK5m">
+                        <ref role="3cqZAo" node="5itBwM5SoMw" resolve="session" />
+                      </node>
+                      <node concept="Xl_RD" id="5itBwM5S4x4" role="37wK5m">
+                        <property role="Xl_RC" value="" />
+                        <node concept="17Uvod" id="5itBwM5S4x5" role="lGtFl">
+                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                          <property role="2qtEX9" value="value" />
+                          <node concept="3zFVjK" id="5itBwM5S4x6" role="3zH0cK">
+                            <node concept="3clFbS" id="5itBwM5S4x7" role="2VODD2">
+                              <node concept="3clFbF" id="5itBwM5S4x8" role="3cqZAp">
+                                <node concept="2OqwBi" id="5itBwM5S4x9" role="3clFbG">
+                                  <node concept="30H73N" id="5itBwM5S4xa" role="2Oq$k0" />
+                                  <node concept="2qgKlT" id="5itBwM5S4xb" role="2OqNvi">
+                                    <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2ZBi8u" id="5itBwM5S4xc" role="lGtFl">
+                    <ref role="2rW$FS" node="4vbeH84GUyf" resolve="builder_variable" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="5itBwM5NyJM" role="3cqZAp">
+                <node concept="2b32R4" id="5itBwM5NzWc" role="lGtFl">
+                  <node concept="3JmXsc" id="5itBwM5NzWd" role="2P8S$">
+                    <node concept="3clFbS" id="5itBwM5NzWe" role="2VODD2">
+                      <node concept="3clFbF" id="5itBwM5N$oO" role="3cqZAp">
+                        <node concept="2OqwBi" id="5itBwM5N_Gi" role="3clFbG">
+                          <node concept="2OqwBi" id="5itBwM5N$F8" role="2Oq$k0">
+                            <node concept="30H73N" id="5itBwM5N$oN" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="5itBwM5N_q6" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:5itBwM5dCWA" resolve="code" />
+                            </node>
+                          </node>
+                          <node concept="3Tsc0h" id="5itBwM5NAsR" role="2OqNvi">
+                            <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="5itBwM5SbCq" role="3cqZAp">
+                <node concept="37vLTw" id="5itBwM5SbCo" role="3clFbG">
+                  <ref role="3cqZAo" node="5itBwM5S4wZ" resolve="builder" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2tJIrI" id="5itBwM5TiN4" role="jymVt" />
+          <node concept="312cEg" id="5itBwM5SoMw" role="jymVt">
+            <property role="TrG5h" value="session" />
+            <node concept="3Tm6S6" id="5itBwM5SoMx" role="1B3o_S" />
+            <node concept="3uibUv" id="5itBwM5Sqvi" role="1tU5fm">
+              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+            </node>
+          </node>
+          <node concept="312cEg" id="5itBwM60YWo" role="jymVt">
+            <property role="TrG5h" value="param" />
+            <node concept="3Tm6S6" id="5itBwM60YWp" role="1B3o_S" />
+            <node concept="3uibUv" id="5itBwM610dU" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              <node concept="29HgVG" id="5itBwM61aKn" role="lGtFl">
+                <node concept="3NFfHV" id="5itBwM61bbp" role="3NFExx">
+                  <node concept="3clFbS" id="5itBwM61bbq" role="2VODD2">
+                    <node concept="3clFbF" id="5itBwM61bD7" role="3cqZAp">
+                      <node concept="2OqwBi" id="5itBwM61bTu" role="3clFbG">
+                        <node concept="30H73N" id="5itBwM61bD6" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="5itBwM61cZM" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:5itBwM5ifE5" resolve="type" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1WS0z7" id="5itBwM611qY" role="lGtFl">
+              <ref role="2rW$FS" node="5itBwM61GZv" resolve="param_field" />
+              <node concept="3JmXsc" id="5itBwM611qZ" role="3Jn$fo">
+                <node concept="3clFbS" id="5itBwM611r0" role="2VODD2">
+                  <node concept="3clFbF" id="5itBwM611u_" role="3cqZAp">
+                    <node concept="2OqwBi" id="5itBwM611KT" role="3clFbG">
+                      <node concept="30H73N" id="5itBwM611u$" role="2Oq$k0" />
+                      <node concept="3Tsc0h" id="5itBwM612S$" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:5itBwM5irVx" resolve="parameter" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="17Uvod" id="5itBwM61ePH" role="lGtFl">
+              <property role="2qtEX9" value="name" />
+              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+              <node concept="3zFVjK" id="5itBwM61ePI" role="3zH0cK">
+                <node concept="3clFbS" id="5itBwM61ePJ" role="2VODD2">
+                  <node concept="3clFbF" id="5itBwM61fxg" role="3cqZAp">
+                    <node concept="2OqwBi" id="5itBwM61fKf" role="3clFbG">
+                      <node concept="30H73N" id="5itBwM61fxf" role="2Oq$k0" />
+                      <node concept="3TrcHB" id="5itBwM61g5T" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="10Nm6u" id="5itBwM61jiB" role="33vP2m" />
+          </node>
+          <node concept="312cEg" id="5itBwM5Uik9" role="jymVt">
+            <property role="TrG5h" value="logical" />
+            <node concept="3Tmbuc" id="5itBwM5Uika" role="1B3o_S" />
+            <node concept="3uibUv" id="5itBwM5Uikb" role="1tU5fm">
+              <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+            </node>
+            <node concept="1WS0z7" id="5itBwM5Uikc" role="lGtFl">
+              <node concept="3JmXsc" id="5itBwM5Uikd" role="3Jn$fo">
+                <node concept="3clFbS" id="5itBwM5Uike" role="2VODD2">
+                  <node concept="3clFbF" id="5itBwM5Uikf" role="3cqZAp">
+                    <node concept="2OqwBi" id="5itBwM5Uikg" role="3clFbG">
+                      <node concept="30H73N" id="5itBwM5Uikj" role="2Oq$k0" />
+                      <node concept="2qgKlT" id="5itBwM5UkYc" role="2OqNvi">
+                        <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1sPUBX" id="5itBwM5Uikl" role="lGtFl">
+              <ref role="v9R2y" node="452KZTbxEFE" resolve="contextName_field_declaration" />
+            </node>
+          </node>
+          <node concept="2tJIrI" id="5itBwM5TiN7" role="jymVt" />
+          <node concept="3Tm1VV" id="5itBwM5JjhB" role="1B3o_S" />
+        </node>
+        <node concept="2tJIrI" id="5itBwM5JiKy" role="jymVt" />
+        <node concept="3clFb_" id="5itBwM60OfG" role="jymVt">
+          <property role="TrG5h" value="token" />
+          <node concept="3uibUv" id="5itBwM60RrR" role="3clF45">
+            <ref role="3uigEE" node="36tQV5AxhJd" resolve="Token" />
+          </node>
+          <node concept="3Tm1VV" id="5itBwM60OfJ" role="1B3o_S" />
+          <node concept="3clFbS" id="5itBwM60OfK" role="3clF47">
+            <node concept="3clFbF" id="5itBwM639v9" role="3cqZAp">
+              <node concept="2ShNRf" id="5itBwM639v7" role="3clFbG">
+                <node concept="1pGfFk" id="5itBwM63b0f" role="2ShVmc">
+                  <ref role="37wK5l" node="36tQV5Axsn7" resolve="Token" />
+                  <node concept="37vLTw" id="5itBwM63cdf" role="37wK5m">
+                    <ref role="3cqZAo" node="5itBwM637ss" resolve="session" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTG" id="5itBwM637ss" role="3clF46">
+            <property role="TrG5h" value="session" />
+            <node concept="3uibUv" id="5itBwM637sr" role="1tU5fm">
+              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+            </node>
+          </node>
+        </node>
+        <node concept="2tJIrI" id="5itBwM5E39w" role="jymVt" />
+        <node concept="3Tm1VV" id="5itBwM5DOW7" role="1B3o_S" />
+        <node concept="raruj" id="5itBwM5DQWE" role="lGtFl" />
+        <node concept="1WS0z7" id="5itBwM5DRJC" role="lGtFl">
+          <node concept="3JmXsc" id="5itBwM5DRJD" role="3Jn$fo">
+            <node concept="3clFbS" id="5itBwM5DRJE" role="2VODD2">
+              <node concept="3clFbF" id="5itBwM5DScr" role="3cqZAp">
+                <node concept="2OqwBi" id="5itBwM5DYhG" role="3clFbG">
+                  <node concept="2OqwBi" id="5itBwM5DSug" role="2Oq$k0">
+                    <node concept="30H73N" id="5itBwM5DScq" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="5itBwM5DW8r" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:1pPth$m5B4Y" resolve="macro" />
+                    </node>
+                  </node>
+                  <node concept="v3k3i" id="5itBwM5E0H8" role="2OqNvi">
+                    <node concept="chp4Y" id="5itBwM5E2jW" role="v3oSu">
+                      <ref role="cht4Q" to="wq2x:5itBwM578SV" resolve="CallMacroTemplate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="5itBwM5Td0V" role="jymVt" />
+      <node concept="2tJIrI" id="5itBwM5Td2d" role="jymVt" />
+      <node concept="3Tm1VV" id="5itBwM5DJeg" role="1B3o_S" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index ac7c550e..228fa086 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -1456,5 +1456,86 @@
       </node>
     </node>
   </node>
+  <node concept="13h7C7" id="5itBwM5t4MP">
+    <property role="3GE5qa" value="macro.decl" />
+    <ref role="13h7C2" to="wq2x:5itBwM578SV" resolve="CallMacroTemplate" />
+    <node concept="13hLZK" id="5itBwM5t4MQ" role="13h7CW">
+      <node concept="3clFbS" id="5itBwM5t4MR" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="5itBwM5t5_C" role="13h7CS">
+      <property role="TrG5h" value="availableLogicalVariable" />
+      <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+      <node concept="3Tm1VV" id="5itBwM5t5_D" role="1B3o_S" />
+      <node concept="3clFbS" id="5itBwM5t5_J" role="3clF47">
+        <node concept="3clFbF" id="5itBwM5AkpQ" role="3cqZAp">
+          <node concept="2OqwBi" id="5itBwM5AsDs" role="3clFbG">
+            <node concept="2OqwBi" id="5itBwM5Ao6V" role="2Oq$k0">
+              <node concept="2OqwBi" id="5itBwM5AkJx" role="2Oq$k0">
+                <node concept="13iPFW" id="5itBwM5AkpO" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="5itBwM5AlUq" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:5itBwM5$rCX" resolve="logical" />
+                </node>
+              </node>
+              <node concept="3goQfb" id="5itBwM5Aqw8" role="2OqNvi">
+                <node concept="1bVj0M" id="5itBwM5Aqwa" role="23t8la">
+                  <node concept="3clFbS" id="5itBwM5Aqwb" role="1bW5cS">
+                    <node concept="3clFbF" id="5itBwM5Ar0o" role="3cqZAp">
+                      <node concept="2OqwBi" id="5itBwM5ArgA" role="3clFbG">
+                        <node concept="37vLTw" id="5itBwM5Ar0n" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5itBwM5Aqwc" resolve="it" />
+                        </node>
+                        <node concept="3Tsc0h" id="5itBwM5ArVA" role="2OqNvi">
+                          <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="5itBwM5Aqwc" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="5itBwM5Aqwd" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3QWeyG" id="5itBwM5AtGx" role="2OqNvi">
+              <node concept="2OqwBi" id="5itBwM5tflV" role="576Qk">
+                <node concept="2OqwBi" id="5itBwM5t8ho" role="2Oq$k0">
+                  <node concept="13iPFW" id="5itBwM5t7Dw" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="5itBwM5t8Vx" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:5itBwM5dHGo" resolve="variable" />
+                  </node>
+                </node>
+                <node concept="3goQfb" id="5itBwM5thLN" role="2OqNvi">
+                  <node concept="1bVj0M" id="5itBwM5thLP" role="23t8la">
+                    <node concept="3clFbS" id="5itBwM5thLQ" role="1bW5cS">
+                      <node concept="3clFbF" id="5itBwM5thSz" role="3cqZAp">
+                        <node concept="2OqwBi" id="5itBwM5ti8D" role="3clFbG">
+                          <node concept="37vLTw" id="5itBwM5thSy" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5itBwM5thLR" resolve="it" />
+                          </node>
+                          <node concept="3Tsc0h" id="5itBwM5tj9l" role="2OqNvi">
+                            <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="5itBwM5thLR" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="5itBwM5thLS" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="5itBwM5t5_K" role="3clF45">
+        <node concept="3Tqbb2" id="5itBwM5t5_L" role="A3Ik2">
+          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index 9b4deba1..76976ffc 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -20,6 +20,7 @@
     <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.coderules.util)" />
     <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)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -32,6 +33,12 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
+      <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" />
@@ -798,8 +805,8 @@
                     <node concept="3gn64h" id="1mdVbTSoaPB" role="3gmYPZ">
                       <ref role="3gnhBz" to="wq2x:6p0DfM0a3TO" resolve="Body" />
                     </node>
-                    <node concept="3gn64h" id="1mdVbTSoaPC" role="3gmYPZ">
-                      <ref role="3gnhBz" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
+                    <node concept="3gn64h" id="5itBwM5wVA8" role="3gmYPZ">
+                      <ref role="3gnhBz" to="wq2x:5itBwM5wMtr" resolve="MacroTemplateBody" />
                     </node>
                   </node>
                   <node concept="1xIGOp" id="1mdVbTSoaPD" role="1xVPHs" />
@@ -888,8 +895,8 @@
                     <node concept="3gn64h" id="1mdVbTSocwO" role="3gmYPZ">
                       <ref role="3gnhBz" to="wq2x:6p0DfM0a3TO" resolve="Body" />
                     </node>
-                    <node concept="3gn64h" id="1mdVbTSocwP" role="3gmYPZ">
-                      <ref role="3gnhBz" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
+                    <node concept="3gn64h" id="5itBwM5wTKI" role="3gmYPZ">
+                      <ref role="3gnhBz" to="wq2x:5itBwM5wMtr" resolve="MacroTemplateBody" />
                     </node>
                   </node>
                   <node concept="1xIGOp" id="1mdVbTSocwQ" role="1xVPHs" />
@@ -978,8 +985,8 @@
                     <node concept="3gn64h" id="1mdVbTSnWep" role="3gmYPZ">
                       <ref role="3gnhBz" to="wq2x:6p0DfM0a3TO" resolve="Body" />
                     </node>
-                    <node concept="3gn64h" id="1mdVbTSnWeq" role="3gmYPZ">
-                      <ref role="3gnhBz" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
+                    <node concept="3gn64h" id="5itBwM5wYEK" role="3gmYPZ">
+                      <ref role="3gnhBz" to="wq2x:5itBwM5wMtr" resolve="MacroTemplateBody" />
                     </node>
                   </node>
                   <node concept="1xIGOp" id="1mdVbTSnWer" role="1xVPHs" />
@@ -1304,8 +1311,8 @@
                     <node concept="3gn64h" id="4jcOV4hwMIZ" role="3gmYPZ">
                       <ref role="3gnhBz" to="wq2x:6p0DfM0a3TO" resolve="Body" />
                     </node>
-                    <node concept="3gn64h" id="4jcOV4hwMJ0" role="3gmYPZ">
-                      <ref role="3gnhBz" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
+                    <node concept="3gn64h" id="5itBwM5wXjQ" role="3gmYPZ">
+                      <ref role="3gnhBz" to="wq2x:5itBwM5wMtr" resolve="MacroTemplateBody" />
                     </node>
                   </node>
                   <node concept="1xIGOp" id="4jcOV4hwMJ1" role="1xVPHs" />
@@ -1380,8 +1387,8 @@
                     <node concept="3gn64h" id="4jcOV4hEF_p" role="3gmYPZ">
                       <ref role="3gnhBz" to="wq2x:6p0DfM0a3TO" resolve="Body" />
                     </node>
-                    <node concept="3gn64h" id="4jcOV4hEF_q" role="3gmYPZ">
-                      <ref role="3gnhBz" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
+                    <node concept="3gn64h" id="5itBwM5wWcD" role="3gmYPZ">
+                      <ref role="3gnhBz" to="wq2x:5itBwM5wMtr" resolve="MacroTemplateBody" />
                     </node>
                   </node>
                   <node concept="1xIGOp" id="4jcOV4hEF_r" role="1xVPHs" />
@@ -1439,5 +1446,85 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="5itBwM5m8KJ">
+    <property role="3GE5qa" value="macro.decl" />
+    <ref role="1M2myG" to="wq2x:5itBwM5kgmv" resolve="CallMacroParameterReference" />
+    <node concept="1N5Pfh" id="5itBwM5mrq0" role="1Mr941">
+      <ref role="1N5Vy1" to="wq2x:5itBwM5mdnH" resolve="declaration" />
+      <node concept="3dgokm" id="5itBwM5mtoA" role="1N6uqs">
+        <node concept="3clFbS" id="5itBwM5mtoB" role="2VODD2">
+          <node concept="3cpWs8" id="5itBwM5mz1L" role="3cqZAp">
+            <node concept="3cpWsn" id="5itBwM5mz1M" role="3cpWs9">
+              <property role="TrG5h" value="cmt" />
+              <node concept="3Tqbb2" id="5itBwM5myCd" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:5itBwM578SV" resolve="CallMacroTemplate" />
+              </node>
+              <node concept="2OqwBi" id="5itBwM5mz1N" role="33vP2m">
+                <node concept="2rP1CM" id="5itBwM5mz1O" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="5itBwM5mz1P" role="2OqNvi">
+                  <node concept="1xMEDy" id="5itBwM5mz1Q" role="1xVPHs">
+                    <node concept="chp4Y" id="5itBwM5mz1R" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:5itBwM578SV" resolve="CallMacroTemplate" />
+                    </node>
+                  </node>
+                  <node concept="1xIGOp" id="5itBwM5mz1S" role="1xVPHs" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="5itBwM5m$gy" role="3cqZAp">
+            <node concept="2ShNRf" id="5itBwM5m$gu" role="3clFbG">
+              <node concept="YeOm9" id="5itBwM5mDok" role="2ShVmc">
+                <node concept="1Y3b0j" id="5itBwM5mDon" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
+                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
+                  <node concept="3Tm1VV" id="5itBwM5mDoo" role="1B3o_S" />
+                  <node concept="2OqwBi" id="5itBwM5n3wt" role="37wK5m">
+                    <node concept="37vLTw" id="5itBwM5n3wu" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5itBwM5mz1M" resolve="cmt" />
+                    </node>
+                    <node concept="3Tsc0h" id="5itBwM5n3wv" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:5itBwM5irVx" resolve="parameter" />
+                    </node>
+                  </node>
+                  <node concept="3clFb_" id="5itBwM5mDOU" role="jymVt">
+                    <property role="TrG5h" value="getName" />
+                    <node concept="17QB3L" id="5itBwM5mDOV" role="3clF45" />
+                    <node concept="3Tm1VV" id="5itBwM5mDOW" role="1B3o_S" />
+                    <node concept="37vLTG" id="5itBwM5mDOY" role="3clF46">
+                      <property role="TrG5h" value="child" />
+                      <node concept="3Tqbb2" id="5itBwM5mDOZ" role="1tU5fm" />
+                    </node>
+                    <node concept="3clFbS" id="5itBwM5mDP1" role="3clF47">
+                      <node concept="3clFbF" id="5itBwM5mELo" role="3cqZAp">
+                        <node concept="2OqwBi" id="5itBwM5mH9x" role="3clFbG">
+                          <node concept="1PxgMI" id="5itBwM5mFLR" role="2Oq$k0">
+                            <property role="1BlNFB" value="true" />
+                            <node concept="chp4Y" id="5itBwM5mH0C" role="3oSUPX">
+                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                            </node>
+                            <node concept="37vLTw" id="5itBwM5mELn" role="1m5AlR">
+                              <ref role="3cqZAo" node="5itBwM5mDOY" resolve="child" />
+                            </node>
+                          </node>
+                          <node concept="3TrcHB" id="5itBwM5mHGp" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="5itBwM5mDP2" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index b6c10ed2..2306e43e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -2805,8 +2805,8 @@
                     <node concept="3gn64h" id="5HLeEcfpD8F" role="3gmYPZ">
                       <ref role="3gnhBz" to="wq2x:6p0DfM0a3TO" resolve="Body" />
                     </node>
-                    <node concept="3gn64h" id="5HLeEcfpD8G" role="3gmYPZ">
-                      <ref role="3gnhBz" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
+                    <node concept="3gn64h" id="5itBwM5wZxg" role="3gmYPZ">
+                      <ref role="3gnhBz" to="wq2x:5itBwM5wMtr" resolve="MacroTemplateBody" />
                     </node>
                     <node concept="3gn64h" id="5HLeEcfpD8H" role="3gmYPZ">
                       <ref role="3gnhBz" to="wq2x:6p0DfM0a3Qe" resolve="Guard" />
@@ -3678,8 +3678,8 @@
                     <node concept="3gn64h" id="5HLeEcfrTSO" role="3gmYPZ">
                       <ref role="3gnhBz" to="wq2x:6p0DfM0a3TO" resolve="Body" />
                     </node>
-                    <node concept="3gn64h" id="5HLeEcfrTSP" role="3gmYPZ">
-                      <ref role="3gnhBz" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
+                    <node concept="3gn64h" id="5itBwM5x1dN" role="3gmYPZ">
+                      <ref role="3gnhBz" to="wq2x:5itBwM5wMtr" resolve="MacroTemplateBody" />
                     </node>
                   </node>
                   <node concept="1xIGOp" id="5HLeEcfrTSQ" role="1xVPHs" />
@@ -5938,5 +5938,368 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="5itBwM5dlZe">
+    <property role="3GE5qa" value="macro.decl" />
+    <ref role="1XX52x" to="wq2x:5itBwM578SV" resolve="CallMacroTemplate" />
+    <node concept="3EZMnI" id="5itBwM5dn$w" role="2wV5jI">
+      <node concept="3F0ifn" id="5itBwM5dn$x" role="3EZMnx">
+        <property role="3F0ifm" value="macro" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+        <node concept="A1WHu" id="5itBwM5_jVS" role="3vIgyS">
+          <ref role="A1WHt" node="5itBwM5_bOR" resolve="CallMacroTemplate_AddLogical" />
+        </node>
+      </node>
+      <node concept="3EZMnI" id="5itBwM5$HaZ" role="3EZMnx">
+        <node concept="3F0ifn" id="5itBwM5$Hb0" role="3EZMnx">
+          <property role="3F0ifm" value="&lt;" />
+          <node concept="11LMrY" id="5itBwM5$Hb1" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="VPM3Z" id="5itBwM5$Hb2" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F2HdR" id="5itBwM5$Hb3" role="3EZMnx">
+          <property role="2czwfO" value="," />
+          <ref role="1NtTu8" to="wq2x:5itBwM5$rCX" resolve="logical" />
+          <node concept="l2Vlx" id="5itBwM5$Hb4" role="2czzBx" />
+          <node concept="3F0ifn" id="5itBwM5$Hb5" role="2czzBI">
+            <property role="ilYzB" value="&lt;no logical&gt;" />
+          </node>
+        </node>
+        <node concept="3F0ifn" id="5itBwM5$Hb6" role="3EZMnx">
+          <property role="3F0ifm" value="&gt;" />
+          <node concept="11L4FC" id="5itBwM5$Hb7" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="l2Vlx" id="5itBwM5$Hb8" role="2iSdaV" />
+        <node concept="pkWqt" id="5itBwM5$Hb9" role="pqm2j">
+          <node concept="3clFbS" id="5itBwM5$Hba" role="2VODD2">
+            <node concept="3clFbF" id="5itBwM5$Hbb" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5$Hbc" role="3clFbG">
+                <node concept="2OqwBi" id="5itBwM5$Hbd" role="2Oq$k0">
+                  <node concept="pncrf" id="5itBwM5$Hbe" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="5itBwM5$TvC" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:5itBwM5$rCX" resolve="logical" />
+                  </node>
+                </node>
+                <node concept="3GX2aA" id="5itBwM5$Hbg" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F0A7n" id="5itBwM5dn$y" role="3EZMnx">
+        <ref role="1k5W1q" to="tpen:hshUnm6" resolve="StaticMethod" />
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+      </node>
+      <node concept="3F0ifn" id="5itBwM5iyXb" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+      </node>
+      <node concept="3F2HdR" id="5itBwM5iw20" role="3EZMnx">
+        <property role="2czwfO" value="," />
+        <ref role="1NtTu8" to="wq2x:5itBwM5irVx" resolve="parameter" />
+        <node concept="l2Vlx" id="5itBwM5iw22" role="2czzBx" />
+        <node concept="tppnM" id="5itBwM5iKkM" role="sWeuL">
+          <node concept="11L4FC" id="5itBwM5iL7s" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="3F0ifn" id="5itBwM5jvh6" role="2czzBI">
+          <property role="3F0ifm" value="" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="5itBwM5iEfL" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+      </node>
+      <node concept="3F0ifn" id="5itBwM5ebQK" role="3EZMnx">
+        <property role="3F0ifm" value="produce" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+        <node concept="lj46D" id="5itBwM5zj89" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pVoyu" id="5itBwM5ebQL" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="A1WHu" id="5itBwM5_af$" role="3vIgyS">
+          <ref role="A1WHt" node="5itBwM5$ZOD" resolve="CallMacroTemplate_AddVariable" />
+        </node>
+      </node>
+      <node concept="3EZMnI" id="5itBwM5ebQN" role="3EZMnx">
+        <node concept="3F0ifn" id="5itBwM5ebQO" role="3EZMnx">
+          <property role="3F0ifm" value="&lt;" />
+          <node concept="11LMrY" id="5itBwM5ebQP" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="VPM3Z" id="5itBwM5ebQQ" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F2HdR" id="5itBwM5ebQR" role="3EZMnx">
+          <property role="2czwfO" value="," />
+          <ref role="1NtTu8" to="wq2x:5itBwM5dHGo" resolve="variable" />
+          <node concept="l2Vlx" id="5itBwM5ebQS" role="2czzBx" />
+          <node concept="3F0ifn" id="5itBwM5ebQT" role="2czzBI">
+            <property role="ilYzB" value="&lt;no logical&gt;" />
+          </node>
+        </node>
+        <node concept="3F0ifn" id="5itBwM5ebQU" role="3EZMnx">
+          <property role="3F0ifm" value="&gt;" />
+          <node concept="11L4FC" id="5itBwM5ebQV" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="l2Vlx" id="5itBwM5ebQW" role="2iSdaV" />
+        <node concept="pkWqt" id="5itBwM5ebQX" role="pqm2j">
+          <node concept="3clFbS" id="5itBwM5ebQY" role="2VODD2">
+            <node concept="3clFbF" id="5itBwM5ebQZ" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5ev5y" role="3clFbG">
+                <node concept="2OqwBi" id="5itBwM5esek" role="2Oq$k0">
+                  <node concept="pncrf" id="5itBwM5erW6" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="5itBwM5esVY" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:5itBwM5dHGo" resolve="variable" />
+                  </node>
+                </node>
+                <node concept="3GX2aA" id="5itBwM5eygB" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3EZMnI" id="5itBwM5ebR5" role="3EZMnx">
+        <node concept="VPM3Z" id="5itBwM5ebR6" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="lj46D" id="5itBwM5ebR7" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pVoyu" id="5itBwM5ebR8" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="l2Vlx" id="5itBwM5ebR9" role="2iSdaV" />
+        <node concept="3F0ifn" id="5itBwM5ebRa" role="3EZMnx">
+          <property role="3F0ifm" value="%%" />
+          <ref role="1k5W1q" node="7LZcKzBE07j" resolve="EmitConstraint" />
+          <node concept="lj46D" id="5itBwM5zmG4" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="ljvvj" id="5itBwM5ebRb" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="3EZMnI" id="5itBwM5ebRc" role="3EZMnx">
+          <property role="S$Qs1" value="true" />
+          <node concept="VPM3Z" id="5itBwM5ebRd" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="pVoyu" id="5itBwM5ebRe" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="lj46D" id="5itBwM5ebRf" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="ljvvj" id="5itBwM5ebRg" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="l2Vlx" id="5itBwM5ebRh" role="2iSdaV" />
+          <node concept="3F1sOY" id="5itBwM5ebRi" role="3EZMnx">
+            <ref role="1NtTu8" to="wq2x:5itBwM5dCWA" resolve="code" />
+            <node concept="lj46D" id="5itBwM5zr2F" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+          </node>
+        </node>
+        <node concept="3F0ifn" id="5itBwM5ebRj" role="3EZMnx">
+          <property role="3F0ifm" value="%%" />
+          <ref role="1k5W1q" node="7LZcKzBE07j" resolve="EmitConstraint" />
+          <node concept="lj46D" id="5itBwM5zohr" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="pVoyu" id="5itBwM5ebRk" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="l2Vlx" id="5itBwM5dn$V" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="5itBwM5igta">
+    <property role="3GE5qa" value="macro.decl" />
+    <ref role="1XX52x" to="wq2x:5itBwM5i6X6" resolve="CallMacroParameterDeclaration" />
+    <node concept="3EZMnI" id="5itBwM5ijeo" role="2wV5jI">
+      <node concept="3F1sOY" id="5itBwM5ijBN" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:5itBwM5ifE5" resolve="type" />
+      </node>
+      <node concept="3F0A7n" id="5itBwM5ikqx" role="3EZMnx">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+      </node>
+      <node concept="l2Vlx" id="5itBwM5ijer" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="Q6S24" id="5itBwM5nh5s">
+    <property role="3GE5qa" value="macro.decl" />
+    <property role="TrG5h" value="CallMacroParameterReference" />
+    <ref role="aqKnT" to="tpee:fz3vP1J" resolve="Expression" />
+    <node concept="3ft6gV" id="5itBwM5nkDj" role="3ft7WO">
+      <node concept="3ft6gW" id="5itBwM5nl2E" role="3ft5RY">
+        <node concept="3clFbS" id="5itBwM5nl2F" role="2VODD2">
+          <node concept="3clFbF" id="5itBwM5nlw3" role="3cqZAp">
+            <node concept="2OqwBi" id="5itBwM5nnMO" role="3clFbG">
+              <node concept="2OqwBi" id="5itBwM5nlCF" role="2Oq$k0">
+                <node concept="3bvxqY" id="5itBwM5nlw2" role="2Oq$k0" />
+                <node concept="2Xjw5R" id="5itBwM5nm9C" role="2OqNvi">
+                  <node concept="1xMEDy" id="5itBwM5nm9E" role="1xVPHs">
+                    <node concept="chp4Y" id="5itBwM5nmEr" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:5itBwM578SV" resolve="CallMacroTemplate" />
+                    </node>
+                  </node>
+                  <node concept="1xIGOp" id="5itBwM5nnAn" role="1xVPHs" />
+                </node>
+              </node>
+              <node concept="3x8VRR" id="5itBwM5noUI" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1s_PAr" id="5itBwM5qf3J" role="3ft5RZ">
+        <node concept="2kknPI" id="5itBwM5qft8" role="1s_PAo">
+          <ref role="2kkw0f" node="5itBwM5nvTV" resolve="CallMacroParameterReference_Smart" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="Q6S24" id="5itBwM5nvTV">
+    <property role="3GE5qa" value="macro.decl" />
+    <property role="TrG5h" value="CallMacroParameterReference_Smart" />
+    <ref role="aqKnT" to="wq2x:5itBwM5kgmv" resolve="CallMacroParameterReference" />
+    <node concept="3XHNnq" id="5itBwM5nx5S" role="3ft7WO">
+      <ref role="3XGfJA" to="wq2x:5itBwM5mdnH" resolve="declaration" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="5itBwM5r4M0">
+    <property role="3GE5qa" value="macro.decl" />
+    <ref role="1XX52x" to="wq2x:5itBwM5kgmv" resolve="CallMacroParameterReference" />
+    <node concept="3EZMnI" id="5itBwM5r5bm" role="2wV5jI">
+      <node concept="1iCGBv" id="5itBwM5r6np" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:5itBwM5mdnH" resolve="declaration" />
+        <node concept="1sVBvm" id="5itBwM5r6nr" role="1sWHZn">
+          <node concept="3F0A7n" id="5itBwM5r6KT" role="2wV5jI">
+            <property role="1Intyy" value="true" />
+            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+          </node>
+        </node>
+      </node>
+      <node concept="l2Vlx" id="5itBwM5r5bp" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="3ICXOK" id="5itBwM5$ZOD">
+    <property role="3GE5qa" value="macro.decl" />
+    <property role="TrG5h" value="CallMacroTemplate_AddVariable" />
+    <ref role="aqKnT" to="wq2x:5itBwM578SV" resolve="CallMacroTemplate" />
+    <node concept="1Qtc8_" id="5itBwM5gyUA" role="IW6Ez">
+      <node concept="IWgqT" id="5itBwM5gyUB" role="1Qtc8A">
+        <node concept="1hCUdq" id="5itBwM5gyUC" role="1hCUd6">
+          <node concept="3clFbS" id="5itBwM5gyUD" role="2VODD2">
+            <node concept="3clFbF" id="5itBwM5gyUE" role="3cqZAp">
+              <node concept="Xl_RD" id="5itBwM5gyUF" role="3clFbG">
+                <property role="Xl_RC" value="&lt;" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWg2L" id="5itBwM5gyUG" role="IWgqQ">
+          <node concept="3clFbS" id="5itBwM5gyUH" role="2VODD2">
+            <node concept="3clFbF" id="5itBwM5gyUI" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5gyUJ" role="3clFbG">
+                <node concept="2OqwBi" id="5itBwM5gyUK" role="2Oq$k0">
+                  <node concept="7Obwk" id="5itBwM5gyUL" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="5itBwM5g_FB" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:5itBwM5dHGo" resolve="variable" />
+                  </node>
+                </node>
+                <node concept="2DeJg1" id="5itBwM5gyUN" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="27VH4U" id="5itBwM5gyUO" role="2jiSrf">
+          <node concept="3clFbS" id="5itBwM5gyUP" role="2VODD2">
+            <node concept="3clFbF" id="5itBwM5gyUQ" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5gyUR" role="3clFbG">
+                <node concept="2OqwBi" id="5itBwM5gyUS" role="2Oq$k0">
+                  <node concept="7Obwk" id="5itBwM5gyUT" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="5itBwM5g_86" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:5itBwM5dHGo" resolve="variable" />
+                  </node>
+                </node>
+                <node concept="1v1jN8" id="5itBwM5gyUV" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cWJ9i" id="5itBwM5gyUW" role="1Qtc8$">
+        <node concept="CtIbL" id="5itBwM5gyUX" role="CtIbM">
+          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="3ICXOK" id="5itBwM5_bOR">
+    <property role="3GE5qa" value="macro.decl" />
+    <property role="TrG5h" value="CallMacroTemplate_AddLogical" />
+    <ref role="aqKnT" to="wq2x:5itBwM578SV" resolve="CallMacroTemplate" />
+    <node concept="1Qtc8_" id="5itBwM5_bOS" role="IW6Ez">
+      <node concept="IWgqT" id="5itBwM5_bOT" role="1Qtc8A">
+        <node concept="1hCUdq" id="5itBwM5_bOU" role="1hCUd6">
+          <node concept="3clFbS" id="5itBwM5_bOV" role="2VODD2">
+            <node concept="3clFbF" id="5itBwM5_bOW" role="3cqZAp">
+              <node concept="Xl_RD" id="5itBwM5_bOX" role="3clFbG">
+                <property role="Xl_RC" value="&lt;" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWg2L" id="5itBwM5_bOY" role="IWgqQ">
+          <node concept="3clFbS" id="5itBwM5_bOZ" role="2VODD2">
+            <node concept="3clFbF" id="5itBwM5_bP0" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5_bP1" role="3clFbG">
+                <node concept="2OqwBi" id="5itBwM5_bP2" role="2Oq$k0">
+                  <node concept="7Obwk" id="5itBwM5_bP3" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="5itBwM5_gCg" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:5itBwM5$rCX" resolve="logical" />
+                  </node>
+                </node>
+                <node concept="2DeJg1" id="5itBwM5_bP5" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="27VH4U" id="5itBwM5_bP6" role="2jiSrf">
+          <node concept="3clFbS" id="5itBwM5_bP7" role="2VODD2">
+            <node concept="3clFbF" id="5itBwM5_bP8" role="3cqZAp">
+              <node concept="2OqwBi" id="5itBwM5_bP9" role="3clFbG">
+                <node concept="2OqwBi" id="5itBwM5_bPa" role="2Oq$k0">
+                  <node concept="7Obwk" id="5itBwM5_bPb" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="5itBwM5_fET" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:5itBwM5$rCX" resolve="logical" />
+                  </node>
+                </node>
+                <node concept="1v1jN8" id="5itBwM5_bPd" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cWJ9i" id="5itBwM5_bPe" role="1Qtc8$">
+        <node concept="CtIbL" id="5itBwM5_bPf" role="CtIbM">
+          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps
index 4b99e734..5aff7094 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps
@@ -294,8 +294,8 @@
                       <node concept="3gn64h" id="2TtA2rKl5c8" role="3gmYPZ">
                         <ref role="3gnhBz" to="wq2x:6p0DfM0a3TO" resolve="Body" />
                       </node>
-                      <node concept="3gn64h" id="2TtA2rKl5iD" role="3gmYPZ">
-                        <ref role="3gnhBz" to="wq2x:7IysFe_ZPX_" resolve="MacroBody" />
+                      <node concept="3gn64h" id="5itBwM5x5N7" role="3gmYPZ">
+                        <ref role="3gnhBz" to="wq2x:5itBwM5wMtr" resolve="MacroTemplateBody" />
                       </node>
                     </node>
                   </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 917c1f9b..841d24c1 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -438,7 +438,7 @@
       <property role="20kJfa" value="macro" />
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <property role="IQ2ns" value="1618328391714763070" />
-      <ref role="20lvS9" node="1pPth$m5Bbz" resolve="MacroDeclaration" />
+      <ref role="20lvS9" node="5itBwM56wgT" resolve="MacroTemplate" />
     </node>
     <node concept="PrWs8" id="1pPth$m5B55" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
@@ -472,8 +472,8 @@
       <property role="20kJfa" value="body" />
       <ref role="20lvS9" node="7IysFe_ZPX_" resolve="MacroBody" />
     </node>
-    <node concept="PrWs8" id="5yr01fDEW3P" role="PzmwI">
-      <ref role="PrY4T" node="6OXbTDyHcuD" resolve="Template" />
+    <node concept="PrWs8" id="5itBwM56QHJ" role="PzmwI">
+      <ref role="PrY4T" node="5itBwM56wgT" resolve="MacroTemplate" />
     </node>
     <node concept="PrWs8" id="1pPth$m5Bb$" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
@@ -570,6 +570,9 @@
     <node concept="PrWs8" id="7IysFe_ZPXA" role="PzmwI">
       <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
     </node>
+    <node concept="PrWs8" id="5itBwM5wQOg" role="PzmwI">
+      <ref role="PrY4T" node="5itBwM5wMtr" resolve="MacroTemplateBody" />
+    </node>
   </node>
   <node concept="1TIwiD" id="7IysFe_ZPXH">
     <property role="EcuMT" value="8908809128801951597" />
@@ -1441,5 +1444,104 @@
       <ref role="20lvS9" node="6p0DfM0a3TO" resolve="Body" />
     </node>
   </node>
+  <node concept="PlHQZ" id="5itBwM56wgT">
+    <property role="EcuMT" value="6097203247139390521" />
+    <property role="3GE5qa" value="macro" />
+    <property role="TrG5h" value="MacroTemplate" />
+    <node concept="PrWs8" id="5itBwM56xRq" role="PrDN$">
+      <ref role="PrY4T" node="6OXbTDyHcuD" resolve="Template" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="5itBwM578SV">
+    <property role="EcuMT" value="6097203247139556923" />
+    <property role="3GE5qa" value="macro.decl" />
+    <property role="TrG5h" value="CallMacroTemplate" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="PrWs8" id="5itBwM57a68" role="PzmwI">
+      <ref role="PrY4T" node="5itBwM56wgT" resolve="MacroTemplate" />
+    </node>
+    <node concept="PrWs8" id="5itBwM5xp12" role="PzmwI">
+      <ref role="PrY4T" node="5itBwM5wMtr" resolve="MacroTemplateBody" />
+    </node>
+    <node concept="PrWs8" id="5itBwM57bFt" role="PzmwI">
+      <ref role="PrY4T" node="7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
+    </node>
+    <node concept="PrWs8" id="5itBwM57bFu" role="PzmwI">
+      <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
+    </node>
+    <node concept="PrWs8" id="5itBwM57bFv" role="PzmwI">
+      <ref role="PrY4T" node="1CgWc1Tyjkz" resolve="Commentable" />
+    </node>
+    <node concept="1TJgyj" id="5itBwM5$rCX" role="1TKVEi">
+      <property role="IQ2ns" value="6097203247147235901" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="logical" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <ref role="20lvS9" node="7IysFe_ZPXH" resolve="MacroBodyLogicalDeclaration" />
+    </node>
+    <node concept="1TJgyj" id="5itBwM5irVx" role="1TKVEi">
+      <property role="IQ2ns" value="6097203247142518497" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="parameter" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <ref role="20lvS9" node="5itBwM5i6X6" resolve="CallMacroParameterDeclaration" />
+    </node>
+    <node concept="1TJgyj" id="5itBwM5dHGo" role="1TKVEi">
+      <property role="IQ2ns" value="6097203247141280536" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="variable" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <ref role="20lvS9" node="7IysFe_ZPXH" resolve="MacroBodyLogicalDeclaration" />
+    </node>
+    <node concept="1TJgyj" id="5itBwM5dCWA" role="1TKVEi">
+      <property role="IQ2ns" value="6097203247141261094" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="code" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="5itBwM5i6X6">
+    <property role="EcuMT" value="6097203247142432582" />
+    <property role="3GE5qa" value="macro.decl" />
+    <property role="TrG5h" value="CallMacroParameterDeclaration" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="5itBwM5ifE5" role="1TKVEi">
+      <property role="IQ2ns" value="6097203247142468229" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="type" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="tpee:fz3vP1H" resolve="Type" />
+    </node>
+    <node concept="PrWs8" id="5itBwM5ie4J" role="PzmwI">
+      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+    </node>
+    <node concept="PrWs8" id="5itBwM5ie4K" role="PzmwI">
+      <ref role="PrY4T" to="tpee:4H$HgYMZ7sw" resolve="IVariableDeclaration" />
+    </node>
+    <node concept="PrWs8" id="5itBwM5ie4L" role="PzmwI">
+      <ref role="PrY4T" to="tpck:hqLv6T6" resolve="IResolveInfo" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="5itBwM5kgmv">
+    <property role="EcuMT" value="6097203247142995359" />
+    <property role="3GE5qa" value="macro.decl" />
+    <property role="TrG5h" value="CallMacroParameterReference" />
+    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
+    <node concept="PrWs8" id="5itBwM5klv$" role="PzmwI">
+      <ref role="PrY4T" to="tpee:SORzhOp6jM" resolve="IVariableReference" />
+    </node>
+    <node concept="1TJgyj" id="5itBwM5mdnH" role="1TKVEi">
+      <property role="IQ2ns" value="6097203247143507437" />
+      <property role="20kJfa" value="declaration" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" node="5itBwM5i6X6" resolve="CallMacroParameterDeclaration" />
+    </node>
+  </node>
+  <node concept="PlHQZ" id="5itBwM5wMtr">
+    <property role="EcuMT" value="6097203247146280795" />
+    <property role="3GE5qa" value="macro" />
+    <property role="TrG5h" value="MacroTemplateBody" />
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index bee3a786..1fb2cfe6 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -1570,5 +1570,39 @@
       <ref role="1YaFvo" to="wq2x:1laj_RSpLVV" resolve="OriginSpec" />
     </node>
   </node>
+  <node concept="1YbPZF" id="5itBwM5rMjq">
+    <property role="TrG5h" value="typeof_CallMacroParameterReference" />
+    <property role="3GE5qa" value="macro.decl" />
+    <node concept="3clFbS" id="5itBwM5rMjr" role="18ibNy">
+      <node concept="1Z5TYs" id="5itBwM5rU6a" role="3cqZAp">
+        <node concept="mw_s8" id="5itBwM5rUT4" role="1ZfhKB">
+          <node concept="2OqwBi" id="5itBwM5rWbm" role="mwGJk">
+            <node concept="2OqwBi" id="5itBwM5rV1j" role="2Oq$k0">
+              <node concept="1YBJjd" id="5itBwM5rUT2" role="2Oq$k0">
+                <ref role="1YBMHb" node="5itBwM5rMjt" resolve="cmpr" />
+              </node>
+              <node concept="3TrEf2" id="5itBwM5rV_w" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:5itBwM5mdnH" resolve="declaration" />
+              </node>
+            </node>
+            <node concept="3TrEf2" id="5itBwM5rWQw" role="2OqNvi">
+              <ref role="3Tt5mk" to="wq2x:5itBwM5ifE5" resolve="type" />
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="5itBwM5rU6d" role="1ZfhK$">
+          <node concept="1Z2H0r" id="5itBwM5rP4Q" role="mwGJk">
+            <node concept="1YBJjd" id="5itBwM5rPvY" role="1Z2MuG">
+              <ref role="1YBMHb" node="5itBwM5rMjt" resolve="cmpr" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="5itBwM5rMjt" role="1YuTPh">
+      <property role="TrG5h" value="cmpr" />
+      <ref role="1YaFvo" to="wq2x:5itBwM5kgmv" resolve="CallMacroParameterReference" />
+    </node>
+  </node>
 </model>