From 9bbf86cb8d7484fb86d52002ee45cd6e666574bc Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 17 Apr 2020 13:47:17 +0200
Subject: [PATCH] Optimize coderules templates runtime and generator.

Drop obsolete code from runtime.
Consolidate and reconcile different templates for consistency.
Simplify generated code.
---
 .../generator/template/main@generator.mps     | 2154 ++++++-----------
 .../jetbrains.mps.lang.coderules.eval.mps     |  147 +-
 .../jetbrains.mps.lang.coderules.program.mps  |  394 +--
 ...s.mps.coderules.typechecking.ui.plugin.mps |    8 +-
 .../models/service.mps                        |  220 --
 .../jetbrains.mps.lang.coderules.template.mps |  697 +++---
 6 files changed, 1242 insertions(+), 2378 deletions(-)

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 5d356c1e..5c95383a 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
@@ -604,9 +604,6 @@
       <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
         <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
       </concept>
-      <concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
-        <child id="1145567471833" name="createdType" index="2T96Bj" />
-      </concept>
       <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
         <reference id="1139877738879" name="concept" index="1A0vxQ" />
       </concept>
@@ -829,11 +826,6 @@
       <ref role="2rZz_L" to="tpee:6LFqxSRBTg8" resolve="MethodDeclaration" />
       <ref role="2rTdP9" to="wq2x:6OXbTDyHcuD" resolve="Template" />
     </node>
-    <node concept="2rT7sh" id="6OXbTDyZfMT" role="2rTMjI">
-      <property role="TrG5h" value="template_ref" />
-      <ref role="2rTdP9" to="wq2x:6OXbTDyHcuD" resolve="Template" />
-      <ref role="2rZz_L" to="tpee:fzclF8t" resolve="InstanceMethodDeclaration" />
-    </node>
     <node concept="2rT7sh" id="2J$kxDHVt6s" role="2rTMjI">
       <property role="TrG5h" value="constraintRule_class" />
       <ref role="2rTdP9" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
@@ -849,6 +841,11 @@
       <ref role="2rTdP9" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
       <ref role="2rZz_L" to="tpee:fz3uBXI" resolve="VariableDeclaration" />
     </node>
+    <node concept="2rT7sh" id="6R6MIbUtc6X" role="2rTMjI">
+      <property role="TrG5h" value="apply_session_field" />
+      <ref role="2rTdP9" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
+      <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
+    </node>
     <node concept="2rT7sh" id="PB1R3YtcNl" role="2rTMjI">
       <property role="TrG5h" value="initToken_input" />
       <ref role="2rZz_L" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
@@ -859,6 +856,11 @@
       <ref role="2rZz_L" to="tpee:fz3uBXI" resolve="VariableDeclaration" />
       <ref role="2rTdP9" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
     </node>
+    <node concept="2rT7sh" id="6R6MIbTaGzw" role="2rTMjI">
+      <property role="TrG5h" value="builder_field" />
+      <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
+      <ref role="2rTdP9" to="wq2x:6OXbTDyHcuD" resolve="Template" />
+    </node>
     <node concept="2rT7sh" id="6FQzrygSZ4e" role="2rTMjI">
       <property role="TrG5h" value="builder_variable_rulemethod" />
       <ref role="2rZz_L" to="tpee:fz3uBXI" resolve="VariableDeclaration" />
@@ -12021,23 +12023,53 @@
     <property role="1sVAO0" value="false" />
     <node concept="2tJIrI" id="36tQV5AoEKI" role="jymVt" />
     <node concept="312cEu" id="36tQV5AoEKJ" role="jymVt">
+      <property role="2bfB8j" value="true" />
       <property role="TrG5h" value="Token" />
-      <property role="2bfB8j" value="false" />
       <node concept="2tJIrI" id="36tQV5AoEKK" role="jymVt" />
       <node concept="3clFbW" id="36tQV5AoEKL" role="jymVt">
         <node concept="3cqZAl" id="36tQV5AoELh" role="3clF45" />
         <node concept="3Tm1VV" id="36tQV5AoELi" role="1B3o_S" />
         <node concept="3clFbS" id="36tQV5AoELj" role="3clF47">
-          <node concept="3clFbF" id="36tQV5AoELk" role="3cqZAp">
-            <node concept="37vLTI" id="36tQV5AoELl" role="3clFbG">
-              <node concept="2OqwBi" id="36tQV5AoELm" role="37vLTJ">
-                <node concept="Xjq3P" id="36tQV5AoELn" role="2Oq$k0" />
-                <node concept="2OwXpG" id="36tQV5AoELo" role="2OqNvi">
-                  <ref role="2Oxat5" node="36tQV5AoEWD" resolve="templateRef" />
+          <node concept="3clFbF" id="6R6MIbUR5SG" role="3cqZAp">
+            <node concept="37vLTI" id="6R6MIbUR6tX" role="3clFbG">
+              <node concept="37vLTw" id="6R6MIbUR6yR" role="37vLTx">
+                <ref role="3cqZAo" node="6R6MIbUR4G7" resolve="input" />
+              </node>
+              <node concept="2OqwBi" id="6R6MIbUR68e" role="37vLTJ">
+                <node concept="Xjq3P" id="6R6MIbUR5SE" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6R6MIbUR6k1" role="2OqNvi">
+                  <ref role="2Oxat5" node="36tQV5AoEVr" resolve="input" />
                 </node>
               </node>
-              <node concept="37vLTw" id="36tQV5AoELp" role="37vLTx">
-                <ref role="3cqZAo" node="36tQV5AoEKM" resolve="templateRef" />
+            </node>
+            <node concept="1W57fq" id="6R6MIbV1G0Q" role="lGtFl">
+              <node concept="3IZrLx" id="6R6MIbV1G0R" role="3IZSJc">
+                <node concept="3clFbS" id="6R6MIbV1G0S" role="2VODD2">
+                  <node concept="3clFbF" id="6R6MIbV1Gav" role="3cqZAp">
+                    <node concept="2OqwBi" id="6R6MIbV1Gaw" role="3clFbG">
+                      <node concept="2OqwBi" id="6R6MIbV1Gax" role="2Oq$k0">
+                        <node concept="30H73N" id="6R6MIbV1Gay" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="6R6MIbV1Gaz" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
+                        </node>
+                      </node>
+                      <node concept="3x8VRR" id="6R6MIbV1Ga$" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6R6MIbUQZ$P" role="3cqZAp">
+            <node concept="37vLTI" id="6R6MIbUQZ$R" role="3clFbG">
+              <node concept="2OqwBi" id="6R6MIbUR0RE" role="37vLTJ">
+                <node concept="Xjq3P" id="6R6MIbUR0U_" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6R6MIbUR0RH" role="2OqNvi">
+                  <ref role="2Oxat5" node="6R6MIbUQZ$L" resolve="session" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="6R6MIbUQZ$V" role="37vLTx">
+                <ref role="3cqZAo" node="6R6MIbUQYO2" resolve="session" />
               </node>
             </node>
           </node>
@@ -12045,102 +12077,18 @@
         <node concept="2ZBi8u" id="36tQV5AoELH" role="lGtFl">
           <ref role="2rW$FS" node="36tQV5Aw2D4" resolve="ruletemplate_token_constructor" />
         </node>
-        <node concept="37vLTG" id="36tQV5AoEKM" role="3clF46">
-          <property role="TrG5h" value="templateRef" />
-          <node concept="3uibUv" id="6OXbTDyZe1I" role="1tU5fm">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        <node concept="37vLTG" id="6R6MIbUR4G7" role="3clF46">
+          <property role="TrG5h" value="input" />
+          <node concept="3Tqbb2" id="6R6MIbUR52L" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="6R6MIbUQYO2" role="3clF46">
+          <property role="TrG5h" value="session" />
+          <node concept="3uibUv" id="6R6MIbUQYO3" role="1tU5fm">
+            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
           </node>
         </node>
       </node>
       <node concept="2tJIrI" id="36tQV5AoELI" role="jymVt" />
-      <node concept="3clFb_" id="36tQV5AoELJ" role="jymVt">
-        <property role="TrG5h" value="init" />
-        <node concept="3cqZAl" id="36tQV5AoELK" role="3clF45" />
-        <node concept="3Tmbuc" id="36tQV5AoELL" role="1B3o_S" />
-        <node concept="3clFbS" id="36tQV5AoELM" role="3clF47">
-          <node concept="3clFbF" id="36tQV5AoEMD" role="3cqZAp">
-            <node concept="37vLTI" id="36tQV5AoEME" role="3clFbG">
-              <node concept="1eOMI4" id="3IIf9OAKcux" role="37vLTx">
-                <node concept="10QFUN" id="3IIf9OAKcuy" role="1eOMHV">
-                  <node concept="3Tqbb2" id="3IIf9OAKcut" role="10QFUM" />
-                  <node concept="AH0OO" id="3IIf9OAKcuu" role="10QFUP">
-                    <node concept="3cmrfG" id="3IIf9OAKcuv" role="AHEQo">
-                      <property role="3cmrfH" value="0" />
-                    </node>
-                    <node concept="37vLTw" id="3IIf9OAKcuw" role="AHHXb">
-                      <ref role="3cqZAo" node="3IIf9OAK4Ug" resolve="input" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="36tQV5AoEMG" role="37vLTJ">
-                <node concept="Xjq3P" id="36tQV5AoEMH" role="2Oq$k0" />
-                <node concept="2OwXpG" id="36tQV5AoEMI" role="2OqNvi">
-                  <ref role="2Oxat5" node="36tQV5AoEVr" resolve="input" />
-                </node>
-              </node>
-            </node>
-            <node concept="1W57fq" id="36tQV5AoEMJ" role="lGtFl">
-              <node concept="3IZrLx" id="36tQV5AoEMK" role="3IZSJc">
-                <node concept="3clFbS" id="36tQV5AoEML" role="2VODD2">
-                  <node concept="3clFbF" id="36tQV5AoEMM" role="3cqZAp">
-                    <node concept="2OqwBi" id="36tQV5AoEMN" role="3clFbG">
-                      <node concept="2OqwBi" id="36tQV5AoEMO" role="2Oq$k0">
-                        <node concept="30H73N" id="36tQV5AoEMP" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="36tQV5AoEMQ" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
-                        </node>
-                      </node>
-                      <node concept="3x8VRR" id="36tQV5AoEMR" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="36tQV5Awzzr" role="3cqZAp">
-            <node concept="37vLTI" id="36tQV5Aw_Cq" role="3clFbG">
-              <node concept="2ShNRf" id="36tQV5Aw_SV" role="37vLTx">
-                <node concept="2T8Vx0" id="36tQV5Aw_MY" role="2ShVmc">
-                  <node concept="2I9FWS" id="36tQV5Aw_MZ" role="2T96Bj" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="36tQV5AwzTc" role="37vLTJ">
-                <node concept="Xjq3P" id="36tQV5Awzzp" role="2Oq$k0" />
-                <node concept="2OwXpG" id="36tQV5Aw$qw" role="2OqNvi">
-                  <ref role="2Oxat5" node="36tQV5AwvNF" resolve="required" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="36tQV5AwDO1" role="3cqZAp">
-            <node concept="37vLTI" id="36tQV5AwDO2" role="3clFbG">
-              <node concept="2ShNRf" id="36tQV5AwDO3" role="37vLTx">
-                <node concept="Tc6Ow" id="36tQV5AwHyL" role="2ShVmc">
-                  <node concept="3uibUv" id="36tQV5AwIcv" role="HW$YZ">
-                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="36tQV5AwDO6" role="37vLTJ">
-                <node concept="Xjq3P" id="36tQV5AwDO7" role="2Oq$k0" />
-                <node concept="2OwXpG" id="36tQV5AwECe" role="2OqNvi">
-                  <ref role="2Oxat5" node="36tQV5AwA22" resolve="ruleBuilder" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="37vLTG" id="3IIf9OAK4Ug" role="3clF46">
-          <property role="TrG5h" value="input" />
-          <node concept="8X2XB" id="3IIf9OAK6W3" role="1tU5fm">
-            <node concept="3uibUv" id="3IIf9OAK4Uf" role="8Xvag">
-              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="36tQV5AoEO5" role="jymVt" />
       <node concept="3clFb_" id="36tQV5AoEOO" role="jymVt">
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="apply" />
@@ -12151,6 +12099,34 @@
         </node>
         <node concept="3Tm1VV" id="36tQV5AoEOU" role="1B3o_S" />
         <node concept="3clFbS" id="36tQV5AoEOV" role="3clF47">
+          <node concept="3cpWs8" id="6R6MIbUR3T9" role="3cqZAp">
+            <node concept="3cpWsn" id="6R6MIbUR3Tc" role="3cpWs9">
+              <property role="TrG5h" value="_session" />
+              <node concept="3uibUv" id="6R6MIbUR3Td" role="1tU5fm">
+                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              </node>
+              <node concept="37vLTw" id="6R6MIbUSyZz" role="33vP2m">
+                <ref role="3cqZAo" node="6R6MIbUQZ$L" resolve="session" />
+              </node>
+              <node concept="2ZBi8u" id="6R6MIbUR3Tf" role="lGtFl">
+                <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="36tQV5AwDO1" role="3cqZAp">
+            <node concept="37vLTI" id="36tQV5AwDO2" role="3clFbG">
+              <node concept="2ShNRf" id="6R6MIbTvFeW" role="37vLTx">
+                <node concept="Tc6Ow" id="6R6MIbTvFL7" role="2ShVmc">
+                  <node concept="3uibUv" id="6R6MIbTvGnC" role="HW$YZ">
+                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTw" id="6R6MIbUR4$k" role="37vLTJ">
+                <ref role="3cqZAo" node="36tQV5AwA22" resolve="ruleBuilders" />
+              </node>
+            </node>
+          </node>
           <node concept="3clFbF" id="36tQV5Az_t2" role="3cqZAp">
             <node concept="2b32R4" id="36tQV5AA6Tm" role="lGtFl">
               <node concept="3JmXsc" id="36tQV5AA6To" role="2P8S$">
@@ -12171,110 +12147,24 @@
                 </node>
               </node>
             </node>
-            <node concept="2OqwBi" id="6OXbTDzdZ5Q" role="3clFbG">
+            <node concept="2OqwBi" id="6R6MIbTbcCP" role="3clFbG">
               <node concept="37vLTw" id="6OXbTDzdY6i" role="2Oq$k0">
-                <ref role="3cqZAo" node="36tQV5AwA22" resolve="ruleBuilder" />
+                <ref role="3cqZAo" node="36tQV5AwA22" resolve="ruleBuilders" />
               </node>
-              <node concept="TSZUe" id="6OXbTDze0y4" role="2OqNvi">
-                <node concept="10Nm6u" id="6OXbTDze0FB" role="25WWJ7" />
+              <node concept="TSZUe" id="6R6MIbTAvEf" role="2OqNvi">
+                <node concept="10Nm6u" id="6R6MIbTAvMD" role="25WWJ7" />
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="36tQV5AJtRo" role="3cqZAp">
-            <node concept="37vLTw" id="36tQV5AJtRm" role="3clFbG">
-              <ref role="3cqZAo" node="36tQV5AwA22" resolve="ruleBuilder" />
+          <node concept="3clFbF" id="6R6MIbTvEDC" role="3cqZAp">
+            <node concept="37vLTw" id="6R6MIbTvEDA" role="3clFbG">
+              <ref role="3cqZAo" node="36tQV5AwA22" resolve="ruleBuilders" />
             </node>
           </node>
         </node>
         <node concept="2AHcQZ" id="36tQV5AoERh" role="2AJF6D">
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
-        <node concept="37vLTG" id="36tQV5AoEOR" role="3clF46">
-          <property role="TrG5h" value="session" />
-          <node concept="3uibUv" id="36tQV5AoEOS" role="1tU5fm">
-            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-          </node>
-          <node concept="2ZBi8u" id="36tQV5AoEOT" role="lGtFl">
-            <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="36tQV5AoERi" role="jymVt" />
-      <node concept="3clFb_" id="36tQV5AoERj" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="requiredNodes" />
-        <node concept="A3Dl8" id="36tQV5AoERk" role="3clF45">
-          <node concept="3Tqbb2" id="36tQV5AoERl" role="A3Ik2" />
-        </node>
-        <node concept="3Tm1VV" id="36tQV5AoERm" role="1B3o_S" />
-        <node concept="2AHcQZ" id="36tQV5AoERn" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-        <node concept="3clFbS" id="36tQV5AoERo" role="3clF47">
-          <node concept="3clFbF" id="36tQV5AwMtY" role="3cqZAp">
-            <node concept="37vLTw" id="36tQV5AwMtW" role="3clFbG">
-              <ref role="3cqZAo" node="36tQV5AwvNF" resolve="required" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="36tQV5AoET1" role="jymVt" />
-      <node concept="3clFb_" id="36tQV5AoETu" role="jymVt">
-        <property role="TrG5h" value="isApplicable" />
-        <property role="1EzhhJ" value="false" />
-        <node concept="10P_77" id="36tQV5AoETv" role="3clF45" />
-        <node concept="3Tm1VV" id="36tQV5AoETw" role="1B3o_S" />
-        <node concept="3clFbS" id="36tQV5AoETx" role="3clF47">
-          <node concept="3clFbF" id="36tQV5AoETy" role="3cqZAp">
-            <node concept="3clFbT" id="36tQV5AoETz" role="3clFbG">
-              <property role="3clFbU" value="true" />
-            </node>
-            <node concept="2b32R4" id="36tQV5AoET$" role="lGtFl">
-              <node concept="3JmXsc" id="36tQV5AoET_" role="2P8S$">
-                <node concept="3clFbS" id="36tQV5AoETA" role="2VODD2">
-                  <node concept="3clFbF" id="36tQV5AoETB" role="3cqZAp">
-                    <node concept="2OqwBi" id="36tQV5AoETC" role="3clFbG">
-                      <node concept="2OqwBi" id="36tQV5AoETD" role="2Oq$k0">
-                        <node concept="3TrEf2" id="36tQV5AoETE" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:tIwzd1_VRv" resolve="code" />
-                        </node>
-                        <node concept="2OqwBi" id="36tQV5AoETF" role="2Oq$k0">
-                          <node concept="30H73N" id="36tQV5AtvIS" role="2Oq$k0" />
-                          <node concept="3TrEf2" id="36tQV5AoETJ" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:36tQV5AmQgD" resolve="condition" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3Tsc0h" id="36tQV5AoETK" role="2OqNvi">
-                        <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="36tQV5AoETL" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-        <node concept="1W57fq" id="36tQV5AoETM" role="lGtFl">
-          <node concept="3IZrLx" id="36tQV5AoETN" role="3IZSJc">
-            <node concept="3clFbS" id="36tQV5AoETO" role="2VODD2">
-              <node concept="3clFbF" id="36tQV5AoETP" role="3cqZAp">
-                <node concept="2OqwBi" id="36tQV5AoETQ" role="3clFbG">
-                  <node concept="2OqwBi" id="36tQV5AoETR" role="2Oq$k0">
-                    <node concept="30H73N" id="36tQV5Atsys" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="36tQV5AoETV" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:36tQV5AmQgD" resolve="condition" />
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="36tQV5AoETW" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="2tJIrI" id="36tQV5AvM3X" role="jymVt" />
       <node concept="3clFb_" id="36tQV5AvM3Y" role="jymVt">
@@ -12292,28 +12182,10 @@
           <ref role="2rW$FS" node="36tQV5AugIl" resolve="template_token_this" />
         </node>
       </node>
-      <node concept="2tJIrI" id="36tQV5AoETX" role="jymVt" />
-      <node concept="3clFb_" id="6i42QSs8m5b" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="templateRef" />
-        <node concept="3uibUv" id="6i42QSs8miP" role="3clF45">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-        <node concept="3Tmbuc" id="2J$kxDHVxkD" role="1B3o_S" />
-        <node concept="3clFbS" id="6i42QSs8m5f" role="3clF47">
-          <node concept="3clFbF" id="6OXbTDyZfHw" role="3cqZAp">
-            <node concept="37vLTw" id="6OXbTDyZfHv" role="3clFbG">
-              <ref role="3cqZAo" node="36tQV5AoEWD" resolve="templateRef" />
-            </node>
-          </node>
-        </node>
-        <node concept="2ZBi8u" id="6OXbTDyZiHm" role="lGtFl">
-          <ref role="2rW$FS" node="6OXbTDyZfMT" resolve="template_ref" />
-        </node>
-      </node>
       <node concept="2tJIrI" id="2J$kxDHVzkJ" role="jymVt" />
       <node concept="312cEu" id="2J$kxDHV_XQ" role="jymVt">
         <property role="TrG5h" value="ConstraintRule" />
+        <property role="2bfB8j" value="true" />
         <node concept="3Tm1VV" id="2J$kxDHV_XR" role="1B3o_S" />
         <node concept="1WS0z7" id="2J$kxDHVBLQ" role="lGtFl">
           <node concept="3JmXsc" id="2J$kxDHVBLR" role="3Jn$fo">
@@ -12398,13 +12270,13 @@
         <node concept="2I9FWS" id="36tQV5AwyT_" role="1tU5fm" />
       </node>
       <node concept="312cEg" id="36tQV5AwA22" role="jymVt">
-        <property role="TrG5h" value="ruleBuilder" />
+        <property role="TrG5h" value="ruleBuilders" />
         <node concept="3Tmbuc" id="36tQV5AxznT" role="1B3o_S" />
         <node concept="2ZBi8u" id="12QmIoz4Z$V" role="lGtFl">
-          <ref role="2rW$FS" node="4vbeH84GUyf" resolve="builder_variable" />
+          <ref role="2rW$FS" node="6R6MIbTaGzw" resolve="builder_field" />
         </node>
-        <node concept="_YKpA" id="36tQV5AwDgP" role="1tU5fm">
-          <node concept="3uibUv" id="36tQV5AwDpP" role="_ZDj9">
+        <node concept="_YKpA" id="6R6MIbTvEQ4" role="1tU5fm">
+          <node concept="3uibUv" id="6R6MIbTvEQ5" role="_ZDj9">
             <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
@@ -12414,15 +12286,18 @@
       <node concept="2ZBi8u" id="36tQV5AoEXc" role="lGtFl">
         <ref role="2rW$FS" node="36tQV5Ap$gK" resolve="ruletemplate_token_class" />
       </node>
-      <node concept="312cEg" id="36tQV5AoEWD" role="jymVt">
-        <property role="TrG5h" value="templateRef" />
-        <node concept="3Tmbuc" id="36tQV5Axziv" role="1B3o_S" />
-        <node concept="3uibUv" id="6OXbTDyZeJ8" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      <node concept="312cEg" id="6R6MIbUQZ$L" role="jymVt">
+        <property role="TrG5h" value="session" />
+        <node concept="3Tmbuc" id="6R6MIbUR0XN" role="1B3o_S" />
+        <node concept="3uibUv" id="6R6MIbUQZ$O" role="1tU5fm">
+          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+        </node>
+        <node concept="2ZBi8u" id="6R6MIbUR125" role="lGtFl">
+          <ref role="2rW$FS" node="6R6MIbUtc6X" resolve="apply_session_field" />
         </node>
       </node>
-      <node concept="3uibUv" id="36tQV5AoEXd" role="1zkMxy">
-        <ref role="3uigEE" to="i348:2RRx4MZ6I3W" resolve="BaseRuleTemplateToken" />
+      <node concept="3uibUv" id="6R6MIbTakqu" role="EKbjA">
+        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
       </node>
     </node>
     <node concept="2tJIrI" id="36tQV5AoEXD" role="jymVt" />
@@ -12438,7 +12313,7 @@
       <node concept="3Tm1VV" id="36tQV5AoEXJ" role="1B3o_S" />
       <node concept="3clFbS" id="36tQV5AoEXK" role="3clF47">
         <node concept="XkiVB" id="36tQV5AoEXL" role="3cqZAp">
-          <ref role="37wK5l" to="i348:1ffsG7bUbEV" resolve="BaseRuleTemplate" />
+          <ref role="37wK5l" to="i348:1ffsG7bUbEV" resolve="AbstraceRuleTemplate" />
           <node concept="37vLTw" id="36tQV5AoEXM" role="37wK5m">
             <ref role="3cqZAo" node="36tQV5AoEXG" resolve="rulesListTemplate" />
           </node>
@@ -12670,7 +12545,7 @@
       </node>
     </node>
     <node concept="3uibUv" id="36tQV5AoF2O" role="1zkMxy">
-      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
       <node concept="3uibUv" id="36tQV5AoF33" role="11_B2D">
         <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
         <node concept="1ZhdrF" id="36tQV5AoF34" role="lGtFl">
@@ -12692,756 +12567,420 @@
         </node>
       </node>
     </node>
-    <node concept="3clFb_" id="36tQV5AoEZs" role="jymVt">
+    <node concept="3clFb_" id="6R6MIbTM3n_" role="jymVt">
       <property role="TrG5h" value="createToken" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="3Tm1VV" id="36tQV5AoEZt" role="1B3o_S" />
-      <node concept="2AHcQZ" id="36tQV5AoEZu" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      <node concept="37vLTG" id="6R6MIbUQTJQ" role="3clF46">
+        <property role="TrG5h" value="input" />
+        <node concept="3Tqbb2" id="6R6MIbUQV2C" role="1tU5fm" />
       </node>
-      <node concept="3clFbS" id="36tQV5AoEZv" role="3clF47">
-        <node concept="3clFbF" id="36tQV5AoEZw" role="3cqZAp">
-          <node concept="2ShNRf" id="36tQV5AoEZx" role="3clFbG">
-            <node concept="1pGfFk" id="36tQV5AoEZy" role="2ShVmc">
+      <node concept="37vLTG" id="6R6MIbTM3nA" role="3clF46">
+        <property role="TrG5h" value="session" />
+        <node concept="3uibUv" id="6R6MIbTM3nB" role="1tU5fm">
+          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="6R6MIbTM3nQ" role="3clF45">
+        <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
+      </node>
+      <node concept="3Tm1VV" id="6R6MIbTM3nD" role="1B3o_S" />
+      <node concept="3clFbS" id="6R6MIbTM3nZ" role="3clF47">
+        <node concept="3clFbF" id="6R6MIbURc4J" role="3cqZAp">
+          <node concept="2ShNRf" id="6R6MIbURc8p" role="3clFbG">
+            <node concept="1pGfFk" id="6R6MIbURc8q" role="2ShVmc">
               <ref role="37wK5l" node="36tQV5AoEKL" resolve="RuleTemplateImpl.Token" />
-              <node concept="1rXfSq" id="6OXbTDyZoW5" role="37wK5m">
-                <ref role="37wK5l" to="i348:62MNP_kY8lD" resolve="templateRef" />
+              <node concept="37vLTw" id="6R6MIbURc8r" role="37wK5m">
+                <ref role="3cqZAo" node="6R6MIbUQTJQ" resolve="input" />
               </node>
-              <node concept="1ZhdrF" id="36tQV5AoEZO" role="lGtFl">
-                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                <property role="2qtEX8" value="baseMethodDeclaration" />
-                <node concept="3$xsQk" id="36tQV5AoEZP" role="3$ytzL">
-                  <node concept="3clFbS" id="36tQV5AoEZQ" role="2VODD2">
-                    <node concept="3clFbF" id="36tQV5AoEZR" role="3cqZAp">
-                      <node concept="2OqwBi" id="36tQV5AoEZS" role="3clFbG">
-                        <node concept="1iwH7S" id="36tQV5AoEZT" role="2Oq$k0" />
-                        <node concept="1iwH70" id="36tQV5AoEZU" role="2OqNvi">
-                          <ref role="1iwH77" node="36tQV5Aw2D4" resolve="ruletemplate_token_constructor" />
-                          <node concept="30H73N" id="36tQV5AoEZV" role="1iwH7V" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
+              <node concept="37vLTw" id="6R6MIbURc8s" role="37wK5m">
+                <ref role="3cqZAo" node="6R6MIbTM3nA" resolve="session" />
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="3uibUv" id="36tQV5AoEZW" role="3clF45">
-        <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
-        <node concept="1ZhdrF" id="36tQV5AoEZX" role="lGtFl">
-          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
-          <property role="2qtEX8" value="classifier" />
-          <node concept="3$xsQk" id="36tQV5AoEZY" role="3$ytzL">
-            <node concept="3clFbS" id="36tQV5AoEZZ" role="2VODD2">
-              <node concept="3clFbF" id="36tQV5AoF00" role="3cqZAp">
-                <node concept="2OqwBi" id="36tQV5AoF01" role="3clFbG">
-                  <node concept="1iwH7S" id="36tQV5AoF02" role="2Oq$k0" />
-                  <node concept="1iwH70" id="36tQV5AoF03" role="2OqNvi">
-                    <ref role="1iwH77" node="36tQV5Ap$gK" resolve="ruletemplate_token_class" />
-                    <node concept="30H73N" id="36tQV5AoF04" role="1iwH7V" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="36tQV5AoF05" role="jymVt" />
-    <node concept="3clFb_" id="36tQV5AoF06" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="initToken" />
-      <node concept="37vLTG" id="36tQV5AoF07" role="3clF46">
-        <property role="TrG5h" value="token" />
-        <node concept="3uibUv" id="36tQV5AoF08" role="1tU5fm">
-          <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
-          <node concept="1ZhdrF" id="36tQV5AoF09" role="lGtFl">
-            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
-            <property role="2qtEX8" value="classifier" />
-            <node concept="3$xsQk" id="36tQV5AoF0a" role="3$ytzL">
-              <node concept="3clFbS" id="36tQV5AoF0b" role="2VODD2">
-                <node concept="3clFbF" id="36tQV5AoF0c" role="3cqZAp">
-                  <node concept="2OqwBi" id="36tQV5AoF0d" role="3clFbG">
-                    <node concept="1iwH7S" id="36tQV5AoF0e" role="2Oq$k0" />
-                    <node concept="1iwH70" id="36tQV5AoF0f" role="2OqNvi">
-                      <ref role="1iwH77" node="36tQV5Ap$gK" resolve="ruletemplate_token_class" />
-                      <node concept="30H73N" id="36tQV5AoF0g" role="1iwH7V" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="36tQV5AoF0h" role="3clF46">
-        <property role="TrG5h" value="input" />
-        <node concept="1W57fq" id="36tQV5AoF0i" role="lGtFl">
-          <node concept="3IZrLx" id="36tQV5AoF0j" role="3IZSJc">
-            <node concept="3clFbS" id="36tQV5AoF0k" role="2VODD2">
-              <node concept="3clFbF" id="36tQV5AoF0l" role="3cqZAp">
-                <node concept="2OqwBi" id="36tQV5AoF0m" role="3clFbG">
-                  <node concept="2OqwBi" id="36tQV5AoF0n" role="2Oq$k0">
-                    <node concept="30H73N" id="36tQV5AoF0o" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="36tQV5AoF0p" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="36tQV5AoF0q" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="gft3U" id="36tQV5AoF0r" role="UU_$l">
-            <node concept="37vLTG" id="36tQV5AoF0s" role="gfFT$">
-              <property role="TrG5h" value="$no_input$" />
-              <node concept="3Tqbb2" id="36tQV5AoF0t" role="1tU5fm" />
-            </node>
-          </node>
-        </node>
-        <node concept="29HgVG" id="36tQV5AoF0u" role="lGtFl">
-          <ref role="2rW$FS" node="PB1R3YtcNl" resolve="initToken_input" />
-          <node concept="3NFfHV" id="36tQV5AoF0v" role="3NFExx">
-            <node concept="3clFbS" id="36tQV5AoF0w" role="2VODD2">
-              <node concept="3clFbF" id="36tQV5AoF0x" role="3cqZAp">
-                <node concept="2OqwBi" id="36tQV5AoF0y" role="3clFbG">
-                  <node concept="2OqwBi" id="36tQV5AoF0z" role="2Oq$k0">
-                    <node concept="3TrEf2" id="36tQV5AoF0$" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
-                    </node>
-                    <node concept="30H73N" id="36tQV5AoF0_" role="2Oq$k0" />
-                  </node>
-                  <node concept="3TrEf2" id="36tQV5AoF0A" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:5NuEpF1ihrB" resolve="input" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3Tqbb2" id="36tQV5AoF0B" role="1tU5fm" />
-      </node>
-      <node concept="3Tm1VV" id="36tQV5AoF10" role="1B3o_S" />
-      <node concept="2AHcQZ" id="36tQV5AoF11" role="2AJF6D">
+      <node concept="2AHcQZ" id="6R6MIbTM3o0" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="3clFbS" id="36tQV5AoF12" role="3clF47">
-        <node concept="3clFbF" id="36tQV5AoF13" role="3cqZAp">
-          <node concept="2OqwBi" id="36tQV5AoF14" role="3clFbG">
-            <node concept="37vLTw" id="36tQV5AoF15" role="2Oq$k0">
-              <ref role="3cqZAo" node="36tQV5AoF07" resolve="token" />
-            </node>
-            <node concept="liA8E" id="36tQV5AoF16" role="2OqNvi">
-              <ref role="37wK5l" node="36tQV5AoELJ" resolve="init" />
-              <node concept="37vLTw" id="36tQV5AoF17" role="37wK5m">
-                <ref role="3cqZAo" node="36tQV5AoF0h" resolve="input" />
-                <node concept="1ZhdrF" id="36tQV5AoF18" role="lGtFl">
-                  <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                  <property role="2qtEX8" value="variableDeclaration" />
-                  <node concept="3$xsQk" id="36tQV5AoF19" role="3$ytzL">
-                    <node concept="3clFbS" id="36tQV5AoF1a" role="2VODD2">
-                      <node concept="3clFbF" id="36tQV5AoF1b" role="3cqZAp">
-                        <node concept="2OqwBi" id="36tQV5AoF1c" role="3clFbG">
-                          <node concept="1iwH7S" id="36tQV5AoF1d" role="2Oq$k0" />
-                          <node concept="1iwH70" id="36tQV5AoF1e" role="2OqNvi">
-                            <ref role="1iwH77" node="PB1R3YtcNl" resolve="initToken_input" />
-                            <node concept="2OqwBi" id="36tQV5AoF1f" role="1iwH7V">
-                              <node concept="2OqwBi" id="36tQV5AoF1g" role="2Oq$k0">
-                                <node concept="30H73N" id="36tQV5AoF1h" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="36tQV5AoF1i" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="36tQV5AoF1j" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:5NuEpF1ihrB" resolve="input" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="1W57fq" id="36tQV5AoF1k" role="lGtFl">
-                  <node concept="3IZrLx" id="36tQV5AoF1l" role="3IZSJc">
-                    <node concept="3clFbS" id="36tQV5AoF1m" role="2VODD2">
-                      <node concept="3clFbF" id="36tQV5AoF1n" role="3cqZAp">
-                        <node concept="2OqwBi" id="36tQV5AoF1o" role="3clFbG">
-                          <node concept="2OqwBi" id="36tQV5AoF1p" role="2Oq$k0">
-                            <node concept="30H73N" id="36tQV5AoF1q" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="36tQV5AoF1r" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
-                            </node>
-                          </node>
-                          <node concept="3x8VRR" id="36tQV5AoF1s" role="2OqNvi" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="36tQV5AoF1R" role="3cqZAp">
-          <node concept="37vLTw" id="36tQV5AoF1S" role="3clFbG">
-            <ref role="3cqZAo" node="36tQV5AoF07" resolve="token" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="36tQV5AoF1T" role="3clF45">
-        <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
-        <node concept="1ZhdrF" id="36tQV5AoF1U" role="lGtFl">
-          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
-          <property role="2qtEX8" value="classifier" />
-          <node concept="3$xsQk" id="36tQV5AoF1V" role="3$ytzL">
-            <node concept="3clFbS" id="36tQV5AoF1W" role="2VODD2">
-              <node concept="3clFbF" id="36tQV5AoF1X" role="3cqZAp">
-                <node concept="2OqwBi" id="36tQV5AoF1Y" role="3clFbG">
-                  <node concept="1iwH7S" id="36tQV5AoF1Z" role="2Oq$k0" />
-                  <node concept="1iwH70" id="36tQV5AoF20" role="2OqNvi">
-                    <ref role="1iwH77" node="36tQV5Ap$gK" resolve="ruletemplate_token_class" />
-                    <node concept="30H73N" id="36tQV5AoF21" role="1iwH7V" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="36tQV5A$Slk" role="jymVt" />
-    <node concept="3clFb_" id="3IIf9OAJSN7" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="newToken" />
-      <node concept="37vLTG" id="3IIf9OAJSN8" role="3clF46">
-        <property role="TrG5h" value="input" />
-        <node concept="8X2XB" id="3IIf9OAJSN9" role="1tU5fm">
-          <node concept="3uibUv" id="3IIf9OAJSNa" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="3IIf9OAJSNc" role="1B3o_S" />
-      <node concept="3clFbS" id="3IIf9OAJSNy" role="3clF47">
-        <node concept="3cpWs8" id="3IIf9OAJXqd" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9OAJXqe" role="3cpWs9">
-            <property role="TrG5h" value="token" />
-            <node concept="1rXfSq" id="mJ_D1405rs" role="33vP2m">
-              <ref role="37wK5l" node="36tQV5AoEZs" resolve="createToken" />
-            </node>
-            <node concept="3uibUv" id="mJ_D1466WT" role="1tU5fm">
-              <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
-              <node concept="1ZhdrF" id="mJ_D1466WU" role="lGtFl">
-                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
-                <property role="2qtEX8" value="classifier" />
-                <node concept="3$xsQk" id="mJ_D1466WV" role="3$ytzL">
-                  <node concept="3clFbS" id="mJ_D1466WW" role="2VODD2">
-                    <node concept="3clFbF" id="mJ_D1466WX" role="3cqZAp">
-                      <node concept="2OqwBi" id="mJ_D1466WY" role="3clFbG">
-                        <node concept="1iwH7S" id="mJ_D1466WZ" role="2Oq$k0" />
-                        <node concept="1iwH70" id="mJ_D1466X0" role="2OqNvi">
-                          <ref role="1iwH77" node="36tQV5Ap$gK" resolve="ruletemplate_token_class" />
-                          <node concept="30H73N" id="mJ_D1466X1" role="1iwH7V" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3IIf9OAJXWT" role="3cqZAp">
-          <node concept="2OqwBi" id="3IIf9OAJXWU" role="3clFbG">
-            <node concept="37vLTw" id="3IIf9OAJXWV" role="2Oq$k0">
-              <ref role="3cqZAo" node="3IIf9OAJXqe" resolve="token" />
-            </node>
-            <node concept="liA8E" id="3IIf9OAJXWW" role="2OqNvi">
-              <ref role="37wK5l" node="36tQV5AoELJ" resolve="init" />
-              <node concept="37vLTw" id="3IIf9OAK2bu" role="37wK5m">
-                <ref role="3cqZAo" node="3IIf9OAJSN8" resolve="input" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3IIf9OAJV30" role="3cqZAp">
-          <node concept="37vLTw" id="3IIf9OAJXqq" role="3clFbG">
-            <ref role="3cqZAo" node="3IIf9OAJXqe" resolve="token" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="3IIf9OAJSNz" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-      <node concept="3uibUv" id="3IIf9OAJVd0" role="3clF45">
-        <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
-        <node concept="1ZhdrF" id="3IIf9OAJVd1" role="lGtFl">
-          <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
-          <property role="2qtEX8" value="classifier" />
-          <node concept="3$xsQk" id="3IIf9OAJVd2" role="3$ytzL">
-            <node concept="3clFbS" id="3IIf9OAJVd3" role="2VODD2">
-              <node concept="3clFbF" id="3IIf9OAJVd4" role="3cqZAp">
-                <node concept="2OqwBi" id="3IIf9OAJVd5" role="3clFbG">
-                  <node concept="1iwH7S" id="3IIf9OAJVd6" role="2Oq$k0" />
-                  <node concept="1iwH70" id="3IIf9OAJVd7" role="2OqNvi">
-                    <ref role="1iwH77" node="36tQV5Ap$gK" resolve="ruletemplate_token_class" />
-                    <node concept="30H73N" id="3IIf9OAJVd8" role="1iwH7V" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
   </node>
   <node concept="13MO4I" id="36tQV5AxhJb">
     <property role="3GE5qa" value="rule" />
     <property role="TrG5h" value="ConstraintRule_creator" />
     <ref role="3gUMe" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
-    <node concept="312cEu" id="36tQV5AxhJd" role="13RCb5">
-      <property role="TrG5h" value="Token" />
-      <node concept="2tJIrI" id="36tQV5AxhJD" role="jymVt" />
-      <node concept="3clFbW" id="36tQV5Axsn7" role="jymVt">
-        <node concept="3cqZAl" id="36tQV5Axsn9" role="3clF45" />
-        <node concept="3Tm1VV" id="36tQV5Axsna" role="1B3o_S" />
-        <node concept="3clFbS" id="36tQV5Axsnb" role="3clF47">
-          <node concept="XkiVB" id="36tQV5AxtiS" role="3cqZAp">
-            <ref role="37wK5l" node="36tQV5AoEKL" resolve="RuleTemplateImpl.Token" />
-            <node concept="10Nm6u" id="36tQV5Axtke" role="37wK5m" />
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="36tQV5AxH2W" role="jymVt" />
-      <node concept="3clFb_" id="36tQV5AxI3x" role="jymVt">
-        <property role="TrG5h" value="context" />
-        <node concept="3cqZAl" id="36tQV5AxI3z" role="3clF45" />
-        <node concept="3Tm1VV" id="36tQV5AxI3$" role="1B3o_S" />
-        <node concept="3clFbS" id="36tQV5AxI3_" role="3clF47">
-          <node concept="3clFbH" id="36tQV5AxQ1s" role="3cqZAp" />
-          <node concept="3clFbF" id="36tQV5AxJ2e" role="3cqZAp">
-            <node concept="2ShNRf" id="36tQV5AxJ2c" role="3clFbG">
-              <node concept="YeOm9" id="36tQV5AxJxD" role="2ShVmc">
-                <node concept="1Y3b0j" id="36tQV5AxJxG" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <ref role="1Y3XeK" node="2J$kxDHVq4U" resolve="Token.ConstraintRule" />
-                  <node concept="3Tm1VV" id="36tQV5AxJxH" role="1B3o_S" />
-                  <node concept="3clFb_" id="36tQV5AxhPU" role="jymVt">
-                    <property role="1EzhhJ" value="false" />
-                    <property role="TrG5h" value="apply" />
-                    <node concept="37vLTG" id="36tQV5AxhPV" role="3clF46">
-                      <property role="TrG5h" value="session" />
-                      <node concept="3uibUv" id="36tQV5AxhPW" role="1tU5fm">
-                        <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-                      </node>
-                      <node concept="2ZBi8u" id="36tQV5BcPaJ" role="lGtFl">
-                        <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
-                      </node>
-                    </node>
-                    <node concept="3Tm1VV" id="36tQV5AxhPX" role="1B3o_S" />
-                    <node concept="3cqZAl" id="36tQV5AI4Yr" role="3clF45" />
-                    <node concept="3clFbS" id="36tQV5AxhQ0" role="3clF47">
-                      <node concept="3clFbF" id="12QmIo_1boW" role="3cqZAp">
-                        <node concept="37vLTI" id="12QmIo_1boX" role="3clFbG">
-                          <node concept="10Nm6u" id="12QmIo_1boY" role="37vLTx" />
-                          <node concept="37vLTw" id="2J$kxDHWdwf" role="37vLTJ">
-                            <ref role="3cqZAo" node="2J$kxDHW1_A" resolve="logical" />
-                          </node>
+    <node concept="312cEu" id="6R6MIbTN7kg" role="13RCb5">
+      <property role="TrG5h" value="__Template" />
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="6R6MIbTN7mS" role="jymVt" />
+      <node concept="312cEu" id="36tQV5AxhJd" role="jymVt">
+        <property role="TrG5h" value="Token" />
+        <property role="2bfB8j" value="true" />
+        <property role="1sVAO0" value="true" />
+        <node concept="2tJIrI" id="36tQV5AxhJD" role="jymVt" />
+        <node concept="3clFb_" id="36tQV5AxI3x" role="jymVt">
+          <property role="TrG5h" value="context" />
+          <node concept="3cqZAl" id="36tQV5AxI3z" role="3clF45" />
+          <node concept="3Tm1VV" id="36tQV5AxI3$" role="1B3o_S" />
+          <node concept="3clFbS" id="36tQV5AxI3_" role="3clF47">
+            <node concept="3clFbH" id="36tQV5AxQ1s" role="3cqZAp" />
+            <node concept="3clFbF" id="36tQV5AxJ2e" role="3cqZAp">
+              <node concept="2ShNRf" id="36tQV5AxJ2c" role="3clFbG">
+                <node concept="YeOm9" id="36tQV5AxJxD" role="2ShVmc">
+                  <node concept="1Y3b0j" id="36tQV5AxJxG" role="YeSDq">
+                    <property role="2bfB8j" value="true" />
+                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                    <ref role="1Y3XeK" node="2J$kxDHVq4U" resolve="Token.ConstraintRule" />
+                    <node concept="3Tm1VV" id="36tQV5AxJxH" role="1B3o_S" />
+                    <node concept="3clFb_" id="36tQV5AxhPU" role="jymVt">
+                      <property role="1EzhhJ" value="false" />
+                      <property role="TrG5h" value="apply" />
+                      <node concept="37vLTG" id="36tQV5AxhPV" role="3clF46">
+                        <property role="TrG5h" value="session" />
+                        <node concept="3uibUv" id="36tQV5AxhPW" role="1tU5fm">
+                          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
                         </node>
-                        <node concept="1WS0z7" id="12QmIo_1bp0" role="lGtFl">
-                          <node concept="3JmXsc" id="12QmIo_1bp1" role="3Jn$fo">
-                            <node concept="3clFbS" id="12QmIo_1bp2" role="2VODD2">
-                              <node concept="3clFbF" id="12QmIo_1bp3" role="3cqZAp">
-                                <node concept="2OqwBi" id="12QmIo_1bp4" role="3clFbG">
-                                  <node concept="30H73N" id="12QmIo_1bp5" role="2Oq$k0" />
-                                  <node concept="2qgKlT" id="2J$kxDI0Mbl" role="2OqNvi">
-                                    <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
-                                  </node>
-                                </node>
-                              </node>
+                        <node concept="2ZBi8u" id="36tQV5BcPaJ" role="lGtFl">
+                          <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
+                        </node>
+                      </node>
+                      <node concept="3Tm1VV" id="36tQV5AxhPX" role="1B3o_S" />
+                      <node concept="3cqZAl" id="36tQV5AI4Yr" role="3clF45" />
+                      <node concept="3clFbS" id="36tQV5AxhQ0" role="3clF47">
+                        <node concept="3clFbF" id="12QmIo_1boW" role="3cqZAp">
+                          <node concept="37vLTI" id="12QmIo_1boX" role="3clFbG">
+                            <node concept="10Nm6u" id="12QmIo_1boY" role="37vLTx" />
+                            <node concept="37vLTw" id="2J$kxDHWdwf" role="37vLTJ">
+                              <ref role="3cqZAo" node="2J$kxDHW1_A" resolve="logical" />
                             </node>
                           </node>
-                        </node>
-                        <node concept="1sPUBX" id="12QmIo_1bp7" role="lGtFl">
-                          <ref role="v9R2y" node="4KRwoemr_Es" resolve="contextName_variable_init" />
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="12QmIo_1aqT" role="3cqZAp" />
-                      <node concept="3cpWs8" id="36tQV5AxhQ1" role="3cqZAp">
-                        <node concept="3cpWsn" id="36tQV5AxhQ2" role="3cpWs9">
-                          <property role="TrG5h" value="builder" />
-                          <node concept="3uibUv" id="36tQV5AxhQ3" role="1tU5fm">
-                            <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                          </node>
-                          <node concept="2ShNRf" id="36tQV5AxhQ4" role="33vP2m">
-                            <node concept="1pGfFk" id="36tQV5AxhQ5" role="2ShVmc">
-                              <ref role="37wK5l" to="i348:7nPD14OeqYJ" resolve="RuleBuilder" />
-                              <node concept="37vLTw" id="5yr01fE1Y_1" role="37wK5m">
-                                <ref role="3cqZAo" node="36tQV5AxhPV" resolve="session" />
-                              </node>
-                              <node concept="Xl_RD" id="6xVZN2uAsCL" role="37wK5m">
-                                <property role="Xl_RC" value="" />
-                                <node concept="5jKBG" id="6xVZN2uAt2r" role="lGtFl">
-                                  <ref role="v9R2y" node="6xVZN2uppfW" resolve="rule_basename" />
-                                </node>
-                              </node>
-                              <node concept="Xl_RD" id="36tQV5AxhQ6" role="37wK5m">
-                                <property role="Xl_RC" value="" />
-                                <node concept="1sPUBX" id="36tQV5AxhQ7" role="lGtFl">
-                                  <ref role="v9R2y" node="3KXGt7WGC_R" resolve="rule_tag" />
-                                  <node concept="30H73N" id="36tQV5AxhQ8" role="v9R3O" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="36tQV5AxhQ9" role="37wK5m">
-                                <node concept="liA8E" id="36tQV5AxhQb" role="2OqNvi">
-                                  <ref role="37wK5l" node="6i42QSs8m5b" resolve="templateRef" />
-                                  <node concept="1ZhdrF" id="6OXbTDyZQR5" role="lGtFl">
-                                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                                    <property role="2qtEX8" value="baseMethodDeclaration" />
-                                    <node concept="3$xsQk" id="6OXbTDyZQR6" role="3$ytzL">
-                                      <node concept="3clFbS" id="6OXbTDyZQR7" role="2VODD2">
-                                        <node concept="3clFbF" id="6OXbTDyZS7B" role="3cqZAp">
-                                          <node concept="2OqwBi" id="6OXbTDyZS7C" role="3clFbG">
-                                            <node concept="1iwH7S" id="6OXbTDyZS7D" role="2Oq$k0" />
-                                            <node concept="1iwH70" id="6OXbTDyZS7E" role="2OqNvi">
-                                              <ref role="1iwH77" node="6OXbTDyZfMT" resolve="template_ref" />
-                                              <node concept="2OqwBi" id="6OXbTDyZS7F" role="1iwH7V">
-                                                <node concept="30H73N" id="6OXbTDyZS7G" role="2Oq$k0" />
-                                                <node concept="2Xjw5R" id="6OXbTDyZS7H" role="2OqNvi">
-                                                  <node concept="1xMEDy" id="6OXbTDyZS7I" role="1xVPHs">
-                                                    <node concept="chp4Y" id="6OXbTDyZS7J" role="ri$Ld">
-                                                      <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="1rXfSq" id="36tQV5Ax_7_" role="2Oq$k0">
-                                  <ref role="37wK5l" node="36tQV5AvM3Y" resolve="token" />
-                                  <node concept="1ZhdrF" id="36tQV5AxZJV" role="lGtFl">
-                                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                                    <property role="2qtEX8" value="baseMethodDeclaration" />
-                                    <node concept="3$xsQk" id="36tQV5AxZJW" role="3$ytzL">
-                                      <node concept="3clFbS" id="36tQV5AxZJX" role="2VODD2">
-                                        <node concept="3clFbF" id="36tQV5Ay08I" role="3cqZAp">
-                                          <node concept="2OqwBi" id="36tQV5Ay0mq" role="3clFbG">
-                                            <node concept="1iwH7S" id="36tQV5Ay08H" role="2Oq$k0" />
-                                            <node concept="1iwH70" id="36tQV5Ay17Q" role="2OqNvi">
-                                              <ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
-                                              <node concept="2OqwBi" id="36tQV5Ay2cd" role="1iwH7V">
-                                                <node concept="30H73N" id="36tQV5Ay21_" role="2Oq$k0" />
-                                                <node concept="2Xjw5R" id="36tQV5Ay355" role="2OqNvi">
-                                                  <node concept="1xMEDy" id="36tQV5Ay357" role="1xVPHs">
-                                                    <node concept="chp4Y" id="6OXbTDyY04F" role="ri$Ld">
-                                                      <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
+                          <node concept="1WS0z7" id="12QmIo_1bp0" role="lGtFl">
+                            <node concept="3JmXsc" id="12QmIo_1bp1" role="3Jn$fo">
+                              <node concept="3clFbS" id="12QmIo_1bp2" role="2VODD2">
+                                <node concept="3clFbF" id="12QmIo_1bp3" role="3cqZAp">
+                                  <node concept="2OqwBi" id="12QmIo_1bp4" role="3clFbG">
+                                    <node concept="30H73N" id="12QmIo_1bp5" role="2Oq$k0" />
+                                    <node concept="2qgKlT" id="2J$kxDI0Mbl" role="2OqNvi">
+                                      <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="10Nm6u" id="aZPZmIa3_t" role="37wK5m">
-                                <node concept="1sPUBX" id="aZPZmIa3Tl" role="lGtFl">
-                                  <ref role="v9R2y" node="aZPZmI9WFp" resolve="origin_node" />
-                                </node>
-                              </node>
-                              <node concept="2YIFZM" id="aZPZmIaA3f" role="37wK5m">
-                                <ref role="37wK5l" to="i8bi:4o40NPkYQhu" resolve="getPointer" />
-                                <ref role="1Pybhc" to="i8bi:5IkW5anFcyt" resolve="SNodeOperations" />
-                                <node concept="10Nm6u" id="aZPZmIaAoE" role="37wK5m">
-                                  <node concept="1sPUBX" id="aZPZmIaAAV" role="lGtFl">
-                                    <ref role="v9R2y" node="1laj_RSpsVh" resolve="reportTarget_node" />
-                                  </node>
-                                </node>
-                              </node>
                             </node>
                           </node>
-                          <node concept="2ZBi8u" id="36tQV5AxhQC" role="lGtFl">
-                            <ref role="2rW$FS" node="4vbeH84GUyf" resolve="builder_variable" />
+                          <node concept="1sPUBX" id="12QmIo_1bp7" role="lGtFl">
+                            <ref role="v9R2y" node="4KRwoemr_Es" resolve="contextName_variable_init" />
                           </node>
                         </node>
-                      </node>
-                      <node concept="3clFbH" id="36tQV5AxhQD" role="3cqZAp" />
-                      <node concept="3clFbH" id="36tQV5AxhQE" role="3cqZAp">
-                        <node concept="2b32R4" id="36tQV5AxhQF" role="lGtFl">
-                          <node concept="3JmXsc" id="36tQV5AxhQG" role="2P8S$">
-                            <node concept="3clFbS" id="36tQV5AxhQH" role="2VODD2">
-                              <node concept="3clFbF" id="36tQV5AxhQI" role="3cqZAp">
-                                <node concept="2OqwBi" id="36tQV5AxhQJ" role="3clFbG">
-                                  <node concept="30H73N" id="36tQV5AxhQK" role="2Oq$k0" />
-                                  <node concept="3Tsc0h" id="36tQV5AxhQL" role="2OqNvi">
-                                    <ref role="3TtcxE" to="wq2x:36tQV5AmIsU" resolve="head" />
+                        <node concept="3clFbH" id="12QmIo_1aqT" role="3cqZAp" />
+                        <node concept="3cpWs8" id="36tQV5AxhQ1" role="3cqZAp">
+                          <node concept="3cpWsn" id="36tQV5AxhQ2" role="3cpWs9">
+                            <property role="TrG5h" value="builder" />
+                            <node concept="3uibUv" id="36tQV5AxhQ3" role="1tU5fm">
+                              <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                            </node>
+                            <node concept="2ShNRf" id="36tQV5AxhQ4" role="33vP2m">
+                              <node concept="1pGfFk" id="36tQV5AxhQ5" role="2ShVmc">
+                                <ref role="37wK5l" to="i348:7nPD14OeqYJ" resolve="RuleBuilder" />
+                                <node concept="37vLTw" id="5yr01fE1Y_1" role="37wK5m">
+                                  <ref role="3cqZAo" node="36tQV5AxhPV" resolve="session" />
+                                </node>
+                                <node concept="Xl_RD" id="6xVZN2uAsCL" role="37wK5m">
+                                  <property role="Xl_RC" value="" />
+                                  <node concept="5jKBG" id="6xVZN2uAt2r" role="lGtFl">
+                                    <ref role="v9R2y" node="6xVZN2uppfW" resolve="rule_basename" />
                                   </node>
                                 </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="36tQV5AxhQM" role="3cqZAp">
-                        <node concept="2b32R4" id="36tQV5AxhQN" role="lGtFl">
-                          <node concept="3JmXsc" id="36tQV5AxhQO" role="2P8S$">
-                            <node concept="3clFbS" id="36tQV5AxhQP" role="2VODD2">
-                              <node concept="3clFbF" id="36tQV5AxhQQ" role="3cqZAp">
-                                <node concept="2OqwBi" id="36tQV5AxhQR" role="3clFbG">
-                                  <node concept="30H73N" id="36tQV5AxhQS" role="2Oq$k0" />
-                                  <node concept="3Tsc0h" id="36tQV5AxhQT" role="2OqNvi">
-                                    <ref role="3TtcxE" to="wq2x:36tQV5AmIsV" resolve="guard" />
+                                <node concept="Xl_RD" id="36tQV5AxhQ6" role="37wK5m">
+                                  <property role="Xl_RC" value="" />
+                                  <node concept="1sPUBX" id="36tQV5AxhQ7" role="lGtFl">
+                                    <ref role="v9R2y" node="3KXGt7WGC_R" resolve="rule_tag" />
+                                    <node concept="30H73N" id="36tQV5AxhQ8" role="v9R3O" />
                                   </node>
                                 </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="36tQV5AxhQU" role="3cqZAp">
-                        <node concept="1W57fq" id="36tQV5AxhQV" role="lGtFl">
-                          <node concept="3IZrLx" id="36tQV5AxhQW" role="3IZSJc">
-                            <node concept="3clFbS" id="36tQV5AxhQX" role="2VODD2">
-                              <node concept="3clFbF" id="36tQV5AxhQY" role="3cqZAp">
-                                <node concept="2OqwBi" id="36tQV5AxhQZ" role="3clFbG">
-                                  <node concept="2OqwBi" id="36tQV5AxhR0" role="2Oq$k0">
-                                    <node concept="30H73N" id="36tQV5AxhR1" role="2Oq$k0" />
-                                    <node concept="3Tsc0h" id="36tQV5AxhR2" role="2OqNvi">
-                                      <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
+                                <node concept="1rXfSq" id="6R6MIbTNlX8" role="37wK5m">
+                                  <ref role="37wK5l" to="i348:62MNP_kY8lD" resolve="getTemplateRef" />
+                                </node>
+                                <node concept="10Nm6u" id="aZPZmIa3_t" role="37wK5m">
+                                  <node concept="1sPUBX" id="aZPZmIa3Tl" role="lGtFl">
+                                    <ref role="v9R2y" node="aZPZmI9WFp" resolve="origin_node" />
+                                  </node>
+                                </node>
+                                <node concept="2YIFZM" id="aZPZmIaA3f" role="37wK5m">
+                                  <ref role="37wK5l" to="i8bi:4o40NPkYQhu" resolve="getPointer" />
+                                  <ref role="1Pybhc" to="i8bi:5IkW5anFcyt" resolve="SNodeOperations" />
+                                  <node concept="10Nm6u" id="aZPZmIaAoE" role="37wK5m">
+                                    <node concept="1sPUBX" id="aZPZmIaAAV" role="lGtFl">
+                                      <ref role="v9R2y" node="1laj_RSpsVh" resolve="reportTarget_node" />
                                     </node>
                                   </node>
-                                  <node concept="3GX2aA" id="36tQV5AxhR3" role="2OqNvi" />
                                 </node>
                               </node>
                             </node>
+                            <node concept="2ZBi8u" id="36tQV5AxhQC" role="lGtFl">
+                              <ref role="2rW$FS" node="4vbeH84GUyf" resolve="builder_variable" />
+                            </node>
                           </node>
                         </node>
-                        <node concept="29HgVG" id="36tQV5AxhR4" role="lGtFl">
-                          <node concept="3NFfHV" id="36tQV5AxhR5" role="3NFExx">
-                            <node concept="3clFbS" id="36tQV5AxhR6" role="2VODD2">
-                              <node concept="3clFbF" id="36tQV5AxhR7" role="3cqZAp">
-                                <node concept="2OqwBi" id="36tQV5AxhR8" role="3clFbG">
-                                  <node concept="2OqwBi" id="36tQV5AxhR9" role="2Oq$k0">
-                                    <node concept="30H73N" id="36tQV5AxhRa" role="2Oq$k0" />
-                                    <node concept="3Tsc0h" id="36tQV5AxhRb" role="2OqNvi">
-                                      <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
+                        <node concept="3clFbH" id="36tQV5AxhQD" role="3cqZAp" />
+                        <node concept="3clFbH" id="36tQV5AxhQE" role="3cqZAp">
+                          <node concept="2b32R4" id="36tQV5AxhQF" role="lGtFl">
+                            <node concept="3JmXsc" id="36tQV5AxhQG" role="2P8S$">
+                              <node concept="3clFbS" id="36tQV5AxhQH" role="2VODD2">
+                                <node concept="3clFbF" id="36tQV5AxhQI" role="3cqZAp">
+                                  <node concept="2OqwBi" id="36tQV5AxhQJ" role="3clFbG">
+                                    <node concept="30H73N" id="36tQV5AxhQK" role="2Oq$k0" />
+                                    <node concept="3Tsc0h" id="36tQV5AxhQL" role="2OqNvi">
+                                      <ref role="3TtcxE" to="wq2x:36tQV5AmIsU" resolve="head" />
                                     </node>
                                   </node>
-                                  <node concept="1uHKPH" id="36tQV5AxhRc" role="2OqNvi" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                      </node>
-                      <node concept="9aQIb" id="36tQV5AxhRd" role="3cqZAp">
-                        <node concept="3clFbS" id="36tQV5AxhRe" role="9aQI4">
-                          <node concept="3clFbF" id="36tQV5AxhRf" role="3cqZAp">
-                            <node concept="2OqwBi" id="36tQV5AxhRg" role="3clFbG">
-                              <node concept="37vLTw" id="36tQV5AxhRh" role="2Oq$k0">
-                                <ref role="3cqZAo" node="36tQV5AxhQ2" resolve="builder" />
-                              </node>
-                              <node concept="liA8E" id="36tQV5AxhRi" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:32fHqDf8Vx1" resolve="appendAlternation" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbH" id="36tQV5AxhRj" role="3cqZAp">
-                            <node concept="29HgVG" id="36tQV5AxhRk" role="lGtFl">
-                              <node concept="3NFfHV" id="36tQV5AxhRl" role="3NFExx">
-                                <node concept="3clFbS" id="36tQV5AxhRm" role="2VODD2">
-                                  <node concept="3clFbF" id="36tQV5AxhRn" role="3cqZAp">
-                                    <node concept="30H73N" id="36tQV5AxhRo" role="3clFbG" />
+                        <node concept="3clFbH" id="36tQV5AxhQM" role="3cqZAp">
+                          <node concept="2b32R4" id="36tQV5AxhQN" role="lGtFl">
+                            <node concept="3JmXsc" id="36tQV5AxhQO" role="2P8S$">
+                              <node concept="3clFbS" id="36tQV5AxhQP" role="2VODD2">
+                                <node concept="3clFbF" id="36tQV5AxhQQ" role="3cqZAp">
+                                  <node concept="2OqwBi" id="36tQV5AxhQR" role="3clFbG">
+                                    <node concept="30H73N" id="36tQV5AxhQS" role="2Oq$k0" />
+                                    <node concept="3Tsc0h" id="36tQV5AxhQT" role="2OqNvi">
+                                      <ref role="3TtcxE" to="wq2x:36tQV5AmIsV" resolve="guard" />
+                                    </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="1W57fq" id="36tQV5AxhRp" role="lGtFl">
-                          <node concept="3IZrLx" id="36tQV5AxhRq" role="3IZSJc">
-                            <node concept="3clFbS" id="36tQV5AxhRr" role="2VODD2">
-                              <node concept="3clFbF" id="36tQV5AxhRs" role="3cqZAp">
-                                <node concept="3eOSWO" id="36tQV5AxhRt" role="3clFbG">
-                                  <node concept="3cmrfG" id="36tQV5AxhRu" role="3uHU7w">
-                                    <property role="3cmrfH" value="1" />
-                                  </node>
-                                  <node concept="2OqwBi" id="36tQV5AxhRv" role="3uHU7B">
-                                    <node concept="2OqwBi" id="36tQV5AxhRw" role="2Oq$k0">
-                                      <node concept="30H73N" id="36tQV5AxhRx" role="2Oq$k0" />
-                                      <node concept="3Tsc0h" id="36tQV5AxhRy" role="2OqNvi">
+                        <node concept="3clFbH" id="36tQV5AxhQU" role="3cqZAp">
+                          <node concept="1W57fq" id="36tQV5AxhQV" role="lGtFl">
+                            <node concept="3IZrLx" id="36tQV5AxhQW" role="3IZSJc">
+                              <node concept="3clFbS" id="36tQV5AxhQX" role="2VODD2">
+                                <node concept="3clFbF" id="36tQV5AxhQY" role="3cqZAp">
+                                  <node concept="2OqwBi" id="36tQV5AxhQZ" role="3clFbG">
+                                    <node concept="2OqwBi" id="36tQV5AxhR0" role="2Oq$k0">
+                                      <node concept="30H73N" id="36tQV5AxhR1" role="2Oq$k0" />
+                                      <node concept="3Tsc0h" id="36tQV5AxhR2" role="2OqNvi">
                                         <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
                                       </node>
                                     </node>
-                                    <node concept="34oBXx" id="36tQV5AxhRz" role="2OqNvi" />
+                                    <node concept="3GX2aA" id="36tQV5AxhR3" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="29HgVG" id="36tQV5AxhR4" role="lGtFl">
+                            <node concept="3NFfHV" id="36tQV5AxhR5" role="3NFExx">
+                              <node concept="3clFbS" id="36tQV5AxhR6" role="2VODD2">
+                                <node concept="3clFbF" id="36tQV5AxhR7" role="3cqZAp">
+                                  <node concept="2OqwBi" id="36tQV5AxhR8" role="3clFbG">
+                                    <node concept="2OqwBi" id="36tQV5AxhR9" role="2Oq$k0">
+                                      <node concept="30H73N" id="36tQV5AxhRa" role="2Oq$k0" />
+                                      <node concept="3Tsc0h" id="36tQV5AxhRb" role="2OqNvi">
+                                        <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
+                                      </node>
+                                    </node>
+                                    <node concept="1uHKPH" id="36tQV5AxhRc" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="1WS0z7" id="36tQV5AxhR$" role="lGtFl">
-                          <node concept="3JmXsc" id="36tQV5AxhR_" role="3Jn$fo">
-                            <node concept="3clFbS" id="36tQV5AxhRA" role="2VODD2">
-                              <node concept="3clFbF" id="36tQV5AxhRB" role="3cqZAp">
-                                <node concept="2OqwBi" id="36tQV5AxhRC" role="3clFbG">
-                                  <node concept="2OqwBi" id="36tQV5AxhRD" role="2Oq$k0">
-                                    <node concept="30H73N" id="36tQV5AxhRE" role="2Oq$k0" />
-                                    <node concept="3Tsc0h" id="36tQV5AxhRF" role="2OqNvi">
-                                      <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
+                        <node concept="9aQIb" id="36tQV5AxhRd" role="3cqZAp">
+                          <node concept="3clFbS" id="36tQV5AxhRe" role="9aQI4">
+                            <node concept="3clFbF" id="36tQV5AxhRf" role="3cqZAp">
+                              <node concept="2OqwBi" id="36tQV5AxhRg" role="3clFbG">
+                                <node concept="37vLTw" id="36tQV5AxhRh" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="36tQV5AxhQ2" resolve="builder" />
+                                </node>
+                                <node concept="liA8E" id="36tQV5AxhRi" role="2OqNvi">
+                                  <ref role="37wK5l" to="i348:32fHqDf8Vx1" resolve="appendAlternation" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbH" id="36tQV5AxhRj" role="3cqZAp">
+                              <node concept="29HgVG" id="36tQV5AxhRk" role="lGtFl">
+                                <node concept="3NFfHV" id="36tQV5AxhRl" role="3NFExx">
+                                  <node concept="3clFbS" id="36tQV5AxhRm" role="2VODD2">
+                                    <node concept="3clFbF" id="36tQV5AxhRn" role="3cqZAp">
+                                      <node concept="30H73N" id="36tQV5AxhRo" role="3clFbG" />
                                     </node>
                                   </node>
-                                  <node concept="7r0gD" id="36tQV5AxhRG" role="2OqNvi">
-                                    <node concept="3cmrfG" id="36tQV5AxhRH" role="7T0AP">
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="1W57fq" id="36tQV5AxhRp" role="lGtFl">
+                            <node concept="3IZrLx" id="36tQV5AxhRq" role="3IZSJc">
+                              <node concept="3clFbS" id="36tQV5AxhRr" role="2VODD2">
+                                <node concept="3clFbF" id="36tQV5AxhRs" role="3cqZAp">
+                                  <node concept="3eOSWO" id="36tQV5AxhRt" role="3clFbG">
+                                    <node concept="3cmrfG" id="36tQV5AxhRu" role="3uHU7w">
                                       <property role="3cmrfH" value="1" />
                                     </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="6E2cNibq3pL" role="3cqZAp">
-                        <node concept="1W57fq" id="6E2cNibq3pM" role="lGtFl">
-                          <node concept="3IZrLx" id="6E2cNibq3pN" role="3IZSJc">
-                            <node concept="3clFbS" id="6E2cNibq3pO" role="2VODD2">
-                              <node concept="3clFbF" id="6E2cNibq3pP" role="3cqZAp">
-                                <node concept="2OqwBi" id="6E2cNibq3pQ" role="3clFbG">
-                                  <node concept="2OqwBi" id="6E2cNibq3pR" role="2Oq$k0">
-                                    <node concept="30H73N" id="6E2cNibq3pS" role="2Oq$k0" />
-                                    <node concept="3Tsc0h" id="6E2cNibq5bc" role="2OqNvi">
-                                      <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
+                                    <node concept="2OqwBi" id="36tQV5AxhRv" role="3uHU7B">
+                                      <node concept="2OqwBi" id="36tQV5AxhRw" role="2Oq$k0">
+                                        <node concept="30H73N" id="36tQV5AxhRx" role="2Oq$k0" />
+                                        <node concept="3Tsc0h" id="36tQV5AxhRy" role="2OqNvi">
+                                          <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
+                                        </node>
+                                      </node>
+                                      <node concept="34oBXx" id="36tQV5AxhRz" role="2OqNvi" />
                                     </node>
                                   </node>
-                                  <node concept="3GX2aA" id="6E2cNibq3pU" role="2OqNvi" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                        </node>
-                        <node concept="29HgVG" id="6E2cNibq3pV" role="lGtFl">
-                          <node concept="3NFfHV" id="6E2cNibq3pW" role="3NFExx">
-                            <node concept="3clFbS" id="6E2cNibq3pX" role="2VODD2">
-                              <node concept="3clFbF" id="6E2cNibq3pY" role="3cqZAp">
-                                <node concept="2OqwBi" id="6E2cNibq3pZ" role="3clFbG">
-                                  <node concept="2OqwBi" id="6E2cNibq3q0" role="2Oq$k0">
-                                    <node concept="30H73N" id="6E2cNibq3q1" role="2Oq$k0" />
-                                    <node concept="3Tsc0h" id="6E2cNibq5o_" role="2OqNvi">
-                                      <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
+                          <node concept="1WS0z7" id="36tQV5AxhR$" role="lGtFl">
+                            <node concept="3JmXsc" id="36tQV5AxhR_" role="3Jn$fo">
+                              <node concept="3clFbS" id="36tQV5AxhRA" role="2VODD2">
+                                <node concept="3clFbF" id="36tQV5AxhRB" role="3cqZAp">
+                                  <node concept="2OqwBi" id="36tQV5AxhRC" role="3clFbG">
+                                    <node concept="2OqwBi" id="36tQV5AxhRD" role="2Oq$k0">
+                                      <node concept="30H73N" id="36tQV5AxhRE" role="2Oq$k0" />
+                                      <node concept="3Tsc0h" id="36tQV5AxhRF" role="2OqNvi">
+                                        <ref role="3TtcxE" to="wq2x:36tQV5AmIsW" resolve="body" />
+                                      </node>
+                                    </node>
+                                    <node concept="7r0gD" id="36tQV5AxhRG" role="2OqNvi">
+                                      <node concept="3cmrfG" id="36tQV5AxhRH" role="7T0AP">
+                                        <property role="3cmrfH" value="1" />
+                                      </node>
                                     </node>
                                   </node>
-                                  <node concept="1uHKPH" id="6E2cNibq3q3" role="2OqNvi" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                      </node>
-                      <node concept="9aQIb" id="6E2cNibq5Ev" role="3cqZAp">
-                        <node concept="3clFbS" id="6E2cNibq5Ew" role="9aQI4">
-                          <node concept="3clFbF" id="6E2cNibq5Ex" role="3cqZAp">
-                            <node concept="2OqwBi" id="6E2cNibq5Ey" role="3clFbG">
-                              <node concept="37vLTw" id="6E2cNibq5Ez" role="2Oq$k0">
-                                <ref role="3cqZAo" node="36tQV5AxhQ2" resolve="builder" />
-                              </node>
-                              <node concept="liA8E" id="6E2cNibq5E$" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:32fHqDf8Vx1" resolve="appendAlternation" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbH" id="6E2cNibq5E_" role="3cqZAp">
-                            <node concept="29HgVG" id="6E2cNibq5EA" role="lGtFl">
-                              <node concept="3NFfHV" id="6E2cNibq5EB" role="3NFExx">
-                                <node concept="3clFbS" id="6E2cNibq5EC" role="2VODD2">
-                                  <node concept="3clFbF" id="6E2cNibq5ED" role="3cqZAp">
-                                    <node concept="30H73N" id="6E2cNibq5EE" role="3clFbG" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="1W57fq" id="6E2cNibq5EF" role="lGtFl">
-                          <node concept="3IZrLx" id="6E2cNibq5EG" role="3IZSJc">
-                            <node concept="3clFbS" id="6E2cNibq5EH" role="2VODD2">
-                              <node concept="3clFbF" id="6E2cNibq5EI" role="3cqZAp">
-                                <node concept="3eOSWO" id="6E2cNibq5EJ" role="3clFbG">
-                                  <node concept="3cmrfG" id="6E2cNibq5EK" role="3uHU7w">
-                                    <property role="3cmrfH" value="1" />
-                                  </node>
-                                  <node concept="2OqwBi" id="6E2cNibq5EL" role="3uHU7B">
-                                    <node concept="2OqwBi" id="6E2cNibq5EM" role="2Oq$k0">
-                                      <node concept="30H73N" id="6E2cNibq5EN" role="2Oq$k0" />
-                                      <node concept="3Tsc0h" id="6E2cNibq6YZ" role="2OqNvi">
+                        <node concept="3clFbH" id="6E2cNibq3pL" role="3cqZAp">
+                          <node concept="1W57fq" id="6E2cNibq3pM" role="lGtFl">
+                            <node concept="3IZrLx" id="6E2cNibq3pN" role="3IZSJc">
+                              <node concept="3clFbS" id="6E2cNibq3pO" role="2VODD2">
+                                <node concept="3clFbF" id="6E2cNibq3pP" role="3cqZAp">
+                                  <node concept="2OqwBi" id="6E2cNibq3pQ" role="3clFbG">
+                                    <node concept="2OqwBi" id="6E2cNibq3pR" role="2Oq$k0">
+                                      <node concept="30H73N" id="6E2cNibq3pS" role="2Oq$k0" />
+                                      <node concept="3Tsc0h" id="6E2cNibq5bc" role="2OqNvi">
                                         <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
                                       </node>
                                     </node>
-                                    <node concept="34oBXx" id="6E2cNibq5EP" role="2OqNvi" />
+                                    <node concept="3GX2aA" id="6E2cNibq3pU" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="29HgVG" id="6E2cNibq3pV" role="lGtFl">
+                            <node concept="3NFfHV" id="6E2cNibq3pW" role="3NFExx">
+                              <node concept="3clFbS" id="6E2cNibq3pX" role="2VODD2">
+                                <node concept="3clFbF" id="6E2cNibq3pY" role="3cqZAp">
+                                  <node concept="2OqwBi" id="6E2cNibq3pZ" role="3clFbG">
+                                    <node concept="2OqwBi" id="6E2cNibq3q0" role="2Oq$k0">
+                                      <node concept="30H73N" id="6E2cNibq3q1" role="2Oq$k0" />
+                                      <node concept="3Tsc0h" id="6E2cNibq5o_" role="2OqNvi">
+                                        <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
+                                      </node>
+                                    </node>
+                                    <node concept="1uHKPH" id="6E2cNibq3q3" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="1WS0z7" id="6E2cNibq5EQ" role="lGtFl">
-                          <node concept="3JmXsc" id="6E2cNibq5ER" role="3Jn$fo">
-                            <node concept="3clFbS" id="6E2cNibq5ES" role="2VODD2">
-                              <node concept="3clFbF" id="6E2cNibq5ET" role="3cqZAp">
-                                <node concept="2OqwBi" id="6E2cNibq5EU" role="3clFbG">
-                                  <node concept="2OqwBi" id="6E2cNibq5EV" role="2Oq$k0">
-                                    <node concept="30H73N" id="6E2cNibq5EW" role="2Oq$k0" />
-                                    <node concept="3Tsc0h" id="6E2cNibq7kv" role="2OqNvi">
-                                      <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
+                        <node concept="9aQIb" id="6E2cNibq5Ev" role="3cqZAp">
+                          <node concept="3clFbS" id="6E2cNibq5Ew" role="9aQI4">
+                            <node concept="3clFbF" id="6E2cNibq5Ex" role="3cqZAp">
+                              <node concept="2OqwBi" id="6E2cNibq5Ey" role="3clFbG">
+                                <node concept="37vLTw" id="6E2cNibq5Ez" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="36tQV5AxhQ2" resolve="builder" />
+                                </node>
+                                <node concept="liA8E" id="6E2cNibq5E$" role="2OqNvi">
+                                  <ref role="37wK5l" to="i348:32fHqDf8Vx1" resolve="appendAlternation" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbH" id="6E2cNibq5E_" role="3cqZAp">
+                              <node concept="29HgVG" id="6E2cNibq5EA" role="lGtFl">
+                                <node concept="3NFfHV" id="6E2cNibq5EB" role="3NFExx">
+                                  <node concept="3clFbS" id="6E2cNibq5EC" role="2VODD2">
+                                    <node concept="3clFbF" id="6E2cNibq5ED" role="3cqZAp">
+                                      <node concept="30H73N" id="6E2cNibq5EE" role="3clFbG" />
                                     </node>
                                   </node>
-                                  <node concept="7r0gD" id="6E2cNibq5EY" role="2OqNvi">
-                                    <node concept="3cmrfG" id="6E2cNibq5EZ" role="7T0AP">
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="1W57fq" id="6E2cNibq5EF" role="lGtFl">
+                            <node concept="3IZrLx" id="6E2cNibq5EG" role="3IZSJc">
+                              <node concept="3clFbS" id="6E2cNibq5EH" role="2VODD2">
+                                <node concept="3clFbF" id="6E2cNibq5EI" role="3cqZAp">
+                                  <node concept="3eOSWO" id="6E2cNibq5EJ" role="3clFbG">
+                                    <node concept="3cmrfG" id="6E2cNibq5EK" role="3uHU7w">
                                       <property role="3cmrfH" value="1" />
                                     </node>
+                                    <node concept="2OqwBi" id="6E2cNibq5EL" role="3uHU7B">
+                                      <node concept="2OqwBi" id="6E2cNibq5EM" role="2Oq$k0">
+                                        <node concept="30H73N" id="6E2cNibq5EN" role="2Oq$k0" />
+                                        <node concept="3Tsc0h" id="6E2cNibq6YZ" role="2OqNvi">
+                                          <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
+                                        </node>
+                                      </node>
+                                      <node concept="34oBXx" id="6E2cNibq5EP" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="1WS0z7" id="6E2cNibq5EQ" role="lGtFl">
+                            <node concept="3JmXsc" id="6E2cNibq5ER" role="3Jn$fo">
+                              <node concept="3clFbS" id="6E2cNibq5ES" role="2VODD2">
+                                <node concept="3clFbF" id="6E2cNibq5ET" role="3cqZAp">
+                                  <node concept="2OqwBi" id="6E2cNibq5EU" role="3clFbG">
+                                    <node concept="2OqwBi" id="6E2cNibq5EV" role="2Oq$k0">
+                                      <node concept="30H73N" id="6E2cNibq5EW" role="2Oq$k0" />
+                                      <node concept="3Tsc0h" id="6E2cNibq7kv" role="2OqNvi">
+                                        <ref role="3TtcxE" to="wq2x:6E2cNiboHlF" resolve="body" />
+                                      </node>
+                                    </node>
+                                    <node concept="7r0gD" id="6E2cNibq5EY" role="2OqNvi">
+                                      <node concept="3cmrfG" id="6E2cNibq5EZ" role="7T0AP">
+                                        <property role="3cmrfH" value="1" />
+                                      </node>
+                                    </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                      </node>
-                      <node concept="3clFbH" id="36tQV5AxhRI" role="3cqZAp" />
-                      <node concept="3clFbF" id="36tQV5AHZjj" role="3cqZAp">
-                        <node concept="2OqwBi" id="36tQV5AI2aB" role="3clFbG">
-                          <node concept="2OqwBi" id="36tQV5AI0dJ" role="2Oq$k0">
-                            <node concept="2OwXpG" id="36tQV5AI0Jy" role="2OqNvi">
-                              <ref role="2Oxat5" node="36tQV5AwA22" resolve="ruleBuilder" />
-                            </node>
-                            <node concept="1rXfSq" id="36tQV5AI1fn" role="2Oq$k0">
-                              <ref role="37wK5l" node="36tQV5AvM3Y" resolve="token" />
-                              <node concept="1ZhdrF" id="36tQV5AI1fo" role="lGtFl">
-                                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                                <property role="2qtEX8" value="baseMethodDeclaration" />
-                                <node concept="3$xsQk" id="36tQV5AI1fp" role="3$ytzL">
-                                  <node concept="3clFbS" id="36tQV5AI1fq" role="2VODD2">
-                                    <node concept="3clFbF" id="36tQV5AI1fr" role="3cqZAp">
-                                      <node concept="2OqwBi" id="36tQV5AI1fs" role="3clFbG">
-                                        <node concept="1iwH7S" id="36tQV5AI1ft" role="2Oq$k0" />
-                                        <node concept="1iwH70" id="36tQV5AI1fu" role="2OqNvi">
-                                          <ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
-                                          <node concept="2OqwBi" id="36tQV5AI1fv" role="1iwH7V">
-                                            <node concept="30H73N" id="36tQV5AI1fw" role="2Oq$k0" />
-                                            <node concept="2Xjw5R" id="36tQV5AI1fx" role="2OqNvi">
-                                              <node concept="1xMEDy" id="36tQV5AI1fy" role="1xVPHs">
-                                                <node concept="chp4Y" id="6OXbTDyY0$L" role="ri$Ld">
+                        <node concept="3clFbH" id="36tQV5AxhRI" role="3cqZAp" />
+                        <node concept="3clFbF" id="6R6MIbTb36F" role="3cqZAp">
+                          <node concept="2OqwBi" id="6R6MIbTAyQK" role="3clFbG">
+                            <node concept="37vLTw" id="6R6MIbTb36D" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6R6MIbTaKAH" resolve="ruleBuilder" />
+                              <node concept="1ZhdrF" id="6R6MIbTb3Cs" role="lGtFl">
+                                <property role="2qtEX8" value="variableDeclaration" />
+                                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                                <node concept="3$xsQk" id="6R6MIbTb3Ct" role="3$ytzL">
+                                  <node concept="3clFbS" id="6R6MIbTb3Cu" role="2VODD2">
+                                    <node concept="3clFbF" id="6R6MIbTb3JX" role="3cqZAp">
+                                      <node concept="2OqwBi" id="6R6MIbTb3JY" role="3clFbG">
+                                        <node concept="1iwH7S" id="6R6MIbTb3JZ" role="2Oq$k0" />
+                                        <node concept="1iwH70" id="6R6MIbTb3K0" role="2OqNvi">
+                                          <ref role="1iwH77" node="6R6MIbTaGzw" resolve="builder_field" />
+                                          <node concept="2OqwBi" id="6R6MIbTb3K1" role="1iwH7V">
+                                            <node concept="30H73N" id="6R6MIbTb3K2" role="2Oq$k0" />
+                                            <node concept="2Xjw5R" id="6R6MIbTb3K3" role="2OqNvi">
+                                              <node concept="1xMEDy" id="6R6MIbTb3K4" role="1xVPHs">
+                                                <node concept="chp4Y" id="6R6MIbTkc_T" role="ri$Ld">
                                                   <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                                                 </node>
                                               </node>
@@ -13454,31 +12993,31 @@
                                 </node>
                               </node>
                             </node>
-                          </node>
-                          <node concept="TSZUe" id="36tQV5AI3Jk" role="2OqNvi">
-                            <node concept="37vLTw" id="36tQV5AI3SW" role="25WWJ7">
-                              <ref role="3cqZAo" node="36tQV5AxhQ2" resolve="builder" />
+                            <node concept="TSZUe" id="6R6MIbTAzUL" role="2OqNvi">
+                              <node concept="37vLTw" id="6R6MIbTA$0q" role="25WWJ7">
+                                <ref role="3cqZAo" node="36tQV5AxhQ2" resolve="builder" />
+                              </node>
                             </node>
                           </node>
                         </node>
                       </node>
+                      <node concept="2AHcQZ" id="36tQV5AxhRO" role="2AJF6D">
+                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                      </node>
                     </node>
-                    <node concept="2AHcQZ" id="36tQV5AxhRO" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                    </node>
-                  </node>
-                  <node concept="2tJIrI" id="36tQV5AxhOo" role="jymVt" />
-                  <node concept="1ZhdrF" id="2J$kxDHVPdb" role="lGtFl">
-                    <property role="2qtEX8" value="classifier" />
-                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1170345865475/1170346070688" />
-                    <node concept="3$xsQk" id="2J$kxDHVPdc" role="3$ytzL">
-                      <node concept="3clFbS" id="2J$kxDHVPdd" role="2VODD2">
-                        <node concept="3clFbF" id="2J$kxDHVPAe" role="3cqZAp">
-                          <node concept="2OqwBi" id="2J$kxDHVPQo" role="3clFbG">
-                            <node concept="1iwH7S" id="2J$kxDHVPAd" role="2Oq$k0" />
-                            <node concept="1iwH70" id="2J$kxDHVPWM" role="2OqNvi">
-                              <ref role="1iwH77" node="2J$kxDHVt6s" resolve="constraintRule_class" />
-                              <node concept="30H73N" id="2J$kxDHVQ9b" role="1iwH7V" />
+                    <node concept="2tJIrI" id="36tQV5AxhOo" role="jymVt" />
+                    <node concept="1ZhdrF" id="2J$kxDHVPdb" role="lGtFl">
+                      <property role="2qtEX8" value="classifier" />
+                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1170345865475/1170346070688" />
+                      <node concept="3$xsQk" id="2J$kxDHVPdc" role="3$ytzL">
+                        <node concept="3clFbS" id="2J$kxDHVPdd" role="2VODD2">
+                          <node concept="3clFbF" id="2J$kxDHVPAe" role="3cqZAp">
+                            <node concept="2OqwBi" id="2J$kxDHVPQo" role="3clFbG">
+                              <node concept="1iwH7S" id="2J$kxDHVPAd" role="2Oq$k0" />
+                              <node concept="1iwH70" id="2J$kxDHVPWM" role="2OqNvi">
+                                <ref role="1iwH77" node="2J$kxDHVt6s" resolve="constraintRule_class" />
+                                <node concept="30H73N" id="2J$kxDHVQ9b" role="1iwH7V" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -13486,17 +13025,70 @@
                     </node>
                   </node>
                 </node>
+                <node concept="raruj" id="36tQV5AxJIJ" role="lGtFl" />
               </node>
-              <node concept="raruj" id="36tQV5AxJIJ" role="lGtFl" />
             </node>
           </node>
-          <node concept="3clFbH" id="36tQV5AxR1g" role="3cqZAp" />
+        </node>
+        <node concept="2tJIrI" id="36tQV5AxhNP" role="jymVt" />
+        <node concept="312cEg" id="6R6MIbTaKAH" role="jymVt">
+          <property role="TrG5h" value="ruleBuilder" />
+          <node concept="3Tm6S6" id="6R6MIbTaKAI" role="1B3o_S" />
+          <node concept="_YKpA" id="6R6MIbTAz77" role="1tU5fm">
+            <node concept="3uibUv" id="6R6MIbTAz78" role="_ZDj9">
+              <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="36tQV5AxhJe" role="1B3o_S" />
+        <node concept="3uibUv" id="6R6MIbUgkER" role="EKbjA">
+          <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="Template.Token" />
         </node>
       </node>
-      <node concept="2tJIrI" id="36tQV5AxhNP" role="jymVt" />
-      <node concept="3Tm1VV" id="36tQV5AxhJe" role="1B3o_S" />
-      <node concept="3uibUv" id="36tQV5AxpPS" role="1zkMxy">
-        <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
+      <node concept="2tJIrI" id="6R6MIbTN7mU" role="jymVt" />
+      <node concept="3Tm1VV" id="6R6MIbTN7kh" role="1B3o_S" />
+      <node concept="3uibUv" id="6R6MIbU1iPN" role="1zkMxy">
+        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
+        <node concept="3uibUv" id="6R6MIbU1kcI" role="11_B2D">
+          <ref role="3uigEE" node="36tQV5AxhJd" resolve="__Template.Token" />
+        </node>
+      </node>
+      <node concept="3clFbW" id="6R6MIbU1l5_" role="jymVt">
+        <node concept="37vLTG" id="6R6MIbU1l5A" role="3clF46">
+          <property role="TrG5h" value="handlerTemplate" />
+          <node concept="3uibUv" id="6R6MIbU1l5B" role="1tU5fm">
+            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RulesListTemplate" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="6R6MIbU1l5C" role="3clF46">
+          <property role="TrG5h" value="name" />
+          <node concept="17QB3L" id="6R6MIbU1l5D" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="6R6MIbU1l5E" role="3clF46">
+          <property role="TrG5h" value="templateRef" />
+          <node concept="3uibUv" id="6R6MIbU1l5F" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="6R6MIbU1l5G" role="3clF45" />
+        <node concept="3Tm1VV" id="6R6MIbU1l5H" role="1B3o_S" />
+        <node concept="3clFbS" id="6R6MIbU1l5I" role="3clF47">
+          <node concept="XkiVB" id="6R6MIbU1l61" role="3cqZAp">
+            <ref role="37wK5l" to="i348:1ffsG7bUbEV" resolve="AbstraceRuleTemplate" />
+            <node concept="37vLTw" id="6R6MIbU1l62" role="37wK5m">
+              <ref role="3cqZAo" node="6R6MIbU1l5A" resolve="handlerTemplate" />
+            </node>
+            <node concept="37vLTw" id="6R6MIbU1l63" role="37wK5m">
+              <ref role="3cqZAo" node="6R6MIbU1l5C" resolve="name" />
+            </node>
+            <node concept="37vLTw" id="6R6MIbU1l64" role="37wK5m">
+              <ref role="3cqZAo" node="6R6MIbU1l5E" resolve="templateRef" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="6R6MIbU9RKN" role="EKbjA">
+        <ref role="3uigEE" to="i348:6R6MIbU9$OD" resolve="Template" />
       </node>
     </node>
   </node>
@@ -13508,34 +13100,18 @@
       <node concept="3cqZAl" id="6OXbTD$juGl" role="3clF45" />
       <node concept="3Tmbuc" id="6OXbTD$jvav" role="1B3o_S" />
       <node concept="3clFbS" id="6OXbTD$juGn" role="3clF47">
-        <node concept="3clFbF" id="6OXbTD$jv6f" role="3cqZAp">
-          <node concept="1rXfSq" id="6OXbTD$jv6e" role="3clFbG">
-            <ref role="37wK5l" node="6OXbTD$jtv1" resolve="init" />
-          </node>
-        </node>
-      </node>
-      <node concept="2ZBi8u" id="6OXbTD$kqyO" role="lGtFl">
-        <ref role="2rW$FS" node="6OXbTD$ko7g" resolve="query_constructor" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6OXbTD$juj6" role="jymVt" />
-    <node concept="3clFb_" id="6OXbTD$fFbC" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="name" />
-      <node concept="17QB3L" id="6OXbTD$fFbD" role="3clF45" />
-      <node concept="3Tm1VV" id="6OXbTD$fFbE" role="1B3o_S" />
-      <node concept="3clFbS" id="6OXbTD$fFbF" role="3clF47">
-        <node concept="3clFbF" id="6OXbTD$fFbG" role="3cqZAp">
-          <node concept="Xl_RD" id="6OXbTD$fFbH" role="3clFbG">
-            <node concept="17Uvod" id="6OXbTD$fFbI" role="lGtFl">
+        <node concept="XkiVB" id="6R6MIbU9lm1" role="3cqZAp">
+          <ref role="37wK5l" to="i348:6R6MIbU8QE_" resolve="AbstractQueryTemplate" />
+          <node concept="Xl_RD" id="6R6MIbU9lCr" role="37wK5m">
+            <node concept="17Uvod" id="6R6MIbU9lCs" role="lGtFl">
               <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
               <property role="2qtEX9" value="value" />
-              <node concept="3zFVjK" id="6OXbTD$fFbJ" role="3zH0cK">
-                <node concept="3clFbS" id="6OXbTD$fFbK" role="2VODD2">
-                  <node concept="3clFbF" id="6OXbTD$fFbL" role="3cqZAp">
-                    <node concept="2OqwBi" id="6OXbTD$fFbM" role="3clFbG">
-                      <node concept="30H73N" id="6OXbTD$fFbN" role="2Oq$k0" />
-                      <node concept="3TrcHB" id="6OXbTD$fFbO" role="2OqNvi">
+              <node concept="3zFVjK" id="6R6MIbU9lCt" role="3zH0cK">
+                <node concept="3clFbS" id="6R6MIbU9lCu" role="2VODD2">
+                  <node concept="3clFbF" id="6R6MIbU9lCv" role="3cqZAp">
+                    <node concept="2OqwBi" id="6R6MIbU9lCw" role="3clFbG">
+                      <node concept="30H73N" id="6R6MIbU9lCx" role="2Oq$k0" />
+                      <node concept="3TrcHB" id="6R6MIbU9lCy" role="2OqNvi">
                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                       </node>
                     </node>
@@ -13544,386 +13120,112 @@
               </node>
             </node>
           </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="6OXbTD$fFbP" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6OXbTD$fFbQ" role="jymVt" />
-    <node concept="3clFb_" id="6OXbTD$fFDS" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="fqName" />
-      <node concept="17QB3L" id="6OXbTD$fFDT" role="3clF45" />
-      <node concept="3Tm1VV" id="6OXbTD$fFDU" role="1B3o_S" />
-      <node concept="3clFbS" id="6OXbTD$fFDV" role="3clF47">
-        <node concept="3clFbF" id="6OXbTD$fFDW" role="3cqZAp">
-          <node concept="Xl_RD" id="6OXbTD$fFDX" role="3clFbG">
+          <node concept="Xl_RD" id="6R6MIbU9lQB" role="37wK5m">
             <property role="Xl_RC" value="" />
-            <node concept="17Uvod" id="6OXbTD$fFDY" role="lGtFl">
+            <node concept="17Uvod" id="6R6MIbU9lQC" role="lGtFl">
               <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
               <property role="2qtEX9" value="value" />
-              <node concept="3zFVjK" id="6OXbTD$fFDZ" role="3zH0cK">
-                <node concept="3clFbS" id="6OXbTD$fFE0" role="2VODD2">
-                  <node concept="3clFbF" id="6OXbTD$fFE1" role="3cqZAp">
-                    <node concept="2OqwBi" id="6OXbTD$fFE2" role="3clFbG">
-                      <node concept="2qgKlT" id="6OXbTD$fFE3" role="2OqNvi">
+              <node concept="3zFVjK" id="6R6MIbU9lQD" role="3zH0cK">
+                <node concept="3clFbS" id="6R6MIbU9lQE" role="2VODD2">
+                  <node concept="3clFbF" id="6R6MIbU9lQF" role="3cqZAp">
+                    <node concept="2OqwBi" id="6R6MIbU9lQG" role="3clFbG">
+                      <node concept="2qgKlT" id="6R6MIbU9lQH" role="2OqNvi">
                         <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                       </node>
-                      <node concept="30H73N" id="6OXbTD$fFE4" role="2Oq$k0" />
+                      <node concept="30H73N" id="6R6MIbU9lQI" role="2Oq$k0" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="6OXbTD$fFE5" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6OXbTD$fBKv" role="jymVt" />
-    <node concept="3clFb_" id="4t7Xo7icnxD" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="kind" />
-      <node concept="3Tm1VV" id="4t7Xo7icnxF" role="1B3o_S" />
-      <node concept="3uibUv" id="4t7Xo7insnx" role="3clF45">
-        <ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
-      </node>
-      <node concept="3clFbS" id="4t7Xo7icnxH" role="3clF47">
-        <node concept="3clFbF" id="2BZXJecG5i6" role="3cqZAp">
-          <node concept="10Nm6u" id="2BZXJecG5i5" role="3clFbG">
-            <node concept="29HgVG" id="2BZXJecG5iA" role="lGtFl">
-              <node concept="3NFfHV" id="2BZXJecG5iQ" role="3NFExx">
-                <node concept="3clFbS" id="2BZXJecG5iR" role="2VODD2">
-                  <node concept="3clFbF" id="2BZXJecG5mX" role="3cqZAp">
-                    <node concept="2OqwBi" id="2BZXJecG5xy" role="3clFbG">
-                      <node concept="30H73N" id="2BZXJecG5mW" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="2BZXJecG6x1" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:2BZXJecE0bF" resolve="queryKind" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="4t7Xo7icnxI" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4t7Xo7icolH" role="jymVt" />
-    <node concept="3clFb_" id="6OXbTD$jihG" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="usedHandlersFqNames" />
-      <node concept="_YKpA" id="6OXbTD$jihH" role="3clF45">
-        <node concept="17QB3L" id="6OXbTD$jihI" role="_ZDj9" />
-      </node>
-      <node concept="3Tm1VV" id="6OXbTD$jihJ" role="1B3o_S" />
-      <node concept="3clFbS" id="6OXbTD$jihL" role="3clF47">
-        <node concept="3clFbF" id="6OXbTD$jjQ5" role="3cqZAp">
-          <node concept="10Nm6u" id="6OXbTD$jjQ4" role="3clFbG" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="6OXbTD$jihM" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6OXbTD$fBKz" role="jymVt" />
-    <node concept="3clFb_" id="7P_FdVPsJk6" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="newQuery" />
-      <node concept="3uibUv" id="7P_FdVPsJka" role="3clF45">
-        <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
-      </node>
-      <node concept="3Tm1VV" id="7P_FdVPsJkb" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVPsJkd" role="3clF47">
-        <node concept="3clFbF" id="7P_FdVQ_tYj" role="3cqZAp">
-          <node concept="2ShNRf" id="7P_FdVQ_tYh" role="3clFbG">
-            <node concept="HV5vD" id="7P_FdVQ_uet" role="2ShVmc">
-              <ref role="HV5vE" node="6OXbTD$r8hA" resolve="QueryTemplateImpl.Configurable" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="7P_FdVPsJke" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-      <node concept="37vLTG" id="7P_FdVQ_t5i" role="3clF46">
-        <property role="TrG5h" value="observable" />
-        <node concept="3uibUv" id="7P_FdVQ_thj" role="1tU5fm">
-          <ref role="3uigEE" to="i348:7P_FdVQ_k3b" resolve="QueryTemplate.QueryObservable" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6tPOoeT46g4" role="jymVt" />
-    <node concept="3clFb_" id="6tPOoeT44hu" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="newToken" />
-      <node concept="37vLTG" id="6tPOoeT44hv" role="3clF46">
-        <property role="TrG5h" value="parameter" />
-        <node concept="8X2XB" id="6tPOoeT44hw" role="1tU5fm">
-          <node concept="3uibUv" id="6tPOoeT44hx" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="6tPOoeT44hy" role="3clF45">
-        <ref role="3uigEE" node="6tPOoeT3Z1_" resolve="QueryTemplateImpl.Token" />
-      </node>
-      <node concept="3Tm1VV" id="6tPOoeT44hz" role="1B3o_S" />
-      <node concept="3clFbS" id="6tPOoeT44h$" role="3clF47">
-        <node concept="3clFbF" id="6tPOoeT44h_" role="3cqZAp">
-          <node concept="2ShNRf" id="6tPOoeT44hA" role="3clFbG">
-            <node concept="1pGfFk" id="6tPOoeT44hB" role="2ShVmc">
-              <ref role="37wK5l" node="6tPOoeT3Z1B" resolve="QueryTemplateImpl.Token" />
-              <node concept="1rXfSq" id="6tPOoeT44hC" role="37wK5m">
-                <ref role="37wK5l" node="6OXbTDz054k" resolve="templateRef" />
-              </node>
-              <node concept="37vLTw" id="6tPOoeT44hD" role="37wK5m">
-                <ref role="3cqZAo" node="6tPOoeT44hv" resolve="parameter" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="6tPOoeT44hE" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6OXbTD$joUc" role="jymVt" />
-    <node concept="3clFb_" id="6OXbTD$jtv1" role="jymVt">
-      <property role="TrG5h" value="init" />
-      <node concept="3cqZAl" id="6OXbTD$jtv3" role="3clF45" />
-      <node concept="3Tm1VV" id="6OXbTD$jtv4" role="1B3o_S" />
-      <node concept="3clFbS" id="6OXbTD$jtv5" role="3clF47">
-        <node concept="3clFbF" id="6tPOoeT3RHA" role="3cqZAp">
-          <node concept="37vLTI" id="6tPOoeT3SNV" role="3clFbG">
-            <node concept="2OqwBi" id="6tPOoeT3S2K" role="37vLTJ">
-              <node concept="Xjq3P" id="6tPOoeT3RH$" role="2Oq$k0" />
-              <node concept="2OwXpG" id="6tPOoeT3Som" role="2OqNvi">
-                <ref role="2Oxat5" node="6OXbTDz03H0" resolve="templateRef" />
-              </node>
-            </node>
-            <node concept="2YIFZM" id="6tPOoeT3TgF" role="37vLTx">
-              <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-              <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
-              <node concept="Xl_RD" id="6tPOoeT3TgG" role="37wK5m">
-                <property role="Xl_RC" value="" />
-                <node concept="17Uvod" id="6tPOoeT3TgH" role="lGtFl">
-                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                  <property role="2qtEX9" value="value" />
-                  <node concept="3zFVjK" id="6tPOoeT3TgI" role="3zH0cK">
-                    <node concept="3clFbS" id="6tPOoeT3TgJ" role="2VODD2">
-                      <node concept="3clFbF" id="6tPOoeT3TgK" role="3cqZAp">
-                        <node concept="2OqwBi" id="6tPOoeT3TgL" role="3clFbG">
-                          <node concept="2OqwBi" id="6tPOoeT3TgM" role="2Oq$k0">
-                            <node concept="2JrnkZ" id="6tPOoeT3TgN" role="2Oq$k0">
-                              <node concept="2OqwBi" id="6tPOoeT3TgO" role="2JrQYb">
-                                <node concept="1iwH7S" id="6tPOoeT3TgP" role="2Oq$k0" />
-                                <node concept="12$id9" id="6tPOoeT3TgQ" role="2OqNvi">
-                                  <node concept="30H73N" id="6tPOoeT3TgR" role="12$y8L" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="6tPOoeT3TgS" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="6tPOoeT3TgT" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="6tPOoeT43El" role="3cqZAp">
-          <node concept="3clFbC" id="6tPOoeT43Em" role="3clFbw">
-            <node concept="10Nm6u" id="6tPOoeT43En" role="3uHU7w" />
-            <node concept="37vLTw" id="6tPOoeT43Eo" role="3uHU7B">
-              <ref role="3cqZAo" node="6tPOoeT428u" resolve="handlerFqNames" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="6tPOoeT43Ep" role="3clFbx">
-            <node concept="3cpWs8" id="6tPOoeT43Eq" role="3cqZAp">
-              <node concept="3cpWsn" id="6tPOoeT43Er" role="3cpWs9">
-                <property role="TrG5h" value="list" />
-                <node concept="_YKpA" id="6tPOoeT43Es" role="1tU5fm">
-                  <node concept="17QB3L" id="6tPOoeT43Et" role="_ZDj9" />
-                </node>
-                <node concept="2ShNRf" id="6tPOoeT43Eu" role="33vP2m">
-                  <node concept="Tc6Ow" id="6tPOoeT43Ev" role="2ShVmc">
-                    <node concept="17QB3L" id="6tPOoeT43Ew" role="HW$YZ" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="6tPOoeT43Ex" role="3cqZAp">
-              <node concept="2OqwBi" id="6tPOoeT43Ey" role="3clFbG">
-                <node concept="37vLTw" id="6tPOoeT43Ez" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6tPOoeT43Er" resolve="list" />
-                </node>
-                <node concept="TSZUe" id="6tPOoeT43E$" role="2OqNvi">
-                  <node concept="Xl_RD" id="6tPOoeT43E_" role="25WWJ7">
-                    <property role="Xl_RC" value="" />
-                    <node concept="17Uvod" id="6tPOoeT43EA" role="lGtFl">
-                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                      <property role="2qtEX9" value="value" />
-                      <node concept="3zFVjK" id="6tPOoeT43EB" role="3zH0cK">
-                        <node concept="3clFbS" id="6tPOoeT43EC" role="2VODD2">
-                          <node concept="3clFbF" id="6tPOoeT43ED" role="3cqZAp">
-                            <node concept="2OqwBi" id="6tPOoeT43EE" role="3clFbG">
-                              <node concept="30H73N" id="6tPOoeT43EF" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="6tPOoeT43EG" role="2OqNvi">
-                                <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+          <node concept="2YIFZM" id="6R6MIbU9lXG" role="37wK5m">
+            <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+            <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
+            <node concept="Xl_RD" id="6R6MIbU9lXH" role="37wK5m">
+              <property role="Xl_RC" value="" />
+              <node concept="17Uvod" id="6R6MIbU9lXI" role="lGtFl">
+                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                <property role="2qtEX9" value="value" />
+                <node concept="3zFVjK" id="6R6MIbU9lXJ" role="3zH0cK">
+                  <node concept="3clFbS" id="6R6MIbU9lXK" role="2VODD2">
+                    <node concept="3clFbF" id="6R6MIbU9lXL" role="3cqZAp">
+                      <node concept="2OqwBi" id="6R6MIbU9lXM" role="3clFbG">
+                        <node concept="2OqwBi" id="6R6MIbU9lXN" role="2Oq$k0">
+                          <node concept="2JrnkZ" id="6R6MIbU9lXO" role="2Oq$k0">
+                            <node concept="2OqwBi" id="6R6MIbU9lXP" role="2JrQYb">
+                              <node concept="1iwH7S" id="6R6MIbU9lXQ" role="2Oq$k0" />
+                              <node concept="12$id9" id="6R6MIbU9lXR" role="2OqNvi">
+                                <node concept="30H73N" id="6R6MIbU9lXS" role="12$y8L" />
                               </node>
                             </node>
                           </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1WS0z7" id="6tPOoeT43EH" role="lGtFl">
-                <node concept="3JmXsc" id="6tPOoeT43EI" role="3Jn$fo">
-                  <node concept="3clFbS" id="6tPOoeT43EJ" role="2VODD2">
-                    <node concept="3clFbF" id="6tPOoeT43EK" role="3cqZAp">
-                      <node concept="2OqwBi" id="6tPOoeT43EL" role="3clFbG">
-                        <node concept="2OqwBi" id="6tPOoeT43EM" role="2Oq$k0">
-                          <node concept="1iwH7S" id="6tPOoeT43EN" role="2Oq$k0" />
-                          <node concept="1r8y6K" id="6tPOoeT43EO" role="2OqNvi" />
-                        </node>
-                        <node concept="2SmgA7" id="6tPOoeT43EP" role="2OqNvi">
-                          <node concept="chp4Y" id="6tPOoeT43EQ" role="1dBWTz">
-                            <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
+                          <node concept="liA8E" id="6R6MIbU9lXT" role="2OqNvi">
+                            <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                           </node>
                         </node>
+                        <node concept="liA8E" id="6R6MIbU9lXU" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="6tPOoeT43ER" role="3cqZAp">
-              <node concept="37vLTI" id="6tPOoeT43ES" role="3clFbG">
-                <node concept="2OqwBi" id="6tPOoeT43ET" role="37vLTx">
-                  <node concept="37vLTw" id="6tPOoeT43EU" role="2Oq$k0">
-                    <ref role="3cqZAo" node="6tPOoeT43Er" resolve="list" />
-                  </node>
-                  <node concept="26Dbio" id="6tPOoeT43EV" role="2OqNvi" />
-                </node>
-                <node concept="2OqwBi" id="6tPOoeT43EW" role="37vLTJ">
-                  <node concept="Xjq3P" id="6tPOoeT43EX" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="6tPOoeT43EY" role="2OqNvi">
-                    <ref role="2Oxat5" node="6tPOoeT428u" resolve="handlerFqNames" />
-                  </node>
-                </node>
-              </node>
-            </node>
           </node>
         </node>
       </node>
+      <node concept="2ZBi8u" id="6OXbTD$kqyO" role="lGtFl">
+        <ref role="2rW$FS" node="6OXbTD$ko7g" resolve="query_constructor" />
+      </node>
     </node>
-    <node concept="2tJIrI" id="6tPOoeT3NWW" role="jymVt" />
-    <node concept="3clFb_" id="6OXbTDz054k" role="jymVt">
-      <property role="TrG5h" value="templateRef" />
-      <node concept="3uibUv" id="6OXbTDz05bG" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-      </node>
-      <node concept="3Tm1VV" id="6OXbTDz054n" role="1B3o_S" />
-      <node concept="3clFbS" id="6OXbTDz054o" role="3clF47">
-        <node concept="3clFbF" id="6OXbTDz05BR" role="3cqZAp">
-          <node concept="37vLTw" id="6OXbTDz05BQ" role="3clFbG">
-            <ref role="3cqZAo" node="6OXbTDz03H0" resolve="templateRef" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6OXbTD$jt5T" role="jymVt" />
-    <node concept="312cEu" id="6OXbTD$r8hA" role="jymVt">
-      <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="Configurable" />
-      <node concept="2tJIrI" id="6OXbTD$r8hB" role="jymVt" />
-      <node concept="3clFb_" id="6OXbTD$r8hC" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="configure" />
-        <node concept="37vLTG" id="6OXbTD$r8hD" role="3clF46">
-          <property role="TrG5h" value="stage" />
-          <node concept="17QB3L" id="6OXbTD$r8hE" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="6OXbTD$r8hF" role="3clF46">
-          <property role="TrG5h" value="config" />
-          <node concept="3uibUv" id="6OXbTD$r8hG" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="6OXbTD$r8hH" role="3clF45">
-          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
-        </node>
-        <node concept="3Tm1VV" id="6OXbTD$r8hI" role="1B3o_S" />
-        <node concept="3clFbS" id="6OXbTD$r8hJ" role="3clF47">
-          <node concept="3clFbF" id="6OXbTD$r8hK" role="3cqZAp">
-            <node concept="37vLTw" id="6OXbTD$r8hL" role="3clFbG">
-              <ref role="3cqZAo" node="6OXbTD$r8hF" resolve="config" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="6OXbTD$r8hM" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6OXbTD$r8hN" role="jymVt" />
-      <node concept="3Tm1VV" id="6OXbTD$r8hO" role="1B3o_S" />
-      <node concept="3uibUv" id="6OXbTD$r8hP" role="EKbjA">
-        <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6tPOoeT40WY" role="jymVt" />
+    <node concept="2tJIrI" id="6OXbTD$juj6" role="jymVt" />
     <node concept="312cEu" id="6tPOoeT3Z1_" role="jymVt">
-      <property role="2bfB8j" value="false" />
+      <property role="2bfB8j" value="true" />
       <property role="TrG5h" value="Token" />
       <node concept="2tJIrI" id="6tPOoeT3Z1A" role="jymVt" />
       <node concept="3clFbW" id="6tPOoeT3Z1B" role="jymVt">
-        <node concept="37vLTG" id="6tPOoeT3Z1C" role="3clF46">
-          <property role="TrG5h" value="templateRef" />
-          <node concept="3uibUv" id="6tPOoeT3Z1D" role="1tU5fm">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        <node concept="3cqZAl" id="6tPOoeT3Z1H" role="3clF45" />
+        <node concept="3Tmbuc" id="6tPOoeT3Z1I" role="1B3o_S" />
+        <node concept="3clFbS" id="6tPOoeT3Z1J" role="3clF47">
+          <node concept="3clFbF" id="6R6MIbUt40G" role="3cqZAp">
+            <node concept="37vLTI" id="6R6MIbUt40I" role="3clFbG">
+              <node concept="2OqwBi" id="6R6MIbUt4Ws" role="37vLTJ">
+                <node concept="Xjq3P" id="6R6MIbUt4XP" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6R6MIbUt4Wv" role="2OqNvi">
+                  <ref role="2Oxat5" node="6R6MIbUt40C" resolve="session" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="6R6MIbUt40M" role="37vLTx">
+                <ref role="3cqZAo" node="6R6MIbUt2Bb" resolve="session" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="37vLTG" id="6tPOoeT3Z1E" role="3clF46">
-          <property role="TrG5h" value="parameter" />
-          <node concept="8X2XB" id="6tPOoeT3Z1F" role="1tU5fm">
-            <node concept="3uibUv" id="6tPOoeT3Z1G" role="8Xvag">
+        <node concept="37vLTG" id="6R6MIbUt2Bb" role="3clF46">
+          <property role="TrG5h" value="session" />
+          <node concept="3uibUv" id="6R6MIbUt2Ba" role="1tU5fm">
+            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6R6MIbUsDsa" role="jymVt" />
+      <node concept="3clFb_" id="6R6MIbUsELR" role="jymVt">
+        <property role="TrG5h" value="withParam" />
+        <node concept="37vLTG" id="6R6MIbUsELS" role="3clF46">
+          <property role="TrG5h" value="value" />
+          <node concept="8X2XB" id="6R6MIbUsELT" role="1tU5fm">
+            <node concept="3uibUv" id="6R6MIbUsELU" role="8Xvag">
               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
             </node>
           </node>
         </node>
-        <node concept="3cqZAl" id="6tPOoeT3Z1H" role="3clF45" />
-        <node concept="3Tmbuc" id="6tPOoeT3Z1I" role="1B3o_S" />
-        <node concept="3clFbS" id="6tPOoeT3Z1J" role="3clF47">
-          <node concept="3clFbF" id="6tPOoeT3Z1K" role="3cqZAp">
-            <node concept="37vLTI" id="6tPOoeT3Z1L" role="3clFbG">
-              <node concept="37vLTw" id="6tPOoeT3Z1M" role="37vLTx">
-                <ref role="3cqZAo" node="6tPOoeT3Z1C" resolve="templateRef" />
-              </node>
-              <node concept="2OqwBi" id="6tPOoeT3Z1N" role="37vLTJ">
-                <node concept="Xjq3P" id="6tPOoeT3Z1O" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6tPOoeT3Z1P" role="2OqNvi">
-                  <ref role="2Oxat5" node="6tPOoeT3Z45" resolve="templateRef" />
-                </node>
-              </node>
-            </node>
-          </node>
+        <node concept="3uibUv" id="6R6MIbUsELV" role="3clF45">
+          <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
+        </node>
+        <node concept="3Tm1VV" id="6R6MIbUsELW" role="1B3o_S" />
+        <node concept="3clFbS" id="6R6MIbUsELY" role="3clF47">
           <node concept="3clFbF" id="6tPOoeT3Z1Q" role="3cqZAp">
             <node concept="37vLTI" id="6tPOoeT3Z1R" role="3clFbG">
               <node concept="1eOMI4" id="6tPOoeT3Z1S" role="37vLTx">
@@ -13965,8 +13267,8 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="37vLTw" id="6tPOoeT3Z2b" role="AHHXb">
-                      <ref role="3cqZAo" node="6tPOoeT3Z1E" resolve="parameter" />
+                    <node concept="37vLTw" id="6R6MIbUFL5r" role="AHHXb">
+                      <ref role="3cqZAo" node="6R6MIbUsELS" resolve="value" />
                     </node>
                   </node>
                 </node>
@@ -14003,26 +13305,14 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="6tPOoeT3Z2A" role="3cqZAp">
-            <node concept="37vLTI" id="6tPOoeT3Z2B" role="3clFbG">
-              <node concept="2ShNRf" id="6tPOoeT3Z2C" role="37vLTx">
-                <node concept="Tc6Ow" id="6tPOoeT3Z2D" role="2ShVmc">
-                  <node concept="3uibUv" id="6tPOoeT3Z2E" role="HW$YZ">
-                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="6tPOoeT3Z2F" role="37vLTJ">
-                <node concept="Xjq3P" id="6tPOoeT3Z2G" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6tPOoeT3Z2H" role="2OqNvi">
-                  <ref role="2Oxat5" node="6tPOoeT3Z41" resolve="ruleBuilder" />
-                </node>
-              </node>
-            </node>
+          <node concept="3clFbF" id="6R6MIbUsEM1" role="3cqZAp">
+            <node concept="Xjq3P" id="6R6MIbUt2_U" role="3clFbG" />
           </node>
         </node>
+        <node concept="2AHcQZ" id="6R6MIbUsELZ" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
       </node>
-      <node concept="2tJIrI" id="6tPOoeT3Z2I" role="jymVt" />
       <node concept="3clFb_" id="6tPOoeT3Z2J" role="jymVt">
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="apply" />
@@ -14031,24 +13321,46 @@
             <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
-        <node concept="37vLTG" id="6tPOoeT3Z2M" role="3clF46">
-          <property role="TrG5h" value="session" />
-          <node concept="3uibUv" id="6tPOoeT3Z2N" role="1tU5fm">
-            <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-          </node>
-          <node concept="2ZBi8u" id="6tPOoeT3Z2O" role="lGtFl">
-            <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
-          </node>
-        </node>
         <node concept="3Tm1VV" id="6tPOoeT3Z2P" role="1B3o_S" />
         <node concept="3clFbS" id="6tPOoeT3Z2Q" role="3clF47">
+          <node concept="3cpWs8" id="6R6MIbUtg13" role="3cqZAp">
+            <node concept="3cpWsn" id="6R6MIbUtg14" role="3cpWs9">
+              <property role="TrG5h" value="_session" />
+              <node concept="3uibUv" id="6R6MIbUtg15" role="1tU5fm">
+                <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              </node>
+              <node concept="37vLTw" id="6R6MIbUtg16" role="33vP2m">
+                <ref role="3cqZAo" node="6R6MIbUt40C" resolve="session" />
+              </node>
+              <node concept="2ZBi8u" id="6R6MIbUtg17" role="lGtFl">
+                <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6tPOoeT3Z2A" role="3cqZAp">
+            <node concept="37vLTI" id="6tPOoeT3Z2B" role="3clFbG">
+              <node concept="2ShNRf" id="6R6MIbTvH3J" role="37vLTx">
+                <node concept="Tc6Ow" id="6R6MIbTvH_L" role="2ShVmc">
+                  <node concept="3uibUv" id="6R6MIbTvI3L" role="HW$YZ">
+                    <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6tPOoeT3Z2F" role="37vLTJ">
+                <node concept="Xjq3P" id="6tPOoeT3Z2G" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6tPOoeT3Z2H" role="2OqNvi">
+                  <ref role="2Oxat5" node="6tPOoeT3Z41" resolve="ruleBuilders" />
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbF" id="6tPOoeT3Z2R" role="3cqZAp">
             <node concept="2OqwBi" id="6tPOoeT3Z2S" role="3clFbG">
               <node concept="37vLTw" id="6tPOoeT3Z2T" role="2Oq$k0">
-                <ref role="3cqZAo" node="6tPOoeT3Z41" resolve="ruleBuilder" />
+                <ref role="3cqZAo" node="6tPOoeT3Z41" resolve="ruleBuilders" />
               </node>
-              <node concept="TSZUe" id="6tPOoeT3Z2U" role="2OqNvi">
-                <node concept="10Nm6u" id="6tPOoeT3Z2V" role="25WWJ7" />
+              <node concept="TSZUe" id="6R6MIbTAwKs" role="2OqNvi">
+                <node concept="10Nm6u" id="6R6MIbTAwT2" role="25WWJ7" />
               </node>
             </node>
             <node concept="2b32R4" id="6tPOoeT3Z2W" role="lGtFl">
@@ -14071,9 +13383,9 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="6tPOoeT3Z35" role="3cqZAp">
-            <node concept="37vLTw" id="6tPOoeT3Z36" role="3clFbG">
-              <ref role="3cqZAo" node="6tPOoeT3Z41" resolve="ruleBuilder" />
+          <node concept="3clFbF" id="6R6MIbTvIAV" role="3cqZAp">
+            <node concept="37vLTw" id="6R6MIbTvIAT" role="3clFbG">
+              <ref role="3cqZAo" node="6tPOoeT3Z41" resolve="ruleBuilders" />
             </node>
           </node>
         </node>
@@ -14097,25 +13409,6 @@
           <ref role="2rW$FS" node="36tQV5AugIl" resolve="template_token_this" />
         </node>
       </node>
-      <node concept="2tJIrI" id="6tPOoeT3Z3g" role="jymVt" />
-      <node concept="3clFb_" id="6tPOoeT3Z3h" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="templateRef" />
-        <node concept="3uibUv" id="6tPOoeT3Z3i" role="3clF45">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-        <node concept="3Tmbuc" id="2J$kxDHYvF1" role="1B3o_S" />
-        <node concept="3clFbS" id="6tPOoeT3Z3k" role="3clF47">
-          <node concept="3clFbF" id="6tPOoeT3Z3l" role="3cqZAp">
-            <node concept="37vLTw" id="6tPOoeT3Z3m" role="3clFbG">
-              <ref role="3cqZAo" node="6tPOoeT3Z45" resolve="templateRef" />
-            </node>
-          </node>
-        </node>
-        <node concept="2ZBi8u" id="6tPOoeT3Z3n" role="lGtFl">
-          <ref role="2rW$FS" node="6OXbTDyZfMT" resolve="template_ref" />
-        </node>
-      </node>
       <node concept="2tJIrI" id="6tPOoeT3Z3o" role="jymVt" />
       <node concept="312cEu" id="2J$kxDHYub7" role="jymVt">
         <property role="TrG5h" value="ConstraintRule" />
@@ -14211,24 +13504,31 @@
         </node>
       </node>
       <node concept="312cEg" id="6tPOoeT3Z41" role="jymVt">
-        <property role="TrG5h" value="ruleBuilder" />
+        <property role="TrG5h" value="ruleBuilders" />
         <node concept="3Tmbuc" id="6tPOoeT3Z42" role="1B3o_S" />
-        <node concept="_YKpA" id="6tPOoeT3Z43" role="1tU5fm">
-          <node concept="3uibUv" id="6tPOoeT3Z44" role="_ZDj9">
+        <node concept="_YKpA" id="6R6MIbTvG$d" role="1tU5fm">
+          <node concept="3uibUv" id="6R6MIbTvG$e" role="_ZDj9">
             <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
-      </node>
-      <node concept="312cEg" id="6tPOoeT3Z45" role="jymVt">
-        <property role="TrG5h" value="templateRef" />
-        <node concept="3Tmbuc" id="6tPOoeT3Z46" role="1B3o_S" />
-        <node concept="3uibUv" id="6tPOoeT3Z47" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        <node concept="2ZBi8u" id="6R6MIbTk4wc" role="lGtFl">
+          <ref role="2rW$FS" node="6R6MIbTaGzw" resolve="builder_field" />
         </node>
       </node>
+      <node concept="312cEg" id="6R6MIbUt40C" role="jymVt">
+        <property role="TrG5h" value="session" />
+        <node concept="3Tmbuc" id="6R6MIbUt5do" role="1B3o_S" />
+        <node concept="3uibUv" id="6R6MIbUt40F" role="1tU5fm">
+          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+        </node>
+        <node concept="2ZBi8u" id="6R6MIbUt57d" role="lGtFl">
+          <ref role="2rW$FS" node="6R6MIbUtc6X" resolve="apply_session_field" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6R6MIbU9rbU" role="jymVt" />
       <node concept="3Tm1VV" id="6tPOoeT3Z48" role="1B3o_S" />
-      <node concept="3uibUv" id="6tPOoeT3Z49" role="EKbjA">
-        <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+      <node concept="3uibUv" id="6R6MIbUe0_f" role="EKbjA">
+        <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
       </node>
       <node concept="1WS0z7" id="6tPOoeT5Mwz" role="lGtFl">
         <node concept="3JmXsc" id="6tPOoeT5Mw_" role="3Jn$fo">
@@ -14245,19 +13545,127 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="6tPOoeT3Vi7" role="jymVt" />
-    <node concept="312cEg" id="6OXbTDz03H0" role="jymVt">
-      <property role="TrG5h" value="templateRef" />
-      <node concept="3Tm6S6" id="6OXbTDz03H1" role="1B3o_S" />
-      <node concept="3uibUv" id="6OXbTDz03H2" role="1tU5fm">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+    <node concept="2tJIrI" id="6R6MIbU8GTs" role="jymVt" />
+    <node concept="2tJIrI" id="6OXbTD$fBKv" role="jymVt" />
+    <node concept="3clFb_" id="4t7Xo7icnxD" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="kind" />
+      <node concept="3Tm1VV" id="4t7Xo7icnxF" role="1B3o_S" />
+      <node concept="3uibUv" id="4t7Xo7insnx" role="3clF45">
+        <ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
+      </node>
+      <node concept="3clFbS" id="4t7Xo7icnxH" role="3clF47">
+        <node concept="3clFbF" id="2BZXJecG5i6" role="3cqZAp">
+          <node concept="10Nm6u" id="2BZXJecG5i5" role="3clFbG">
+            <node concept="29HgVG" id="2BZXJecG5iA" role="lGtFl">
+              <node concept="3NFfHV" id="2BZXJecG5iQ" role="3NFExx">
+                <node concept="3clFbS" id="2BZXJecG5iR" role="2VODD2">
+                  <node concept="3clFbF" id="2BZXJecG5mX" role="3cqZAp">
+                    <node concept="2OqwBi" id="2BZXJecG5xy" role="3clFbG">
+                      <node concept="30H73N" id="2BZXJecG5mW" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2BZXJecG6x1" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:2BZXJecE0bF" resolve="queryKind" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4t7Xo7icnxI" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="312cEg" id="6tPOoeT428u" role="jymVt">
-      <property role="TrG5h" value="handlerFqNames" />
-      <node concept="3Tm6S6" id="6tPOoeT428v" role="1B3o_S" />
-      <node concept="_YKpA" id="6tPOoeT428w" role="1tU5fm">
-        <node concept="17QB3L" id="6tPOoeT428x" role="_ZDj9" />
+    <node concept="2tJIrI" id="4t7Xo7icolH" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVPsJk6" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="newQuery" />
+      <node concept="3uibUv" id="7P_FdVPsJka" role="3clF45">
+        <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVPsJkb" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPsJkd" role="3clF47">
+        <node concept="3clFbF" id="7P_FdVQ_tYj" role="3cqZAp">
+          <node concept="2ShNRf" id="7P_FdVQ_tYh" role="3clFbG">
+            <node concept="HV5vD" id="7P_FdVQ_uet" role="2ShVmc">
+              <ref role="HV5vE" node="6OXbTD$r8hA" resolve="QueryTemplateImpl.Configurable" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7P_FdVPsJke" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6R6MIbUswGA" role="jymVt" />
+    <node concept="3clFb_" id="6R6MIbUsyqI" role="jymVt">
+      <property role="TrG5h" value="createToken" />
+      <node concept="37vLTG" id="6R6MIbUsyqL" role="3clF46">
+        <property role="TrG5h" value="session" />
+        <node concept="3uibUv" id="6R6MIbUsyqM" role="1tU5fm">
+          <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="6R6MIbUsyqT" role="3clF45">
+        <ref role="3uigEE" node="6tPOoeT3Z1_" resolve="QueryTemplateImpl.Token" />
+      </node>
+      <node concept="3Tm1VV" id="6R6MIbUsyqO" role="1B3o_S" />
+      <node concept="3clFbS" id="6R6MIbUsyqU" role="3clF47">
+        <node concept="3clFbF" id="6tPOoeT44h_" role="3cqZAp">
+          <node concept="2ShNRf" id="6tPOoeT44hA" role="3clFbG">
+            <node concept="1pGfFk" id="6tPOoeT44hB" role="2ShVmc">
+              <ref role="37wK5l" node="6tPOoeT3Z1B" resolve="QueryTemplateImpl.Token" />
+              <node concept="37vLTw" id="6R6MIbUt7_H" role="37wK5m">
+                <ref role="3cqZAo" node="6R6MIbUsyqL" resolve="session" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6R6MIbUsyqV" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6tPOoeT3NWW" role="jymVt" />
+    <node concept="312cEu" id="6OXbTD$r8hA" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="Configurable" />
+      <node concept="2tJIrI" id="6OXbTD$r8hB" role="jymVt" />
+      <node concept="3clFb_" id="6OXbTD$r8hC" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="configure" />
+        <node concept="37vLTG" id="6OXbTD$r8hD" role="3clF46">
+          <property role="TrG5h" value="stage" />
+          <node concept="17QB3L" id="6OXbTD$r8hE" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="6OXbTD$r8hF" role="3clF46">
+          <property role="TrG5h" value="config" />
+          <node concept="3uibUv" id="6OXbTD$r8hG" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="6OXbTD$r8hH" role="3clF45">
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+        </node>
+        <node concept="3Tm1VV" id="6OXbTD$r8hI" role="1B3o_S" />
+        <node concept="3clFbS" id="6OXbTD$r8hJ" role="3clF47">
+          <node concept="3clFbF" id="6OXbTD$r8hK" role="3cqZAp">
+            <node concept="37vLTw" id="6OXbTD$r8hL" role="3clFbG">
+              <ref role="3cqZAo" node="6OXbTD$r8hF" resolve="config" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="6OXbTD$r8hM" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6OXbTD$r8hN" role="jymVt" />
+      <node concept="3Tm1VV" id="6OXbTD$r8hO" role="1B3o_S" />
+      <node concept="3uibUv" id="6OXbTD$r8hP" role="EKbjA">
+        <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
       </node>
     </node>
     <node concept="2tJIrI" id="6OXbTD$joxi" role="jymVt" />
@@ -14265,11 +13673,11 @@
     <node concept="n94m4" id="6OXbTD$fBF0" role="lGtFl">
       <ref role="n9lRv" to="wq2x:6OXbTD$dU7b" resolve="Query" />
     </node>
-    <node concept="17Uvod" id="6OXbTD$iVUX" role="lGtFl">
-      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+    <node concept="17Uvod" id="6R6MIbU9jV9" role="lGtFl">
       <property role="2qtEX9" value="name" />
-      <node concept="3zFVjK" id="6OXbTD$iVUY" role="3zH0cK">
-        <node concept="3clFbS" id="6OXbTD$iVUZ" role="2VODD2">
+      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+      <node concept="3zFVjK" id="6R6MIbU9jVa" role="3zH0cK">
+        <node concept="3clFbS" id="6R6MIbU9jVb" role="2VODD2">
           <node concept="3clFbF" id="6OXbTDzn1Cc" role="3cqZAp">
             <node concept="3cpWs3" id="6OXbTDzn8_I" role="3clFbG">
               <node concept="2OqwBi" id="6OXbTDzna3X" role="3uHU7w">
@@ -14294,9 +13702,9 @@
         </node>
       </node>
     </node>
-    <node concept="3uibUv" id="6OXbTD$iV$$" role="EKbjA">
-      <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
-      <node concept="3uibUv" id="6tPOoeT6cJK" role="11_B2D">
+    <node concept="3uibUv" id="6R6MIbU9dNK" role="1zkMxy">
+      <ref role="3uigEE" to="i348:6R6MIbU8KKa" resolve="AbstractQueryTemplate" />
+      <node concept="3uibUv" id="6R6MIbU9iLG" role="11_B2D">
         <ref role="3uigEE" node="6tPOoeT3Z1_" resolve="QueryTemplateImpl.Token" />
       </node>
     </node>
@@ -14991,21 +14399,13 @@
     <ref role="3gUMe" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
     <node concept="312cEu" id="2J$kxDHVpw_" role="13RCb5">
       <property role="TrG5h" value="Token" />
+      <property role="1sVAO0" value="true" />
       <node concept="2tJIrI" id="2J$kxDHVpKf" role="jymVt" />
-      <node concept="3clFbW" id="2J$kxDHVpOm" role="jymVt">
-        <node concept="3cqZAl" id="2J$kxDHVpOo" role="3clF45" />
-        <node concept="3Tm1VV" id="2J$kxDHVpOp" role="1B3o_S" />
-        <node concept="3clFbS" id="2J$kxDHVpOq" role="3clF47">
-          <node concept="XkiVB" id="2J$kxDHVpYu" role="3cqZAp">
-            <ref role="37wK5l" node="36tQV5AoEKL" resolve="RuleTemplateImpl.Token" />
-            <node concept="10Nm6u" id="2J$kxDHVpZG" role="37wK5m" />
-          </node>
-        </node>
-      </node>
       <node concept="2tJIrI" id="2J$kxDHVq3o" role="jymVt" />
       <node concept="312cEu" id="2J$kxDHVq4U" role="jymVt">
         <property role="TrG5h" value="ConstraintRule" />
         <property role="1sVAO0" value="true" />
+        <property role="2bfB8j" value="true" />
         <node concept="2tJIrI" id="2J$kxDHVqu$" role="jymVt" />
         <node concept="3clFb_" id="2J$kxDHVqPZ" role="jymVt">
           <property role="TrG5h" value="rule" />
@@ -15155,8 +14555,8 @@
       </node>
       <node concept="2tJIrI" id="2J$kxDHVq3F" role="jymVt" />
       <node concept="3Tm1VV" id="2J$kxDHVpwA" role="1B3o_S" />
-      <node concept="3uibUv" id="2J$kxDHVpJI" role="1zkMxy">
-        <ref role="3uigEE" node="36tQV5AoEKJ" resolve="RuleTemplateImpl.Token" />
+      <node concept="3uibUv" id="6R6MIbU1r50" role="1zkMxy">
+        <ref role="3uigEE" node="36tQV5AxhJd" resolve="__Template.Token" />
       </node>
     </node>
   </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 52a5a6f6..2da0f24b 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -363,13 +363,6 @@
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="ng" index="3oM_SD">
@@ -3458,10 +3451,10 @@
       </node>
       <node concept="A3Dl8" id="6fdr4UgfxqC" role="3clF45">
         <node concept="3uibUv" id="1ffsG7c4ezn" role="A3Ik2">
-          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
           <node concept="3qUE_q" id="7XdbJdyRKIf" role="11_B2D">
             <node concept="3uibUv" id="7XdbJdyRMGp" role="3qUE_r">
-              <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+              <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
             </node>
           </node>
         </node>
@@ -3473,10 +3466,10 @@
             <property role="TrG5h" value="result" />
             <node concept="_YKpA" id="12yN8DyvAUd" role="1tU5fm">
               <node concept="3uibUv" id="6tPOoeTaEit" role="_ZDj9">
-                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                 <node concept="3qUE_q" id="6tPOoeTaEiu" role="11_B2D">
                   <node concept="3uibUv" id="6tPOoeTaEiv" role="3qUE_r">
-                    <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                    <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                   </node>
                 </node>
               </node>
@@ -3484,10 +3477,10 @@
             <node concept="2ShNRf" id="12yN8DyvD8g" role="33vP2m">
               <node concept="Tc6Ow" id="12yN8DyvD72" role="2ShVmc">
                 <node concept="3uibUv" id="6tPOoeTaGDL" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                   <node concept="3qUE_q" id="6tPOoeTaGDM" role="11_B2D">
                     <node concept="3uibUv" id="6tPOoeTaGDN" role="3qUE_r">
-                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                     </node>
                   </node>
                 </node>
@@ -3619,10 +3612,10 @@
                     <property role="TrG5h" value="matching" />
                     <node concept="3vKaQO" id="12yN8DyD$_b" role="1tU5fm">
                       <node concept="3uibUv" id="7XdbJdyRSmQ" role="3O5elw">
-                        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                         <node concept="3qUE_q" id="7XdbJdyRSmR" role="11_B2D">
                           <node concept="3uibUv" id="7XdbJdyRSmS" role="3qUE_r">
-                            <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                            <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                           </node>
                         </node>
                       </node>
@@ -3680,10 +3673,10 @@
                   <node concept="3cpWsn" id="12yN8DyDOdM" role="1Duv9x">
                     <property role="TrG5h" value="tpl" />
                     <node concept="3uibUv" id="6tPOoeTaJl8" role="1tU5fm">
-                      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                       <node concept="3qUE_q" id="6tPOoeTaJl9" role="11_B2D">
                         <node concept="3uibUv" id="6tPOoeTaJla" role="3qUE_r">
-                          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                         </node>
                       </node>
                     </node>
@@ -3735,10 +3728,10 @@
       <property role="TrG5h" value="allRuleTemplatesWithNoInput" />
       <node concept="A3Dl8" id="5NuEpF1qn9B" role="3clF45">
         <node concept="3uibUv" id="7XdbJdyRWsv" role="A3Ik2">
-          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
           <node concept="3qUE_q" id="7XdbJdyRWsw" role="11_B2D">
             <node concept="3uibUv" id="7XdbJdyRWsx" role="3qUE_r">
-              <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+              <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
             </node>
           </node>
         </node>
@@ -3750,10 +3743,10 @@
             <property role="TrG5h" value="result" />
             <node concept="_YKpA" id="5NuEpF1qn9H" role="1tU5fm">
               <node concept="3uibUv" id="6tPOoeTaMF9" role="_ZDj9">
-                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                 <node concept="3qUE_q" id="6tPOoeTaMFa" role="11_B2D">
                   <node concept="3uibUv" id="6tPOoeTaMFb" role="3qUE_r">
-                    <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                    <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                   </node>
                 </node>
               </node>
@@ -3761,10 +3754,10 @@
             <node concept="2ShNRf" id="5NuEpF1qn9J" role="33vP2m">
               <node concept="Tc6Ow" id="5NuEpF1qn9K" role="2ShVmc">
                 <node concept="3uibUv" id="6tPOoeTaOFc" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                   <node concept="3qUE_q" id="6tPOoeTaOFd" role="11_B2D">
                     <node concept="3uibUv" id="6tPOoeTaOFe" role="3qUE_r">
-                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                     </node>
                   </node>
                 </node>
@@ -3780,10 +3773,10 @@
                 <property role="TrG5h" value="matching" />
                 <node concept="3vKaQO" id="5NuEpF1qnan" role="1tU5fm">
                   <node concept="3uibUv" id="6tPOoeTaQxm" role="3O5elw">
-                    <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                    <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                     <node concept="3qUE_q" id="6tPOoeTaQxn" role="11_B2D">
                       <node concept="3uibUv" id="6tPOoeTaQxo" role="3qUE_r">
-                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                       </node>
                     </node>
                   </node>
@@ -3815,10 +3808,10 @@
               <node concept="3cpWsn" id="5NuEpF1qnaO" role="1Duv9x">
                 <property role="TrG5h" value="tpl" />
                 <node concept="3uibUv" id="6tPOoeTaR5p" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                   <node concept="3qUE_q" id="6tPOoeTaR5q" role="11_B2D">
                     <node concept="3uibUv" id="6tPOoeTaR5r" role="3qUE_r">
-                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                     </node>
                   </node>
                 </node>
@@ -4066,10 +4059,10 @@
                     <property role="TrG5h" value="stageTemplate" />
                     <node concept="3vKaQO" id="4MqhgXUaPfW" role="1tU5fm">
                       <node concept="3uibUv" id="7XdbJdySsFg" role="3O5elw">
-                        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                         <node concept="3qUE_q" id="7XdbJdySsFh" role="11_B2D">
                           <node concept="3uibUv" id="7XdbJdySsFi" role="3qUE_r">
-                            <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                            <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                           </node>
                         </node>
                       </node>
@@ -4098,10 +4091,10 @@
                             <node concept="2ShNRf" id="4MqhgXUaPg9" role="37vLTx">
                               <node concept="Tc6Ow" id="4MqhgXUaPga" role="2ShVmc">
                                 <node concept="3uibUv" id="6tPOoeTaAOM" role="HW$YZ">
-                                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                                   <node concept="3qUE_q" id="6tPOoeTaAON" role="11_B2D">
                                     <node concept="3uibUv" id="6tPOoeTaAOO" role="3qUE_r">
-                                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                                     </node>
                                   </node>
                                 </node>
@@ -4164,10 +4157,10 @@
                             <ref role="3cqZAo" node="4MqhgXUaONz" resolve="ruleTemplate" />
                           </node>
                           <node concept="3uibUv" id="3IIf9OAyhfn" role="10QFUM">
-                            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                             <node concept="3qUE_q" id="3IIf9OAyXlP" role="11_B2D">
                               <node concept="3uibUv" id="3IIf9OAyXlQ" role="3qUE_r">
-                                <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                                <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                               </node>
                             </node>
                           </node>
@@ -4183,7 +4176,7 @@
                   <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
                   <node concept="3qUE_q" id="7XdbJdySBO2" role="11_B2D">
                     <node concept="3uibUv" id="7XdbJdySBO3" role="3qUE_r">
-                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                     </node>
                   </node>
                 </node>
@@ -4264,10 +4257,10 @@
         <node concept="3bZ5Sz" id="YGS68MZPLr" role="3rvQeY" />
         <node concept="3vKaQO" id="12yN8DyDzne" role="3rvSg0">
           <node concept="3uibUv" id="7XdbJdyRSXd" role="3O5elw">
-            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
             <node concept="3qUE_q" id="7XdbJdyRSXe" role="11_B2D">
               <node concept="3uibUv" id="7XdbJdyRSXf" role="3qUE_r">
-                <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
               </node>
             </node>
           </node>
@@ -4278,10 +4271,10 @@
           <node concept="3bZ5Sz" id="YGS68MZQMl" role="3rHrn6" />
           <node concept="3vKaQO" id="429xoypKEop" role="3rHtpV">
             <node concept="3uibUv" id="6tPOoeTa_2l" role="3O5elw">
-              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
               <node concept="3qUE_q" id="6tPOoeTa_2m" role="11_B2D">
                 <node concept="3uibUv" id="6tPOoeTa_2n" role="3qUE_r">
-                  <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                  <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                 </node>
               </node>
             </node>
@@ -8257,28 +8250,6 @@
               </node>
             </node>
             <node concept="3clFbH" id="6OXbTD$owiJ" role="3cqZAp" />
-            <node concept="3cpWs8" id="7WKNeR97HMt" role="3cqZAp">
-              <node concept="3cpWsn" id="7WKNeR97HMu" role="3cpWs9">
-                <property role="TrG5h" value="handlerFqNames" />
-                <property role="3TUv4t" value="true" />
-                <node concept="2hMVRd" id="7WKNeR97HL8" role="1tU5fm">
-                  <node concept="17QB3L" id="7WKNeR97HLb" role="2hN53Y" />
-                </node>
-                <node concept="2ShNRf" id="7WKNeR97HMv" role="33vP2m">
-                  <node concept="2i4dXS" id="7WKNeR97HMw" role="2ShVmc">
-                    <node concept="17QB3L" id="7WKNeR97HMx" role="HW$YZ" />
-                    <node concept="2OqwBi" id="7WKNeR97HMy" role="I$8f6">
-                      <node concept="2GrUjf" id="7WKNeR97HMz" role="2Oq$k0">
-                        <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
-                      </node>
-                      <node concept="liA8E" id="7WKNeR97HM$" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:6OXbTD$iO0E" resolve="usedHandlersFqNames" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
             <node concept="3cpWs8" id="6OXbTD$o4WA" role="3cqZAp">
               <node concept="3cpWsn" id="6OXbTD$o4WB" role="3cpWs9">
                 <property role="TrG5h" value="index" />
@@ -8286,58 +8257,10 @@
                   <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
                 </node>
                 <node concept="2ShNRf" id="6OXbTD$o4WC" role="33vP2m">
-                  <node concept="YeOm9" id="6OXbTD$o4WD" role="2ShVmc">
-                    <node concept="1Y3b0j" id="6OXbTD$o4WE" role="YeSDq">
-                      <property role="2bfB8j" value="true" />
-                      <ref role="1Y3XeK" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
-                      <ref role="37wK5l" node="7P_FdVPIH2n" resolve="RuleTemplateIndex" />
-                      <node concept="3Tm1VV" id="6OXbTD$o4WF" role="1B3o_S" />
-                      <node concept="37vLTw" id="6OXbTD$o4WG" role="37wK5m">
-                        <ref role="3cqZAo" node="7WKNeR96eOL" resolve="manifests" />
-                      </node>
-                      <node concept="3clFb_" id="6OXbTD$o4WH" role="jymVt">
-                        <property role="TrG5h" value="acceptRulesListTemplate" />
-                        <property role="1EzhhJ" value="false" />
-                        <node concept="37vLTG" id="6OXbTD$o4WI" role="3clF46">
-                          <property role="TrG5h" value="ht" />
-                          <node concept="3uibUv" id="6OXbTD$o4WJ" role="1tU5fm">
-                            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RulesListTemplate" />
-                          </node>
-                        </node>
-                        <node concept="10P_77" id="6OXbTD$o4WK" role="3clF45" />
-                        <node concept="3Tmbuc" id="6OXbTD$o4WL" role="1B3o_S" />
-                        <node concept="3clFbS" id="6OXbTD$o4WM" role="3clF47">
-                          <node concept="1X3_iC" id="6OXbTD$o4WN" role="lGtFl">
-                            <property role="3V$3am" value="statement" />
-                            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                            <node concept="3clFbF" id="6OXbTD$o4WO" role="8Wnug">
-                              <node concept="2OqwBi" id="6OXbTD$o4WP" role="3clFbG">
-                                <node concept="37vLTw" id="6OXbTD$o4WQ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7WKNeR97HMu" resolve="handlerFqNames" />
-                                </node>
-                                <node concept="3JPx81" id="6OXbTD$o4WR" role="2OqNvi">
-                                  <node concept="2OqwBi" id="6OXbTD$o4WS" role="25WWJ7">
-                                    <node concept="37vLTw" id="6OXbTD$o4WT" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6OXbTD$o4WI" resolve="ht" />
-                                    </node>
-                                    <node concept="liA8E" id="6OXbTD$o4WU" role="2OqNvi">
-                                      <ref role="37wK5l" to="i348:7P_FdVQoZmr" resolve="fqName" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbF" id="6OXbTD$o4WV" role="3cqZAp">
-                            <node concept="3clFbT" id="6OXbTD$o4WW" role="3clFbG">
-                              <property role="3clFbU" value="true" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2AHcQZ" id="6OXbTD$o4WX" role="2AJF6D">
-                          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                        </node>
-                      </node>
+                  <node concept="1pGfFk" id="6R6MIbUsnIh" role="2ShVmc">
+                    <ref role="37wK5l" node="7P_FdVPIH2n" resolve="RuleTemplateIndex" />
+                    <node concept="37vLTw" id="6OXbTD$o4WG" role="37wK5m">
+                      <ref role="3cqZAo" node="7WKNeR96eOL" resolve="manifests" />
                     </node>
                   </node>
                 </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index 79699423..d2279808 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -320,9 +320,6 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
-        <child id="1144104376918" name="parameter" index="1xVPHs" />
-      </concept>
       <concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
@@ -336,7 +333,6 @@
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
-      <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
       <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
         <child id="1145567471833" name="createdType" index="2T96Bj" />
@@ -347,7 +343,6 @@
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
-      <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144195091934" name="jetbrains.mps.lang.smodel.structure.Node_IsRoleOperation" flags="nn" index="1BlSNk">
         <reference id="1144195362400" name="conceptOfParent" index="1BmUXE" />
         <reference id="1144195396777" name="linkInParent" index="1Bn3mz" />
@@ -5649,9 +5644,9 @@
       <node concept="37vLTG" id="5ntLU8GlSnJ" role="3clF46">
         <property role="TrG5h" value="tpl" />
         <node concept="3uibUv" id="1ffsG7c51iR" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
           <node concept="16syzq" id="7XdbJdyQi3s" role="11_B2D">
-            <ref role="16sUi3" node="7XdbJdyQdwM" resolve="Token" />
+            <ref role="16sUi3" node="7XdbJdyQdwM" resolve="T" />
           </node>
         </node>
       </node>
@@ -5679,6 +5674,9 @@
                     <node concept="37vLTw" id="7XdbJdyLAMJ" role="37wK5m">
                       <ref role="3cqZAo" node="5ntLU8GlSnL" resolve="node" />
                     </node>
+                    <node concept="37vLTw" id="7DvO2MaieSB" role="37wK5m">
+                      <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="applicationSession" />
+                    </node>
                     <node concept="2ShNRf" id="7XdbJdyLCh3" role="37wK5m">
                       <node concept="Tc6Ow" id="7XdbJdyLDeJ" role="2ShVmc">
                         <node concept="3uibUv" id="7XdbJdyLDvC" role="HW$YZ">
@@ -5697,8 +5695,8 @@
                       </node>
                       <node concept="37vLTG" id="7XdbJdyLDP7" role="1bW2Oz">
                         <property role="TrG5h" value="token" />
-                        <node concept="3uibUv" id="7XdbJdyLEet" role="1tU5fm">
-                          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                        <node concept="16syzq" id="6R6MIbURx8Q" role="1tU5fm">
+                          <ref role="16sUi3" node="7XdbJdyQdwM" resolve="T" />
                         </node>
                       </node>
                       <node concept="3clFbS" id="7XdbJdyLDL6" role="1bW5cS">
@@ -5714,9 +5712,6 @@
                                 </node>
                                 <node concept="liA8E" id="7XdbJdyLNxU" role="2OqNvi">
                                   <ref role="37wK5l" to="i348:2RRx4MZ6CCe" resolve="apply" />
-                                  <node concept="37vLTw" id="7DvO2MaieSB" role="37wK5m">
-                                    <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="applicationSession" />
-                                  </node>
                                 </node>
                               </node>
                             </node>
@@ -5877,9 +5872,9 @@
         </node>
       </node>
       <node concept="16euLQ" id="7XdbJdyQdwM" role="16eVyc">
-        <property role="TrG5h" value="Token" />
+        <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="7XdbJdyQhEU" role="3ztrMU">
-          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
         </node>
       </node>
     </node>
@@ -5892,7 +5887,7 @@
         <node concept="3uibUv" id="6OXbTDybcP0" role="1tU5fm">
           <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
           <node concept="16syzq" id="6OXbTDybqOL" role="11_B2D">
-            <ref role="16sUi3" node="6OXbTDyaL_y" resolve="Token" />
+            <ref role="16sUi3" node="6OXbTDyaL_y" resolve="T" />
           </node>
         </node>
       </node>
@@ -5907,25 +5902,6 @@
       <node concept="3clFbS" id="6OXbTDyaL$2" role="3clF47">
         <node concept="SfApY" id="6OXbTDyaL$3" role="3cqZAp">
           <node concept="3clFbS" id="6OXbTDyaL$4" role="SfCbr">
-            <node concept="3cpWs8" id="6OXbTDycgwD" role="3cqZAp">
-              <node concept="3cpWsn" id="6OXbTDycgwE" role="3cpWs9">
-                <property role="TrG5h" value="newToken" />
-                <node concept="16syzq" id="6OXbTDycgwC" role="1tU5fm">
-                  <ref role="16sUi3" node="6OXbTDyaL_y" resolve="Token" />
-                </node>
-                <node concept="2OqwBi" id="6OXbTDycgwF" role="33vP2m">
-                  <node concept="37vLTw" id="6OXbTDyhhGJ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="6OXbTDyaLzX" resolve="tpl" />
-                  </node>
-                  <node concept="liA8E" id="6OXbTDycgwH" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:6tPOoeT3pU7" resolve="newToken" />
-                    <node concept="37vLTw" id="6OXbTDycgwJ" role="37wK5m">
-                      <ref role="3cqZAo" node="6OXbTDycbjU" resolve="parameter" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
             <node concept="3cpWs8" id="6OXbTDycmTi" role="3cqZAp">
               <node concept="3cpWsn" id="6OXbTDycmTj" role="3cpWs9">
                 <property role="TrG5h" value="builders" />
@@ -5935,14 +5911,29 @@
                   </node>
                 </node>
                 <node concept="2OqwBi" id="6OXbTDycmTk" role="33vP2m">
-                  <node concept="37vLTw" id="6OXbTDycmTl" role="2Oq$k0">
-                    <ref role="3cqZAo" node="6OXbTDycgwE" resolve="newToken" />
+                  <node concept="1eOMI4" id="6R6MIbUuWzx" role="2Oq$k0">
+                    <node concept="2OqwBi" id="6R6MIbUuWzq" role="1eOMHV">
+                      <node concept="2OqwBi" id="6R6MIbUuWzr" role="2Oq$k0">
+                        <node concept="37vLTw" id="6R6MIbUuWzs" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6OXbTDyaLzX" resolve="tpl" />
+                        </node>
+                        <node concept="liA8E" id="6R6MIbUuWzt" role="2OqNvi">
+                          <ref role="37wK5l" to="i348:5itBwM78vMu" resolve="createToken" />
+                          <node concept="37vLTw" id="6R6MIbUuWzu" role="37wK5m">
+                            <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="applicationSession" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="6R6MIbUuWzv" role="2OqNvi">
+                        <ref role="37wK5l" to="i348:5itBwM86qEL" resolve="withParam" />
+                        <node concept="37vLTw" id="6R6MIbUuWzw" role="37wK5m">
+                          <ref role="3cqZAo" node="6OXbTDycbjU" resolve="parameter" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
                   <node concept="liA8E" id="6OXbTDycmTm" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:mJ_D14woVW" resolve="apply" />
-                    <node concept="37vLTw" id="6OXbTDycmTn" role="37wK5m">
-                      <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="applicationSession" />
-                    </node>
+                    <ref role="37wK5l" to="i348:6R6MIbUcYSn" resolve="apply" />
                   </node>
                 </node>
               </node>
@@ -6033,9 +6024,9 @@
         </node>
       </node>
       <node concept="16euLQ" id="6OXbTDyaL_y" role="16eVyc">
-        <property role="TrG5h" value="Token" />
-        <node concept="3uibUv" id="6OXbTDyblTM" role="3ztrMU">
-          <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="6R6MIbUdgwE" role="3ztrMU">
+          <ref role="3uigEE" to="i348:6R6MIbU8M46" resolve="QueryTemplate.Token" />
         </node>
       </node>
     </node>
@@ -6045,9 +6036,9 @@
       <node concept="37vLTG" id="7XdbJdyNeFb" role="3clF46">
         <property role="TrG5h" value="tpl" />
         <node concept="3uibUv" id="7XdbJdyNeFc" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
           <node concept="16syzq" id="7XdbJdyQuae" role="11_B2D">
-            <ref role="16sUi3" node="7XdbJdyQn2x" resolve="Token" />
+            <ref role="16sUi3" node="7XdbJdyQn2x" resolve="T" />
           </node>
         </node>
       </node>
@@ -6081,6 +6072,9 @@
                 <node concept="37vLTw" id="7XdbJdyNlwY" role="37wK5m">
                   <ref role="3cqZAo" node="7XdbJdyNeFd" resolve="node" />
                 </node>
+                <node concept="37vLTw" id="6R6MIbUSQ10" role="37wK5m">
+                  <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="applicationSession" />
+                </node>
                 <node concept="2ShNRf" id="7XdbJdyNlwZ" role="37wK5m">
                   <node concept="Tc6Ow" id="7kTeLbQlGXX" role="2ShVmc">
                     <node concept="3Tqbb2" id="7kTeLbQlGXZ" role="HW$YZ" />
@@ -6095,240 +6089,74 @@
                   </node>
                   <node concept="37vLTG" id="7XdbJdyNlx6" role="1bW2Oz">
                     <property role="TrG5h" value="token" />
-                    <node concept="3uibUv" id="7XdbJdyNlx7" role="1tU5fm">
-                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                    <node concept="3uibUv" id="6R6MIbUessc" role="1tU5fm">
+                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                     </node>
                   </node>
                   <node concept="3clFbS" id="7XdbJdyNlx8" role="1bW5cS">
-                    <node concept="3clFbJ" id="7kTeLbQiXFV" role="3cqZAp">
-                      <node concept="3clFbS" id="7kTeLbQiXFX" role="3clFbx">
-                        <node concept="1X3_iC" id="6tPOoeSEcF$" role="lGtFl">
-                          <property role="3V$3am" value="statement" />
-                          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                          <node concept="3clFbF" id="7XdbJdyNlxa" role="8Wnug">
-                            <node concept="2OqwBi" id="7XdbJdyNlxb" role="3clFbG">
-                              <node concept="37vLTw" id="7XdbJdyNlxc" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7XdbJdyNlx3" resolve="req" />
-                              </node>
-                              <node concept="X8dFx" id="7XdbJdyNlxd" role="2OqNvi">
-                                <node concept="2OqwBi" id="7XdbJdyNlxe" role="25WWJ7">
-                                  <node concept="37vLTw" id="7XdbJdyNlxf" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7XdbJdyNlx6" resolve="token" />
-                                  </node>
-                                  <node concept="liA8E" id="7XdbJdyNlxg" role="2OqNvi">
-                                    <ref role="37wK5l" to="i348:2RRx4MZ6CC4" resolve="requiredNodes" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
+                    <node concept="3clFbH" id="6R6MIbUT6Hc" role="3cqZAp" />
+                    <node concept="3clFbF" id="4vBwiiV93PW" role="3cqZAp">
+                      <node concept="2OqwBi" id="4vBwiiV9a97" role="3clFbG">
+                        <node concept="37vLTw" id="4vBwiiV93PU" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7XdbJdyNlx3" resolve="req" />
                         </node>
-                        <node concept="3clFbH" id="5lxnBcU9jKE" role="3cqZAp" />
-                        <node concept="1X3_iC" id="6tPOoeSEimQ" role="lGtFl">
-                          <property role="3V$3am" value="statement" />
-                          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                          <node concept="3clFbF" id="61wrp1Ja3bW" role="8Wnug">
-                            <node concept="2OqwBi" id="61wrp1Ja3bX" role="3clFbG">
-                              <node concept="37vLTw" id="61wrp1Ja3bY" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7XdbJdyNlx3" resolve="req" />
-                              </node>
-                              <node concept="X8dFx" id="61wrp1Ja3bZ" role="2OqNvi">
-                                <node concept="2OqwBi" id="61wrp1Ja3c0" role="25WWJ7">
-                                  <node concept="2OqwBi" id="61wrp1Ja3c1" role="2Oq$k0">
-                                    <node concept="37vLTw" id="61wrp1Ja3c2" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7XdbJdyNlx6" resolve="token" />
-                                    </node>
-                                    <node concept="liA8E" id="61wrp1Ja3c3" role="2OqNvi">
-                                      <ref role="37wK5l" to="i348:2RRx4MZ6CC4" resolve="requiredNodes" />
-                                    </node>
-                                  </node>
-                                  <node concept="3goQfb" id="61wrp1Ja3c4" role="2OqNvi">
-                                    <node concept="1bVj0M" id="61wrp1Ja3c5" role="23t8la">
-                                      <node concept="3clFbS" id="61wrp1Ja3c6" role="1bW5cS">
-                                        <node concept="3clFbF" id="4vBwiiV8XA_" role="3cqZAp">
-                                          <node concept="2OqwBi" id="61wrp1Jb9EN" role="3clFbG">
-                                            <node concept="2OqwBi" id="61wrp1JaY1y" role="2Oq$k0">
-                                              <node concept="37vLTw" id="61wrp1JaTVz" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="61wrp1Ja3cc" resolve="it" />
-                                              </node>
-                                              <node concept="2z74zc" id="61wrp1Jb3M4" role="2OqNvi" />
-                                            </node>
-                                            <node concept="3$u5V9" id="61wrp1JbfxI" role="2OqNvi">
-                                              <node concept="1bVj0M" id="61wrp1JbfxK" role="23t8la">
-                                                <node concept="3clFbS" id="61wrp1JbfxL" role="1bW5cS">
-                                                  <node concept="3clFbF" id="61wrp1JboA4" role="3cqZAp">
-                                                    <node concept="2OqwBi" id="61wrp1JbsBz" role="3clFbG">
-                                                      <node concept="37vLTw" id="61wrp1JboA3" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="61wrp1JbfxM" resolve="ref" />
-                                                      </node>
-                                                      <node concept="2ZHEkA" id="61wrp1JbxMb" role="2OqNvi" />
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                                <node concept="Rh6nW" id="61wrp1JbfxM" role="1bW2Oz">
-                                                  <property role="TrG5h" value="ref" />
-                                                  <node concept="2jxLKc" id="61wrp1JbfxN" role="1tU5fm" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="Rh6nW" id="61wrp1Ja3cc" role="1bW2Oz">
-                                        <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="61wrp1Ja3cd" role="1tU5fm" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbH" id="5lxnBcU9jKP" role="3cqZAp" />
-                        <node concept="3clFbF" id="4vBwiiV93PW" role="3cqZAp">
-                          <node concept="2OqwBi" id="4vBwiiV9a97" role="3clFbG">
-                            <node concept="37vLTw" id="4vBwiiV93PU" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7XdbJdyNlx3" resolve="req" />
-                            </node>
-                            <node concept="X8dFx" id="4vBwiiV9gaM" role="2OqNvi">
-                              <node concept="37vLTw" id="4vBwiiV9kvj" role="25WWJ7">
-                                <ref role="3cqZAo" node="4vBwiiV8GXc" resolve="requiredNodes" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbH" id="4vBwiiV9oEo" role="3cqZAp" />
-                        <node concept="3clFbF" id="4vBwiiV9z4v" role="3cqZAp">
-                          <node concept="2OqwBi" id="4vBwiiV9CYL" role="3clFbG">
-                            <node concept="37vLTw" id="4vBwiiV9z4t" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7XdbJdyNlx3" resolve="req" />
-                            </node>
-                            <node concept="X8dFx" id="4vBwiiV9J_N" role="2OqNvi">
-                              <node concept="2OqwBi" id="4vBwiiV9WcB" role="25WWJ7">
-                                <node concept="37vLTw" id="4vBwiiV9PDZ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4vBwiiV8GXc" resolve="requiredNodes" />
-                                </node>
-                                <node concept="3goQfb" id="4vBwiiVa1qZ" role="2OqNvi">
-                                  <node concept="1bVj0M" id="4vBwiiVa1r0" role="23t8la">
-                                    <node concept="3clFbS" id="4vBwiiVa1r1" role="1bW5cS">
-                                      <node concept="3clFbF" id="4vBwiiVa1r2" role="3cqZAp">
-                                        <node concept="2OqwBi" id="4vBwiiVa1r3" role="3clFbG">
-                                          <node concept="2OqwBi" id="4vBwiiVa1r4" role="2Oq$k0">
-                                            <node concept="37vLTw" id="4vBwiiVa1r5" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="4vBwiiVa1rg" resolve="it" />
-                                            </node>
-                                            <node concept="2z74zc" id="4vBwiiVa1r6" role="2OqNvi" />
-                                          </node>
-                                          <node concept="3$u5V9" id="4vBwiiVa1r7" role="2OqNvi">
-                                            <node concept="1bVj0M" id="4vBwiiVa1r8" role="23t8la">
-                                              <node concept="3clFbS" id="4vBwiiVa1r9" role="1bW5cS">
-                                                <node concept="3clFbF" id="4vBwiiVa1ra" role="3cqZAp">
-                                                  <node concept="2OqwBi" id="4vBwiiVa1rb" role="3clFbG">
-                                                    <node concept="37vLTw" id="4vBwiiVa1rc" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="4vBwiiVa1re" resolve="ref" />
-                                                    </node>
-                                                    <node concept="2ZHEkA" id="4vBwiiVa1rd" role="2OqNvi" />
-                                                  </node>
-                                                </node>
-                                              </node>
-                                              <node concept="Rh6nW" id="4vBwiiVa1re" role="1bW2Oz">
-                                                <property role="TrG5h" value="ref" />
-                                                <node concept="2jxLKc" id="4vBwiiVa1rf" role="1tU5fm" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="Rh6nW" id="4vBwiiVa1rg" role="1bW2Oz">
-                                      <property role="TrG5h" value="it" />
-                                      <node concept="2jxLKc" id="4vBwiiVa1rh" role="1tU5fm" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbH" id="5lxnBcU9jL1" role="3cqZAp" />
-                        <node concept="3SKdUt" id="7n0CLM0i47p" role="3cqZAp">
-                          <node concept="1PaTwC" id="589APehYxQN" role="3ndbpf">
-                            <node concept="3oM_SD" id="589APehYxQO" role="1PaTwD">
-                              <property role="3oM_SC" value="FIXME:" />
-                            </node>
-                            <node concept="3oM_SD" id="589APehYxQP" role="1PaTwD">
-                              <property role="3oM_SC" value="treat" />
-                            </node>
-                            <node concept="3oM_SD" id="589APehYxQQ" role="1PaTwD">
-                              <property role="3oM_SC" value="all" />
-                            </node>
-                            <node concept="3oM_SD" id="589APehYxQR" role="1PaTwD">
-                              <property role="3oM_SC" value="type" />
-                            </node>
-                            <node concept="3oM_SD" id="589APehYxQS" role="1PaTwD">
-                              <property role="3oM_SC" value="node's" />
-                            </node>
-                            <node concept="3oM_SD" id="589APehYxQT" role="1PaTwD">
-                              <property role="3oM_SC" value="descendants" />
-                            </node>
-                            <node concept="3oM_SD" id="589APehYxQU" role="1PaTwD">
-                              <property role="3oM_SC" value="as" />
-                            </node>
-                            <node concept="3oM_SD" id="589APehYxQV" role="1PaTwD">
-                              <property role="3oM_SC" value="required" />
-                            </node>
-                            <node concept="3oM_SD" id="589APehYxQW" role="1PaTwD">
-                              <property role="3oM_SC" value="nodes" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="1X3_iC" id="6hqFpWnwuIs" role="lGtFl">
-                          <property role="3V$3am" value="statement" />
-                          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                          <node concept="3clFbF" id="1Y1WZtYxnyU" role="8Wnug">
-                            <node concept="2OqwBi" id="1Y1WZtYxt_c" role="3clFbG">
-                              <node concept="37vLTw" id="1Y1WZtYxnyS" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7XdbJdyNlx3" resolve="req" />
-                              </node>
-                              <node concept="X8dFx" id="1Y1WZtYxziB" role="2OqNvi">
-                                <node concept="2OqwBi" id="1Y1WZtYxGKc" role="25WWJ7">
-                                  <node concept="2OqwBi" id="1Y1WZtYxBeX" role="2Oq$k0">
-                                    <node concept="37vLTw" id="1Y1WZtYxBeY" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7XdbJdyNlx6" resolve="token" />
-                                    </node>
-                                    <node concept="liA8E" id="1Y1WZtYxBeZ" role="2OqNvi">
-                                      <ref role="37wK5l" to="i348:2RRx4MZ6CC4" resolve="requiredNodes" />
-                                    </node>
-                                  </node>
-                                  <node concept="3goQfb" id="1Y1WZtYxLtp" role="2OqNvi">
-                                    <node concept="1bVj0M" id="1Y1WZtYxLtr" role="23t8la">
-                                      <node concept="3clFbS" id="1Y1WZtYxLts" role="1bW5cS">
-                                        <node concept="3clFbF" id="1Y1WZtYxPTg" role="3cqZAp">
-                                          <node concept="2OqwBi" id="1Y1WZtYxTTB" role="3clFbG">
-                                            <node concept="37vLTw" id="1Y1WZtYxPTf" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="1Y1WZtYxLtt" resolve="it" />
-                                            </node>
-                                            <node concept="2Rf3mk" id="1Y1WZtYxZ5R" role="2OqNvi">
-                                              <node concept="1xIGOp" id="1Y1WZtYyoBF" role="1xVPHs" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="Rh6nW" id="1Y1WZtYxLtt" role="1bW2Oz">
-                                        <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="1Y1WZtYxLtu" role="1tU5fm" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
+                        <node concept="X8dFx" id="4vBwiiV9gaM" role="2OqNvi">
+                          <node concept="37vLTw" id="4vBwiiV9kvj" role="25WWJ7">
+                            <ref role="3cqZAo" node="4vBwiiV8GXc" resolve="requiredNodes" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbT" id="3c$Di5Or0qw" role="3clFbw">
-                        <property role="3clFbU" value="true" />
+                    </node>
+                    <node concept="3clFbF" id="4vBwiiV9z4v" role="3cqZAp">
+                      <node concept="2OqwBi" id="4vBwiiV9CYL" role="3clFbG">
+                        <node concept="37vLTw" id="4vBwiiV9z4t" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7XdbJdyNlx3" resolve="req" />
+                        </node>
+                        <node concept="X8dFx" id="4vBwiiV9J_N" role="2OqNvi">
+                          <node concept="2OqwBi" id="4vBwiiV9WcB" role="25WWJ7">
+                            <node concept="37vLTw" id="4vBwiiV9PDZ" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4vBwiiV8GXc" resolve="requiredNodes" />
+                            </node>
+                            <node concept="3goQfb" id="4vBwiiVa1qZ" role="2OqNvi">
+                              <node concept="1bVj0M" id="4vBwiiVa1r0" role="23t8la">
+                                <node concept="3clFbS" id="4vBwiiVa1r1" role="1bW5cS">
+                                  <node concept="3clFbF" id="4vBwiiVa1r2" role="3cqZAp">
+                                    <node concept="2OqwBi" id="4vBwiiVa1r3" role="3clFbG">
+                                      <node concept="2OqwBi" id="4vBwiiVa1r4" role="2Oq$k0">
+                                        <node concept="37vLTw" id="4vBwiiVa1r5" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="4vBwiiVa1rg" resolve="it" />
+                                        </node>
+                                        <node concept="2z74zc" id="4vBwiiVa1r6" role="2OqNvi" />
+                                      </node>
+                                      <node concept="3$u5V9" id="4vBwiiVa1r7" role="2OqNvi">
+                                        <node concept="1bVj0M" id="4vBwiiVa1r8" role="23t8la">
+                                          <node concept="3clFbS" id="4vBwiiVa1r9" role="1bW5cS">
+                                            <node concept="3clFbF" id="4vBwiiVa1ra" role="3cqZAp">
+                                              <node concept="2OqwBi" id="4vBwiiVa1rb" role="3clFbG">
+                                                <node concept="37vLTw" id="4vBwiiVa1rc" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="4vBwiiVa1re" resolve="ref" />
+                                                </node>
+                                                <node concept="2ZHEkA" id="4vBwiiVa1rd" role="2OqNvi" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="Rh6nW" id="4vBwiiVa1re" role="1bW2Oz">
+                                            <property role="TrG5h" value="ref" />
+                                            <node concept="2jxLKc" id="4vBwiiVa1rf" role="1tU5fm" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="Rh6nW" id="4vBwiiVa1rg" role="1bW2Oz">
+                                  <property role="TrG5h" value="it" />
+                                  <node concept="2jxLKc" id="4vBwiiVa1rh" role="1tU5fm" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                     <node concept="3clFbF" id="7XdbJdyTmDa" role="3cqZAp">
@@ -6350,9 +6178,9 @@
         </node>
       </node>
       <node concept="16euLQ" id="7XdbJdyQn2x" role="16eVyc">
-        <property role="TrG5h" value="Token" />
-        <node concept="3uibUv" id="7XdbJdyQqdA" role="3ztrMU">
-          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="6R6MIbUenbg" role="3ztrMU">
+          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
         </node>
       </node>
     </node>
@@ -6364,10 +6192,10 @@
         <property role="TrG5h" value="tpls" />
         <node concept="A3Dl8" id="tIwzd1I3Xn" role="1tU5fm">
           <node concept="3uibUv" id="6tPOoeTdbj8" role="A3Ik2">
-            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
             <node concept="3qUE_q" id="6tPOoeTdbj9" role="11_B2D">
               <node concept="3uibUv" id="6tPOoeTdbja" role="3qUE_r">
-                <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
               </node>
             </node>
           </node>
@@ -6525,10 +6353,10 @@
                   <node concept="3cpWsn" id="4MqhgXUBzFo" role="3cpWs9">
                     <property role="TrG5h" value="template" />
                     <node concept="3uibUv" id="4MqhgXUBzF7" role="1tU5fm">
-                      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                       <node concept="3qUE_q" id="7XdbJdyRy2h" role="11_B2D">
                         <node concept="3uibUv" id="7XdbJdyRyYU" role="3qUE_r">
-                          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                         </node>
                       </node>
                     </node>
@@ -7163,10 +6991,10 @@
           <node concept="3cpWsn" id="tIwzd1I3Xj" role="1Duv9x">
             <property role="TrG5h" value="tpl" />
             <node concept="3uibUv" id="6tPOoeTdcfx" role="1tU5fm">
-              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
               <node concept="3qUE_q" id="6tPOoeTdcfy" role="11_B2D">
                 <node concept="3uibUv" id="6tPOoeTdcfz" role="3qUE_r">
-                  <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                  <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                 </node>
               </node>
             </node>
@@ -7665,10 +7493,10 @@
               <property role="TrG5h" value="tpls" />
               <node concept="A3Dl8" id="5ntLU8GlzSt" role="1tU5fm">
                 <node concept="3uibUv" id="1ffsG7c5hrm" role="A3Ik2">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                   <node concept="3qUE_q" id="7XdbJdyRI0u" role="11_B2D">
                     <node concept="3uibUv" id="7XdbJdyRId5" role="3qUE_r">
-                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                     </node>
                   </node>
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index 13d6215f..5cccd9d8 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -695,7 +695,7 @@
               <node concept="3cpWsn" id="1CcQBrPeqBu" role="3cpWs9">
                 <property role="TrG5h" value="template" />
                 <node concept="3uibUv" id="3IIf9OADWM$" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
                   <node concept="3qTvmN" id="3IIf9OADXsN" role="11_B2D" />
                 </node>
                 <node concept="37vLTw" id="6tPOoeTdjBM" role="33vP2m">
@@ -714,7 +714,7 @@
                     <ref role="3cqZAo" node="1CcQBrPeqBu" resolve="template" />
                   </node>
                   <node concept="liA8E" id="6i42QSsgfqW" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:62MNP_kY8lD" resolve="templateRef" />
+                    <ref role="37wK5l" to="i348:62MNP_kY8lD" resolve="getTemplateRef" />
                   </node>
                 </node>
               </node>
@@ -767,10 +767,10 @@
           <node concept="3cpWsn" id="3YJ7yg2N2M5" role="1Duv9x">
             <property role="TrG5h" value="tpl" />
             <node concept="3uibUv" id="1ffsG7c4ezn" role="1tU5fm">
-              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstraceRuleTemplate" />
               <node concept="3qUE_q" id="7XdbJdyRKIf" role="11_B2D">
                 <node concept="3uibUv" id="7XdbJdyRMGp" role="3qUE_r">
-                  <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+                  <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                 </node>
               </node>
             </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 55570169..5ed988d0 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -1726,25 +1726,6 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3cpWs8" id="7WKNeR9_f8v" role="3cqZAp">
-                    <node concept="3cpWsn" id="7WKNeR9_f8w" role="3cpWs9">
-                      <property role="TrG5h" value="queryObserver" />
-                      <node concept="3uibUv" id="7WKNeR9_f8t" role="1tU5fm">
-                        <ref role="3uigEE" to="18ew:~Reference" resolve="Reference" />
-                        <node concept="3uibUv" id="7WKNeR9_g2W" role="11_B2D">
-                          <ref role="3uigEE" to="i348:7P_FdVQ_jCo" resolve="QueryTemplate.QueryObserver" />
-                        </node>
-                      </node>
-                      <node concept="2ShNRf" id="7WKNeR9_m1_" role="33vP2m">
-                        <node concept="1pGfFk" id="7WKNeR9_lXk" role="2ShVmc">
-                          <ref role="37wK5l" to="18ew:~Reference.&lt;init&gt;()" resolve="Reference" />
-                          <node concept="3uibUv" id="7WKNeR9_lXl" role="1pMfVU">
-                            <ref role="3uigEE" to="i348:7P_FdVQ_jCo" resolve="QueryTemplate.QueryObserver" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3cpWs8" id="7WKNeR9zcC9" role="3cqZAp">
                     <node concept="3cpWsn" id="7WKNeR9zcCa" role="3cpWs9">
                       <property role="TrG5h" value="queryConfig" />
@@ -1759,43 +1740,6 @@
                           </node>
                           <node concept="liA8E" id="7WKNeR9$9EE" role="2OqNvi">
                             <ref role="37wK5l" to="i348:7P_FdVPsDM6" resolve="newQuery" />
-                            <node concept="2ShNRf" id="7WKNeR9$c6Q" role="37wK5m">
-                              <node concept="YeOm9" id="7WKNeR9$e5a" role="2ShVmc">
-                                <node concept="1Y3b0j" id="7WKNeR9$e5d" role="YeSDq">
-                                  <property role="2bfB8j" value="true" />
-                                  <ref role="1Y3XeK" to="i348:7P_FdVQ_k3b" resolve="QueryTemplate.QueryObservable" />
-                                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                                  <node concept="3Tm1VV" id="7WKNeR9$e5e" role="1B3o_S" />
-                                  <node concept="3clFb_" id="7WKNeR9$e5f" role="jymVt">
-                                    <property role="1EzhhJ" value="false" />
-                                    <property role="TrG5h" value="subscribe" />
-                                    <node concept="37vLTG" id="7WKNeR9$e5g" role="3clF46">
-                                      <property role="TrG5h" value="observer" />
-                                      <node concept="3uibUv" id="7WKNeR9$e5h" role="1tU5fm">
-                                        <ref role="3uigEE" to="i348:7P_FdVQ_jCo" resolve="QueryTemplate.QueryObserver" />
-                                      </node>
-                                    </node>
-                                    <node concept="3cqZAl" id="7WKNeR9$e5i" role="3clF45" />
-                                    <node concept="3Tm1VV" id="7WKNeR9$e5j" role="1B3o_S" />
-                                    <node concept="3clFbS" id="7WKNeR9$e5l" role="3clF47">
-                                      <node concept="3clFbF" id="7WKNeR9_oZD" role="3cqZAp">
-                                        <node concept="2OqwBi" id="7WKNeR9_pke" role="3clFbG">
-                                          <node concept="37vLTw" id="7WKNeR9_oZB" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
-                                          </node>
-                                          <node concept="liA8E" id="7WKNeR9_puh" role="2OqNvi">
-                                            <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object)" resolve="set" />
-                                            <node concept="37vLTw" id="7WKNeR9_pSd" role="37wK5m">
-                                              <ref role="3cqZAo" node="7WKNeR9$e5g" resolve="observer" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
                           </node>
                         </node>
                         <node concept="10Nm6u" id="7WKNeR9$atX" role="3K4GZi" />
@@ -2194,64 +2138,6 @@
                         </node>
                       </node>
                       <node concept="3clFbH" id="51a$_pPMPYj" role="3cqZAp" />
-                      <node concept="3SKdUt" id="19OC8ZSFpl" role="3cqZAp">
-                        <node concept="1PaTwC" id="19OC8ZSFpm" role="3ndbpf">
-                          <node concept="3oM_SD" id="19OC8ZSFpo" role="1PaTwD">
-                            <property role="3oM_SC" value="FIXME" />
-                          </node>
-                          <node concept="3oM_SD" id="19OC8ZSGbM" role="1PaTwD">
-                            <property role="3oM_SC" value="kill" />
-                          </node>
-                          <node concept="3oM_SD" id="19OC8ZSGXr" role="1PaTwD">
-                            <property role="3oM_SC" value="this" />
-                          </node>
-                          <node concept="3oM_SD" id="19OC8ZSGXv" role="1PaTwD">
-                            <property role="3oM_SC" value="nonsense" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbJ" id="7WKNeR9$rEF" role="3cqZAp">
-                        <node concept="3clFbS" id="7WKNeR9$rEG" role="3clFbx">
-                          <node concept="3clFbF" id="7WKNeR9$Mkw" role="3cqZAp">
-                            <node concept="2OqwBi" id="7WKNeR9$N7D" role="3clFbG">
-                              <node concept="2OqwBi" id="7WKNeR9_x9U" role="2Oq$k0">
-                                <node concept="37vLTw" id="7WKNeR9_qKx" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
-                                </node>
-                                <node concept="liA8E" id="7WKNeR9_ybk" role="2OqNvi">
-                                  <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="7WKNeR9$NVL" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:7P_FdVQ_jFm" resolve="onNext" />
-                                <node concept="37vLTw" id="7WKNeR9AuTl" role="37wK5m">
-                                  <ref role="3cqZAo" node="7WKNeR9AkUd" resolve="stage" />
-                                </node>
-                                <node concept="2OqwBi" id="7WKNeR9$Y1M" role="37wK5m">
-                                  <node concept="37vLTw" id="7WKNeR9$Xd$" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
-                                  </node>
-                                  <node concept="liA8E" id="7WKNeR9$YSO" role="2OqNvi">
-                                    <ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3y3z36" id="7WKNeR9$rEM" role="3clFbw">
-                          <node concept="10Nm6u" id="7WKNeR9$rEN" role="3uHU7w" />
-                          <node concept="2OqwBi" id="7WKNeR9_vhW" role="3uHU7B">
-                            <node concept="37vLTw" id="7WKNeR9_um5" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
-                            </node>
-                            <node concept="liA8E" id="7WKNeR9_waj" role="2OqNvi">
-                              <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="19OC8ZSDKz" role="3cqZAp" />
                       <node concept="3clFbF" id="19OC8ZSIFL" role="3cqZAp">
                         <node concept="37vLTI" id="19OC8ZSIFN" role="3clFbG">
                           <node concept="2OqwBi" id="2yEnwsh8A4I" role="37vLTx">
@@ -2370,56 +2256,6 @@
                           </node>
                         </node>
                         <node concept="3clFbH" id="19OC8ZSPgT" role="3cqZAp" />
-                        <node concept="3SKdUt" id="19OC8ZSOu2" role="3cqZAp">
-                          <node concept="1PaTwC" id="19OC8ZSOu3" role="3ndbpf">
-                            <node concept="3oM_SD" id="19OC8ZSOu4" role="1PaTwD">
-                              <property role="3oM_SC" value="FIXME" />
-                            </node>
-                            <node concept="3oM_SD" id="19OC8ZSOu5" role="1PaTwD">
-                              <property role="3oM_SC" value="kill" />
-                            </node>
-                            <node concept="3oM_SD" id="19OC8ZSOu6" role="1PaTwD">
-                              <property role="3oM_SC" value="this" />
-                            </node>
-                            <node concept="3oM_SD" id="19OC8ZSOu7" role="1PaTwD">
-                              <property role="3oM_SC" value="nonsense" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbJ" id="7WKNeR9$11B" role="3cqZAp">
-                          <node concept="3clFbS" id="7WKNeR9$11D" role="3clFbx">
-                            <node concept="3clFbF" id="7WKNeR9$kQ6" role="3cqZAp">
-                              <node concept="2OqwBi" id="7WKNeR9$lHy" role="3clFbG">
-                                <node concept="2OqwBi" id="7WKNeR9_BAK" role="2Oq$k0">
-                                  <node concept="37vLTw" id="7WKNeR9_AAA" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
-                                  </node>
-                                  <node concept="liA8E" id="7WKNeR9_Cwm" role="2OqNvi">
-                                    <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
-                                  </node>
-                                </node>
-                                <node concept="liA8E" id="7WKNeR9$mx1" role="2OqNvi">
-                                  <ref role="37wK5l" to="i348:7P_FdVQ_jU$" resolve="onFailure" />
-                                  <node concept="37vLTw" id="7WKNeR9$o3_" role="37wK5m">
-                                    <ref role="3cqZAo" node="19wqdqOkjcb" resolve="firstException" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3y3z36" id="7WKNeR9$jSU" role="3clFbw">
-                            <node concept="10Nm6u" id="7WKNeR9$jXg" role="3uHU7w" />
-                            <node concept="2OqwBi" id="7WKNeR9_$Ih" role="3uHU7B">
-                              <node concept="37vLTw" id="7WKNeR9_zLu" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
-                              </node>
-                              <node concept="liA8E" id="7WKNeR9__Ke" role="2OqNvi">
-                                <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbH" id="7WKNeR9$0ha" role="3cqZAp" />
                         <node concept="3clFbF" id="19OC8ZSUvn" role="3cqZAp">
                           <node concept="37vLTI" id="19OC8ZSW$t" role="3clFbG">
                             <node concept="2OqwBi" id="19OC8ZSZ2h" role="37vLTx">
@@ -2446,62 +2282,6 @@
                     </node>
                   </node>
                   <node concept="3clFbH" id="7WKNeR9zC9b" role="3cqZAp" />
-                  <node concept="3SKdUt" id="19OC8ZSqqV" role="3cqZAp">
-                    <node concept="1PaTwC" id="19OC8ZSqqW" role="3ndbpf">
-                      <node concept="3oM_SD" id="19OC8ZSqqY" role="1PaTwD">
-                        <property role="3oM_SC" value="FIXME" />
-                      </node>
-                      <node concept="3oM_SD" id="19OC8ZSs2T" role="1PaTwD">
-                        <property role="3oM_SC" value="kill" />
-                      </node>
-                      <node concept="3oM_SD" id="19OC8ZSvwP" role="1PaTwD">
-                        <property role="3oM_SC" value="this" />
-                      </node>
-                      <node concept="3oM_SD" id="19OC8ZSwic" role="1PaTwD">
-                        <property role="3oM_SC" value="nonsense" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbJ" id="7WKNeR9$wYz" role="3cqZAp">
-                    <node concept="3clFbS" id="7WKNeR9$wY$" role="3clFbx">
-                      <node concept="3clFbF" id="7WKNeR9$wY_" role="3cqZAp">
-                        <node concept="2OqwBi" id="7WKNeR9$wYA" role="3clFbG">
-                          <node concept="2OqwBi" id="7WKNeR9_Hb9" role="2Oq$k0">
-                            <node concept="37vLTw" id="7WKNeR9_Gar" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
-                            </node>
-                            <node concept="liA8E" id="7WKNeR9_I5L" role="2OqNvi">
-                              <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="7WKNeR9$wYC" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:7P_FdVQ_jLY" resolve="onCompleted" />
-                            <node concept="2OqwBi" id="3bpBM3QdvOL" role="37wK5m">
-                              <node concept="37vLTw" id="3bpBM3QdvOM" role="2Oq$k0">
-                                <ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
-                              </node>
-                              <node concept="liA8E" id="3bpBM3QdvON" role="2OqNvi">
-                                <ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3y3z36" id="7WKNeR9$wYE" role="3clFbw">
-                      <node concept="10Nm6u" id="7WKNeR9$wYF" role="3uHU7w" />
-                      <node concept="2OqwBi" id="7WKNeR9_El1" role="3uHU7B">
-                        <node concept="37vLTw" id="7WKNeR9_Dnc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
-                        </node>
-                        <node concept="liA8E" id="7WKNeR9_FeI" role="2OqNvi">
-                          <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="4jShfh67I32" role="3cqZAp" />
-                  <node concept="3clFbH" id="5gVsyvEP5R3" role="3cqZAp" />
                   <node concept="3cpWs6" id="19OC8ZSVvj" role="3cqZAp">
                     <node concept="37vLTw" id="19OC8ZSVvk" role="3cqZAk">
                       <ref role="3cqZAo" node="19OC8ZSz1h" resolve="outEff" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index e76581f0..41d04545 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -492,7 +492,7 @@
     </node>
   </node>
   <node concept="312cEu" id="1ffsG7bUbCM">
-    <property role="TrG5h" value="BaseRuleTemplate" />
+    <property role="TrG5h" value="AbstraceRuleTemplate" />
     <property role="1sVAO0" value="true" />
     <property role="3GE5qa" value="template" />
     <node concept="2tJIrI" id="1ffsG7bUbEG" role="jymVt" />
@@ -609,58 +609,56 @@
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="applyReduce" />
       <node concept="16syzq" id="7XdbJdyi9Le" role="3clF45">
-        <ref role="16sUi3" node="7XdbJdyi9Lq" resolve="T" />
+        <ref role="16sUi3" node="7XdbJdyi9Lq" resolve="R" />
       </node>
       <node concept="3Tm1VV" id="7XdbJdyi9Lf" role="1B3o_S" />
       <node concept="37vLTG" id="7XdbJdyi9Lh" role="3clF46">
         <property role="TrG5h" value="input" />
         <node concept="3Tqbb2" id="7XdbJdyi9Li" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="6R6MIbURCWS" role="3clF46">
+        <property role="TrG5h" value="session" />
+        <node concept="3uibUv" id="6R6MIbURJjM" role="1tU5fm">
+          <ref role="3uigEE" node="18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+        </node>
+      </node>
       <node concept="37vLTG" id="7XdbJdyi9Lj" role="3clF46">
         <property role="TrG5h" value="init" />
         <node concept="16syzq" id="7XdbJdyi9Lk" role="1tU5fm">
-          <ref role="16sUi3" node="7XdbJdyi9Lq" resolve="T" />
+          <ref role="16sUi3" node="7XdbJdyi9Lq" resolve="R" />
         </node>
       </node>
       <node concept="37vLTG" id="7XdbJdyi9Ll" role="3clF46">
         <property role="TrG5h" value="applyFun" />
         <node concept="1ajhzC" id="7XdbJdyi9Lm" role="1tU5fm">
           <node concept="16syzq" id="7XdbJdyi9Ln" role="1ajw0F">
-            <ref role="16sUi3" node="7XdbJdyi9Lq" resolve="T" />
+            <ref role="16sUi3" node="7XdbJdyi9Lq" resolve="R" />
           </node>
-          <node concept="16syzq" id="7XdbJdyi9Lr" role="1ajw0F">
-            <ref role="16sUi3" node="1ffsG7bUbY4" resolve="Token" />
+          <node concept="16syzq" id="6R6MIbTSSSY" role="1ajw0F">
+            <ref role="16sUi3" node="1ffsG7bUbY4" resolve="T" />
           </node>
           <node concept="16syzq" id="7XdbJdyi9Lp" role="1ajl9A">
-            <ref role="16sUi3" node="7XdbJdyi9Lq" resolve="T" />
+            <ref role="16sUi3" node="7XdbJdyi9Lq" resolve="R" />
           </node>
         </node>
       </node>
       <node concept="16euLQ" id="7XdbJdyi9Lq" role="16eVyc">
-        <property role="TrG5h" value="T" />
+        <property role="TrG5h" value="R" />
       </node>
       <node concept="3clFbS" id="7XdbJdyi9Ls" role="3clF47">
-        <node concept="3cpWs8" id="7XdbJdyicox" role="3cqZAp">
-          <node concept="3cpWsn" id="7XdbJdyicoy" role="3cpWs9">
-            <property role="TrG5h" value="token" />
-            <node concept="16syzq" id="7XdbJdyicow" role="1tU5fm">
-              <ref role="16sUi3" node="1ffsG7bUbY4" resolve="Token" />
-            </node>
-            <node concept="1rXfSq" id="7XdbJdyicoz" role="33vP2m">
-              <ref role="37wK5l" node="3IIf9OAJOPP" resolve="newToken" />
-              <node concept="37vLTw" id="mJ_D13ZSBm" role="37wK5m">
-                <ref role="3cqZAo" node="7XdbJdyi9Lh" resolve="input" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3cpWs6" id="7XdbJdyModD" role="3cqZAp">
           <node concept="2Sg_IR" id="7XdbJdyModE" role="3cqZAk">
             <node concept="37vLTw" id="7XdbJdyModF" role="2SgHGx">
               <ref role="3cqZAo" node="7XdbJdyi9Lj" resolve="init" />
             </node>
-            <node concept="37vLTw" id="7XdbJdyModG" role="2SgHGx">
-              <ref role="3cqZAo" node="7XdbJdyicoy" resolve="token" />
+            <node concept="1rXfSq" id="6R6MIbUSdsk" role="2SgHGx">
+              <ref role="37wK5l" node="5itBwM7b6jI" resolve="createToken" />
+              <node concept="37vLTw" id="6R6MIbUSdsl" role="37wK5m">
+                <ref role="3cqZAo" node="7XdbJdyi9Lh" resolve="input" />
+              </node>
+              <node concept="37vLTw" id="6R6MIbUSdsm" role="37wK5m">
+                <ref role="3cqZAo" node="6R6MIbURCWS" resolve="session" />
+              </node>
             </node>
             <node concept="37vLTw" id="7XdbJdyModH" role="2SgG2M">
               <ref role="3cqZAo" node="7XdbJdyi9Ll" resolve="applyFun" />
@@ -670,85 +668,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7XdbJdyiayM" role="jymVt" />
-    <node concept="3clFb_" id="7XdbJdyi9Lu" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="apply" />
-      <node concept="3cqZAl" id="7XdbJdyi9Lv" role="3clF45" />
-      <node concept="3Tm1VV" id="7XdbJdyi9Lw" role="1B3o_S" />
-      <node concept="37vLTG" id="7XdbJdyi9Ly" role="3clF46">
-        <property role="TrG5h" value="input" />
-        <node concept="3Tqbb2" id="7XdbJdyi9Lz" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7XdbJdyi9L$" role="3clF46">
-        <property role="TrG5h" value="applyFun" />
-        <node concept="1ajhzC" id="7XdbJdyi9L_" role="1tU5fm">
-          <node concept="16syzq" id="7XdbJdyi9LC" role="1ajw0F">
-            <ref role="16sUi3" node="1ffsG7bUbY4" resolve="Token" />
-          </node>
-          <node concept="3cqZAl" id="7XdbJdyi9LB" role="1ajl9A" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="7XdbJdyi9LD" role="3clF47">
-        <node concept="3cpWs8" id="7XdbJdyinIU" role="3cqZAp">
-          <node concept="3cpWsn" id="7XdbJdyinIV" role="3cpWs9">
-            <property role="TrG5h" value="token" />
-            <node concept="16syzq" id="7XdbJdyinIW" role="1tU5fm">
-              <ref role="16sUi3" node="1ffsG7bUbY4" resolve="Token" />
-            </node>
-            <node concept="1rXfSq" id="7XdbJdyinIX" role="33vP2m">
-              <ref role="37wK5l" node="3IIf9OAJOPP" resolve="newToken" />
-              <node concept="37vLTw" id="mJ_D13ZU0N" role="37wK5m">
-                <ref role="3cqZAo" node="7XdbJdyi9Ly" resolve="input" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7XdbJdyinJ4" role="3cqZAp">
-          <node concept="2Sg_IR" id="7XdbJdyinJ5" role="3clFbG">
-            <node concept="37vLTw" id="7XdbJdyinJ7" role="2SgHGx">
-              <ref role="3cqZAo" node="7XdbJdyinIV" resolve="token" />
-            </node>
-            <node concept="37vLTw" id="7XdbJdyinJ8" role="2SgG2M">
-              <ref role="3cqZAo" node="7XdbJdyi9L$" resolve="applyFun" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="6tPOoeSDkEh" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7XdbJdz5jXz" role="jymVt" />
-    <node concept="3clFb_" id="7XdbJdz5lDL" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="createToken" />
-      <node concept="16syzq" id="7XdbJdz5lDQ" role="3clF45">
-        <ref role="16sUi3" node="1ffsG7bUbY4" resolve="Token" />
-      </node>
-      <node concept="3Tmbuc" id="7XdbJdz5okr" role="1B3o_S" />
-      <node concept="3clFbS" id="7XdbJdz5lDR" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="7XdbJdz5k0i" role="jymVt" />
-    <node concept="3clFb_" id="75vUFrSIQhr" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="initToken" />
-      <node concept="37vLTG" id="75vUFrSIQhu" role="3clF46">
-        <property role="TrG5h" value="token" />
-        <node concept="16syzq" id="75vUFrSIQhz" role="1tU5fm">
-          <ref role="16sUi3" node="1ffsG7bUbY4" resolve="Token" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="75vUFrSIQhs" role="3clF46">
-        <property role="TrG5h" value="input" />
-        <node concept="3Tqbb2" id="75vUFrSIQht" role="1tU5fm" />
-      </node>
-      <node concept="16syzq" id="6YKq674vGah" role="3clF45">
-        <ref role="16sUi3" node="1ffsG7bUbY4" resolve="Token" />
-      </node>
-      <node concept="3Tmbuc" id="7XdbJdz5vEM" role="1B3o_S" />
-      <node concept="3clFbS" id="75vUFrSIQh_" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="75vUFrSIQ8c" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUsgC4" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="handlerTemplate" />
@@ -769,7 +688,7 @@
     </node>
     <node concept="2tJIrI" id="4MqhgXUshra" role="jymVt" />
     <node concept="3clFb_" id="62MNP_kY8lD" role="jymVt">
-      <property role="TrG5h" value="templateRef" />
+      <property role="TrG5h" value="getTemplateRef" />
       <node concept="3uibUv" id="62MNP_kY8Lq" role="3clF45">
         <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
       </node>
@@ -840,15 +759,15 @@
       <node concept="17QB3L" id="1ffsG7bUbIO" role="1tU5fm" />
     </node>
     <node concept="16euLQ" id="1ffsG7bUbY4" role="16eVyc">
-      <property role="TrG5h" value="Token" />
+      <property role="TrG5h" value="T" />
       <node concept="3uibUv" id="7XdbJdy7jWi" role="3ztrMU">
-        <ref role="3uigEE" node="2RRx4MZ6_68" resolve="RuleTemplateToken" />
+        <ref role="3uigEE" node="2RRx4MZ6_68" resolve="RuleTemplate.Token" />
       </node>
     </node>
     <node concept="3uibUv" id="1ffsG7bWFot" role="EKbjA">
       <ref role="3uigEE" node="1ffsG7bW_V4" resolve="RuleTemplate" />
       <node concept="16syzq" id="1ffsG7bWGME" role="11_B2D">
-        <ref role="16sUi3" node="1ffsG7bUbY4" resolve="Token" />
+        <ref role="16sUi3" node="1ffsG7bUbY4" resolve="T" />
       </node>
     </node>
     <node concept="312cEg" id="62MNP_kY7Vb" role="jymVt">
@@ -870,6 +789,27 @@
     <property role="TrG5h" value="RuleTemplate" />
     <property role="3GE5qa" value="template" />
     <node concept="2tJIrI" id="67SsWaEm4a8" role="jymVt" />
+    <node concept="3HP615" id="2RRx4MZ6_68" role="jymVt">
+      <property role="TrG5h" value="Token" />
+      <property role="3GE5qa" value="template.token" />
+      <node concept="2tJIrI" id="2RRx4MZ6CCd" role="jymVt" />
+      <node concept="3clFb_" id="2RRx4MZ6CCe" role="jymVt">
+        <property role="TrG5h" value="apply" />
+        <node concept="A3Dl8" id="2RRx4MZ6CCf" role="3clF45">
+          <node concept="3uibUv" id="2RRx4MZ6CCg" role="A3Ik2">
+            <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="2RRx4MZ6CCn" role="1B3o_S" />
+        <node concept="3clFbS" id="2RRx4MZ6CCo" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="2RRx4MZ6CBN" role="jymVt" />
+      <node concept="3Tm1VV" id="2RRx4MZ6_69" role="1B3o_S" />
+      <node concept="3uibUv" id="mJ_D14woTd" role="3HQHJm">
+        <ref role="3uigEE" node="mJ_D14woL$" resolve="Template.Token" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6R6MIbUc$TU" role="jymVt" />
     <node concept="3clFb_" id="4vBwiiUVL7_" role="jymVt">
       <property role="TrG5h" value="name" />
       <node concept="17QB3L" id="4vBwiiUVOVU" role="3clF45" />
@@ -907,39 +847,35 @@
       <node concept="3clFbS" id="4MqhgXUndvt" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="PB1R3YsIZx" role="jymVt" />
-    <node concept="3clFb_" id="6i42QSs8m5b" role="jymVt">
-      <property role="TrG5h" value="templateRef" />
-      <node concept="3uibUv" id="6i42QSs8miP" role="3clF45">
-        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-      </node>
-      <node concept="3Tm1VV" id="6i42QSs8m5e" role="1B3o_S" />
-      <node concept="3clFbS" id="6i42QSs8m5f" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="3IIf9OAJNDf" role="jymVt" />
-    <node concept="3clFb_" id="3IIf9OAJOPP" role="jymVt">
-      <property role="TrG5h" value="newToken" />
-      <node concept="37vLTG" id="3IIf9OAJRcv" role="3clF46">
+    <node concept="3clFb_" id="5itBwM7b6jI" role="jymVt">
+      <property role="TrG5h" value="createToken" />
+      <node concept="37vLTG" id="6R6MIbUQSdY" role="3clF46">
         <property role="TrG5h" value="input" />
-        <node concept="8X2XB" id="3IIf9OAJSqg" role="1tU5fm">
-          <node concept="3uibUv" id="3IIf9OAJS3D" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
+        <node concept="3Tqbb2" id="6R6MIbUQTep" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="5itBwM7b8HC" role="3clF46">
+        <property role="TrG5h" value="session" />
+        <node concept="3uibUv" id="5itBwM7b97n" role="1tU5fm">
+          <ref role="3uigEE" node="18kNIl1vDPZ" resolve="TemplateApplicationSession" />
         </node>
       </node>
-      <node concept="16syzq" id="3IIf9OAJQ56" role="3clF45">
-        <ref role="16sUi3" node="1ffsG7bWA35" resolve="Token" />
+      <node concept="16syzq" id="6R6MIbTLZYB" role="3clF45">
+        <ref role="16sUi3" node="1ffsG7bWA35" resolve="T" />
       </node>
-      <node concept="3Tm1VV" id="3IIf9OAJOPS" role="1B3o_S" />
-      <node concept="3clFbS" id="3IIf9OAJOPT" role="3clF47" />
+      <node concept="3Tm1VV" id="5itBwM7b6jL" role="1B3o_S" />
+      <node concept="3clFbS" id="5itBwM7b6jM" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="6i42QSs8m2v" role="jymVt" />
+    <node concept="2tJIrI" id="6R6MIbTLZP0" role="jymVt" />
     <node concept="3Tm1VV" id="1ffsG7bW_V5" role="1B3o_S" />
     <node concept="16euLQ" id="1ffsG7bWA35" role="16eVyc">
-      <property role="TrG5h" value="Token" />
+      <property role="TrG5h" value="T" />
       <node concept="3uibUv" id="7XdbJdy67uN" role="3ztrMU">
-        <ref role="3uigEE" node="2RRx4MZ6_68" resolve="RuleTemplateToken" />
+        <ref role="3uigEE" node="2RRx4MZ6_68" resolve="RuleTemplate.Token" />
       </node>
     </node>
+    <node concept="3uibUv" id="6R6MIbU9BOp" role="3HQHJm">
+      <ref role="3uigEE" node="6R6MIbU9$OD" resolve="Template" />
+    </node>
   </node>
   <node concept="3HP615" id="4MqhgXU9fm3">
     <property role="TrG5h" value="RulesListTemplate" />
@@ -979,104 +915,6 @@
     <node concept="2tJIrI" id="4MqhgXUaiOu" role="jymVt" />
     <node concept="3Tm1VV" id="4MqhgXU9fm4" role="1B3o_S" />
   </node>
-  <node concept="3HP615" id="2RRx4MZ6_68">
-    <property role="TrG5h" value="RuleTemplateToken" />
-    <property role="3GE5qa" value="template.token" />
-    <node concept="2tJIrI" id="2RRx4MZSLs8" role="jymVt" />
-    <node concept="3clFb_" id="2RRx4MZ6CBV" role="jymVt">
-      <property role="TrG5h" value="isApplicable" />
-      <node concept="10P_77" id="2RRx4MZ6CC0" role="3clF45" />
-      <node concept="3Tm1VV" id="2RRx4MZ6CC1" role="1B3o_S" />
-      <node concept="3clFbS" id="2RRx4MZ6CC2" role="3clF47" />
-      <node concept="2AHcQZ" id="3c$Di5Oqtsi" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2RRx4MZ6CC3" role="jymVt" />
-    <node concept="3clFb_" id="2RRx4MZ6CC4" role="jymVt">
-      <property role="TrG5h" value="requiredNodes" />
-      <node concept="A3Dl8" id="2RRx4MZ6CC5" role="3clF45">
-        <node concept="3Tqbb2" id="2RRx4MZ6CC6" role="A3Ik2" />
-      </node>
-      <node concept="3Tm1VV" id="2RRx4MZ6CC7" role="1B3o_S" />
-      <node concept="3clFbS" id="2RRx4MZ6CC8" role="3clF47" />
-      <node concept="2AHcQZ" id="6tPOoeSE0jz" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2RRx4MZ6CCd" role="jymVt" />
-    <node concept="3clFb_" id="2RRx4MZ6CCe" role="jymVt">
-      <property role="TrG5h" value="apply" />
-      <node concept="A3Dl8" id="2RRx4MZ6CCf" role="3clF45">
-        <node concept="3uibUv" id="2RRx4MZ6CCg" role="A3Ik2">
-          <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="2RRx4MZ6CCl" role="3clF46">
-        <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="2RRx4MZ6CCm" role="1tU5fm">
-          <ref role="3uigEE" node="18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="2RRx4MZ6CCn" role="1B3o_S" />
-      <node concept="3clFbS" id="2RRx4MZ6CCo" role="3clF47" />
-      <node concept="2AHcQZ" id="mJ_D14wp18" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2RRx4MZ6CBN" role="jymVt" />
-    <node concept="3Tm1VV" id="2RRx4MZ6_69" role="1B3o_S" />
-    <node concept="3uibUv" id="mJ_D14woTd" role="3HQHJm">
-      <ref role="3uigEE" node="mJ_D14woL$" resolve="TemplateToken" />
-    </node>
-  </node>
-  <node concept="312cEu" id="2RRx4MZ6I3W">
-    <property role="TrG5h" value="BaseRuleTemplateToken" />
-    <property role="1sVAO0" value="true" />
-    <property role="3GE5qa" value="template.token" />
-    <node concept="2tJIrI" id="2RRx4MZ6Ib2" role="jymVt" />
-    <node concept="3clFb_" id="2RRx4MZ6Ibj" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="isApplicable" />
-      <node concept="10P_77" id="2RRx4MZ6Ibk" role="3clF45" />
-      <node concept="3Tm1VV" id="2RRx4MZ6Ibl" role="1B3o_S" />
-      <node concept="3clFbS" id="2RRx4MZ6Ibn" role="3clF47">
-        <node concept="3clFbF" id="2RRx4MZ6Ibq" role="3cqZAp">
-          <node concept="3clFbT" id="2RRx4MZ6J1n" role="3clFbG">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="2RRx4MZ6Ibo" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2RRx4MZ6IQo" role="jymVt" />
-    <node concept="3clFb_" id="2RRx4MZ6Ibr" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="requiredNodes" />
-      <node concept="A3Dl8" id="2RRx4MZ6Ibs" role="3clF45">
-        <node concept="3Tqbb2" id="2RRx4MZ6Ibt" role="A3Ik2" />
-      </node>
-      <node concept="3Tm1VV" id="2RRx4MZ6Ibu" role="1B3o_S" />
-      <node concept="3clFbS" id="2RRx4MZ6Ibw" role="3clF47">
-        <node concept="3clFbF" id="2RRx4MZ6J2x" role="3cqZAp">
-          <node concept="10Nm6u" id="2RRx4MZ6J2w" role="3clFbG" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="2RRx4MZ6Ibx" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-      <node concept="2AHcQZ" id="6tPOoeSEcvH" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2RRx4MZ6IJC" role="jymVt" />
-    <node concept="3Tm1VV" id="2RRx4MZ6I3X" role="1B3o_S" />
-    <node concept="3uibUv" id="2RRx4MZ6I8M" role="EKbjA">
-      <ref role="3uigEE" node="2RRx4MZ6_68" resolve="RuleTemplateToken" />
-    </node>
-  </node>
   <node concept="3HP615" id="36tQV5AurZW">
     <property role="3GE5qa" value="template" />
     <property role="TrG5h" value="ConstraintRuleTemplate" />
@@ -1096,99 +934,48 @@
     <node concept="2tJIrI" id="36tQV5AIeEy" role="jymVt" />
     <node concept="3Tm1VV" id="36tQV5AurZX" role="1B3o_S" />
   </node>
-  <node concept="3HP615" id="mJ_D14woL$">
-    <property role="3GE5qa" value="template.token" />
-    <property role="TrG5h" value="TemplateToken" />
-    <node concept="2tJIrI" id="mJ_D14woOn" role="jymVt" />
-    <node concept="3clFb_" id="mJ_D14woVW" role="jymVt">
-      <property role="TrG5h" value="apply" />
-      <node concept="A3Dl8" id="mJ_D14woVX" role="3clF45">
-        <node concept="3uibUv" id="mJ_D14woVY" role="A3Ik2">
-          <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="mJ_D14woVZ" role="3clF46">
-        <property role="TrG5h" value="session" />
-        <node concept="3uibUv" id="mJ_D14woW0" role="1tU5fm">
-          <ref role="3uigEE" node="18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="mJ_D14woW1" role="1B3o_S" />
-      <node concept="3clFbS" id="mJ_D14woW2" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="mJ_D14woOp" role="jymVt" />
-    <node concept="3Tm1VV" id="mJ_D14woL_" role="1B3o_S" />
-  </node>
   <node concept="3HP615" id="6OXbTD$iNPP">
     <property role="3GE5qa" value="template" />
     <property role="TrG5h" value="QueryTemplate" />
     <node concept="2tJIrI" id="6OXbTD$iO0e" role="jymVt" />
-    <node concept="3clFb_" id="6OXbTD$iO0w" role="jymVt">
-      <property role="TrG5h" value="name" />
-      <node concept="17QB3L" id="6OXbTD$iO0x" role="3clF45" />
-      <node concept="3Tm1VV" id="6OXbTD$iO0y" role="1B3o_S" />
-      <node concept="3clFbS" id="6OXbTD$iO0z" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="6OXbTD$iO0$" role="jymVt" />
-    <node concept="3clFb_" id="6OXbTD$iO0_" role="jymVt">
-      <property role="TrG5h" value="fqName" />
-      <node concept="17QB3L" id="6OXbTD$iO0A" role="3clF45" />
-      <node concept="3Tm1VV" id="6OXbTD$iO0B" role="1B3o_S" />
-      <node concept="3clFbS" id="6OXbTD$iO0C" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="4t7Xo7iclkP" role="jymVt" />
-    <node concept="3clFb_" id="4t7Xo7icmmF" role="jymVt">
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="kind" />
-      <node concept="3clFbS" id="4t7Xo7icmmI" role="3clF47" />
-      <node concept="3Tm1VV" id="4t7Xo7icmmJ" role="1B3o_S" />
-      <node concept="3uibUv" id="4t7Xo7intc6" role="3clF45">
-        <ref role="3uigEE" node="4t7Xo7inshN" resolve="QueryKind" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6OXbTD$iO0D" role="jymVt" />
-    <node concept="3clFb_" id="6OXbTD$iO0E" role="jymVt">
-      <property role="TrG5h" value="usedHandlersFqNames" />
-      <node concept="_YKpA" id="6OXbTD$iO0F" role="3clF45">
-        <node concept="17QB3L" id="6OXbTD$iO0G" role="_ZDj9" />
-      </node>
-      <node concept="3Tm1VV" id="6OXbTD$iO0H" role="1B3o_S" />
-      <node concept="3clFbS" id="6OXbTD$iO0I" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="6OXbTD$iO0n" role="jymVt" />
-    <node concept="3clFb_" id="6tPOoeT3pU7" role="jymVt">
-      <property role="TrG5h" value="newToken" />
-      <node concept="37vLTG" id="6tPOoeT3pU8" role="3clF46">
-        <property role="TrG5h" value="parameter" />
-        <node concept="8X2XB" id="6tPOoeT3pU9" role="1tU5fm">
-          <node concept="3uibUv" id="6tPOoeT3pUa" role="8Xvag">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+    <node concept="3HP615" id="6R6MIbU8M46" role="jymVt">
+      <property role="TrG5h" value="Token" />
+      <property role="3GE5qa" value="template.token" />
+      <node concept="2tJIrI" id="6R6MIbU8M47" role="jymVt" />
+      <node concept="3clFb_" id="6R6MIbUcYSn" role="jymVt">
+        <property role="TrG5h" value="apply" />
+        <node concept="A3Dl8" id="6R6MIbUcYSo" role="3clF45">
+          <node concept="3uibUv" id="6R6MIbUcYSp" role="A3Ik2">
+            <ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
           </node>
         </node>
+        <node concept="3Tm1VV" id="6R6MIbUcYSs" role="1B3o_S" />
+        <node concept="3clFbS" id="6R6MIbUcYSt" role="3clF47" />
       </node>
-      <node concept="16syzq" id="6tPOoeT3qes" role="3clF45">
-        <ref role="16sUi3" node="6tPOoeT3qak" resolve="Token" />
-      </node>
-      <node concept="3Tm1VV" id="6tPOoeT3pUc" role="1B3o_S" />
-      <node concept="3clFbS" id="6tPOoeT3pUd" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="6tPOoeT3pQI" role="jymVt" />
-    <node concept="3Tm1VV" id="6OXbTD$iNPQ" role="1B3o_S" />
-    <node concept="3clFb_" id="7P_FdVPsDM6" role="jymVt">
-      <property role="TrG5h" value="newQuery" />
-      <node concept="37vLTG" id="7P_FdVQ_p5F" role="3clF46">
-        <property role="TrG5h" value="observable" />
-        <node concept="3uibUv" id="7P_FdVQ_p6p" role="1tU5fm">
-          <ref role="3uigEE" node="7P_FdVQ_k3b" resolve="QueryTemplate.QueryObservable" />
+      <node concept="2tJIrI" id="6R6MIbUcYSm" role="jymVt" />
+      <node concept="3clFb_" id="5itBwM86qEL" role="jymVt">
+        <property role="TrG5h" value="withParam" />
+        <node concept="37vLTG" id="5itBwM86qEM" role="3clF46">
+          <property role="TrG5h" value="value" />
+          <node concept="8X2XB" id="5itBwM86qEN" role="1tU5fm">
+            <node concept="3uibUv" id="5itBwM86qEO" role="8Xvag">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
         </node>
+        <node concept="3uibUv" id="6R6MIbUsAgO" role="3clF45">
+          <ref role="3uigEE" node="6R6MIbU8M46" resolve="QueryTemplate.Token" />
+        </node>
+        <node concept="3Tm1VV" id="5itBwM86qEQ" role="1B3o_S" />
+        <node concept="3clFbS" id="5itBwM86qER" role="3clF47" />
       </node>
-      <node concept="3uibUv" id="7P_FdVPsDNI" role="3clF45">
-        <ref role="3uigEE" node="7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
+      <node concept="2tJIrI" id="6R6MIbUs$7p" role="jymVt" />
+      <node concept="3Tm1VV" id="6R6MIbU8M4h" role="1B3o_S" />
+      <node concept="3uibUv" id="6R6MIbU8M4i" role="3HQHJm">
+        <ref role="3uigEE" node="mJ_D14woL$" resolve="Template.Token" />
       </node>
-      <node concept="3Tm1VV" id="7P_FdVPsDM9" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVPsDMa" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="6OXbTD$reMa" role="jymVt" />
+    <node concept="2tJIrI" id="6R6MIbUcYx4" role="jymVt" />
     <node concept="3HP615" id="7P_FdVPsDC0" role="jymVt">
       <property role="2bfB8j" value="true" />
       <property role="TrG5h" value="QueryConfigurable" />
@@ -1215,87 +1002,64 @@
       <node concept="3Tm1VV" id="7P_FdVPsDC1" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="6OXbTD$reOi" role="jymVt" />
-    <node concept="3HP615" id="7P_FdVQ_k3b" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="QueryObservable" />
-      <node concept="2tJIrI" id="7P_FdVQ_k6c" role="jymVt" />
-      <node concept="3clFb_" id="7P_FdVQ_k6A" role="jymVt">
-        <property role="TrG5h" value="subscribe" />
-        <node concept="37vLTG" id="7P_FdVQ_ka7" role="3clF46">
-          <property role="TrG5h" value="observer" />
-          <node concept="3uibUv" id="7P_FdVQ_kaO" role="1tU5fm">
-            <ref role="3uigEE" node="7P_FdVQ_jCo" resolve="QueryTemplate.QueryObserver" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="7P_FdVQ_k6C" role="3clF45" />
-        <node concept="3Tm1VV" id="7P_FdVQ_k6D" role="1B3o_S" />
-        <node concept="3clFbS" id="7P_FdVQ_k6E" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="7P_FdVQ_oC2" role="jymVt" />
-      <node concept="3Tm1VV" id="7P_FdVQ_k3c" role="1B3o_S" />
-      <node concept="2AHcQZ" id="19OC8ZSn3f" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+    <node concept="3clFb_" id="6OXbTD$iO0w" role="jymVt">
+      <property role="TrG5h" value="name" />
+      <node concept="17QB3L" id="6OXbTD$iO0x" role="3clF45" />
+      <node concept="3Tm1VV" id="6OXbTD$iO0y" role="1B3o_S" />
+      <node concept="3clFbS" id="6OXbTD$iO0z" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="6OXbTD$iO0$" role="jymVt" />
+    <node concept="3clFb_" id="6OXbTD$iO0_" role="jymVt">
+      <property role="TrG5h" value="fqName" />
+      <node concept="17QB3L" id="6OXbTD$iO0A" role="3clF45" />
+      <node concept="3Tm1VV" id="6OXbTD$iO0B" role="1B3o_S" />
+      <node concept="3clFbS" id="6OXbTD$iO0C" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="6R6MIbU90O$" role="jymVt" />
+    <node concept="3clFb_" id="4t7Xo7icmmF" role="jymVt">
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="kind" />
+      <node concept="3clFbS" id="4t7Xo7icmmI" role="3clF47" />
+      <node concept="3Tm1VV" id="4t7Xo7icmmJ" role="1B3o_S" />
+      <node concept="3uibUv" id="4t7Xo7intc6" role="3clF45">
+        <ref role="3uigEE" node="4t7Xo7inshN" resolve="QueryKind" />
       </node>
     </node>
-    <node concept="2tJIrI" id="6OXbTD$reQr" role="jymVt" />
-    <node concept="3HP615" id="7P_FdVQ_jCo" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="QueryObserver" />
-      <node concept="2tJIrI" id="7P_FdVQ_jEo" role="jymVt" />
-      <node concept="3clFb_" id="7P_FdVQ_jFm" role="jymVt">
-        <property role="TrG5h" value="onNext" />
-        <node concept="37vLTG" id="7P_FdVQ_jF$" role="3clF46">
-          <property role="TrG5h" value="stage" />
-          <node concept="17QB3L" id="7P_FdVQ_jI8" role="1tU5fm" />
+    <node concept="2tJIrI" id="6OXbTD$iO0D" role="jymVt" />
+    <node concept="3clFb_" id="5itBwM78vMu" role="jymVt">
+      <property role="TrG5h" value="createToken" />
+      <node concept="37vLTG" id="5itBwM78zqd" role="3clF46">
+        <property role="TrG5h" value="session" />
+        <node concept="3uibUv" id="5itBwM78$AE" role="1tU5fm">
+          <ref role="3uigEE" node="18kNIl1vDPZ" resolve="TemplateApplicationSession" />
         </node>
-        <node concept="37vLTG" id="7P_FdVQ_jJ3" role="3clF46">
-          <property role="TrG5h" value="storeView" />
-          <node concept="3uibUv" id="7P_FdVQ_jJT" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~StoreView" resolve="StoreView" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="7P_FdVQ_jFp" role="3clF45" />
-        <node concept="3Tm1VV" id="7P_FdVQ_jFq" role="1B3o_S" />
-        <node concept="3clFbS" id="7P_FdVQ_jFr" role="3clF47" />
       </node>
-      <node concept="2tJIrI" id="7P_FdVQ_jL5" role="jymVt" />
-      <node concept="3clFb_" id="7P_FdVQ_jLY" role="jymVt">
-        <property role="TrG5h" value="onCompleted" />
-        <node concept="37vLTG" id="7P_FdVQ_jPZ" role="3clF46">
-          <property role="TrG5h" value="view" />
-          <node concept="3uibUv" id="7P_FdVQ_jQR" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~StoreView" resolve="StoreView" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="7P_FdVQ_jM0" role="3clF45" />
-        <node concept="3Tm1VV" id="7P_FdVQ_jM1" role="1B3o_S" />
-        <node concept="3clFbS" id="7P_FdVQ_jM2" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="7P_FdVQ_jS6" role="jymVt" />
-      <node concept="3clFb_" id="7P_FdVQ_jU$" role="jymVt">
-        <property role="TrG5h" value="onFailure" />
-        <node concept="37vLTG" id="7P_FdVQ_jY$" role="3clF46">
-          <property role="TrG5h" value="exception" />
-          <node concept="3uibUv" id="7WKNeR9$ZWp" role="1tU5fm">
-            <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="7P_FdVQ_jUB" role="3clF45" />
-        <node concept="3Tm1VV" id="7P_FdVQ_jUC" role="1B3o_S" />
-        <node concept="3clFbS" id="7P_FdVQ_jUD" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="7P_FdVQ_jEt" role="jymVt" />
-      <node concept="3Tm1VV" id="7P_FdVQ_jCp" role="1B3o_S" />
-      <node concept="2AHcQZ" id="19OC8ZSn0U" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      <node concept="16syzq" id="5itBwM7WsnX" role="3clF45">
+        <ref role="16sUi3" node="6tPOoeT3qak" resolve="T" />
       </node>
+      <node concept="3Tm1VV" id="5itBwM78vMx" role="1B3o_S" />
+      <node concept="3clFbS" id="5itBwM78vMy" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="6R6MIbUsv9j" role="jymVt" />
+    <node concept="3Tm1VV" id="6OXbTD$iNPQ" role="1B3o_S" />
+    <node concept="3clFb_" id="7P_FdVPsDM6" role="jymVt">
+      <property role="TrG5h" value="newQuery" />
+      <node concept="3uibUv" id="7P_FdVPsDNI" role="3clF45">
+        <ref role="3uigEE" node="7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVPsDM9" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPsDMa" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="6OXbTD$reMa" role="jymVt" />
     <node concept="16euLQ" id="6tPOoeT3qak" role="16eVyc">
-      <property role="TrG5h" value="Token" />
-      <node concept="3uibUv" id="6tPOoeT3qal" role="3ztrMU">
-        <ref role="3uigEE" node="mJ_D14woL$" resolve="TemplateToken" />
+      <property role="TrG5h" value="T" />
+      <node concept="3uibUv" id="6R6MIbUdZ9d" role="3ztrMU">
+        <ref role="3uigEE" node="6R6MIbU8M46" resolve="QueryTemplate.Token" />
       </node>
     </node>
+    <node concept="3uibUv" id="6R6MIbU9AOG" role="3HQHJm">
+      <ref role="3uigEE" node="6R6MIbU9$OD" resolve="Template" />
+    </node>
   </node>
   <node concept="3HP615" id="4t7Xo7inshN">
     <property role="TrG5h" value="QueryKind" />
@@ -6715,5 +6479,174 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="6R6MIbU8KKa">
+    <property role="3GE5qa" value="template" />
+    <property role="TrG5h" value="AbstractQueryTemplate" />
+    <property role="1sVAO0" value="true" />
+    <node concept="2tJIrI" id="6R6MIbU8KQu" role="jymVt" />
+    <node concept="3clFbW" id="6R6MIbU8QE_" role="jymVt">
+      <node concept="3cqZAl" id="6R6MIbU8QEB" role="3clF45" />
+      <node concept="3Tm1VV" id="6R6MIbU8QEC" role="1B3o_S" />
+      <node concept="3clFbS" id="6R6MIbU8QED" role="3clF47">
+        <node concept="3clFbF" id="6R6MIbU8VEN" role="3cqZAp">
+          <node concept="37vLTI" id="6R6MIbU8WtG" role="3clFbG">
+            <node concept="37vLTw" id="6R6MIbU8W$q" role="37vLTx">
+              <ref role="3cqZAo" node="6R6MIbU8Ub3" resolve="name" />
+            </node>
+            <node concept="2OqwBi" id="6R6MIbU8VQs" role="37vLTJ">
+              <node concept="Xjq3P" id="6R6MIbU8VEM" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6R6MIbU8W8L" role="2OqNvi">
+                <ref role="2Oxat5" node="6R6MIbU8TtO" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6R6MIbU8WAx" role="3cqZAp">
+          <node concept="37vLTI" id="6R6MIbU8XsQ" role="3clFbG">
+            <node concept="37vLTw" id="6R6MIbU8XyM" role="37vLTx">
+              <ref role="3cqZAo" node="6R6MIbU8Uhy" resolve="fqName" />
+            </node>
+            <node concept="2OqwBi" id="6R6MIbU8WNm" role="37vLTJ">
+              <node concept="Xjq3P" id="6R6MIbU8WAv" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6R6MIbU8X5L" role="2OqNvi">
+                <ref role="2Oxat5" node="6R6MIbU8VeS" resolve="fqName" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6R6MIbU8YuV" role="3cqZAp">
+          <node concept="37vLTI" id="6R6MIbU8YuX" role="3clFbG">
+            <node concept="2OqwBi" id="6R6MIbU8YOk" role="37vLTJ">
+              <node concept="Xjq3P" id="6R6MIbU8YRP" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6R6MIbU8Zr4" role="2OqNvi">
+                <ref role="2Oxat5" node="6R6MIbU8TtR" resolve="templateRef" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="6R6MIbU8Yv1" role="37vLTx">
+              <ref role="3cqZAo" node="6R6MIbU8Y5J" resolve="templateRef" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6R6MIbU8Ub3" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="6R6MIbU8Ub2" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6R6MIbU8Uhy" role="3clF46">
+        <property role="TrG5h" value="fqName" />
+        <node concept="17QB3L" id="6R6MIbU8Uo9" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6R6MIbU8Y5J" role="3clF46">
+        <property role="TrG5h" value="templateRef" />
+        <node concept="3uibUv" id="6R6MIbU8Y5K" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6R6MIbU8TC$" role="jymVt" />
+    <node concept="3clFb_" id="6R6MIbU8TDY" role="jymVt">
+      <property role="TrG5h" value="name" />
+      <node concept="17QB3L" id="6R6MIbU8TDZ" role="3clF45" />
+      <node concept="3Tm1VV" id="6R6MIbU8TE0" role="1B3o_S" />
+      <node concept="3clFbS" id="6R6MIbU8TE2" role="3clF47">
+        <node concept="3clFbF" id="6R6MIbU8TOi" role="3cqZAp">
+          <node concept="37vLTw" id="6R6MIbU8TOh" role="3clFbG">
+            <ref role="3cqZAo" node="6R6MIbU8TtO" resolve="name" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6R6MIbU8TE3" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6R6MIbU8TSx" role="jymVt" />
+    <node concept="3clFb_" id="6R6MIbU8TWk" role="jymVt">
+      <property role="TrG5h" value="fqName" />
+      <node concept="17QB3L" id="6R6MIbU8TWl" role="3clF45" />
+      <node concept="3Tm1VV" id="6R6MIbU8TWm" role="1B3o_S" />
+      <node concept="3clFbS" id="6R6MIbU8TWo" role="3clF47">
+        <node concept="3clFbF" id="6R6MIbU8Vwq" role="3cqZAp">
+          <node concept="37vLTw" id="6R6MIbU8Vwp" role="3clFbG">
+            <ref role="3cqZAo" node="6R6MIbU8VeS" resolve="fqName" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6R6MIbU8TWp" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6R6MIbU8V$j" role="jymVt" />
+    <node concept="3clFb_" id="6R6MIbU91sk" role="jymVt">
+      <property role="TrG5h" value="getTemplateRef" />
+      <node concept="3uibUv" id="6R6MIbU91sl" role="3clF45">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+      <node concept="3Tm1VV" id="6R6MIbU91sm" role="1B3o_S" />
+      <node concept="3clFbS" id="6R6MIbU91so" role="3clF47">
+        <node concept="3clFbF" id="6R6MIbU920H" role="3cqZAp">
+          <node concept="37vLTw" id="6R6MIbU920G" role="3clFbG">
+            <ref role="3cqZAo" node="6R6MIbU8TtR" resolve="templateRef" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6R6MIbU91sp" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6R6MIbU91P_" role="jymVt" />
+    <node concept="312cEg" id="6R6MIbU8TtO" role="jymVt">
+      <property role="TrG5h" value="name" />
+      <node concept="3Tm6S6" id="6R6MIbU8TtP" role="1B3o_S" />
+      <node concept="17QB3L" id="6R6MIbU8TtQ" role="1tU5fm" />
+    </node>
+    <node concept="312cEg" id="6R6MIbU8VeS" role="jymVt">
+      <property role="TrG5h" value="fqName" />
+      <node concept="3Tm6S6" id="6R6MIbU8VeT" role="1B3o_S" />
+      <node concept="17QB3L" id="6R6MIbU8VeU" role="1tU5fm" />
+    </node>
+    <node concept="312cEg" id="6R6MIbU8TtR" role="jymVt">
+      <property role="TrG5h" value="templateRef" />
+      <node concept="3Tm6S6" id="6R6MIbU8TtS" role="1B3o_S" />
+      <node concept="3uibUv" id="6R6MIbU8TtT" role="1tU5fm">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6R6MIbU8KQz" role="jymVt" />
+    <node concept="3Tm1VV" id="6R6MIbU8KKb" role="1B3o_S" />
+    <node concept="16euLQ" id="6R6MIbU8PKj" role="16eVyc">
+      <property role="TrG5h" value="T" />
+      <node concept="3uibUv" id="6R6MIbUdXAi" role="3ztrMU">
+        <ref role="3uigEE" node="6R6MIbU8M46" resolve="QueryTemplate.Token" />
+      </node>
+    </node>
+    <node concept="3uibUv" id="6R6MIbU8QpB" role="EKbjA">
+      <ref role="3uigEE" node="6OXbTD$iNPP" resolve="QueryTemplate" />
+      <node concept="16syzq" id="6R6MIbU8QC6" role="11_B2D">
+        <ref role="16sUi3" node="6R6MIbU8PKj" resolve="T" />
+      </node>
+    </node>
+  </node>
+  <node concept="3HP615" id="6R6MIbU9$OD">
+    <property role="3GE5qa" value="template" />
+    <property role="TrG5h" value="Template" />
+    <node concept="2tJIrI" id="6R6MIbU9_i3" role="jymVt" />
+    <node concept="3HP615" id="mJ_D14woL$" role="jymVt">
+      <property role="3GE5qa" value="template.token" />
+      <property role="TrG5h" value="Token" />
+      <node concept="2tJIrI" id="mJ_D14woOn" role="jymVt" />
+      <node concept="3Tm1VV" id="mJ_D14woL_" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="6R6MIbUg6du" role="jymVt" />
+    <node concept="3clFb_" id="6R6MIbU9_nr" role="jymVt">
+      <property role="TrG5h" value="getTemplateRef" />
+      <node concept="3uibUv" id="6R6MIbU9_ns" role="3clF45">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+      <node concept="3Tm1VV" id="6R6MIbU9_nt" role="1B3o_S" />
+      <node concept="3clFbS" id="6R6MIbU9_nu" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="6R6MIbU9_i0" role="jymVt" />
+    <node concept="3Tm1VV" id="6R6MIbU9$OE" role="1B3o_S" />
+  </node>
 </model>