diff --git a/build.xml b/build.xml
index 3ee87f73..f2655d5d 100644
--- a/build.xml
+++ b/build.xml
@@ -2320,7 +2320,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typechecking.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.typechecking.ui, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typechecking.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.typechecking.ui, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2347,8 +2347,11 @@
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.dataform" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
@@ -2376,10 +2379,15 @@
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
index 57a698ab..568d43c5 100644
--- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
+++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps
@@ -196,7 +196,7 @@
     </language>
   </registry>
   <node concept="312cEu" id="5rhZO$TYZJM">
-    <property role="TrG5h" value="ChrProgramBuilder" />
+    <property role="TrG5h" value="LogicProgramBuilder" />
     <node concept="2tJIrI" id="5rhZO$TZ4oM" role="jymVt" />
     <node concept="3clFbW" id="5rhZO$TZ9Ji" role="jymVt">
       <node concept="3cqZAl" id="5rhZO$TZ9Jk" role="3clF45" />
@@ -260,7 +260,7 @@
         <node concept="3clFbF" id="5rhZO$TZjg5" role="3cqZAp">
           <node concept="2ShNRf" id="5rhZO$TZjg3" role="3clFbG">
             <node concept="1pGfFk" id="5rhZO$TZlOE" role="2ShVmc">
-              <ref role="37wK5l" node="7eGEHDlcF69" resolve="ChrProgram" />
+              <ref role="37wK5l" node="7eGEHDlcF69" resolve="LogicProgram" />
               <node concept="37vLTw" id="5rhZO$TZlPA" role="37wK5m">
                 <ref role="3cqZAo" node="5rhZO$TZiL2" resolve="name" />
               </node>
@@ -600,7 +600,7 @@
     <node concept="3Tm1VV" id="18cJbc1659x" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="7eGEHDlcEJ0">
-    <property role="TrG5h" value="ChrProgram" />
+    <property role="TrG5h" value="LogicProgram" />
     <node concept="3uibUv" id="78CwJJcTnG5" role="1zkMxy">
       <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
     </node>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index 7a916e6e..b72e62f6 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -1123,7 +1123,7 @@
         </node>
         <node concept="1SiIV0" id="wfREvqakXX" role="3bR37C">
           <node concept="3bR9La" id="wfREvqakXY" role="1SiIV1">
-            <property role="3bR36h" value="false" />
+            <property role="3bR36h" value="true" />
             <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
           </node>
         </node>
@@ -1319,6 +1319,12 @@
             <ref role="3bR37D" node="oI9YrJ7Rx" resolve="jetbrains.mps.typechecking.reporting" />
           </node>
         </node>
+        <node concept="1SiIV0" id="6OXbTD_u8Xd" role="3bR37C">
+          <node concept="3bR9La" id="6OXbTD_u8Xe" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7BVjoXzUx6U" resolve="jetbrains.mps.lang.typesystem2" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="65DJywFj0uW" role="3989C9">
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd b/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
index 37f1d5d9..59199831 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
+++ b/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
@@ -20,6 +20,7 @@
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)</dependency>
+    <dependency reexport="false">c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.typesystem2)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -51,15 +52,23 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
+    <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
+    <module reference="942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
+    <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
+    <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.lang.typechecking.test)" version="0" />
+    <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.typesystem2)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
+    <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
index a3911fb6..3f6d2463 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
@@ -45,6 +45,10 @@
     <import index="qox2" ref="r:7ff0776c-aea4-4df2-88a3-2efb6b568dc3(jetbrains.mps.typechecking.plugin)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
+    <import index="kqnc" ref="r:92b96158-68e6-4f53-a32b-36e2b456fe01(jetbrains.mps.baseLanguageExt.types)" />
+    <import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.typesystem2.structure)" />
+    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.rule)" />
+    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -158,6 +162,7 @@
       <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -251,6 +256,12 @@
         <child id="1172028236559" name="expression" index="3ykU8v" />
       </concept>
     </language>
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
+        <property id="1167245565795" name="severity" index="35gtTG" />
+        <child id="1167227463056" name="logExpression" index="34bqiv" />
+      </concept>
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -258,9 +269,13 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
+      <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
+        <child id="3648723375513868575" name="repositoryArg" index="Vysub" />
+      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -271,6 +286,7 @@
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
       <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
+      <concept id="3648723375513868532" name="jetbrains.mps.lang.smodel.structure.NodePointer_ResolveOperation" flags="ng" index="Vyspw" />
       <concept id="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
       <concept id="597763930871270009" name="jetbrains.mps.lang.smodel.structure.ChildNodeRefExpression" flags="nn" index="3fl2lp">
         <reference id="597763930871272016" name="targetNode" index="3fl3PK" />
@@ -764,6 +780,20 @@
         <node concept="1QHqEK" id="4BHjwwGUr4u" role="3cqZAp">
           <node concept="1QHqEC" id="4BHjwwGUr4w" role="1QHqEI">
             <node concept="3clFbS" id="4BHjwwGUr4y" role="1bW5cS">
+              <node concept="3cpWs8" id="6OXbTD_oHco" role="3cqZAp">
+                <node concept="3cpWsn" id="6OXbTD_oHcp" role="3cpWs9">
+                  <property role="TrG5h" value="repo" />
+                  <node concept="3uibUv" id="6OXbTD_oHcm" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
+                  <node concept="2OqwBi" id="6OXbTD_oHcq" role="33vP2m">
+                    <node concept="1jxXqW" id="6OXbTD_oHcr" role="2Oq$k0" />
+                    <node concept="liA8E" id="6OXbTD_oHcs" role="2OqNvi">
+                      <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    </node>
+                  </node>
+                </node>
+              </node>
               <node concept="3cpWs8" id="4BHjwwGUyPL" role="3cqZAp">
                 <node concept="3cpWsn" id="4BHjwwGUyPM" role="3cpWs9">
                   <property role="TrG5h" value="cls" />
@@ -778,59 +808,90 @@
                     </node>
                     <node concept="liA8E" id="4BHjwwGUyPP" role="2OqNvi">
                       <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
-                      <node concept="2OqwBi" id="4BHjwwGUyPQ" role="37wK5m">
-                        <node concept="1jxXqW" id="4BHjwwGUyPR" role="2Oq$k0" />
-                        <node concept="liA8E" id="4BHjwwGUyPS" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                      <node concept="37vLTw" id="6OXbTD_oHct" role="37wK5m">
+                        <ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="6OXbTD_o6iu" role="3cqZAp">
+                <node concept="3cpWsn" id="6OXbTD_o6iv" role="3cpWs9">
+                  <property role="TrG5h" value="session" />
+                  <node concept="3uibUv" id="6OXbTD_o6ic" role="1tU5fm">
+                    <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+                  </node>
+                  <node concept="2YIFZM" id="6OXbTD_oXUh" role="33vP2m">
+                    <ref role="37wK5l" to="hano:7DvO2M9p276" resolve="newSession" />
+                    <ref role="1Pybhc" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+                    <node concept="37vLTw" id="6OXbTD_oYKG" role="37wK5m">
+                      <ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
+                    </node>
+                    <node concept="2OqwBi" id="6OXbTD_p3E4" role="37wK5m">
+                      <node concept="37vLTw" id="6OXbTD_p2Rk" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4BHjwwGUyPM" resolve="cls" />
+                      </node>
+                      <node concept="I4A8Y" id="6OXbTD_p4Bp" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="6OXbTD_oquh" role="3cqZAp">
+                <node concept="3cpWsn" id="6OXbTD_oqui" role="3cpWs9">
+                  <property role="TrG5h" value="queryTemplate" />
+                  <node concept="3uibUv" id="6OXbTD_oqtX" role="1tU5fm">
+                    <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+                  </node>
+                  <node concept="2OqwBi" id="6OXbTD_oquj" role="33vP2m">
+                    <node concept="2OqwBi" id="6OXbTD_oquk" role="2Oq$k0">
+                      <node concept="37vLTw" id="6OXbTD_oqul" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
+                      </node>
+                      <node concept="liA8E" id="6OXbTD_oqum" role="2OqNvi">
+                        <ref role="37wK5l" to="hano:7WKNeR9alW4" resolve="queryTemplates" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="6OXbTD_oqun" role="2OqNvi">
+                      <ref role="37wK5l" to="hano:7WKNeR95RPZ" resolve="byFqName" />
+                      <node concept="2OqwBi" id="6OXbTD_oquo" role="37wK5m">
+                        <node concept="2OqwBi" id="6OXbTD_oqup" role="2Oq$k0">
+                          <node concept="2tJFMh" id="6OXbTD_oquq" role="2Oq$k0">
+                            <node concept="ZC_QK" id="6OXbTD_oqur" role="2tJFKM">
+                              <ref role="2aWVGs" to="kqnc:6OXbTD$fto2" resolve="typecheck" />
+                            </node>
+                          </node>
+                          <node concept="Vyspw" id="6OXbTD_oqus" role="2OqNvi">
+                            <node concept="37vLTw" id="6OXbTD_oLKo" role="Vysub">
+                              <ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2qgKlT" id="6OXbTD_oquu" role="2OqNvi">
+                          <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3cpWs8" id="14$_tTxzuR6" role="3cqZAp">
-                <node concept="3cpWsn" id="14$_tTxzuR7" role="3cpWs9">
-                  <property role="TrG5h" value="modelRepo" />
-                  <node concept="3uibUv" id="14$_tTxzuQX" role="1tU5fm">
-                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-                  </node>
-                  <node concept="2OqwBi" id="14$_tTxzuR8" role="33vP2m">
-                    <node concept="2JrnkZ" id="14$_tTxzuR9" role="2Oq$k0">
-                      <node concept="2OqwBi" id="14$_tTxzuRa" role="2JrQYb">
-                        <node concept="37vLTw" id="14$_tTxzuRb" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4BHjwwGUyPM" resolve="cls" />
-                        </node>
-                        <node concept="I4A8Y" id="14$_tTxzuRc" role="2OqNvi" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="14$_tTxzuRd" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="14$_tTxzzvw" role="3cqZAp" />
+              <node concept="3clFbH" id="6OXbTD_nzVS" role="3cqZAp" />
               <node concept="3cpWs8" id="6$7vuu2ugt2" role="3cqZAp">
                 <node concept="3cpWsn" id="6$7vuu2ugt3" role="3cpWs9">
                   <property role="TrG5h" value="tplApp" />
                   <node concept="3uibUv" id="6$7vuu2ugsZ" role="1tU5fm">
-                    <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramBuilder" />
+                    <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
                   </node>
                   <node concept="2ShNRf" id="6$7vuu2ugt4" role="33vP2m">
                     <node concept="1pGfFk" id="6$7vuu2ugt5" role="2ShVmc">
-                      <ref role="37wK5l" to="hano:7DvO2M9pdut" resolve="ProgramBuilder" />
-                      <node concept="2YIFZM" id="7DvO2M9pPpZ" role="37wK5m">
-                        <ref role="37wK5l" to="hano:7DvO2M9p276" resolve="newSession" />
-                        <ref role="1Pybhc" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
-                        <node concept="37vLTw" id="7DvO2M9pQ0S" role="37wK5m">
-                          <ref role="3cqZAo" node="14$_tTxzuR7" resolve="modelRepo" />
-                        </node>
-                        <node concept="2OqwBi" id="7DvO2M9pQ0T" role="37wK5m">
-                          <node concept="37vLTw" id="7DvO2M9pQ0U" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4BHjwwGUyPM" resolve="cls" />
-                          </node>
-                          <node concept="I4A8Y" id="7DvO2M9pQ0V" role="2OqNvi" />
-                        </node>
+                      <ref role="37wK5l" to="hano:7WKNeR9bcL$" resolve="ProgramProducer" />
+                      <node concept="Xl_RD" id="6OXbTDxuaSu" role="37wK5m">
+                        <property role="Xl_RC" value="test" />
+                      </node>
+                      <node concept="37vLTw" id="6OXbTD_oFoC" role="37wK5m">
+                        <ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
+                      </node>
+                      <node concept="37vLTw" id="6OXbTD_ouEx" role="37wK5m">
+                        <ref role="3cqZAo" node="6OXbTD_oqui" resolve="queryTemplate" />
                       </node>
                     </node>
                   </node>
@@ -847,7 +908,7 @@
                       <ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
                     </node>
                     <node concept="liA8E" id="6$7vuu2ujxU" role="2OqNvi">
-                      <ref role="37wK5l" to="hano:7kTeLbPojCz" resolve="forEach" />
+                      <ref role="37wK5l" to="hano:7kTeLbPojCz" resolve="produce" />
                       <node concept="2ShNRf" id="3IIf9O_jdGL" role="37wK5m">
                         <node concept="2HTt$P" id="3IIf9O_jgA8" role="2ShVmc">
                           <node concept="3Tqbb2" id="3IIf9O_jhoV" role="2HTBi0" />
@@ -859,9 +920,6 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Xl_RD" id="6$7vuu2ujxY" role="37wK5m">
-                        <property role="Xl_RC" value="test" />
-                      </node>
                     </node>
                   </node>
                 </node>
@@ -1083,6 +1141,19 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFbH" id="6OXbTD_$g_q" role="3cqZAp" />
+                  <node concept="34ab3g" id="6OXbTD_$iGJ" role="3cqZAp">
+                    <property role="35gtTG" value="error" />
+                    <node concept="3cpWs3" id="6OXbTD_$mKd" role="34bqiv">
+                      <node concept="37vLTw" id="6OXbTD_$oP8" role="3uHU7w">
+                        <ref role="3cqZAo" node="oI9YrxmUa" resolve="types" />
+                      </node>
+                      <node concept="Xl_RD" id="6OXbTD_$iGL" role="3uHU7B">
+                        <property role="Xl_RC" value="*** types: " />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="6OXbTD_$gB9" role="3cqZAp" />
                   <node concept="3vwNmj" id="oI9YrxthE" role="3cqZAp">
                     <node concept="2YFouu" id="oI9YrxthF" role="3vwVQn">
                       <node concept="2c44tf" id="oI9YrxthG" role="3uHU7B">
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps b/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
index 56d0b8ea..a46eac56 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
@@ -26062,8 +26062,9 @@
             <node concept="3cpWs8" id="1CcQBrPeqBt" role="3cqZAp">
               <node concept="3cpWsn" id="1CcQBrPeqBu" role="3cpWs9">
                 <property role="TrG5h" value="template" />
-                <node concept="3uibUv" id="1CcQBrPeqBs" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                <node concept="3uibUv" id="3IIf9OADWM$" role="1tU5fm">
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                  <node concept="3qTvmN" id="3IIf9OADXsN" role="11_B2D" />
                 </node>
                 <node concept="1LFfDK" id="1CcQBrPeqBv" role="33vP2m">
                   <node concept="3cmrfG" id="1CcQBrPeqBw" role="1LF_Uc">
@@ -26086,7 +26087,7 @@
                     <ref role="3cqZAo" node="1CcQBrPeqBu" resolve="template" />
                   </node>
                   <node concept="liA8E" id="6i42QSsgfqW" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:6i42QSs8m5b" resolve="templateRef" />
+                    <ref role="37wK5l" to="i348:62MNP_kY8lD" resolve="templateRef" />
                   </node>
                 </node>
               </node>
@@ -26143,10 +26144,10 @@
                 <ref role="3uigEE" to="hano:1CcQBrPcZVG" resolve="HandlingStage" />
               </node>
               <node concept="3uibUv" id="1ffsG7c4ezn" role="1Lm7xW">
-                <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                 <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="RuleTemplateApplicationToken" />
+                    <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                   </node>
                 </node>
               </node>
@@ -31640,9 +31641,6 @@
                 <node concept="2ShNRf" id="7WKNeR8TcXE" role="25WWJ7">
                   <node concept="1pGfFk" id="7WKNeR8TcXF" role="2ShVmc">
                     <ref role="37wK5l" to="tj24:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
-                    <node concept="37vLTw" id="7WKNeR9foS9" role="37wK5m">
-                      <ref role="3cqZAo" node="7WKNeR9fm7b" resolve="queryFqName" />
-                    </node>
                     <node concept="2OqwBi" id="7WKNeR8TcXG" role="37wK5m">
                       <node concept="Xjq3P" id="7WKNeR8TcXH" role="2Oq$k0" />
                       <node concept="2OwXpG" id="7WKNeR8TcXI" role="2OqNvi">
@@ -31652,6 +31650,9 @@
                     <node concept="37vLTw" id="7WKNeR8ThOi" role="37wK5m">
                       <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
                     </node>
+                    <node concept="37vLTw" id="7WKNeR9foS9" role="37wK5m">
+                      <ref role="3cqZAo" node="7WKNeR9fm7b" resolve="queryFqName" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -33769,8 +33770,8 @@
                   <node concept="2OqwBi" id="7WKNeR9hhki" role="37vLTx">
                     <node concept="2OqwBi" id="7WKNeR9hhkj" role="2Oq$k0">
                       <node concept="2tJFMh" id="7WKNeR9hhkk" role="2Oq$k0">
-                        <node concept="ZC_QK" id="7WKNeR9hhkl" role="2tJFKM">
-                          <ref role="2aWVGs" to="kqnc:7WKNeR9hdZc" resolve="main" />
+                        <node concept="ZC_QK" id="6OXbTD$ftQw" role="2tJFKM">
+                          <ref role="2aWVGs" to="kqnc:6OXbTD$fto2" resolve="typecheck" />
                         </node>
                       </node>
                       <node concept="Vyspw" id="7WKNeR9hhkm" role="2OqNvi">
@@ -33787,7 +33788,7 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="2qgKlT" id="7WKNeR9hhks" role="2OqNvi">
+                    <node concept="2qgKlT" id="6OXbTD$fur0" role="2OqNvi">
                       <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                     </node>
                   </node>
@@ -33938,8 +33939,8 @@
                   <node concept="2OqwBi" id="3IIf9O_okkp" role="37vLTx">
                     <node concept="2OqwBi" id="3IIf9O_okkq" role="2Oq$k0">
                       <node concept="2tJFMh" id="3IIf9O_okkr" role="2Oq$k0">
-                        <node concept="ZC_QK" id="3IIf9O_okks" role="2tJFKM">
-                          <ref role="2aWVGs" to="kqnc:7WKNeR9hdZc" resolve="main" />
+                        <node concept="ZC_QK" id="6OXbTD$fxQ1" role="2tJFKM">
+                          <ref role="2aWVGs" to="kqnc:6OXbTD$fto2" resolve="typecheck" />
                         </node>
                       </node>
                       <node concept="Vyspw" id="3IIf9O_okkt" role="2OqNvi">
@@ -33956,7 +33957,7 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="2qgKlT" id="3IIf9O_okkz" role="2OqNvi">
+                    <node concept="2qgKlT" id="6OXbTD$fyqI" role="2OqNvi">
                       <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                     </node>
                   </node>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
index 97952d7e..256c812f 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
@@ -368,6 +368,9 @@
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
       <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">
+        <reference id="7400021826771268269" name="concept" index="2sp9C9" />
+      </concept>
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
@@ -407,6 +410,13 @@
       <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="linkRole" 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="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
@@ -902,15 +912,15 @@
             <node concept="2ShNRf" id="3IIf9OAgt3H" role="33vP2m">
               <node concept="1pGfFk" id="3IIf9OAgt3I" role="2ShVmc">
                 <ref role="37wK5l" node="7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
-                <node concept="1rXfSq" id="3IIf9OAgtip" role="37wK5m">
-                  <ref role="37wK5l" node="3IIf9OA6Owz" resolve="subtypeofQueryFqName" />
-                </node>
                 <node concept="37vLTw" id="3IIf9OAm07q" role="37wK5m">
                   <ref role="3cqZAo" node="3IIf9OAm07k" resolve="nodes" />
                 </node>
                 <node concept="37vLTw" id="3IIf9OAgt3L" role="37wK5m">
                   <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
                 </node>
+                <node concept="1rXfSq" id="3IIf9OAgtip" role="37wK5m">
+                  <ref role="37wK5l" node="3IIf9OA6Owz" resolve="subtypeofQueryFqName" />
+                </node>
               </node>
             </node>
           </node>
@@ -1025,8 +1035,8 @@
           <node concept="2OqwBi" id="3IIf9OA6MX9" role="3cqZAk">
             <node concept="2OqwBi" id="3IIf9OA6MXa" role="2Oq$k0">
               <node concept="2tJFMh" id="3IIf9OA6MXb" role="2Oq$k0">
-                <node concept="ZC_QK" id="3IIf9OA6MXc" role="2tJFKM">
-                  <ref role="2aWVGs" to="kqnc:7WKNeR9hdZc" resolve="main" />
+                <node concept="ZC_QK" id="6OXbTD$P1oO" role="2tJFKM">
+                  <ref role="2aWVGs" to="kqnc:6OXbTD$fto2" resolve="typecheck" />
                 </node>
               </node>
               <node concept="Vyspw" id="3IIf9OA6MXd" role="2OqNvi">
@@ -1052,8 +1062,8 @@
           <node concept="2OqwBi" id="3IIf9OA6OwC" role="3cqZAk">
             <node concept="2OqwBi" id="3IIf9OA6OwD" role="2Oq$k0">
               <node concept="2tJFMh" id="3IIf9OA6OwE" role="2Oq$k0">
-                <node concept="ZC_QK" id="3IIf9OA6Pov" role="2tJFKM">
-                  <ref role="2aWVGs" to="kqnc:3IIf9OA5vJR" resolve="subtypeOf" />
+                <node concept="ZC_QK" id="6OXbTD$P1P2" role="2tJFKM">
+                  <ref role="2aWVGs" to="kqnc:6OXbTD$ftrf" resolve="subtypeOf" />
                 </node>
               </node>
               <node concept="Vyspw" id="3IIf9OA6OwG" role="2OqNvi">
@@ -1062,7 +1072,7 @@
                 </node>
               </node>
             </node>
-            <node concept="2qgKlT" id="3IIf9OA6OwI" role="2OqNvi">
+            <node concept="2qgKlT" id="6OXbTD$P2nZ" role="2OqNvi">
               <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
             </node>
           </node>
@@ -1114,15 +1124,15 @@
             <node concept="2ShNRf" id="3IIf9O_qVtJ" role="33vP2m">
               <node concept="1pGfFk" id="3IIf9O_qVtK" role="2ShVmc">
                 <ref role="37wK5l" node="7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
-                <node concept="37vLTw" id="3IIf9O_rfQn" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_r1EB" resolve="queryFqName" />
-                </node>
                 <node concept="37vLTw" id="3IIf9O_qVvh" role="37wK5m">
                   <ref role="3cqZAo" node="3IIf9O_qVvd" resolve="nodes" />
                 </node>
                 <node concept="37vLTw" id="3IIf9O_qVvf" role="37wK5m">
                   <ref role="3cqZAo" node="3IIf9O_qVvb" resolve="repository" />
                 </node>
+                <node concept="37vLTw" id="3IIf9O_rfQn" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_r1EB" resolve="queryFqName" />
+                </node>
               </node>
             </node>
           </node>
@@ -3338,8 +3348,8 @@
                       <node concept="3cpWs8" id="7WKNeR9z3I$" role="3cqZAp">
                         <node concept="3cpWsn" id="7WKNeR9z3I_" role="3cpWs9">
                           <property role="TrG5h" value="queryTemplate" />
-                          <node concept="3uibUv" id="7WKNeR9z3I6" role="1tU5fm">
-                            <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+                          <node concept="3uibUv" id="6OXbTD$pURF" role="1tU5fm">
+                            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
                           </node>
                           <node concept="2OqwBi" id="7WKNeR9z3IA" role="33vP2m">
                             <node concept="37vLTw" id="7WKNeR9z3IB" role="2Oq$k0">
@@ -3388,8 +3398,8 @@
                                   <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" />
+                                      <ref role="1Y3XeK" to="i348:7P_FdVQ_k3b" resolve="QueryTemplate.QueryObservable" />
                                       <node concept="3Tm1VV" id="7WKNeR9$e5e" role="1B3o_S" />
                                       <node concept="3clFb_" id="7WKNeR9$e5f" role="jymVt">
                                         <property role="1EzhhJ" value="false" />
@@ -4369,7 +4379,6 @@
     <property role="3GE5qa" value="launch.step" />
     <node concept="3Tm1VV" id="3F6vMxq$KGN" role="1B3o_S" />
     <node concept="2tJIrI" id="6kREIVkR068" role="jymVt" />
-    <node concept="2tJIrI" id="6kREIVkQZkh" role="jymVt" />
     <node concept="3clFbW" id="7kTeLbPt4na" role="jymVt">
       <node concept="3cqZAl" id="7kTeLbPt4nb" role="3clF45" />
       <node concept="3Tm1VV" id="7kTeLbPt4nc" role="1B3o_S" />
@@ -4417,16 +4426,16 @@
       <node concept="3cqZAl" id="7WKNeR9fh8k" role="3clF45" />
       <node concept="3Tm1VV" id="7WKNeR9fh8l" role="1B3o_S" />
       <node concept="3clFbS" id="7WKNeR9fh8m" role="3clF47">
-        <node concept="3clFbF" id="7WKNeR9fh8n" role="3cqZAp">
-          <node concept="37vLTI" id="7WKNeR9fh8o" role="3clFbG">
-            <node concept="2OqwBi" id="7WKNeR9fh8p" role="37vLTJ">
-              <node concept="Xjq3P" id="7WKNeR9fh8q" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7WKNeR9fh8r" role="2OqNvi">
-                <ref role="2Oxat5" node="6kREIVkLEGt" resolve="repository" />
+        <node concept="3clFbF" id="7WKNeR9fkhk" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR9fkhl" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR9fkhm" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR9fkhn" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR9fkho" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR9fj4f" resolve="queryFqName" />
               </node>
             </node>
-            <node concept="37vLTw" id="7WKNeR9fh8s" role="37vLTx">
-              <ref role="3cqZAo" node="7WKNeR9fh8_" resolve="repository" />
+            <node concept="37vLTw" id="7WKNeR9fkhp" role="37vLTx">
+              <ref role="3cqZAo" node="7WKNeR9fiNv" resolve="queryFqName" />
             </node>
           </node>
         </node>
@@ -4443,23 +4452,32 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7WKNeR9fkhk" role="3cqZAp">
-          <node concept="37vLTI" id="7WKNeR9fkhl" role="3clFbG">
-            <node concept="2OqwBi" id="7WKNeR9fkhm" role="37vLTJ">
-              <node concept="Xjq3P" id="7WKNeR9fkhn" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7WKNeR9fkho" role="2OqNvi">
-                <ref role="2Oxat5" node="7WKNeR9fj4f" resolve="queryFqName" />
+        <node concept="3clFbF" id="7WKNeR9fh8n" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR9fh8o" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR9fh8p" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR9fh8q" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR9fh8r" role="2OqNvi">
+                <ref role="2Oxat5" node="6kREIVkLEGt" resolve="repository" />
               </node>
             </node>
-            <node concept="37vLTw" id="7WKNeR9fkhp" role="37vLTx">
-              <ref role="3cqZAo" node="7WKNeR9fiNv" resolve="queryFqName" />
+            <node concept="37vLTw" id="7WKNeR9fh8s" role="37vLTx">
+              <ref role="3cqZAo" node="7WKNeR9fh8_" resolve="repository" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6OXbTDxIg05" role="3cqZAp">
+          <node concept="37vLTI" id="6OXbTDxIg07" role="3clFbG">
+            <node concept="2OqwBi" id="6OXbTDxIh3L" role="37vLTJ">
+              <node concept="Xjq3P" id="6OXbTDxIhcu" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6OXbTDxIh3O" role="2OqNvi">
+                <ref role="2Oxat5" node="6OXbTDxIg00" resolve="queryParameter" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="6OXbTDxIg0b" role="37vLTx">
+              <ref role="3cqZAo" node="6OXbTDxI9hi" resolve="queryParameter" />
             </node>
           </node>
         </node>
-      </node>
-      <node concept="37vLTG" id="7WKNeR9fiNv" role="3clF46">
-        <property role="TrG5h" value="queryFqName" />
-        <node concept="17QB3L" id="7WKNeR9fiNw" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="7WKNeR9fh8z" role="3clF46">
         <property role="TrG5h" value="inputNodes" />
@@ -4471,6 +4489,18 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
+      <node concept="37vLTG" id="7WKNeR9fiNv" role="3clF46">
+        <property role="TrG5h" value="queryFqName" />
+        <node concept="17QB3L" id="7WKNeR9fiNw" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="6OXbTDxI9hi" role="3clF46">
+        <property role="TrG5h" value="queryParameter" />
+        <node concept="8X2XB" id="6OXbTDxIdpB" role="1tU5fm">
+          <node concept="3uibUv" id="6OXbTDxIdi7" role="8Xvag">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="7WKNeR9fh8i" role="jymVt" />
     <node concept="3clFb_" id="1pPth$lMB$v" role="jymVt">
@@ -4698,12 +4728,20 @@
                             <node concept="2OqwBi" id="Hg6Enc4Wbs" role="37vLTJ">
                               <node concept="Xjq3P" id="Hg6Enc4Wbt" role="2Oq$k0" />
                               <node concept="2OwXpG" id="Hg6Enc4Wbu" role="2OqNvi">
-                                <ref role="2Oxat5" node="3GlpCDSzA$E" resolve="programBuilder" />
+                                <ref role="2Oxat5" node="3GlpCDSzA$E" resolve="programProducer" />
                               </node>
                             </node>
                             <node concept="2ShNRf" id="Hg6Enc4Wbv" role="37vLTx">
                               <node concept="1pGfFk" id="Hg6Enc4Wbw" role="2ShVmc">
-                                <ref role="37wK5l" to="hano:7WKNeR9bcL$" resolve="ProgramBuilder" />
+                                <ref role="37wK5l" to="hano:7WKNeR9bcL$" resolve="ProgramProducer" />
+                                <node concept="3cpWs3" id="6OXbTDxuiso" role="37wK5m">
+                                  <node concept="37vLTw" id="6OXbTDxuisp" role="3uHU7w">
+                                    <ref role="3cqZAo" node="Hg6Enc4Wb5" resolve="nameHint" />
+                                  </node>
+                                  <node concept="Xl_RD" id="6OXbTDxuisq" role="3uHU7B">
+                                    <property role="Xl_RC" value="types_" />
+                                  </node>
+                                </node>
                                 <node concept="2OqwBi" id="7DvO2M9pC8F" role="37wK5m">
                                   <node concept="Xjq3P" id="7DvO2M9pC8G" role="2Oq$k0" />
                                   <node concept="2OwXpG" id="7DvO2M9pC8H" role="2OqNvi">
@@ -4728,20 +4766,15 @@
                             </node>
                             <node concept="2OqwBi" id="7kTeLbPtIoW" role="37vLTx">
                               <node concept="37vLTw" id="7kTeLbPtIoX" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3GlpCDSzA$E" resolve="programBuilder" />
+                                <ref role="3cqZAo" node="3GlpCDSzA$E" resolve="programProducer" />
                               </node>
                               <node concept="liA8E" id="7kTeLbPtIoY" role="2OqNvi">
-                                <ref role="37wK5l" to="hano:7kTeLbPojCz" resolve="forEach" />
+                                <ref role="37wK5l" to="hano:7kTeLbPojCz" resolve="produce" />
                                 <node concept="37vLTw" id="7kTeLbPtKEF" role="37wK5m">
                                   <ref role="3cqZAo" node="7kTeLbPt5$3" resolve="nodes" />
                                 </node>
-                                <node concept="3cpWs3" id="7kTeLbPtIp0" role="37wK5m">
-                                  <node concept="37vLTw" id="7kTeLbPtIp1" role="3uHU7w">
-                                    <ref role="3cqZAo" node="Hg6Enc4Wb5" resolve="nameHint" />
-                                  </node>
-                                  <node concept="Xl_RD" id="7kTeLbPtIp2" role="3uHU7B">
-                                    <property role="Xl_RC" value="types_" />
-                                  </node>
+                                <node concept="37vLTw" id="6OXbTDxOms3" role="37wK5m">
+                                  <ref role="3cqZAo" node="6OXbTDxIg00" resolve="queryParameter" />
                                 </node>
                               </node>
                             </node>
@@ -4845,8 +4878,8 @@
     <node concept="2tJIrI" id="7WKNeR9kCIM" role="jymVt" />
     <node concept="3clFb_" id="7WKNeR9kDKp" role="jymVt">
       <property role="TrG5h" value="queryTemplate" />
-      <node concept="3uibUv" id="7WKNeR9kEIG" role="3clF45">
-        <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+      <node concept="3uibUv" id="6OXbTD$pWcW" role="3clF45">
+        <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
       </node>
       <node concept="3Tm1VV" id="7WKNeR9kDKs" role="1B3o_S" />
       <node concept="3clFbS" id="7WKNeR9kDKt" role="3clF47">
@@ -4873,7 +4906,7 @@
         <node concept="3clFbF" id="4QPCta1h7tZ" role="3cqZAp">
           <node concept="2OqwBi" id="4QPCta1h7Ik" role="3clFbG">
             <node concept="37vLTw" id="4QPCta1h7tY" role="2Oq$k0">
-              <ref role="3cqZAo" node="3GlpCDSzA$E" resolve="programBuilder" />
+              <ref role="3cqZAo" node="3GlpCDSzA$E" resolve="programProducer" />
             </node>
             <node concept="liA8E" id="4QPCta1h7Ts" role="2OqNvi">
               <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getPrograms" />
@@ -4904,15 +4937,15 @@
     <node concept="312cEg" id="7WKNeR9kv7q" role="jymVt">
       <property role="TrG5h" value="queryTemplate" />
       <node concept="3Tm6S6" id="7WKNeR9kv7o" role="1B3o_S" />
-      <node concept="3uibUv" id="7WKNeR9kv7p" role="1tU5fm">
-        <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+      <node concept="3uibUv" id="6OXbTD$kGXo" role="1tU5fm">
+        <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
       </node>
     </node>
     <node concept="312cEg" id="3GlpCDSzA$E" role="jymVt">
-      <property role="TrG5h" value="programBuilder" />
+      <property role="TrG5h" value="programProducer" />
       <node concept="3Tm6S6" id="6kREIVkHEOZ" role="1B3o_S" />
       <node concept="3uibUv" id="3GlpCDSzA$D" role="1tU5fm">
-        <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramBuilder" />
+        <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
       </node>
     </node>
     <node concept="312cEg" id="6kREIVkLEGt" role="jymVt">
@@ -4927,6 +4960,15 @@
       <node concept="3Tm6S6" id="7WKNeR9fj4g" role="1B3o_S" />
       <node concept="17QB3L" id="7WKNeR9fj4i" role="1tU5fm" />
     </node>
+    <node concept="312cEg" id="6OXbTDxIg00" role="jymVt">
+      <property role="TrG5h" value="queryParameter" />
+      <node concept="3Tm6S6" id="6OXbTDxIg01" role="1B3o_S" />
+      <node concept="10Q1$e" id="6OXbTDxIhw6" role="1tU5fm">
+        <node concept="3uibUv" id="6OXbTDxIg04" role="10Q1$1">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="7nPD14NbIif">
     <property role="TrG5h" value="MultiTrace" />
@@ -6076,7 +6118,40 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="443LGHBTRIR" role="3cqZAp" />
+        <node concept="3clFbH" id="6OXbTD_AGUa" role="3cqZAp" />
+        <node concept="3SKdUt" id="6OXbTD_AKjZ" role="3cqZAp">
+          <node concept="3SKdUq" id="6OXbTD_AKk1" role="3SKWNk">
+            <property role="3SKdUp" value="TODO: need a direct link to the query" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="6OXbTD_AY$T" role="3cqZAp" />
+        <node concept="1X3_iC" id="6OXbTD_AJ6F" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="3cpWs8" id="6OXbTD_Apwe" role="8Wnug">
+            <node concept="3cpWsn" id="6OXbTD_Apwf" role="3cpWs9">
+              <property role="TrG5h" value="queryNode" />
+              <node concept="2sp9CU" id="6OXbTD_Apwd" role="1tU5fm">
+                <ref role="2sp9C9" to="wq2x:6OXbTD$dU7b" resolve="Query" />
+              </node>
+              <node concept="2tJFMh" id="6OXbTD_Apwg" role="33vP2m">
+                <node concept="ZC_QK" id="6OXbTD_Apwh" role="2tJFKM">
+                  <ref role="2aWVGs" to="kqnc:6OXbTD$fto2" resolve="typecheck" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6OXbTD_A30I" role="3cqZAp">
+          <node concept="3cpWsn" id="6OXbTD_A30J" role="3cpWs9">
+            <property role="TrG5h" value="queryFqname" />
+            <node concept="17QB3L" id="6OXbTD_A30G" role="1tU5fm" />
+            <node concept="Xl_RD" id="6OXbTD_AFOY" role="33vP2m">
+              <property role="Xl_RC" value="jetbrains.mps.baseLanguageExt.types.typecheck" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6OXbTD__XSd" role="3cqZAp" />
         <node concept="3cpWs8" id="7y50OW6XU81" role="3cqZAp">
           <node concept="3cpWsn" id="7y50OW6XU82" role="3cpWs9">
             <property role="TrG5h" value="helper" />
@@ -6085,13 +6160,21 @@
             </node>
             <node concept="2YIFZM" id="2Qe6u2c7U1p" role="33vP2m">
               <ref role="1Pybhc" node="1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
-              <ref role="37wK5l" node="2Qe6u2c7U1k" resolve="helper" />
-              <node concept="37vLTw" id="2Qe6u2c7U1n" role="37wK5m">
-                <ref role="3cqZAo" node="7smgEqg8tfa" resolve="root" />
+              <ref role="37wK5l" node="2Qe6u2c8aJv" resolve="helper" />
+              <node concept="2ShNRf" id="6OXbTD__WV5" role="37wK5m">
+                <node concept="Tc6Ow" id="6OXbTD__WV6" role="2ShVmc">
+                  <node concept="3Tqbb2" id="6OXbTD__WV7" role="HW$YZ" />
+                  <node concept="37vLTw" id="6OXbTD__Xdf" role="HW$Y0">
+                    <ref role="3cqZAo" node="7smgEqg8tfa" resolve="root" />
+                  </node>
+                </node>
               </node>
               <node concept="37vLTw" id="2Qe6u2c7U1o" role="37wK5m">
                 <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
               </node>
+              <node concept="37vLTw" id="6OXbTD_A8RK" role="37wK5m">
+                <ref role="3cqZAo" node="6OXbTD_A30J" resolve="queryFqname" />
+              </node>
             </node>
           </node>
         </node>
@@ -6236,6 +6319,9 @@
                                     <node concept="37vLTw" id="2Qe6u2c8hlW" role="37wK5m">
                                       <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
                                     </node>
+                                    <node concept="37vLTw" id="6OXbTD_A9ie" role="37wK5m">
+                                      <ref role="3cqZAo" node="6OXbTD_A30J" resolve="queryFqname" />
+                                    </node>
                                   </node>
                                   <node concept="37vLTw" id="2Qe6u2c9dcK" role="37vLTJ">
                                     <ref role="3cqZAo" node="2Qe6u2c8ezt" resolve="helper2" />
@@ -6581,99 +6667,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="2Qe6u2c7Uvv" role="jymVt" />
-    <node concept="2YIFZL" id="2Qe6u2c7U1k" role="jymVt">
-      <property role="TrG5h" value="helper" />
-      <node concept="3Tm6S6" id="2Qe6u2c7U1l" role="1B3o_S" />
-      <node concept="3uibUv" id="2Qe6u2c7U1m" role="3clF45">
-        <ref role="3uigEE" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-      </node>
-      <node concept="37vLTG" id="2Qe6u2c7U1a" role="3clF46">
-        <property role="TrG5h" value="root" />
-        <node concept="3Tqbb2" id="2Qe6u2c7U1b" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="2Qe6u2c7U1c" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="2Qe6u2c7U1d" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="2Qe6u2c7U0E" role="3clF47">
-        <node concept="3cpWs8" id="2Qe6u2c7U0H" role="3cqZAp">
-          <node concept="3cpWsn" id="2Qe6u2c7U0I" role="3cpWs9">
-            <property role="TrG5h" value="applyTemplatesStep" />
-            <node concept="3uibUv" id="2Qe6u2c7U0J" role="1tU5fm">
-              <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-            </node>
-            <node concept="2ShNRf" id="2Qe6u2c7U0K" role="33vP2m">
-              <node concept="1pGfFk" id="2Qe6u2c7U0L" role="2ShVmc">
-                <ref role="37wK5l" node="7kTeLbPt4na" resolve="ApplyTemplatesStep" />
-                <node concept="2ShNRf" id="3IIf9O_rFsk" role="37wK5m">
-                  <node concept="Tc6Ow" id="3IIf9O_rGw7" role="2ShVmc">
-                    <node concept="3Tqbb2" id="3IIf9O_rHIs" role="HW$YZ" />
-                    <node concept="37vLTw" id="3IIf9O_rJ6J" role="HW$Y0">
-                      <ref role="3cqZAo" node="2Qe6u2c7U1a" resolve="root" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="2Qe6u2c7U1f" role="37wK5m">
-                  <ref role="3cqZAo" node="2Qe6u2c7U1c" resolve="repository" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2Qe6u2c7U0O" role="3cqZAp">
-          <node concept="3cpWsn" id="2Qe6u2c7U0P" role="3cpWs9">
-            <property role="TrG5h" value="evaluateRulesStep" />
-            <property role="3TUv4t" value="false" />
-            <node concept="3uibUv" id="2Qe6u2c7U0Q" role="1tU5fm">
-              <ref role="3uigEE" node="1pPth$lBNWG" resolve="EvaluateRulesStep" />
-            </node>
-            <node concept="2ShNRf" id="2Qe6u2c7U0R" role="33vP2m">
-              <node concept="1pGfFk" id="2Qe6u2c7U0S" role="2ShVmc">
-                <ref role="37wK5l" node="1pPth$lHpLU" resolve="EvaluateRulesStep" />
-                <node concept="37vLTw" id="2Qe6u2c7U1h" role="37wK5m">
-                  <ref role="3cqZAo" node="2Qe6u2c7U1c" resolve="repository" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2Qe6u2c7U0U" role="3cqZAp">
-          <node concept="3cpWsn" id="2Qe6u2c7U0V" role="3cpWs9">
-            <property role="TrG5h" value="collectTypesStep" />
-            <node concept="3uibUv" id="2Qe6u2c7U0W" role="1tU5fm">
-              <ref role="3uigEE" node="6IQb_RxlB9v" resolve="CollectTypesStep" />
-            </node>
-            <node concept="2ShNRf" id="2Qe6u2c7U0X" role="33vP2m">
-              <node concept="1pGfFk" id="2Qe6u2c7U0Y" role="2ShVmc">
-                <ref role="37wK5l" node="6IQb_RxlCdT" resolve="CollectTypesStep" />
-                <node concept="37vLTw" id="2Qe6u2c7U1e" role="37wK5m">
-                  <ref role="3cqZAo" node="2Qe6u2c7U1c" resolve="repository" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="2Qe6u2c7U18" role="3cqZAp">
-          <node concept="2ShNRf" id="2Qe6u2c7U13" role="3cqZAk">
-            <node concept="1pGfFk" id="2Qe6u2c7U14" role="2ShVmc">
-              <ref role="37wK5l" node="443LGHBiDEV" resolve="TypecheckingHelper" />
-              <node concept="37vLTw" id="2Qe6u2c7U15" role="37wK5m">
-                <ref role="3cqZAo" node="2Qe6u2c7U0I" resolve="applyTemplatesStep" />
-              </node>
-              <node concept="37vLTw" id="2Qe6u2c7U16" role="37wK5m">
-                <ref role="3cqZAo" node="2Qe6u2c7U0P" resolve="evaluateRulesStep" />
-              </node>
-              <node concept="37vLTw" id="2Qe6u2c7U17" role="37wK5m">
-                <ref role="3cqZAo" node="2Qe6u2c7U0V" resolve="collectTypesStep" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2Qe6u2c7PEY" role="jymVt" />
     <node concept="2YIFZL" id="2Qe6u2c8aJv" role="jymVt">
       <property role="TrG5h" value="helper" />
       <node concept="3Tm6S6" id="2Qe6u2c8aJw" role="1B3o_S" />
@@ -6690,6 +6683,10 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
+      <node concept="37vLTG" id="6OXbTD_A4DJ" role="3clF46">
+        <property role="TrG5h" value="queryFqname" />
+        <node concept="17QB3L" id="6OXbTD_A53L" role="1tU5fm" />
+      </node>
       <node concept="3clFbS" id="2Qe6u2c8aJA" role="3clF47">
         <node concept="3cpWs8" id="2Qe6u2c8aJB" role="3cqZAp">
           <node concept="3cpWsn" id="2Qe6u2c8aJC" role="3cpWs9">
@@ -6699,13 +6696,16 @@
             </node>
             <node concept="2ShNRf" id="2Qe6u2c8aJE" role="33vP2m">
               <node concept="1pGfFk" id="2Qe6u2c8aJF" role="2ShVmc">
-                <ref role="37wK5l" node="7kTeLbPt4na" resolve="ApplyTemplatesStep" />
+                <ref role="37wK5l" node="7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
                 <node concept="37vLTw" id="2Qe6u2c8aJG" role="37wK5m">
                   <ref role="3cqZAo" node="2Qe6u2c8aJy" resolve="nodes" />
                 </node>
                 <node concept="37vLTw" id="2Qe6u2c8aJH" role="37wK5m">
                   <ref role="3cqZAo" node="2Qe6u2c8aJ$" resolve="repository" />
                 </node>
+                <node concept="37vLTw" id="6OXbTD_A6xQ" role="37wK5m">
+                  <ref role="3cqZAo" node="6OXbTD_A4DJ" resolve="queryFqname" />
+                </node>
               </node>
             </node>
           </node>
@@ -6762,9 +6762,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="2Qe6u2c8aJu" role="jymVt" />
-    <node concept="2tJIrI" id="2Qe6u2c7PGO" role="jymVt" />
-    <node concept="2tJIrI" id="2Qe6u2c7PIF" role="jymVt" />
-    <node concept="2tJIrI" id="1N_0WA5Jy0_" role="jymVt" />
     <node concept="3Tm1VV" id="1N_0WA5JxZP" role="1B3o_S" />
     <node concept="3UR2Jj" id="443LGHBisnv" role="lGtFl">
       <node concept="TZ5HA" id="443LGHBisnw" role="TZ5H$">
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 564f66a2..6683cc01 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -581,6 +581,7 @@
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
       <concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
+      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
         <reference id="1171315804605" name="concept" index="2RRcyH" />
       </concept>
@@ -714,6 +715,7 @@
         <child id="1225711182005" name="list" index="1y566C" />
         <child id="1225711191269" name="index" index="1y58nS" />
       </concept>
+      <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
@@ -764,11 +766,6 @@
       <ref role="2rTdP9" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
       <ref role="2rZz_L" to="tpee:fzclF84" resolve="ConstructorDeclaration" />
     </node>
-    <node concept="2rT7sh" id="7P_FdVPtAzR" role="2rTMjI">
-      <property role="TrG5h" value="query_template" />
-      <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
-      <ref role="2rTdP9" to="wq2x:7P_FdVQ_S6B" resolve="Query" />
-    </node>
     <node concept="2rT7sh" id="6w6CYIRhsKS" role="2rTMjI">
       <property role="TrG5h" value="rule_class" />
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
@@ -845,9 +842,14 @@
       <ref role="2rTdP9" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
     </node>
     <node concept="2rT7sh" id="36tQV5AugIl" role="2rTMjI">
-      <property role="TrG5h" value="ruletemplate_token_this" />
-      <ref role="2rTdP9" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+      <property role="TrG5h" value="template_token_this" />
       <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="429xoypVg6q" role="2rTMjI">
       <property role="TrG5h" value="apply_session_parameter" />
@@ -879,15 +881,155 @@
       <ref role="2rTdP9" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
       <ref role="2rZz_L" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
     </node>
+    <node concept="2rT7sh" id="7P_FdVPtAzR" role="2rTMjI">
+      <property role="TrG5h" value="query_class" />
+      <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
+      <ref role="2rTdP9" to="wq2x:6OXbTD$dU7b" resolve="Query" />
+    </node>
+    <node concept="2rT7sh" id="6OXbTD$ko7g" role="2rTMjI">
+      <property role="TrG5h" value="query_constructor" />
+      <ref role="2rTdP9" to="wq2x:6OXbTD$dU7b" resolve="Query" />
+      <ref role="2rZz_L" to="tpee:fzclF84" resolve="ConstructorDeclaration" />
+    </node>
+    <node concept="2rT7sh" id="6OXbTD$jKJM" role="2rTMjI">
+      <property role="TrG5h" value="query_stage_constructor" />
+      <ref role="2rTdP9" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
+      <ref role="2rZz_L" to="tpee:fzclF84" resolve="ConstructorDeclaration" />
+    </node>
     <node concept="3lhOvk" id="4MqhgXUaA0d" role="3lj3bC">
       <ref role="30HIoZ" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
       <ref role="3lhOvi" node="4MqhgXU9Ebr" resolve="HandlerTemplateImpl" />
       <ref role="2sgKRv" node="4MqhgXUaC7X" resolve="handler_template_class" />
     </node>
     <node concept="3lhOvk" id="7P_FdVQ_Uvo" role="3lj3bC">
-      <ref role="30HIoZ" to="wq2x:7P_FdVQ_S6B" resolve="Query" />
-      <ref role="3lhOvi" node="7P_FdVPsJiz" resolve="QueryTemplateImpl" />
-      <ref role="2sgKRv" node="7P_FdVPtAzR" resolve="query_template" />
+      <ref role="2sgKRv" node="7P_FdVPtAzR" resolve="query_class" />
+      <ref role="3lhOvi" node="6OXbTD$fBEY" resolve="QueryTemplateImpl" />
+      <ref role="30HIoZ" to="wq2x:6OXbTD$dU7b" resolve="Query" />
+    </node>
+    <node concept="3lhOvk" id="6OXbTD$_yFY" role="3lj3bC">
+      <ref role="30HIoZ" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
+      <ref role="3lhOvi" node="7P_FdVPsJiz" resolve="QueryStageTemplateImpl" />
+      <node concept="30G5F_" id="6OXbTD$CVyQ" role="30HLyM">
+        <node concept="3clFbS" id="6OXbTD$CVyR" role="2VODD2">
+          <node concept="3SKdUt" id="6OXbTD$CVHM" role="3cqZAp">
+            <node concept="3SKdUq" id="6OXbTD$CVHN" role="3SKWNk">
+              <property role="3SKdUp" value="ensure the rule is only mapped to root once" />
+            </node>
+          </node>
+          <node concept="3SKdUt" id="6OXbTD$CVHO" role="3cqZAp">
+            <node concept="3SKdUq" id="6OXbTD$CVHP" role="3SKWNk">
+              <property role="3SKdUp" value="additionally, ensure all the rules have unique names" />
+            </node>
+          </node>
+          <node concept="3SKdUt" id="6OXbTD$CVHQ" role="3cqZAp">
+            <node concept="3SKdUq" id="6OXbTD$CVHR" role="3SKWNk">
+              <property role="3SKdUp" value="see the script &quot;init_tracking&quot;" />
+            </node>
+          </node>
+          <node concept="3cpWs8" id="6OXbTD$CVHS" role="3cqZAp">
+            <node concept="3cpWsn" id="6OXbTD$CVHT" role="3cpWs9">
+              <property role="TrG5h" value="trackMap" />
+              <node concept="3uibUv" id="6OXbTD$CVHU" role="1tU5fm">
+                <ref role="3uigEE" to="5zyv:~ConcurrentHashMap" resolve="ConcurrentHashMap" />
+                <node concept="17QB3L" id="6OXbTD$CVHV" role="11_B2D" />
+                <node concept="3Tqbb2" id="6OXbTD$CVHW" role="11_B2D" />
+              </node>
+              <node concept="10QFUN" id="6OXbTD$CVHX" role="33vP2m">
+                <node concept="3uibUv" id="6OXbTD$CVHY" role="10QFUM">
+                  <ref role="3uigEE" to="5zyv:~ConcurrentHashMap" resolve="ConcurrentHashMap" />
+                  <node concept="17QB3L" id="6OXbTD$CVHZ" role="11_B2D" />
+                  <node concept="3Tqbb2" id="6OXbTD$CVI0" role="11_B2D" />
+                </node>
+                <node concept="2OqwBi" id="6OXbTD$CVI1" role="10QFUP">
+                  <node concept="1iwH7S" id="6OXbTD$CVI2" role="2Oq$k0" />
+                  <node concept="2fSANN" id="6OXbTD$CVI3" role="2OqNvi">
+                    <node concept="Xl_RD" id="6OXbTD$CVI4" role="2fWi3N">
+                      <property role="Xl_RC" value="TRACKING" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="6OXbTD$CVI5" role="3cqZAp">
+            <node concept="3cpWsn" id="6OXbTD$CVI6" role="3cpWs9">
+              <property role="TrG5h" value="mappedNode" />
+              <node concept="3Tqbb2" id="6OXbTD$CVI7" role="1tU5fm" />
+              <node concept="2OqwBi" id="6OXbTD$CVI8" role="33vP2m">
+                <node concept="37vLTw" id="6OXbTD$CVI9" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6OXbTD$CVHT" resolve="trackMap" />
+                </node>
+                <node concept="liA8E" id="6OXbTD$CVIa" role="2OqNvi">
+                  <ref role="37wK5l" to="5zyv:~ConcurrentHashMap.putIfAbsent(java.lang.Object,java.lang.Object):java.lang.Object" resolve="putIfAbsent" />
+                  <node concept="2OqwBi" id="6OXbTD$CVIb" role="37wK5m">
+                    <node concept="30H73N" id="6OXbTD$CVIc" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="6OXbTD$CVId" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                  </node>
+                  <node concept="30H73N" id="6OXbTD$CVIe" role="37wK5m" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="6OXbTD$CVIf" role="3cqZAp">
+            <node concept="3clFbS" id="6OXbTD$CVIg" role="3clFbx">
+              <node concept="3SKdUt" id="6OXbTD$CVIh" role="3cqZAp">
+                <node concept="3SKdUq" id="6OXbTD$CVIi" role="3SKWNk">
+                  <property role="3SKdUp" value="name collision" />
+                </node>
+              </node>
+              <node concept="3clFbF" id="6OXbTD$CVIj" role="3cqZAp">
+                <node concept="2OqwBi" id="6OXbTD$CVIk" role="3clFbG">
+                  <node concept="1iwH7S" id="6OXbTD$CVIl" role="2Oq$k0" />
+                  <node concept="2k5nB$" id="6OXbTD$CVIm" role="2OqNvi">
+                    <node concept="30H73N" id="6OXbTD$CVIn" role="2k6f33" />
+                    <node concept="3cpWs3" id="6OXbTD$CVIo" role="2k5Stb">
+                      <node concept="3cpWs3" id="6OXbTD$CVIp" role="3uHU7B">
+                        <node concept="2OqwBi" id="6OXbTD$CVIq" role="3uHU7w">
+                          <node concept="30H73N" id="6OXbTD$CVIr" role="2Oq$k0" />
+                          <node concept="3TrcHB" id="6OXbTD$CVIs" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                        <node concept="Xl_RD" id="6OXbTD$CVIt" role="3uHU7B">
+                          <property role="Xl_RC" value="query name collision \&quot;" />
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="6OXbTD$CVIu" role="3uHU7w">
+                        <property role="Xl_RC" value="\&quot;" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1Wc70l" id="6OXbTD$CVIv" role="3clFbw">
+              <node concept="3y3z36" id="6OXbTD$CVIw" role="3uHU7w">
+                <node concept="30H73N" id="6OXbTD$CVIx" role="3uHU7w" />
+                <node concept="37vLTw" id="6OXbTD$CVIy" role="3uHU7B">
+                  <ref role="3cqZAo" node="6OXbTD$CVI6" resolve="mappedNode" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6OXbTD$CVIz" role="3uHU7B">
+                <node concept="37vLTw" id="6OXbTD$CVI$" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6OXbTD$CVI6" resolve="mappedNode" />
+                </node>
+                <node concept="3x8VRR" id="6OXbTD$CVI_" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="6OXbTD$CWOz" role="3cqZAp" />
+          <node concept="3clFbF" id="6OXbTD$CVIA" role="3cqZAp">
+            <node concept="2OqwBi" id="6OXbTD$CVIB" role="3clFbG">
+              <node concept="37vLTw" id="6OXbTD$CVIC" role="2Oq$k0">
+                <ref role="3cqZAo" node="6OXbTD$CVI6" resolve="mappedNode" />
+              </node>
+              <node concept="3w_OXm" id="6OXbTD$CVID" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="3lhOvk" id="4vbeH84zIB1" role="3lj3bC">
       <ref role="3lhOvi" node="4vbeH84zLYz" resolve="RuleTemplateImpl_deprecated" />
@@ -1571,8 +1713,8 @@
                                   <node concept="30H73N" id="36tQV5AIYvI" role="2Oq$k0" />
                                   <node concept="2Xjw5R" id="36tQV5AIZ7W" role="2OqNvi">
                                     <node concept="1xMEDy" id="36tQV5AIZ7Y" role="1xVPHs">
-                                      <node concept="chp4Y" id="36tQV5AIZaP" role="ri$Ld">
-                                        <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                      <node concept="chp4Y" id="6OXbTDzeayj" role="ri$Ld">
+                                        <ref role="cht4Q" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
                                       </node>
                                     </node>
                                   </node>
@@ -1833,87 +1975,8 @@
               </node>
               <node concept="liA8E" id="5wZaC7XVUQQ" role="2OqNvi">
                 <ref role="37wK5l" node="2RRx4N073iu" resolve="init" />
-                <node concept="37vLTw" id="5wZaC7XVWfb" role="37wK5m">
-                  <ref role="3cqZAo" node="2RRx4N07lhe" resolve="input" />
-                  <node concept="1W57fq" id="5wZaC7XVWfc" role="lGtFl">
-                    <node concept="3IZrLx" id="5wZaC7XVWfd" role="3IZSJc">
-                      <node concept="3clFbS" id="5wZaC7XVWfe" role="2VODD2">
-                        <node concept="3clFbF" id="5wZaC7XVWff" role="3cqZAp">
-                          <node concept="2OqwBi" id="5wZaC7XVWfg" role="3clFbG">
-                            <node concept="2OqwBi" id="5wZaC7XVWfh" role="2Oq$k0">
-                              <node concept="2OqwBi" id="5wZaC7XVWfi" role="2Oq$k0">
-                                <node concept="2OqwBi" id="5wZaC7XVWfj" role="2Oq$k0">
-                                  <node concept="1PxgMI" id="5wZaC7XVWfk" role="2Oq$k0">
-                                    <property role="1BlNFB" value="true" />
-                                    <node concept="30H73N" id="5wZaC7XVWfl" role="1m5AlR" />
-                                    <node concept="chp4Y" id="5wZaC7XVWfm" role="3oSUPX">
-                                      <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="5wZaC7XVWfn" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:6wQEDbCLoaZ" resolve="includeClause" />
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="5wZaC7XVWfo" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:6wQEDbCL4Fj" resolve="fragment" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5wZaC7XVWfp" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:6wQEDbCCPyR" resolve="input" />
-                              </node>
-                            </node>
-                            <node concept="3x8VRR" id="5wZaC7XVWfq" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="1W57fq" id="4QPCta0ttHp" role="lGtFl">
-                    <node concept="3IZrLx" id="4QPCta0ttHq" role="3IZSJc">
-                      <node concept="3clFbS" id="4QPCta0ttHr" role="2VODD2">
-                        <node concept="3clFbF" id="4QPCta0ttHs" role="3cqZAp">
-                          <node concept="2OqwBi" id="4QPCta0ttHt" role="3clFbG">
-                            <node concept="2OqwBi" id="4QPCta0ttHu" role="2Oq$k0">
-                              <node concept="2OqwBi" id="4QPCta0ttHv" role="2Oq$k0">
-                                <node concept="2OqwBi" id="4QPCta0ttHw" role="2Oq$k0">
-                                  <node concept="1PxgMI" id="4QPCta0ttHx" role="2Oq$k0">
-                                    <property role="1BlNFB" value="true" />
-                                    <node concept="30H73N" id="4QPCta0ttHy" role="1m5AlR" />
-                                    <node concept="chp4Y" id="4QPCta0ttHz" role="3oSUPX">
-                                      <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="4QPCta0ttH$" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:6wQEDbCLoaZ" resolve="includeClause" />
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="4QPCta0ttH_" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:6wQEDbCL4Fj" resolve="fragment" />
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="4QPCta0ttHA" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:6wQEDbCCPyR" resolve="input" />
-                              </node>
-                            </node>
-                            <node concept="3x8VRR" id="4QPCta0ttHB" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="10Nm6u" id="4QPCta0tvCs" role="37wK5m">
-                  <node concept="1W57fq" id="4QPCta0tyrk" role="lGtFl">
-                    <node concept="3IZrLx" id="4QPCta0tyrm" role="3IZSJc">
-                      <node concept="3clFbS" id="4QPCta0tyro" role="2VODD2">
-                        <node concept="3clFbF" id="4QPCta0tBig" role="3cqZAp">
-                          <node concept="3clFbT" id="4QPCta0tBif" role="3clFbG">
-                            <property role="3clFbU" value="false" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
+                <node concept="37vLTw" id="mJ_D13Si92" role="37wK5m">
+                  <ref role="3cqZAo" node="mJ_D13RM0K" resolve="input" />
                 </node>
               </node>
             </node>
@@ -1948,8 +2011,16 @@
           </node>
           <node concept="3clFbF" id="2RRx4N0IK5Q" role="3cqZAp">
             <node concept="37vLTI" id="2RRx4N0IK5R" role="3clFbG">
-              <node concept="37vLTw" id="2RRx4N0IK5S" role="37vLTx">
-                <ref role="3cqZAo" node="2RRx4N07lhe" resolve="input" />
+              <node concept="10QFUN" id="mJ_D13SlxJ" role="37vLTx">
+                <node concept="3Tqbb2" id="mJ_D13SlxE" role="10QFUM" />
+                <node concept="AH0OO" id="mJ_D13SlxF" role="10QFUP">
+                  <node concept="3cmrfG" id="mJ_D13SlxG" role="AHEQo">
+                    <property role="3cmrfH" value="0" />
+                  </node>
+                  <node concept="37vLTw" id="mJ_D13SlxH" role="AHHXb">
+                    <ref role="3cqZAo" node="mJ_D13RM0K" resolve="input" />
+                  </node>
+                </node>
               </node>
               <node concept="2OqwBi" id="2RRx4N0IK5T" role="37vLTJ">
                 <node concept="Xjq3P" id="2RRx4N0IK5U" role="2Oq$k0" />
@@ -1984,8 +2055,48 @@
                   <ref role="2Oxat5" node="4QPCta0tXFk" resolve="iterateOver" />
                 </node>
               </node>
-              <node concept="37vLTw" id="4QPCta0tB$F" role="37vLTx">
-                <ref role="3cqZAo" node="4QPCta0sOh7" resolve="iterateOver" />
+              <node concept="10QFUN" id="mJ_D13Sq_D" role="37vLTx">
+                <node concept="3uibUv" id="mJ_D13Sq_t" role="10QFUM">
+                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                  <node concept="29HgVG" id="mJ_D13Sq_u" role="lGtFl">
+                    <node concept="3NFfHV" id="mJ_D13Sq_v" role="3NFExx">
+                      <node concept="3clFbS" id="mJ_D13Sq_w" role="2VODD2">
+                        <node concept="3clFbF" id="mJ_D13Svqa" role="3cqZAp">
+                          <node concept="2OqwBi" id="mJ_D13Svqb" role="3clFbG">
+                            <node concept="2OqwBi" id="mJ_D13Svqc" role="2Oq$k0">
+                              <node concept="2OqwBi" id="mJ_D13Svqd" role="2Oq$k0">
+                                <node concept="3TrEf2" id="mJ_D13Svqe" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:5MHpiylGjt8" resolve="iterateParameterBlock" />
+                                </node>
+                                <node concept="1PxgMI" id="mJ_D13Svqf" role="2Oq$k0">
+                                  <property role="1BlNFB" value="true" />
+                                  <node concept="chp4Y" id="mJ_D13Svqg" role="3oSUPX">
+                                    <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
+                                  </node>
+                                  <node concept="30H73N" id="mJ_D13Svqh" role="1m5AlR" />
+                                </node>
+                              </node>
+                              <node concept="3TrEf2" id="mJ_D13Svqi" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:5MHpiylFI5Z" resolve="parameter" />
+                              </node>
+                            </node>
+                            <node concept="3TrEf2" id="mJ_D13Svqj" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:5MHpiylFYj$" resolve="type" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="AH0OO" id="mJ_D13Sq__" role="10QFUP">
+                  <node concept="3cmrfG" id="mJ_D13Sq_A" role="AHEQo">
+                    <property role="3cmrfH" value="1" />
+                  </node>
+                  <node concept="37vLTw" id="mJ_D13Sq_B" role="AHHXb">
+                    <ref role="3cqZAo" node="mJ_D13RM0K" resolve="input" />
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="1W57fq" id="4QPCta0tB$G" role="lGtFl">
@@ -2038,109 +2149,11 @@
             </node>
           </node>
         </node>
-        <node concept="37vLTG" id="2RRx4N07lhe" role="3clF46">
+        <node concept="37vLTG" id="mJ_D13RM0K" role="3clF46">
           <property role="TrG5h" value="input" />
-          <node concept="3Tqbb2" id="2RRx4N07lhd" role="1tU5fm" />
-          <node concept="1W57fq" id="2RRx4N0IRdF" role="lGtFl">
-            <node concept="3IZrLx" id="2RRx4N0IRdH" role="3IZSJc">
-              <node concept="3clFbS" id="2RRx4N0IRdJ" role="2VODD2">
-                <node concept="3clFbF" id="2RRx4N0IRLV" role="3cqZAp">
-                  <node concept="2OqwBi" id="2RRx4N0IU_a" role="3clFbG">
-                    <node concept="2OqwBi" id="2RRx4N0IS7Y" role="2Oq$k0">
-                      <node concept="30H73N" id="2RRx4N0IRLU" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="2RRx4N0ITKf" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:6wQEDbCCPyR" resolve="input" />
-                      </node>
-                    </node>
-                    <node concept="3x8VRR" id="2RRx4N0IUYD" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="17Uvod" id="2RRx4N0IWFc" role="lGtFl">
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <property role="2qtEX9" value="name" />
-            <node concept="3zFVjK" id="2RRx4N0IWFd" role="3zH0cK">
-              <node concept="3clFbS" id="2RRx4N0IWFe" role="2VODD2">
-                <node concept="3clFbF" id="2RRx4N0IXha" role="3cqZAp">
-                  <node concept="2OqwBi" id="2RRx4N0J2Hz" role="3clFbG">
-                    <node concept="2OqwBi" id="2RRx4N0J00x" role="2Oq$k0">
-                      <node concept="2OqwBi" id="2RRx4N0IXFd" role="2Oq$k0">
-                        <node concept="30H73N" id="2RRx4N0IXh9" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="2RRx4N0IZgv" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:6wQEDbCCPyR" resolve="input" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="2RRx4N0J1KX" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:5NuEpF1ihrB" resolve="input" />
-                      </node>
-                    </node>
-                    <node concept="3TrcHB" id="2RRx4N0J4e8" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="37vLTG" id="4QPCta0sOh7" role="3clF46">
-          <property role="TrG5h" value="iterateOver" />
-          <node concept="3uibUv" id="4QPCta0sOh8" role="1tU5fm">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-            <node concept="29HgVG" id="4QPCta0sOh9" role="lGtFl">
-              <node concept="3NFfHV" id="4QPCta0sOha" role="3NFExx">
-                <node concept="3clFbS" id="4QPCta0sOhb" role="2VODD2">
-                  <node concept="3clFbF" id="4QPCta0sOhc" role="3cqZAp">
-                    <node concept="2OqwBi" id="4QPCta0sOhd" role="3clFbG">
-                      <node concept="2OqwBi" id="4QPCta0sOhe" role="2Oq$k0">
-                        <node concept="2OqwBi" id="4QPCta0sOhf" role="2Oq$k0">
-                          <node concept="3TrEf2" id="4QPCta0sOhg" role="2OqNvi">
-                            <ref role="3Tt5mk" to="wq2x:5MHpiylGjt8" resolve="iterateParameterBlock" />
-                          </node>
-                          <node concept="1PxgMI" id="4QPCta0t8w3" role="2Oq$k0">
-                            <property role="1BlNFB" value="true" />
-                            <node concept="chp4Y" id="4QPCta0tbr1" role="3oSUPX">
-                              <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
-                            </node>
-                            <node concept="30H73N" id="4QPCta0sOhh" role="1m5AlR" />
-                          </node>
-                        </node>
-                        <node concept="3TrEf2" id="4QPCta0sOhi" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:5MHpiylFI5Z" resolve="parameter" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="4QPCta0sOhj" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:5MHpiylFYj$" resolve="type" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1W57fq" id="4QPCta0sOhk" role="lGtFl">
-            <node concept="3IZrLx" id="4QPCta0sOhl" role="3IZSJc">
-              <node concept="3clFbS" id="4QPCta0sOhm" role="2VODD2">
-                <node concept="3clFbF" id="4QPCta0sOhn" role="3cqZAp">
-                  <node concept="2OqwBi" id="4QPCta0sOho" role="3clFbG">
-                    <node concept="2OqwBi" id="4QPCta0sOhp" role="2Oq$k0">
-                      <node concept="1PxgMI" id="4QPCta0sZre" role="2Oq$k0">
-                        <property role="1BlNFB" value="true" />
-                        <node concept="chp4Y" id="4QPCta0t2o0" role="3oSUPX">
-                          <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
-                        </node>
-                        <node concept="30H73N" id="4QPCta0sOhq" role="1m5AlR" />
-                      </node>
-                      <node concept="3TrEf2" id="4QPCta0sOhr" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:5MHpiylGjt8" resolve="iterateParameterBlock" />
-                      </node>
-                    </node>
-                    <node concept="3x8VRR" id="4QPCta0sOhs" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
+          <node concept="8X2XB" id="mJ_D13RM0L" role="1tU5fm">
+            <node concept="3uibUv" id="mJ_D13RM0M" role="8Xvag">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
             </node>
           </node>
         </node>
@@ -3972,6 +3985,139 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5wZaC7XTE97" role="jymVt" />
+    <node concept="3clFb_" id="mJ_D13QlPg" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="newToken" />
+      <node concept="37vLTG" id="mJ_D13QlPh" role="3clF46">
+        <property role="TrG5h" value="input" />
+        <node concept="8X2XB" id="mJ_D13QlPi" role="1tU5fm">
+          <node concept="3uibUv" id="mJ_D13QlPj" role="8Xvag">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="mJ_D13QlQi" role="3clF45">
+        <ref role="3uigEE" node="2RRx4MZnXS3" resolve="RuleTemplateImpl_deprecated.Token" />
+      </node>
+      <node concept="3Tm1VV" id="mJ_D13QlPl" role="1B3o_S" />
+      <node concept="3clFbS" id="mJ_D13QlQr" role="3clF47">
+        <node concept="3cpWs8" id="mJ_D13QQuQ" role="3cqZAp">
+          <node concept="3cpWsn" id="mJ_D13QQuR" role="3cpWs9">
+            <property role="TrG5h" value="token" />
+            <node concept="3uibUv" id="mJ_D13R23m" role="1tU5fm">
+              <ref role="3uigEE" node="2RRx4MZnXS3" resolve="RuleTemplateImpl_deprecated.Token" />
+              <node concept="1ZhdrF" id="mJ_D13R23n" role="lGtFl">
+                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
+                <property role="2qtEX8" value="classifier" />
+                <node concept="3$xsQk" id="mJ_D13R23o" role="3$ytzL">
+                  <node concept="3clFbS" id="mJ_D13R23p" role="2VODD2">
+                    <node concept="3clFbF" id="mJ_D13R23q" role="3cqZAp">
+                      <node concept="2OqwBi" id="mJ_D13R23r" role="3clFbG">
+                        <node concept="1iwH7S" id="mJ_D13R23s" role="2Oq$k0" />
+                        <node concept="1iwH70" id="mJ_D13R23t" role="2OqNvi">
+                          <ref role="1iwH77" node="452KZTbsjfN" resolve="rule_token_class" />
+                          <node concept="30H73N" id="mJ_D13R23u" role="1iwH7V" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1rXfSq" id="mJ_D14044T" role="33vP2m">
+              <ref role="37wK5l" node="6YKq674wFvX" resolve="createToken" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="mJ_D14iB2P" role="3cqZAp">
+          <node concept="2OqwBi" id="mJ_D14iB2Q" role="3clFbG">
+            <node concept="37vLTw" id="mJ_D14iB2R" role="2Oq$k0">
+              <ref role="3cqZAo" node="mJ_D13QQuR" resolve="token" />
+            </node>
+            <node concept="liA8E" id="mJ_D14iB2S" role="2OqNvi">
+              <ref role="37wK5l" node="2RRx4N073iu" resolve="init" />
+              <node concept="37vLTw" id="mJ_D14iB2T" role="37wK5m">
+                <ref role="3cqZAo" node="mJ_D13QlPh" resolve="input" />
+              </node>
+            </node>
+          </node>
+          <node concept="1W57fq" id="mJ_D14jj2m" role="lGtFl">
+            <node concept="3IZrLx" id="mJ_D14jj2o" role="3IZSJc">
+              <node concept="3clFbS" id="mJ_D14jj2q" role="2VODD2">
+                <node concept="3clFbF" id="mJ_D14cqhq" role="3cqZAp">
+                  <node concept="2OqwBi" id="mJ_D14cqhr" role="3clFbG">
+                    <node concept="2OqwBi" id="mJ_D14cqhs" role="2Oq$k0">
+                      <node concept="1PxgMI" id="mJ_D14cqht" role="2Oq$k0">
+                        <property role="1BlNFB" value="true" />
+                        <node concept="chp4Y" id="mJ_D14cqhu" role="3oSUPX">
+                          <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
+                        </node>
+                        <node concept="30H73N" id="mJ_D14cqhv" role="1m5AlR" />
+                      </node>
+                      <node concept="3TrEf2" id="mJ_D14cqhw" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:5MHpiylGjt8" resolve="iterateParameterBlock" />
+                      </node>
+                    </node>
+                    <node concept="3w_OXm" id="mJ_D14jlGi" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="mJ_D13QFIL" role="3cqZAp">
+          <node concept="2OqwBi" id="mJ_D13QFIM" role="3clFbG">
+            <node concept="37vLTw" id="mJ_D13QWS_" role="2Oq$k0">
+              <ref role="3cqZAo" node="mJ_D13QQuR" resolve="token" />
+            </node>
+            <node concept="liA8E" id="mJ_D13QFIO" role="2OqNvi">
+              <ref role="37wK5l" node="2RRx4N073iu" resolve="init" />
+              <node concept="AH0OO" id="mJ_D14jcWX" role="37wK5m">
+                <node concept="3cmrfG" id="mJ_D14jeUw" role="AHEQo">
+                  <property role="3cmrfH" value="0" />
+                </node>
+                <node concept="37vLTw" id="mJ_D14jaTs" role="AHHXb">
+                  <ref role="3cqZAo" node="mJ_D13QlPh" resolve="input" />
+                </node>
+              </node>
+              <node concept="10Nm6u" id="mJ_D14jhJS" role="37wK5m" />
+            </node>
+          </node>
+          <node concept="1W57fq" id="mJ_D14iE3v" role="lGtFl">
+            <node concept="3IZrLx" id="mJ_D14iE3x" role="3IZSJc">
+              <node concept="3clFbS" id="mJ_D14iE3z" role="2VODD2">
+                <node concept="3clFbF" id="mJ_D14iFa$" role="3cqZAp">
+                  <node concept="2OqwBi" id="mJ_D14iFa_" role="3clFbG">
+                    <node concept="2OqwBi" id="mJ_D14iFaA" role="2Oq$k0">
+                      <node concept="1PxgMI" id="mJ_D14iFaB" role="2Oq$k0">
+                        <property role="1BlNFB" value="true" />
+                        <node concept="chp4Y" id="mJ_D14iFaC" role="3oSUPX">
+                          <ref role="cht4Q" to="wq2x:7eGEHDlgPU4" resolve="Rule" />
+                        </node>
+                        <node concept="30H73N" id="mJ_D14iFaD" role="1m5AlR" />
+                      </node>
+                      <node concept="3TrEf2" id="mJ_D14iFaE" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:5MHpiylGjt8" resolve="iterateParameterBlock" />
+                      </node>
+                    </node>
+                    <node concept="3x8VRR" id="mJ_D14iFaF" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="mJ_D13QN1Y" role="3cqZAp">
+          <node concept="37vLTw" id="mJ_D13QV$B" role="3clFbG">
+            <ref role="3cqZAo" node="mJ_D13QQuR" resolve="token" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="mJ_D13QlQs" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="mJ_D13QvaW" role="jymVt" />
     <node concept="312cEg" id="5wZaC7XTIMr" role="jymVt">
       <property role="TrG5h" value="prototype" />
       <node concept="3Tm6S6" id="5wZaC7XTIMs" role="1B3o_S" />
@@ -5841,8 +5987,8 @@
       <property role="TrG5h" value="queryTemplates" />
       <property role="1EzhhJ" value="false" />
       <node concept="_YKpA" id="7P_FdVPtt0j" role="3clF45">
-        <node concept="3uibUv" id="7P_FdVPtt0k" role="_ZDj9">
-          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+        <node concept="3uibUv" id="6OXbTD$jZLr" role="_ZDj9">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7P_FdVPtt0l" role="1B3o_S" />
@@ -5983,14 +6129,14 @@
               <node concept="3cpWsn" id="7P_FdVPtxqi" role="3cpWs9">
                 <property role="TrG5h" value="qtpl" />
                 <node concept="_YKpA" id="7P_FdVPtxq9" role="1tU5fm">
-                  <node concept="3uibUv" id="7P_FdVPtxqc" role="_ZDj9">
-                    <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+                  <node concept="3uibUv" id="6OXbTD$k1ph" role="_ZDj9">
+                    <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="7P_FdVPtxqj" role="33vP2m">
                   <node concept="Tc6Ow" id="7P_FdVPtxqk" role="2ShVmc">
-                    <node concept="3uibUv" id="7P_FdVPtxql" role="HW$YZ">
-                      <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+                    <node concept="3uibUv" id="6OXbTD$k1Lk" role="HW$YZ">
+                      <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
                     </node>
                   </node>
                 </node>
@@ -6003,18 +6149,18 @@
                 </node>
                 <node concept="TSZUe" id="7P_FdVPtztn" role="2OqNvi">
                   <node concept="2ShNRf" id="7P_FdVPtzv0" role="25WWJ7">
-                    <node concept="HV5vD" id="7P_FdVPtCja" role="2ShVmc">
-                      <ref role="HV5vE" node="7P_FdVPsJiz" resolve="QueryTemplateImpl" />
-                      <node concept="1ZhdrF" id="7P_FdVPtCTC" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/2820489544401957797/2820489544401957798" />
-                        <property role="2qtEX8" value="classifier" />
-                        <node concept="3$xsQk" id="7P_FdVPtCTD" role="3$ytzL">
-                          <node concept="3clFbS" id="7P_FdVPtCTE" role="2VODD2">
+                    <node concept="1pGfFk" id="6OXbTD$keFf" role="2ShVmc">
+                      <ref role="37wK5l" node="6OXbTD$juGj" resolve="QueryTemplateImpl" />
+                      <node concept="1ZhdrF" id="6OXbTD$keJ8" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                        <property role="2qtEX8" value="baseMethodDeclaration" />
+                        <node concept="3$xsQk" id="6OXbTD$keJ9" role="3$ytzL">
+                          <node concept="3clFbS" id="6OXbTD$keJa" role="2VODD2">
                             <node concept="3clFbF" id="7P_FdVPtDvB" role="3cqZAp">
                               <node concept="2OqwBi" id="7P_FdVPtDvC" role="3clFbG">
                                 <node concept="1iwH7S" id="7P_FdVPtDvD" role="2Oq$k0" />
                                 <node concept="1iwH70" id="7P_FdVPtDvE" role="2OqNvi">
-                                  <ref role="1iwH77" node="7P_FdVPtAzR" resolve="query_template" />
+                                  <ref role="1iwH77" node="6OXbTD$ko7g" resolve="query_constructor" />
                                   <node concept="30H73N" id="7P_FdVPtDvF" role="1iwH7V" />
                                 </node>
                               </node>
@@ -6036,8 +6182,8 @@
                           <node concept="1r8y6K" id="7P_FdVQCuKr" role="2OqNvi" />
                         </node>
                         <node concept="2SmgA7" id="7P_FdVQCuKs" role="2OqNvi">
-                          <node concept="chp4Y" id="7P_FdVQCvkd" role="1dBWTz">
-                            <ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="Query" />
+                          <node concept="chp4Y" id="6OXbTD$kgyN" role="1dBWTz">
+                            <ref role="cht4Q" to="wq2x:6OXbTD$dU7b" resolve="Query" />
                           </node>
                         </node>
                       </node>
@@ -6086,8 +6232,8 @@
       <property role="TrG5h" value="queryTemplates" />
       <node concept="3Tm6S6" id="7P_FdVPtty_" role="1B3o_S" />
       <node concept="_YKpA" id="7P_FdVPttyA" role="1tU5fm">
-        <node concept="3uibUv" id="7P_FdVPttIb" role="_ZDj9">
-          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+        <node concept="3uibUv" id="6OXbTD$k0vK" role="_ZDj9">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
         </node>
       </node>
     </node>
@@ -9280,13 +9426,13 @@
                                           <node concept="2OqwBi" id="36tQV5AHjCa" role="3clFbG">
                                             <node concept="1iwH7S" id="36tQV5AHjCb" role="2Oq$k0" />
                                             <node concept="1iwH70" id="36tQV5AHjCc" role="2OqNvi">
-                                              <ref role="1iwH77" node="36tQV5AugIl" resolve="ruletemplate_token_this" />
+                                              <ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
                                               <node concept="2OqwBi" id="36tQV5AHjCf" role="1iwH7V">
                                                 <node concept="30H73N" id="36tQV5AHjCg" role="2Oq$k0" />
                                                 <node concept="2Xjw5R" id="36tQV5AHjCh" role="2OqNvi">
                                                   <node concept="1xMEDy" id="36tQV5AHjCi" role="1xVPHs">
-                                                    <node concept="chp4Y" id="36tQV5AHjCj" role="ri$Ld">
-                                                      <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                                    <node concept="chp4Y" id="6OXbTDyY3uN" role="ri$Ld">
+                                                      <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                                                     </node>
                                                   </node>
                                                 </node>
@@ -9566,13 +9712,13 @@
                                             <node concept="2OqwBi" id="36tQV5AHs67" role="3clFbG">
                                               <node concept="1iwH7S" id="36tQV5AHs68" role="2Oq$k0" />
                                               <node concept="1iwH70" id="36tQV5AHs69" role="2OqNvi">
-                                                <ref role="1iwH77" node="36tQV5AugIl" resolve="ruletemplate_token_this" />
+                                                <ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
                                                 <node concept="2OqwBi" id="36tQV5AHs6a" role="1iwH7V">
                                                   <node concept="30H73N" id="36tQV5AHs6b" role="2Oq$k0" />
                                                   <node concept="2Xjw5R" id="36tQV5AHs6c" role="2OqNvi">
                                                     <node concept="1xMEDy" id="36tQV5AHs6d" role="1xVPHs">
-                                                      <node concept="chp4Y" id="36tQV5AHs6e" role="ri$Ld">
-                                                        <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                                      <node concept="chp4Y" id="6OXbTDyY40x" role="ri$Ld">
+                                                        <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                                                       </node>
                                                     </node>
                                                   </node>
@@ -9643,13 +9789,13 @@
                                           <node concept="2OqwBi" id="7lt0LtPM635" role="3clFbG">
                                             <node concept="1iwH7S" id="7lt0LtPM636" role="2Oq$k0" />
                                             <node concept="1iwH70" id="7lt0LtPM637" role="2OqNvi">
-                                              <ref role="1iwH77" node="36tQV5AugIl" resolve="ruletemplate_token_this" />
+                                              <ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
                                               <node concept="2OqwBi" id="7lt0LtPM638" role="1iwH7V">
                                                 <node concept="30H73N" id="7lt0LtPM639" role="2Oq$k0" />
                                                 <node concept="2Xjw5R" id="7lt0LtPM63a" role="2OqNvi">
                                                   <node concept="1xMEDy" id="7lt0LtPM63b" role="1xVPHs">
-                                                    <node concept="chp4Y" id="7lt0LtPM63c" role="ri$Ld">
-                                                      <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                                    <node concept="chp4Y" id="6OXbTDyY4gR" role="ri$Ld">
+                                                      <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                                                     </node>
                                                   </node>
                                                 </node>
@@ -9775,16 +9921,16 @@
                         <node concept="3clFbS" id="36tQV5AEsNf" role="2VODD2">
                           <node concept="3cpWs8" id="36tQV5AEVaP" role="3cqZAp">
                             <node concept="3cpWsn" id="36tQV5AEVaQ" role="3cpWs9">
-                              <property role="TrG5h" value="rt" />
+                              <property role="TrG5h" value="tpl" />
                               <node concept="3Tqbb2" id="36tQV5AEVaR" role="1tU5fm">
-                                <ref role="ehGHo" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                <ref role="ehGHo" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                               </node>
                               <node concept="2OqwBi" id="36tQV5AEVaS" role="33vP2m">
                                 <node concept="30H73N" id="36tQV5AEVaT" role="2Oq$k0" />
                                 <node concept="2Xjw5R" id="36tQV5AEVaU" role="2OqNvi">
                                   <node concept="1xMEDy" id="36tQV5AEVaV" role="1xVPHs">
-                                    <node concept="chp4Y" id="36tQV5AEVaW" role="ri$Ld">
-                                      <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                    <node concept="chp4Y" id="6OXbTDyHe$q" role="ri$Ld">
+                                      <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                                     </node>
                                   </node>
                                 </node>
@@ -9798,14 +9944,14 @@
                                 <property role="32f$Ya" value="true" />
                                 <node concept="2OqwBi" id="36tQV5AEVb1" role="32eq0w">
                                   <node concept="37vLTw" id="36tQV5AEVb2" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="36tQV5AEVaQ" resolve="rt" />
+                                    <ref role="3cqZAo" node="36tQV5AEVaQ" resolve="tpl" />
                                   </node>
                                   <node concept="3TrcHB" id="36tQV5AEVb3" role="2OqNvi">
                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                                   </node>
                                 </node>
                                 <node concept="37vLTw" id="36tQV5AEVb4" role="32eq0x">
-                                  <ref role="3cqZAo" node="36tQV5AEVaQ" resolve="rt" />
+                                  <ref role="3cqZAo" node="36tQV5AEVaQ" resolve="tpl" />
                                 </node>
                               </node>
                             </node>
@@ -9837,8 +9983,8 @@
                 <node concept="30H73N" id="36tQV5AEBED" role="2Oq$k0" />
                 <node concept="2Xjw5R" id="36tQV5AECdv" role="2OqNvi">
                   <node concept="1xMEDy" id="36tQV5AECdx" role="1xVPHs">
-                    <node concept="chp4Y" id="36tQV5AECl6" role="ri$Ld">
-                      <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                    <node concept="chp4Y" id="6OXbTDyHdO2" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                     </node>
                   </node>
                 </node>
@@ -11917,13 +12063,13 @@
                                 <node concept="2OqwBi" id="36tQV5AGD3v" role="3cqZAk">
                                   <node concept="1iwH7S" id="36tQV5AGD3w" role="2Oq$k0" />
                                   <node concept="1iwH70" id="36tQV5AGD3x" role="2OqNvi">
-                                    <ref role="1iwH77" node="36tQV5AugIl" resolve="ruletemplate_token_this" />
+                                    <ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
                                     <node concept="2OqwBi" id="36tQV5AGD3y" role="1iwH7V">
                                       <node concept="30H73N" id="36tQV5AGD3z" role="2Oq$k0" />
                                       <node concept="2Xjw5R" id="36tQV5AGD3$" role="2OqNvi">
                                         <node concept="1xMEDy" id="36tQV5AGD3_" role="1xVPHs">
-                                          <node concept="chp4Y" id="36tQV5AGE2S" role="ri$Ld">
-                                            <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                          <node concept="chp4Y" id="6OXbTDyY1iU" role="ri$Ld">
+                                            <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                                           </node>
                                         </node>
                                       </node>
@@ -14130,15 +14276,15 @@
                               <node concept="2OqwBi" id="36tQV5AwdtY" role="3cqZAk">
                                 <node concept="1iwH7S" id="36tQV5AwdtZ" role="2Oq$k0" />
                                 <node concept="1iwH70" id="36tQV5Awdu0" role="2OqNvi">
-                                  <ref role="1iwH77" node="36tQV5AugIl" resolve="ruletemplate_token_this" />
+                                  <ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
                                   <node concept="2OqwBi" id="36tQV5Awdu1" role="1iwH7V">
                                     <node concept="v3LJS" id="36tQV5Awdu2" role="2Oq$k0">
                                       <ref role="v3LJV" node="5wZaC7XJCJi" resolve="logicalVar" />
                                     </node>
                                     <node concept="2Xjw5R" id="36tQV5Awdu3" role="2OqNvi">
                                       <node concept="1xMEDy" id="36tQV5Awdu4" role="1xVPHs">
-                                        <node concept="chp4Y" id="36tQV5Awdu5" role="ri$Ld">
-                                          <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                        <node concept="chp4Y" id="6OXbTDyRi5i" role="ri$Ld">
+                                          <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                                         </node>
                                       </node>
                                     </node>
@@ -14170,8 +14316,8 @@
                               <node concept="30H73N" id="36tQV5Awdui" role="2Oq$k0" />
                               <node concept="2Xjw5R" id="36tQV5Awduj" role="2OqNvi">
                                 <node concept="1xMEDy" id="36tQV5Awduk" role="1xVPHs">
-                                  <node concept="chp4Y" id="36tQV5Awdul" role="ri$Ld">
-                                    <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                  <node concept="chp4Y" id="6OXbTDyUyS5" role="ri$Ld">
+                                    <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                                   </node>
                                 </node>
                               </node>
@@ -14182,8 +14328,8 @@
                               </node>
                               <node concept="2Xjw5R" id="36tQV5Awduo" role="2OqNvi">
                                 <node concept="1xMEDy" id="36tQV5Awdup" role="1xVPHs">
-                                  <node concept="chp4Y" id="36tQV5Awduq" role="ri$Ld">
-                                    <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                  <node concept="chp4Y" id="6OXbTDyRi1L" role="ri$Ld">
+                                    <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                                   </node>
                                 </node>
                               </node>
@@ -14210,8 +14356,8 @@
                 <node concept="30H73N" id="36tQV5AufdV" role="2Oq$k0" />
                 <node concept="2Xjw5R" id="36tQV5AufdW" role="2OqNvi">
                   <node concept="1xMEDy" id="36tQV5AufdX" role="1xVPHs">
-                    <node concept="chp4Y" id="36tQV5AufPg" role="ri$Ld">
-                      <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                    <node concept="chp4Y" id="6OXbTDyRhxY" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                     </node>
                   </node>
                 </node>
@@ -16196,6 +16342,7 @@
       <node concept="A3Dl8" id="4MqhgXUazsN" role="3clF45">
         <node concept="3uibUv" id="4MqhgXUazsO" role="A3Ik2">
           <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+          <node concept="3qTvmN" id="6OXbTD$jQGx" role="11_B2D" />
         </node>
       </node>
       <node concept="3Tm1VV" id="4MqhgXUazsP" role="1B3o_S" />
@@ -16230,12 +16377,14 @@
                 <node concept="_YKpA" id="4MqhgXUcvdv" role="1tU5fm">
                   <node concept="3uibUv" id="4MqhgXUcvdy" role="_ZDj9">
                     <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                    <node concept="3qTvmN" id="6OXbTD$jrdS" role="11_B2D" />
                   </node>
                 </node>
                 <node concept="2ShNRf" id="4MqhgXUcvd_" role="33vP2m">
                   <node concept="Tc6Ow" id="4MqhgXUcvdA" role="2ShVmc">
                     <node concept="3uibUv" id="4MqhgXUcvdB" role="HW$YZ">
                       <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                      <node concept="3qTvmN" id="6OXbTD$js5s" role="11_B2D" />
                     </node>
                   </node>
                 </node>
@@ -16365,6 +16514,7 @@
       <node concept="_YKpA" id="4MqhgXUcrn4" role="1tU5fm">
         <node concept="3uibUv" id="4MqhgXUcrpr" role="_ZDj9">
           <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+          <node concept="3qTvmN" id="6OXbTD$jqHa" role="11_B2D" />
         </node>
       </node>
     </node>
@@ -18019,9 +18169,9 @@
       <node concept="2tJIrI" id="36tQV5AoEKK" role="jymVt" />
       <node concept="3clFbW" id="36tQV5AoEKL" role="jymVt">
         <node concept="37vLTG" id="36tQV5AoEKM" role="3clF46">
-          <property role="TrG5h" value="ruleTemplate" />
-          <node concept="3uibUv" id="36tQV5AoEKN" role="1tU5fm">
-            <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+          <property role="TrG5h" value="templateRef" />
+          <node concept="3uibUv" id="6OXbTDyZe1I" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
           </node>
         </node>
         <node concept="3cqZAl" id="36tQV5AoELh" role="3clF45" />
@@ -18032,11 +18182,11 @@
               <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="ruleTemplate" />
+                  <ref role="2Oxat5" node="36tQV5AoEWD" resolve="templateRef" />
                 </node>
               </node>
               <node concept="37vLTw" id="36tQV5AoELp" role="37vLTx">
-                <ref role="3cqZAo" node="36tQV5AoEKM" resolve="ruleTemplate" />
+                <ref role="3cqZAo" node="36tQV5AoEKM" resolve="templateRef" />
               </node>
             </node>
           </node>
@@ -18053,8 +18203,18 @@
         <node concept="3clFbS" id="36tQV5AoELM" role="3clF47">
           <node concept="3clFbF" id="36tQV5AoEMD" role="3cqZAp">
             <node concept="37vLTI" id="36tQV5AoEME" role="3clFbG">
-              <node concept="37vLTw" id="36tQV5AoEMF" role="37vLTx">
-                <ref role="3cqZAo" node="36tQV5AoENl" resolve="input" />
+              <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" />
@@ -18139,50 +18299,11 @@
             </node>
           </node>
         </node>
-        <node concept="37vLTG" id="36tQV5AoENl" role="3clF46">
+        <node concept="37vLTG" id="3IIf9OAK4Ug" role="3clF46">
           <property role="TrG5h" value="input" />
-          <node concept="3Tqbb2" id="36tQV5AoENm" role="1tU5fm" />
-          <node concept="1W57fq" id="36tQV5AoENn" role="lGtFl">
-            <node concept="3IZrLx" id="36tQV5AoENo" role="3IZSJc">
-              <node concept="3clFbS" id="36tQV5AoENp" role="2VODD2">
-                <node concept="3clFbF" id="36tQV5AoENq" role="3cqZAp">
-                  <node concept="2OqwBi" id="36tQV5AoENr" role="3clFbG">
-                    <node concept="2OqwBi" id="36tQV5AoENs" role="2Oq$k0">
-                      <node concept="30H73N" id="36tQV5AoENt" role="2Oq$k0" />
-                      <node concept="3TrEf2" id="36tQV5AoENu" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
-                      </node>
-                    </node>
-                    <node concept="3x8VRR" id="36tQV5AoENv" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="17Uvod" id="36tQV5AoENw" role="lGtFl">
-            <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-            <property role="2qtEX9" value="name" />
-            <node concept="3zFVjK" id="36tQV5AoENx" role="3zH0cK">
-              <node concept="3clFbS" id="36tQV5AoENy" role="2VODD2">
-                <node concept="3clFbF" id="36tQV5AoENz" role="3cqZAp">
-                  <node concept="2OqwBi" id="36tQV5AoEN$" role="3clFbG">
-                    <node concept="2OqwBi" id="36tQV5AoEN_" role="2Oq$k0">
-                      <node concept="2OqwBi" id="36tQV5AoENA" role="2Oq$k0">
-                        <node concept="30H73N" id="36tQV5AoENB" role="2Oq$k0" />
-                        <node concept="3TrEf2" id="36tQV5AoENC" role="2OqNvi">
-                          <ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="36tQV5AoEND" role="2OqNvi">
-                        <ref role="3Tt5mk" to="wq2x:5NuEpF1ihrB" resolve="input" />
-                      </node>
-                    </node>
-                    <node concept="3TrcHB" id="36tQV5AoENE" role="2OqNvi">
-                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
+          <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>
@@ -18208,7 +18329,14 @@
         <node concept="3Tm1VV" id="36tQV5AoEOU" role="1B3o_S" />
         <node concept="3clFbS" id="36tQV5AoEOV" role="3clF47">
           <node concept="3clFbF" id="36tQV5Az_t2" role="3cqZAp">
-            <node concept="10Nm6u" id="36tQV5Az_t0" role="3clFbG" />
+            <node concept="2OqwBi" id="6OXbTDzdZ5Q" role="3clFbG">
+              <node concept="37vLTw" id="6OXbTDzdY6i" role="2Oq$k0">
+                <ref role="3cqZAo" node="36tQV5AwA22" resolve="ruleBuilder" />
+              </node>
+              <node concept="TSZUe" id="6OXbTDze0y4" role="2OqNvi">
+                <node concept="10Nm6u" id="6OXbTDze0FB" role="25WWJ7" />
+              </node>
+            </node>
             <node concept="2b32R4" id="36tQV5AA6Tm" role="lGtFl">
               <node concept="3JmXsc" id="36tQV5AA6To" role="2P8S$">
                 <node concept="3clFbS" id="36tQV5AA6Tq" role="2VODD2">
@@ -18329,10 +18457,29 @@
           </node>
         </node>
         <node concept="2ZBi8u" id="36tQV5AvM44" role="lGtFl">
-          <ref role="2rW$FS" node="36tQV5AugIl" resolve="ruletemplate_token_this" />
+          <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="3Tm1VV" id="6i42QSs8m5e" 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="6OXbTDyYYWe" role="jymVt" />
       <node concept="312cEg" id="36tQV5AoEVr" role="jymVt">
         <property role="TrG5h" value="input" />
         <node concept="3Tmbuc" id="36tQV5AxYm8" role="1B3o_S" />
@@ -18421,10 +18568,10 @@
         </node>
       </node>
       <node concept="312cEg" id="36tQV5AoEWD" role="jymVt">
-        <property role="TrG5h" value="ruleTemplate" />
+        <property role="TrG5h" value="templateRef" />
         <node concept="3Tmbuc" id="36tQV5Axziv" role="1B3o_S" />
-        <node concept="3uibUv" id="36tQV5AoEWF" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+        <node concept="3uibUv" id="6OXbTDyZeJ8" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
         </node>
       </node>
       <node concept="3Tm1VV" id="36tQV5AoEXa" role="1B3o_S" />
@@ -18620,7 +18767,9 @@
           <node concept="2ShNRf" id="36tQV5AoEZx" role="3clFbG">
             <node concept="1pGfFk" id="36tQV5AoEZy" role="2ShVmc">
               <ref role="37wK5l" node="36tQV5AoEKL" resolve="RuleTemplateImpl.Token" />
-              <node concept="Xjq3P" id="36tQV5AoEZz" role="37wK5m" />
+              <node concept="1rXfSq" id="6OXbTDyZoW5" role="37wK5m">
+                <ref role="37wK5l" to="i348:62MNP_kY8lD" resolve="templateRef" />
+              </node>
               <node concept="1ZhdrF" id="36tQV5AoEZO" role="lGtFl">
                 <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
                 <property role="2qtEX8" value="baseMethodDeclaration" />
@@ -18827,6 +18976,90 @@
       </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 concept="3Tm1VV" id="36tQV5AoF2x" role="1B3o_S" />
     <node concept="n94m4" id="36tQV5AoF2y" role="lGtFl">
       <ref role="n9lRv" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
@@ -18957,28 +19190,23 @@
                               </node>
                               <node concept="2OqwBi" id="36tQV5AxhQ9" role="37wK5m">
                                 <node concept="liA8E" id="36tQV5AxhQb" role="2OqNvi">
-                                  <ref role="37wK5l" to="i348:6i42QSs8m5b" resolve="templateRef" />
-                                </node>
-                                <node concept="2OqwBi" id="36tQV5Ax_Aw" role="2Oq$k0">
-                                  <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="ruletemplate_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="36tQV5Ay3dL" role="ri$Ld">
-                                                        <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
-                                                      </node>
+                                  <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>
@@ -18989,8 +19217,34 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="2OwXpG" id="36tQV5AxAgR" role="2OqNvi">
-                                    <ref role="2Oxat5" node="36tQV5AoEWD" resolve="ruleTemplate" />
+                                </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>
                                   </node>
                                 </node>
                               </node>
@@ -19009,13 +19263,13 @@
                                               <node concept="2OqwBi" id="36tQV5Ay3Lp" role="3clFbG">
                                                 <node concept="1iwH7S" id="36tQV5Ay3Lq" role="2Oq$k0" />
                                                 <node concept="1iwH70" id="36tQV5Ay3Lr" role="2OqNvi">
-                                                  <ref role="1iwH77" node="36tQV5AugIl" resolve="ruletemplate_token_this" />
+                                                  <ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
                                                   <node concept="2OqwBi" id="36tQV5Ay3Ls" role="1iwH7V">
                                                     <node concept="30H73N" id="36tQV5Ay3Lt" role="2Oq$k0" />
                                                     <node concept="2Xjw5R" id="36tQV5Ay3Lu" role="2OqNvi">
                                                       <node concept="1xMEDy" id="36tQV5Ay3Lv" role="1xVPHs">
-                                                        <node concept="chp4Y" id="36tQV5Ay3Lw" role="ri$Ld">
-                                                          <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                                        <node concept="chp4Y" id="6OXbTDyY0kv" role="ri$Ld">
+                                                          <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                                                         </node>
                                                       </node>
                                                     </node>
@@ -19255,13 +19509,13 @@
                                       <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="ruletemplate_token_this" />
+                                          <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="36tQV5AI1fz" role="ri$Ld">
-                                                  <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                                <node concept="chp4Y" id="6OXbTDyY0$L" role="ri$Ld">
+                                                  <ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
                                                 </node>
                                               </node>
                                             </node>
@@ -19946,73 +20200,96 @@
     </node>
   </node>
   <node concept="312cEu" id="7P_FdVPsJiz">
-    <property role="TrG5h" value="QueryTemplateImpl" />
+    <property role="TrG5h" value="QueryStageTemplateImpl" />
     <node concept="2tJIrI" id="7P_FdVPsJjJ" role="jymVt" />
     <node concept="3clFbW" id="7P_FdVPsZGY" role="jymVt">
       <node concept="3cqZAl" id="7P_FdVPsZH0" role="3clF45" />
       <node concept="3Tm1VV" id="7P_FdVPsZH1" role="1B3o_S" />
       <node concept="3clFbS" id="7P_FdVPsZH2" role="3clF47">
+        <node concept="XkiVB" id="6OXbTDz06Dq" role="3cqZAp">
+          <ref role="37wK5l" to="i348:6OXbTDz039g" resolve="BaseQueryStageTemplate" />
+          <node concept="2YIFZM" id="6OXbTDz07ib" role="37wK5m">
+            <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="deserialize" />
+            <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+            <node concept="Xl_RD" id="6OXbTDz07ic" role="37wK5m">
+              <property role="Xl_RC" value="" />
+              <node concept="17Uvod" id="6OXbTDz07id" role="lGtFl">
+                <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                <property role="2qtEX9" value="value" />
+                <node concept="3zFVjK" id="6OXbTDz07ie" role="3zH0cK">
+                  <node concept="3clFbS" id="6OXbTDz07if" role="2VODD2">
+                    <node concept="3clFbF" id="6OXbTDz07ig" role="3cqZAp">
+                      <node concept="2OqwBi" id="6OXbTDz07ih" role="3clFbG">
+                        <node concept="2OqwBi" id="6OXbTDz07ii" role="2Oq$k0">
+                          <node concept="2JrnkZ" id="6OXbTDz07ij" role="2Oq$k0">
+                            <node concept="2OqwBi" id="6OXbTDz07ik" role="2JrQYb">
+                              <node concept="1iwH7S" id="6OXbTDz07il" role="2Oq$k0" />
+                              <node concept="12$id9" id="6OXbTDz07im" role="2OqNvi">
+                                <node concept="30H73N" id="6OXbTDz07in" role="12$y8L" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="6OXbTDz07io" role="2OqNvi">
+                            <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="6OXbTDz07ip" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="7P_FdVPsZW$" role="3cqZAp">
           <node concept="1rXfSq" id="7P_FdVPsZWz" role="3clFbG">
             <ref role="37wK5l" node="7P_FdVPsY9t" resolve="init" />
           </node>
         </node>
       </node>
+      <node concept="2ZBi8u" id="6OXbTD$jHfN" role="lGtFl">
+        <ref role="2rW$FS" node="6OXbTD$jKJM" resolve="query_stage_constructor" />
+      </node>
     </node>
     <node concept="2tJIrI" id="7P_FdVPsZu6" role="jymVt" />
-    <node concept="3clFb_" id="7P_FdVQ_sF3" role="jymVt">
+    <node concept="3clFb_" id="6OXbTD$oTt2" role="jymVt">
       <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="name" />
-      <node concept="17QB3L" id="7P_FdVQ_sF4" role="3clF45" />
-      <node concept="3Tm1VV" id="7P_FdVQ_sF5" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVQ_sF8" role="3clF47">
-        <node concept="3clFbF" id="7P_FdVQ_t4O" role="3cqZAp">
-          <node concept="Xl_RD" id="7P_FdVQ_t4N" role="3clFbG">
-            <node concept="17Uvod" id="7P_FdVQBm6D" role="lGtFl">
-              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-              <property role="2qtEX9" value="value" />
-              <node concept="3zFVjK" id="7P_FdVQBm6E" role="3zH0cK">
-                <node concept="3clFbS" id="7P_FdVQBm6F" role="2VODD2">
-                  <node concept="3clFbF" id="7P_FdVQBmDg" role="3cqZAp">
-                    <node concept="2OqwBi" id="7P_FdVQBmPZ" role="3clFbG">
-                      <node concept="30H73N" id="7P_FdVQBmDf" role="2Oq$k0" />
-                      <node concept="3TrcHB" id="7P_FdVQBpgC" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="7P_FdVQ_sF9" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7P_FdVQ_sS8" role="jymVt" />
-    <node concept="2tJIrI" id="7WKNeR94O6t" role="jymVt" />
-    <node concept="3clFb_" id="7WKNeR94Ovt" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="fqName" />
-      <node concept="17QB3L" id="7WKNeR94Ovu" role="3clF45" />
-      <node concept="3Tm1VV" id="7WKNeR94Ovv" role="1B3o_S" />
-      <node concept="3clFbS" id="7WKNeR94Ovy" role="3clF47">
-        <node concept="3clFbF" id="7WKNeR94Q7J" role="3cqZAp">
-          <node concept="Xl_RD" id="7WKNeR94Q7K" role="3clFbG">
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="stageName" />
+      <node concept="3Tm1VV" id="6OXbTD$oTt4" role="1B3o_S" />
+      <node concept="17QB3L" id="6OXbTD$oTt5" role="3clF45" />
+      <node concept="3clFbS" id="6OXbTD$oTt9" role="3clF47">
+        <node concept="3clFbF" id="6OXbTD$rl3J" role="3cqZAp">
+          <node concept="Xl_RD" id="6OXbTD$rl3I" role="3clFbG">
             <property role="Xl_RC" value="" />
-            <node concept="17Uvod" id="7WKNeR94Q7L" role="lGtFl">
+            <node concept="17Uvod" id="6OXbTD$rl40" role="lGtFl">
               <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
               <property role="2qtEX9" value="value" />
-              <node concept="3zFVjK" id="7WKNeR94Q7M" role="3zH0cK">
-                <node concept="3clFbS" id="7WKNeR94Q7N" role="2VODD2">
-                  <node concept="3clFbF" id="7WKNeR94Q7O" role="3cqZAp">
-                    <node concept="2OqwBi" id="7WKNeR94Q7P" role="3clFbG">
-                      <node concept="2qgKlT" id="7WKNeR94Q7Q" role="2OqNvi">
-                        <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+              <node concept="3zFVjK" id="6OXbTD$rl41" role="3zH0cK">
+                <node concept="3clFbS" id="6OXbTD$rl42" role="2VODD2">
+                  <node concept="3clFbF" id="6OXbTD$YC09" role="3cqZAp">
+                    <node concept="3K4zz7" id="6OXbTD$YC0a" role="3clFbG">
+                      <node concept="2OqwBi" id="6OXbTD$YC0b" role="3K4E3e">
+                        <node concept="30H73N" id="6OXbTD$YC0c" role="2Oq$k0" />
+                        <node concept="3TrcHB" id="6OXbTD$YC0d" role="2OqNvi">
+                          <ref role="3TsBF5" to="wq2x:6OXbTD$fGCg" resolve="stage" />
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="6OXbTD$YC0e" role="3K4GZi">
+                        <property role="Xl_RC" value=".initial" />
+                      </node>
+                      <node concept="3y3z36" id="6OXbTD$YC0f" role="3K4Cdx">
+                        <node concept="10Nm6u" id="6OXbTD$YC0g" role="3uHU7w" />
+                        <node concept="2OqwBi" id="6OXbTD$YC0h" role="3uHU7B">
+                          <node concept="30H73N" id="6OXbTD$YC0i" role="2Oq$k0" />
+                          <node concept="3TrcHB" id="6OXbTD$YC0j" role="2OqNvi">
+                            <ref role="3TsBF5" to="wq2x:6OXbTD$fGCg" resolve="stage" />
+                          </node>
+                        </node>
                       </node>
-                      <node concept="30H73N" id="7WKNeR94Q7R" role="2Oq$k0" />
                     </node>
                   </node>
                 </node>
@@ -20021,62 +20298,43 @@
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="7WKNeR94Ovz" role="2AJF6D">
+      <node concept="2AHcQZ" id="6OXbTD$oTta" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="7P_FdVQBlF6" role="jymVt" />
-    <node concept="3clFb_" id="7P_FdVQBlR_" role="jymVt">
+    <node concept="2tJIrI" id="6OXbTD$oYAE" role="jymVt" />
+    <node concept="3clFb_" id="mJ_D14AmWW" role="jymVt">
       <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="usedHandlersFqNames" />
-      <node concept="_YKpA" id="7P_FdVQBlRA" role="3clF45">
-        <node concept="17QB3L" id="7P_FdVQBlRB" role="_ZDj9" />
-      </node>
-      <node concept="3Tm1VV" id="7P_FdVQBlRC" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVQBlRF" role="3clF47">
-        <node concept="3clFbF" id="7P_FdVQBpDp" role="3cqZAp">
-          <node concept="10Nm6u" id="7P_FdVQBpDo" role="3clFbG" />
+      <property role="TrG5h" value="newToken" />
+      <node concept="37vLTG" id="mJ_D14AmWX" role="3clF46">
+        <property role="TrG5h" value="parameter" />
+        <node concept="8X2XB" id="mJ_D14AmWY" role="1tU5fm">
+          <node concept="3uibUv" id="mJ_D14AmWZ" role="8Xvag">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="7P_FdVQBlRG" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      <node concept="3uibUv" id="mJ_D14GCMV" role="3clF45">
+        <ref role="3uigEE" node="mJ_D14GspB" resolve="QueryStageTemplateImpl.Token" />
       </node>
-    </node>
-    <node concept="2tJIrI" id="7P_FdVPsJsW" role="jymVt" />
-    <node concept="3clFb_" id="7P_FdVPsJk6" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="newQuery" />
-      <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 concept="37vLTG" id="7P_FdVPsJk7" role="3clF46">
-        <property role="TrG5h" value="parameters" />
-        <node concept="3uibUv" id="3IIf9OAgMw$" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3qTvmN" id="3IIf9OAm5Tq" role="11_B2D" />
-        </node>
-      </node>
-      <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="7P_FdVPsNol" resolve="QueryTemplateImpl.Configurable" />
+      <node concept="3Tm1VV" id="mJ_D14AmX1" role="1B3o_S" />
+      <node concept="3clFbS" id="mJ_D14AmX5" role="3clF47">
+        <node concept="3clFbF" id="6OXbTDyAxHS" role="3cqZAp">
+          <node concept="2ShNRf" id="6OXbTDyAxHQ" role="3clFbG">
+            <node concept="1pGfFk" id="6OXbTDyAyef" role="2ShVmc">
+              <ref role="37wK5l" node="6OXbTDyyObG" resolve="QueryStageTemplateImpl.Token" />
+              <node concept="1rXfSq" id="6OXbTDz06lZ" role="37wK5m">
+                <ref role="37wK5l" to="i348:6OXbTDz054k" resolve="templateRef" />
+              </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="7P_FdVPsJke" role="2AJF6D">
+      <node concept="2AHcQZ" id="mJ_D14AmX6" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="7P_FdVPsJjN" role="jymVt" />
+    <node concept="2tJIrI" id="mJ_D14AnCu" role="jymVt" />
     <node concept="3clFb_" id="7P_FdVPsY9t" role="jymVt">
       <property role="TrG5h" value="init" />
       <node concept="3cqZAl" id="7P_FdVPsY9u" role="3clF45" />
@@ -20171,6 +20429,249 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7P_FdVPsYaj" role="jymVt" />
+    <node concept="312cEu" id="mJ_D14GspB" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="Token" />
+      <node concept="2tJIrI" id="mJ_D14GyFs" role="jymVt" />
+      <node concept="3clFbW" id="6OXbTDyyObG" role="jymVt">
+        <node concept="37vLTG" id="6OXbTDyZZ1T" role="3clF46">
+          <property role="TrG5h" value="templateRef" />
+          <node concept="3uibUv" id="6OXbTDyZZk8" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="6OXbTDyAyw_" role="3clF46">
+          <property role="TrG5h" value="parameter" />
+          <node concept="8X2XB" id="6OXbTDyAzlA" role="1tU5fm">
+            <node concept="3uibUv" id="6OXbTDyAyDX" role="8Xvag">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="6OXbTDyyObI" role="3clF45" />
+        <node concept="3Tmbuc" id="6OXbTDyyOB3" role="1B3o_S" />
+        <node concept="3clFbS" id="6OXbTDyyObK" role="3clF47">
+          <node concept="3clFbF" id="6OXbTDz01Lj" role="3cqZAp">
+            <node concept="37vLTI" id="6OXbTDz02EC" role="3clFbG">
+              <node concept="37vLTw" id="6OXbTDz02Jz" role="37vLTx">
+                <ref role="3cqZAo" node="6OXbTDyZZ1T" resolve="templateRef" />
+              </node>
+              <node concept="2OqwBi" id="6OXbTDz022R" role="37vLTJ">
+                <node concept="Xjq3P" id="6OXbTDz01Lh" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6OXbTDz02k4" role="2OqNvi">
+                  <ref role="2Oxat5" node="6OXbTDyZWv$" resolve="templateRef" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6OXbTDyAGxC" role="3cqZAp">
+            <node concept="37vLTI" id="6OXbTDyAH8r" role="3clFbG">
+              <node concept="37vLTw" id="6OXbTDyAHdX" role="37vLTx">
+                <ref role="3cqZAo" node="6OXbTDyAyw_" resolve="parameter" />
+              </node>
+              <node concept="2OqwBi" id="6OXbTDyAGLB" role="37vLTJ">
+                <node concept="Xjq3P" id="6OXbTDyAGxA" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6OXbTDyAGUD" role="2OqNvi">
+                  <ref role="2Oxat5" node="6OXbTDyAEzN" resolve="parameter" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6OXbTDzZEM6" role="3cqZAp">
+            <node concept="37vLTI" id="6OXbTDzZEM7" role="3clFbG">
+              <node concept="10Nm6u" id="6OXbTDzZEM8" role="37vLTx" />
+              <node concept="37vLTw" id="6OXbTDzZEM9" role="37vLTJ">
+                <ref role="3cqZAo" node="6OXbTDz70gM" resolve="logical" />
+              </node>
+            </node>
+            <node concept="1WS0z7" id="6OXbTDzZEMa" role="lGtFl">
+              <node concept="3JmXsc" id="6OXbTDzZEMb" role="3Jn$fo">
+                <node concept="3clFbS" id="6OXbTDzZEMc" role="2VODD2">
+                  <node concept="3clFbF" id="6OXbTDzZEMd" role="3cqZAp">
+                    <node concept="2OqwBi" id="6OXbTDzZEMe" role="3clFbG">
+                      <node concept="30H73N" id="6OXbTDzZEMf" role="2Oq$k0" />
+                      <node concept="2qgKlT" id="6OXbTDzZGH5" role="2OqNvi">
+                        <ref role="37wK5l" to="x5bw:6OXbTDz3CDo" resolve="localContextNames" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1sPUBX" id="6OXbTDzZEMh" role="lGtFl">
+              <ref role="v9R2y" node="4KRwoemr_Es" resolve="contextName_variable_init" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="6OXbTDyyZth" role="3cqZAp">
+            <node concept="37vLTI" id="6OXbTDyyZti" role="3clFbG">
+              <node concept="2ShNRf" id="6OXbTDyyZtj" role="37vLTx">
+                <node concept="Tc6Ow" id="6OXbTDyyZtk" role="2ShVmc">
+                  <node concept="3uibUv" id="6OXbTDyyZtl" role="HW$YZ">
+                    <ref role="3uigEE" to="6pyv:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6OXbTDyyZtm" role="37vLTJ">
+                <node concept="Xjq3P" id="6OXbTDyyZtn" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6OXbTDyyZto" role="2OqNvi">
+                  <ref role="2Oxat5" node="6OXbTDyyUc6" resolve="ruleBuilder" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6OXbTDyyMq2" role="jymVt" />
+      <node concept="3clFb_" id="mJ_D14GyNS" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="apply" />
+        <node concept="A3Dl8" id="mJ_D14GyNT" role="3clF45">
+          <node concept="3uibUv" id="mJ_D14GyNU" role="A3Ik2">
+            <ref role="3uigEE" to="6pyv:7eGEHDlc$ap" resolve="RuleBuilder" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="mJ_D14GyNV" role="3clF46">
+          <property role="TrG5h" value="session" />
+          <node concept="3uibUv" id="mJ_D14GyNW" role="1tU5fm">
+            <ref role="3uigEE" to="psr6:18kNIl1vDPZ" resolve="AbstractMacroProcessing" />
+          </node>
+          <node concept="2ZBi8u" id="6OXbTDza_L2" role="lGtFl">
+            <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="mJ_D14GyNX" role="1B3o_S" />
+        <node concept="3clFbS" id="mJ_D14GyNZ" role="3clF47">
+          <node concept="3clFbF" id="6OXbTDyyZYU" role="3cqZAp">
+            <node concept="2OqwBi" id="6OXbTDyz0KH" role="3clFbG">
+              <node concept="37vLTw" id="6OXbTDyyZYS" role="2Oq$k0">
+                <ref role="3cqZAo" node="6OXbTDyyUc6" resolve="ruleBuilder" />
+              </node>
+              <node concept="TSZUe" id="6OXbTDyz1Yj" role="2OqNvi">
+                <node concept="10Nm6u" id="6OXbTDyz29W" role="25WWJ7" />
+              </node>
+            </node>
+            <node concept="2b32R4" id="6OXbTDyz9iH" role="lGtFl">
+              <node concept="3JmXsc" id="6OXbTDyz9iR" role="2P8S$">
+                <node concept="3clFbS" id="6OXbTDyz9j1" role="2VODD2">
+                  <node concept="3clFbF" id="6OXbTDyz9Kz" role="3cqZAp">
+                    <node concept="2OqwBi" id="6OXbTDyzaBr" role="3clFbG">
+                      <node concept="2OqwBi" id="6OXbTDyz9Yw" role="2Oq$k0">
+                        <node concept="30H73N" id="6OXbTDyz9Ky" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="6OXbTDyzabO" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:6OXbTDyyU9U" resolve="code" />
+                        </node>
+                      </node>
+                      <node concept="3Tsc0h" id="6OXbTDyzbq6" role="2OqNvi">
+                        <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6OXbTDyyZic" role="3cqZAp">
+            <node concept="37vLTw" id="6OXbTDyyZia" role="3clFbG">
+              <ref role="3cqZAo" node="6OXbTDyyUc6" resolve="ruleBuilder" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="mJ_D14GyO0" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6OXbTDyNTeR" role="jymVt" />
+      <node concept="3clFb_" id="6OXbTDyNRtP" role="jymVt">
+        <property role="TrG5h" value="token" />
+        <node concept="3uibUv" id="6OXbTDyNXe5" role="3clF45">
+          <ref role="3uigEE" node="mJ_D14GspB" resolve="QueryStageTemplateImpl.Token" />
+        </node>
+        <node concept="3Tmbuc" id="6OXbTDyNRtR" role="1B3o_S" />
+        <node concept="3clFbS" id="6OXbTDyNRtS" role="3clF47">
+          <node concept="3clFbF" id="6OXbTDyNRtT" role="3cqZAp">
+            <node concept="Xjq3P" id="6OXbTDyNXdx" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="2ZBi8u" id="6OXbTDyNRtV" role="lGtFl">
+          <ref role="2rW$FS" node="36tQV5AugIl" resolve="template_token_this" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6OXbTDyZVEW" role="jymVt" />
+      <node concept="3clFb_" id="6OXbTDyZUI_" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="templateRef" />
+        <node concept="3uibUv" id="6OXbTDyZUIA" role="3clF45">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+        <node concept="3Tm1VV" id="6OXbTDyZUIB" role="1B3o_S" />
+        <node concept="3clFbS" id="6OXbTDyZUIC" role="3clF47">
+          <node concept="3clFbF" id="6OXbTDyZUID" role="3cqZAp">
+            <node concept="37vLTw" id="6OXbTDz02LZ" role="3clFbG">
+              <ref role="3cqZAo" node="6OXbTDyZWv$" resolve="templateRef" />
+            </node>
+          </node>
+        </node>
+        <node concept="2ZBi8u" id="6OXbTDyZUIF" role="lGtFl">
+          <ref role="2rW$FS" node="6OXbTDyZfMT" resolve="template_ref" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6OXbTDyACtM" role="jymVt" />
+      <node concept="2tJIrI" id="6OXbTD$rmWg" role="jymVt" />
+      <node concept="312cEg" id="6OXbTDyAEzN" role="jymVt">
+        <property role="TrG5h" value="parameter" />
+        <node concept="3Tmbuc" id="6OXbTDyAFCN" role="1B3o_S" />
+        <node concept="10Q1$e" id="6OXbTDyAFFi" role="1tU5fm">
+          <node concept="3uibUv" id="6OXbTDyAFFf" role="10Q1$1">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="312cEg" id="6OXbTDz70gM" role="jymVt">
+        <property role="TrG5h" value="logical" />
+        <node concept="3uibUv" id="6OXbTDz70gN" role="1tU5fm">
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+        </node>
+        <node concept="3Tm1VV" id="6OXbTDz70gO" role="1B3o_S" />
+        <node concept="1WS0z7" id="6OXbTDz70gP" role="lGtFl">
+          <node concept="3JmXsc" id="6OXbTDz70gQ" role="3Jn$fo">
+            <node concept="3clFbS" id="6OXbTDz70gR" role="2VODD2">
+              <node concept="3clFbF" id="6OXbTDz70gS" role="3cqZAp">
+                <node concept="2OqwBi" id="6OXbTDz70gT" role="3clFbG">
+                  <node concept="30H73N" id="6OXbTDz70gU" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="6OXbTDz75JH" role="2OqNvi">
+                    <ref role="37wK5l" to="x5bw:6OXbTDz3CDo" resolve="localContextNames" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1sPUBX" id="6OXbTDz70gW" role="lGtFl">
+          <ref role="v9R2y" node="452KZTbxEFE" resolve="contextName_field_declaration" />
+        </node>
+      </node>
+      <node concept="312cEg" id="6OXbTDyyUc6" role="jymVt">
+        <property role="TrG5h" value="ruleBuilder" />
+        <node concept="3Tmbuc" id="6OXbTDyyUc7" role="1B3o_S" />
+        <node concept="_YKpA" id="6OXbTDyyUc8" role="1tU5fm">
+          <node concept="3uibUv" id="6OXbTDyyUc9" role="_ZDj9">
+            <ref role="3uigEE" to="6pyv:7eGEHDlc$ap" resolve="RuleBuilder" />
+          </node>
+        </node>
+      </node>
+      <node concept="312cEg" id="6OXbTDyZWv$" role="jymVt">
+        <property role="TrG5h" value="templateRef" />
+        <node concept="3Tmbuc" id="6OXbTDyZWv_" role="1B3o_S" />
+        <node concept="3uibUv" id="6OXbTDyZWvA" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="mJ_D14GspC" role="1B3o_S" />
+      <node concept="3uibUv" id="mJ_D14Gysj" role="EKbjA">
+        <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="mJ_D14GrLk" role="jymVt" />
     <node concept="312cEu" id="7P_FdVPsNol" role="jymVt">
       <property role="2bfB8j" value="false" />
       <property role="TrG5h" value="Configurable" />
@@ -20193,52 +20694,9 @@
         </node>
         <node concept="3Tm1VV" id="7P_FdVQ_tvN" role="1B3o_S" />
         <node concept="3clFbS" id="7P_FdVQ_tvP" role="3clF47">
-          <node concept="3clFbF" id="7P_FdVQ_tGn" role="3cqZAp">
-            <node concept="2OqwBi" id="7P_FdVQBZOm" role="3clFbG">
-              <node concept="37vLTw" id="7P_FdVQ_tGk" role="2Oq$k0">
-                <ref role="3cqZAo" node="7P_FdVQ_tvK" resolve="config" />
-              </node>
-              <node concept="liA8E" id="7P_FdVQC013" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParam(java.lang.String,java.lang.Object):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withParam" />
-                <node concept="Xl_RD" id="3GlpCDSC7E4" role="37wK5m">
-                  <property role="Xl_RC" value="main" />
-                </node>
-                <node concept="2OqwBi" id="3GlpCDSC7E5" role="37wK5m">
-                  <node concept="2ShNRf" id="3GlpCDSC7E6" role="2Oq$k0">
-                    <node concept="1pGfFk" id="3GlpCDSC7E7" role="2ShVmc">
-                      <ref role="37wK5l" to="6pyv:4sSe4$oM2rk" resolve="ConstraintBuilder" />
-                      <node concept="2ShNRf" id="3GlpCDSC7E8" role="37wK5m">
-                        <node concept="1pGfFk" id="3GlpCDSC7E9" role="2ShVmc">
-                          <ref role="37wK5l" to="av0y:~ConstraintSymbol.&lt;init&gt;(java.lang.String,int)" resolve="ConstraintSymbol" />
-                          <node concept="Xl_RD" id="3GlpCDSC7Ea" role="37wK5m">
-                            <property role="Xl_RC" value="main" />
-                          </node>
-                          <node concept="3cmrfG" id="3GlpCDSC7Eb" role="37wK5m">
-                            <property role="3cmrfH" value="0" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="3GlpCDSC7Ec" role="2OqNvi">
-                    <ref role="37wK5l" to="6pyv:4sSe4$oM2zI" resolve="toConstraint" />
-                  </node>
-                  <node concept="29HgVG" id="3IIf9O_e5LZ" role="lGtFl">
-                    <node concept="3NFfHV" id="3IIf9O_e5OB" role="3NFExx">
-                      <node concept="3clFbS" id="3IIf9O_e5OC" role="2VODD2">
-                        <node concept="3clFbF" id="3IIf9O_e6jr" role="3cqZAp">
-                          <node concept="2OqwBi" id="3IIf9O_e6tS" role="3clFbG">
-                            <node concept="30H73N" id="3IIf9O_e6jq" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="3IIf9O_e6H2" role="2OqNvi">
-                              <ref role="3Tt5mk" to="wq2x:3IIf9O_dj_p" resolve="start" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
+          <node concept="3clFbF" id="6OXbTD$7WuY" role="3cqZAp">
+            <node concept="37vLTw" id="6OXbTD$7WuX" role="3clFbG">
+              <ref role="3cqZAo" node="7P_FdVQ_tvK" resolve="config" />
             </node>
           </node>
         </node>
@@ -20263,13 +20721,439 @@
     <node concept="2tJIrI" id="7P_FdVPsY3k" role="jymVt" />
     <node concept="3Tm1VV" id="7P_FdVPsJi$" role="1B3o_S" />
     <node concept="n94m4" id="7P_FdVPsJi_" role="lGtFl">
-      <ref role="n9lRv" to="wq2x:7P_FdVQ_S6B" resolve="Query" />
-    </node>
-    <node concept="3uibUv" id="7P_FdVPsJjx" role="EKbjA">
-      <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+      <ref role="n9lRv" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
     </node>
     <node concept="3uibUv" id="7P_FdVPsWWe" role="1zkMxy">
-      <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="AbstractQueryTemplate" />
+      <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="BaseQueryStageTemplate" />
+      <node concept="3uibUv" id="mJ_D14GCbF" role="11_B2D">
+        <ref role="3uigEE" node="mJ_D14GspB" resolve="QueryStageTemplateImpl.Token" />
+      </node>
+    </node>
+    <node concept="17Uvod" id="6OXbTDzmOgW" role="lGtFl">
+      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+      <property role="2qtEX9" value="name" />
+      <node concept="3zFVjK" id="6OXbTDzmOgX" role="3zH0cK">
+        <node concept="3clFbS" id="6OXbTDzmOgY" role="2VODD2">
+          <node concept="3clFbF" id="6OXbTD$iXcU" role="3cqZAp">
+            <node concept="3cpWs3" id="6OXbTD$jayM" role="3clFbG">
+              <node concept="2OqwBi" id="6OXbTD$jbpC" role="3uHU7w">
+                <node concept="30H73N" id="6OXbTD$jb80" role="2Oq$k0" />
+                <node concept="3TrcHB" id="6OXbTD$jbGv" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                </node>
+              </node>
+              <node concept="3cpWs3" id="6OXbTD$j895" role="3uHU7B">
+                <node concept="2OqwBi" id="6OXbTD$j6sH" role="3uHU7B">
+                  <node concept="1PxgMI" id="6OXbTD$j5_3" role="2Oq$k0">
+                    <property role="1BlNFB" value="true" />
+                    <node concept="chp4Y" id="6OXbTD$j5VH" role="3oSUPX">
+                      <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                    </node>
+                    <node concept="2OqwBi" id="6OXbTD$j21f" role="1m5AlR">
+                      <node concept="30H73N" id="6OXbTD$j1dZ" role="2Oq$k0" />
+                      <node concept="2Rxl7S" id="6OXbTD$j3OS" role="2OqNvi" />
+                    </node>
+                  </node>
+                  <node concept="3TrcHB" id="6OXbTD$j6Zf" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+                <node concept="Xl_RD" id="6OXbTD$j89N" role="3uHU7w">
+                  <property role="Xl_RC" value="_" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="6OXbTD$fBEY">
+    <property role="TrG5h" value="QueryTemplateImpl" />
+    <node concept="2tJIrI" id="6OXbTD$fBKs" role="jymVt" />
+    <node concept="3clFbW" id="6OXbTD$juGj" role="jymVt">
+      <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">
+              <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">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </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">
+            <property role="Xl_RC" value="" />
+            <node concept="17Uvod" id="6OXbTD$fFDY" 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">
+                        <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                      </node>
+                      <node concept="30H73N" id="6OXbTD$fFE4" 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="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="6OXbTD$jo8g" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="stageTemplates" />
+      <node concept="A3Dl8" id="6OXbTD$jo8h" role="3clF45">
+        <node concept="3uibUv" id="6OXbTD$jo8i" role="A3Ik2">
+          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryStageTemplate" />
+          <node concept="3qTvmN" id="6OXbTD$jvLz" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6OXbTD$jo8j" role="1B3o_S" />
+      <node concept="3clFbS" id="6OXbTD$jo8l" role="3clF47">
+        <node concept="3clFbF" id="6OXbTD$jvfF" role="3cqZAp">
+          <node concept="37vLTw" id="6OXbTD$jvfE" role="3clFbG">
+            <ref role="3cqZAo" node="6OXbTD$joVJ" resolve="queryStageTemplates" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6OXbTD$jo8m" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6OXbTD$oJ3M" role="jymVt" />
+    <node concept="3clFb_" id="6OXbTD$oJL_" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="stageTemplate" />
+      <node concept="37vLTG" id="6OXbTD$oJLA" role="3clF46">
+        <property role="TrG5h" value="stage" />
+        <node concept="17QB3L" id="6OXbTD$oJLB" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="6OXbTD$oJLC" role="3clF45">
+        <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryStageTemplate" />
+      </node>
+      <node concept="3Tm1VV" id="6OXbTD$oJLD" role="1B3o_S" />
+      <node concept="3clFbS" id="6OXbTD$oJLF" role="3clF47">
+        <node concept="3clFbF" id="6OXbTD$oLi8" role="3cqZAp">
+          <node concept="2OqwBi" id="6OXbTD$oO6x" role="3clFbG">
+            <node concept="37vLTw" id="6OXbTD$oLi5" role="2Oq$k0">
+              <ref role="3cqZAo" node="6OXbTD$joVJ" resolve="queryStageTemplates" />
+            </node>
+            <node concept="1z4cxt" id="6OXbTD$oPum" role="2OqNvi">
+              <node concept="1bVj0M" id="6OXbTD$oPuo" role="23t8la">
+                <node concept="3clFbS" id="6OXbTD$oPup" role="1bW5cS">
+                  <node concept="3clFbF" id="6OXbTD$p1Bb" role="3cqZAp">
+                    <node concept="17R0WA" id="6OXbTD$p34L" role="3clFbG">
+                      <node concept="37vLTw" id="6OXbTD$p1Ba" role="3uHU7B">
+                        <ref role="3cqZAo" node="6OXbTD$oJLA" resolve="stage" />
+                      </node>
+                      <node concept="2OqwBi" id="6OXbTD$oQ4j" role="3uHU7w">
+                        <node concept="37vLTw" id="6OXbTD$oPGs" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6OXbTD$oPuq" resolve="it" />
+                        </node>
+                        <node concept="liA8E" id="6OXbTD$p0Jk" role="2OqNvi">
+                          <ref role="37wK5l" to="i348:6OXbTD$oRWJ" resolve="stageName" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="6OXbTD$oPuq" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="6OXbTD$oPur" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6OXbTD$oJLG" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6OXbTD$rbXF" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVPsJk6" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="newQuery" />
+      <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 concept="37vLTG" id="7P_FdVPsJk7" role="3clF46">
+        <property role="TrG5h" value="parameters" />
+        <node concept="3uibUv" id="3IIf9OAgMw$" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="3qTvmN" id="3IIf9OAm5Tq" role="11_B2D" />
+        </node>
+      </node>
+      <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="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="3clFbJ" id="6OXbTD$jvU0" role="3cqZAp">
+          <node concept="3clFbC" id="6OXbTD$jwT3" role="3clFbw">
+            <node concept="10Nm6u" id="6OXbTD$jxlL" role="3uHU7w" />
+            <node concept="37vLTw" id="6OXbTD$jvVi" role="3uHU7B">
+              <ref role="3cqZAo" node="6OXbTD$joVJ" resolve="queryStageTemplates" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="6OXbTD$jvU2" role="3clFbx">
+            <node concept="3cpWs8" id="6OXbTD$jzf5" role="3cqZAp">
+              <node concept="3cpWsn" id="6OXbTD$jzf6" role="3cpWs9">
+                <property role="TrG5h" value="list" />
+                <node concept="_YKpA" id="6OXbTD$jzeN" role="1tU5fm">
+                  <node concept="3uibUv" id="6OXbTD$jzeU" role="_ZDj9">
+                    <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryStageTemplate" />
+                    <node concept="3qTvmN" id="6OXbTD$jzeV" role="11_B2D" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="6OXbTD$jzf7" role="33vP2m">
+                  <node concept="Tc6Ow" id="6OXbTD$jzf8" role="2ShVmc">
+                    <node concept="3uibUv" id="6OXbTD$jzf9" role="HW$YZ">
+                      <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryStageTemplate" />
+                      <node concept="3qTvmN" id="6OXbTD$jzfa" role="11_B2D" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="6OXbTD$j$4u" role="3cqZAp">
+              <node concept="2OqwBi" id="6OXbTD$j$Qb" role="3clFbG">
+                <node concept="37vLTw" id="6OXbTD$j$4s" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6OXbTD$jzf6" resolve="list" />
+                </node>
+                <node concept="TSZUe" id="6OXbTD$jA1b" role="2OqNvi">
+                  <node concept="2ShNRf" id="6OXbTD$jA3j" role="25WWJ7">
+                    <node concept="1pGfFk" id="6OXbTD$jAl5" role="2ShVmc">
+                      <ref role="37wK5l" node="7P_FdVPsZGY" resolve="QueryStageTemplateImpl" />
+                      <node concept="1ZhdrF" id="6OXbTD$jAuC" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                        <property role="2qtEX8" value="baseMethodDeclaration" />
+                        <node concept="3$xsQk" id="6OXbTD$jAuD" role="3$ytzL">
+                          <node concept="3clFbS" id="6OXbTD$jAuE" role="2VODD2">
+                            <node concept="3clFbF" id="6OXbTD$jOJW" role="3cqZAp">
+                              <node concept="2OqwBi" id="6OXbTD$jOW$" role="3clFbG">
+                                <node concept="1iwH7S" id="6OXbTD$jOJV" role="2Oq$k0" />
+                                <node concept="1iwH70" id="6OXbTD$jP2j" role="2OqNvi">
+                                  <ref role="1iwH77" node="6OXbTD$jKJM" resolve="query_stage_constructor" />
+                                  <node concept="30H73N" id="6OXbTD$jPhE" role="1iwH7V" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1WS0z7" id="6OXbTD$jBaW" role="lGtFl">
+                <node concept="3JmXsc" id="6OXbTD$jBaY" role="3Jn$fo">
+                  <node concept="3clFbS" id="6OXbTD$jBb0" role="2VODD2">
+                    <node concept="3clFbF" id="6OXbTD$jBOy" role="3cqZAp">
+                      <node concept="2OqwBi" id="6OXbTD$jC1u" role="3clFbG">
+                        <node concept="30H73N" id="6OXbTD$jBOx" role="2Oq$k0" />
+                        <node concept="3Tsc0h" id="6OXbTD$jFbt" role="2OqNvi">
+                          <ref role="3TtcxE" to="wq2x:6OXbTD$dU7c" resolve="queryStage" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="6OXbTD$jxtb" role="3cqZAp">
+              <node concept="37vLTI" id="6OXbTD$jyN_" role="3clFbG">
+                <node concept="37vLTw" id="6OXbTD$jzfb" role="37vLTx">
+                  <ref role="3cqZAo" node="6OXbTD$jzf6" resolve="list" />
+                </node>
+                <node concept="2OqwBi" id="6OXbTD$jx_K" role="37vLTJ">
+                  <node concept="Xjq3P" id="6OXbTD$jxta" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="6OXbTD$jxQd" role="2OqNvi">
+                    <ref role="2Oxat5" node="6OXbTD$joVJ" resolve="queryStageTemplates" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </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="6OXbTD$r7fk" role="jymVt" />
+    <node concept="312cEg" id="6OXbTD$joVJ" role="jymVt">
+      <property role="TrG5h" value="queryStageTemplates" />
+      <node concept="3Tm6S6" id="6OXbTD$joVK" role="1B3o_S" />
+      <node concept="_YKpA" id="6OXbTD$joVL" role="1tU5fm">
+        <node concept="3uibUv" id="6OXbTD$jpNI" role="_ZDj9">
+          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryStageTemplate" />
+          <node concept="3qTvmN" id="6OXbTD$jsP9" role="11_B2D" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6OXbTD$joxi" role="jymVt" />
+    <node concept="3Tm1VV" id="6OXbTD$fBEZ" role="1B3o_S" />
+    <node concept="n94m4" id="6OXbTD$fBF0" role="lGtFl">
+      <ref role="n9lRv" to="wq2x:6OXbTD$dU7b" resolve="Query" />
+    </node>
+    <node concept="3uibUv" id="6OXbTD$iV$$" role="EKbjA">
+      <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+    </node>
+    <node concept="17Uvod" id="6OXbTD$iVUX" role="lGtFl">
+      <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+      <property role="2qtEX9" value="name" />
+      <node concept="3zFVjK" id="6OXbTD$iVUY" role="3zH0cK">
+        <node concept="3clFbS" id="6OXbTD$iVUZ" role="2VODD2">
+          <node concept="3clFbF" id="6OXbTDzn1Cc" role="3cqZAp">
+            <node concept="3cpWs3" id="6OXbTDzn8_I" role="3clFbG">
+              <node concept="2OqwBi" id="6OXbTDzna3X" role="3uHU7w">
+                <node concept="35c_gC" id="6OXbTDzn91I" role="2Oq$k0">
+                  <ref role="35c_gD" to="wq2x:6OXbTD$dU7b" resolve="Query" />
+                </node>
+                <node concept="3n3YKJ" id="6OXbTDznb3m" role="2OqNvi" />
+              </node>
+              <node concept="3cpWs3" id="6OXbTDzn6VY" role="3uHU7B">
+                <node concept="2OqwBi" id="6OXbTDzn1Ce" role="3uHU7B">
+                  <node concept="30H73N" id="6OXbTDzn1Cf" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="6OXbTDzn1Cg" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+                <node concept="Xl_RD" id="6OXbTDzn7j9" role="3uHU7w">
+                  <property role="Xl_RC" value="_" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
index 6d6dd277..7bdcc2bf 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/behavior.mps
@@ -2725,5 +2725,109 @@
       <node concept="3clFbS" id="34$A1Mf3_WA" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="6OXbTDz3CCF">
+    <ref role="13h7C2" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
+    <node concept="13i0hz" id="6OXbTDz3CCQ" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="exportedLogicalVariable" />
+      <ref role="13i0hy" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
+      <node concept="3Tm1VV" id="6OXbTDz3CCR" role="1B3o_S" />
+      <node concept="3clFbS" id="6OXbTDz3CCS" role="3clF47">
+        <node concept="3clFbF" id="6OXbTDz3CCT" role="3cqZAp">
+          <node concept="2OqwBi" id="6OXbTDz3CCU" role="3clFbG">
+            <node concept="2OqwBi" id="6OXbTDz3CCV" role="2Oq$k0">
+              <node concept="2OqwBi" id="6OXbTDz3CCW" role="2Oq$k0">
+                <node concept="2OqwBi" id="6OXbTDz3CCX" role="2Oq$k0">
+                  <node concept="13iPFW" id="6OXbTDz3CCY" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="6OXbTDz3CCZ" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:6OXbTDyyU9U" resolve="code" />
+                  </node>
+                </node>
+                <node concept="2Rf3mk" id="6OXbTDz3CD0" role="2OqNvi">
+                  <node concept="1xMEDy" id="6OXbTDz3CD1" role="1xVPHs">
+                    <node concept="chp4Y" id="6OXbTDz3CD2" role="ri$Ld">
+                      <ref role="cht4Q" to="wq2x:36tQV5AmIt0" resolve="ConstraintRuleStatement" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="13MTOL" id="6OXbTDz3CD3" role="2OqNvi">
+                <ref role="13MTZf" to="wq2x:36tQV5AmIt1" resolve="rule" />
+              </node>
+            </node>
+            <node concept="3goQfb" id="6OXbTDz3CD4" role="2OqNvi">
+              <node concept="1bVj0M" id="6OXbTDz3CD5" role="23t8la">
+                <node concept="3clFbS" id="6OXbTDz3CD6" role="1bW5cS">
+                  <node concept="3clFbF" id="6OXbTDz3CD7" role="3cqZAp">
+                    <node concept="2OqwBi" id="6OXbTDz3CD8" role="3clFbG">
+                      <node concept="37vLTw" id="6OXbTDz3CD9" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6OXbTDz3CDb" resolve="it" />
+                      </node>
+                      <node concept="2qgKlT" id="6OXbTDz3CDa" role="2OqNvi">
+                        <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="6OXbTDz3CDb" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="6OXbTDz3CDc" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="6OXbTDz3CDd" role="3clF45">
+        <node concept="3Tqbb2" id="6OXbTDz3CDe" role="A3Ik2">
+          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="6OXbTDz3CDf" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="availableLogicalVariable" />
+      <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+      <node concept="3Tm1VV" id="6OXbTDz3CDg" role="1B3o_S" />
+      <node concept="3clFbS" id="6OXbTDz3CDh" role="3clF47">
+        <node concept="3clFbF" id="6OXbTDz3CDi" role="3cqZAp">
+          <node concept="2OqwBi" id="6OXbTDz3CDj" role="3clFbG">
+            <node concept="13iPFW" id="6OXbTDz3CDk" role="2Oq$k0" />
+            <node concept="2qgKlT" id="6OXbTDz3CDl" role="2OqNvi">
+              <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="6OXbTDz3CDm" role="3clF45">
+        <node concept="3Tqbb2" id="6OXbTDz3CDn" role="A3Ik2">
+          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="6OXbTDz3CDo" role="13h7CS">
+      <property role="TrG5h" value="localContextNames" />
+      <property role="13i0it" value="false" />
+      <property role="13i0iv" value="false" />
+      <node concept="3Tm1VV" id="6OXbTDz3CDp" role="1B3o_S" />
+      <node concept="3clFbS" id="6OXbTDz3CDq" role="3clF47">
+        <node concept="3clFbF" id="6OXbTDz3CDr" role="3cqZAp">
+          <node concept="BsUDl" id="6OXbTDz3CDs" role="3clFbG">
+            <ref role="37wK5l" to="ha02:7E86$tKAujJ" resolve="exportedLogicalVariable" />
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="6OXbTDz3CDt" role="3clF45">
+        <node concept="3Tqbb2" id="6OXbTDz3CDu" role="A3Ik2">
+          <ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
+        </node>
+      </node>
+    </node>
+    <node concept="13hLZK" id="6OXbTDz3CCG" role="13h7CW">
+      <node concept="3clFbS" id="6OXbTDz3CCH" role="2VODD2" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 6a1908aa..a820cc49 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -6806,17 +6806,31 @@
     </node>
   </node>
   <node concept="24kQdi" id="7P_FdVQ_S6G">
-    <ref role="1XX52x" to="wq2x:7P_FdVQ_S6B" resolve="Query" />
+    <ref role="1XX52x" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
     <node concept="3EZMnI" id="7P_FdVQ_S6R" role="2wV5jI">
-      <node concept="PMmxH" id="7P_FdVQ_S6Y" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      </node>
       <node concept="3F0A7n" id="7P_FdVQ_S77" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         <node concept="ljvvj" id="3IIf9O_dj_X" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
       </node>
+      <node concept="3F0ifn" id="6OXbTD$fGLE" role="3EZMnx">
+        <property role="3F0ifm" value="" />
+        <node concept="ljvvj" id="6OXbTD$fGLF" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="6OXbTD$fGJW" role="3EZMnx">
+        <property role="3F0ifm" value="stage:" />
+      </node>
+      <node concept="3F0A7n" id="6OXbTD$fGKx" role="3EZMnx">
+        <property role="1$x2rV" value="initial" />
+        <property role="1O74Pk" value="true" />
+        <ref role="1NtTu8" to="wq2x:6OXbTD$fGCg" resolve="stage" />
+        <node concept="ljvvj" id="6OXbTD$fGKI" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
       <node concept="l2Vlx" id="7P_FdVQ_S6U" role="2iSdaV" />
       <node concept="3F0ifn" id="3IIf9O_dj_Z" role="3EZMnx">
         <property role="3F0ifm" value="" />
@@ -6824,19 +6838,38 @@
           <property role="VOm3f" value="true" />
         </node>
       </node>
-      <node concept="3EZMnI" id="3IIf9O_djA8" role="3EZMnx">
-        <node concept="VPM3Z" id="3IIf9O_djAa" role="3F10Kt">
+      <node concept="3EZMnI" id="6OXbTDyyUaE" role="3EZMnx">
+        <node concept="VPM3Z" id="6OXbTDyyUaG" role="3F10Kt">
           <property role="VOm3f" value="false" />
         </node>
-        <node concept="3F0ifn" id="3IIf9O_djAo" role="3EZMnx">
-          <property role="3F0ifm" value="start:" />
+        <node concept="3F1sOY" id="6OXbTDyyUb0" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:6OXbTDyyU9U" resolve="code" />
         </node>
-        <node concept="3F1sOY" id="3IIf9O_djAu" role="3EZMnx">
-          <ref role="1NtTu8" to="wq2x:3IIf9O_dj_p" resolve="start" />
-        </node>
-        <node concept="l2Vlx" id="3IIf9O_djAd" role="2iSdaV" />
+        <node concept="l2Vlx" id="6OXbTDyyUaJ" role="2iSdaV" />
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="6OXbTD$dU7D">
+    <ref role="1XX52x" to="wq2x:6OXbTD$dU7b" resolve="Query" />
+    <node concept="3EZMnI" id="6OXbTD$dU7F" role="2wV5jI">
+      <node concept="3F0A7n" id="6OXbTD$dU81" role="3EZMnx">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+        <node concept="ljvvj" id="6OXbTD$dU8h" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="6OXbTD$dU8b" role="3EZMnx">
+        <property role="3F0ifm" value="" />
+        <node concept="ljvvj" id="6OXbTD$dU8j" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F2HdR" id="6OXbTD$dU7M" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:6OXbTD$dU7c" resolve="queryStage" />
+        <node concept="l2Vlx" id="6OXbTD$dU7O" role="2czzBx" />
+      </node>
+      <node concept="l2Vlx" id="6OXbTD$dU7I" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index 81b2b1c7..ea5a0914 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -43,7 +43,9 @@
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
         <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
-      <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
+      <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ">
+        <child id="1169127546356" name="extends" index="PrDN$" />
+      </concept>
       <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
         <reference id="1169127628841" name="intfc" index="PrY4T" />
       </concept>
@@ -1412,6 +1414,9 @@
       <property role="20lbJX" value="1" />
       <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
     </node>
+    <node concept="PrWs8" id="6OXbTDyHcSb" role="PzmwI">
+      <ref role="PrY4T" node="6OXbTDyHcuD" resolve="Template" />
+    </node>
     <node concept="PrWs8" id="36tQV5AmIsC" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
     </node>
@@ -1591,18 +1596,54 @@
   </node>
   <node concept="1TIwiD" id="7P_FdVQ_S6B">
     <property role="EcuMT" value="9035818301008609703" />
+    <property role="TrG5h" value="QueryTemplate" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyi" id="6OXbTD$fGCg" role="1TKVEl">
+      <property role="IQ2nx" value="7871500063866800656" />
+      <property role="TrG5h" value="stage" />
+      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
+    </node>
+    <node concept="1TJgyj" id="6OXbTDyyU9U" role="1TKVEi">
+      <property role="IQ2ns" value="7871500063838282362" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="code" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fzclF80" resolve="StatementList" />
+    </node>
+    <node concept="PrWs8" id="6OXbTDyHcHo" role="PzmwI">
+      <ref role="PrY4T" node="6OXbTDyHcuD" resolve="Template" />
+    </node>
+    <node concept="PrWs8" id="7P_FdVQ_S6O" role="PzmwI">
+      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+    </node>
+    <node concept="PrWs8" id="6OXbTDz3CC2" role="PzmwI">
+      <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
+    </node>
+    <node concept="PrWs8" id="6OXbTDz3CCc" role="PzmwI">
+      <ref role="PrY4T" node="7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
+    </node>
+  </node>
+  <node concept="PlHQZ" id="6OXbTDyHcuD">
+    <property role="EcuMT" value="7871500063840978857" />
+    <property role="TrG5h" value="Template" />
+    <node concept="PrWs8" id="6OXbTDyHcuE" role="PrDN$">
+      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="6OXbTD$dU7b">
+    <property role="EcuMT" value="7871500063866331595" />
     <property role="TrG5h" value="Query" />
     <property role="19KtqR" value="true" />
     <property role="34LRSv" value="query" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="3IIf9O_dj_p" role="1TKVEi">
-      <property role="IQ2ns" value="4300441339817179481" />
+    <node concept="1TJgyj" id="6OXbTD$dU7c" role="1TKVEi">
+      <property role="IQ2ns" value="7871500063866331596" />
       <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="start" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" node="6p0DfM0ang5" resolve="UserConstraint" />
+      <property role="20kJfa" value="queryStage" />
+      <property role="20lbJX" value="0..n" />
+      <ref role="20lvS9" node="7P_FdVQ_S6B" resolve="QueryTemplate" />
     </node>
-    <node concept="PrWs8" id="7P_FdVQ_S6O" role="PzmwI">
+    <node concept="PrWs8" id="6OXbTD$dU7e" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
     </node>
   </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
index f2773def..47c2f94a 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
@@ -3076,10 +3076,10 @@
             <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
           </node>
           <node concept="3uibUv" id="1ffsG7c4ezn" role="1Lm7xW">
-            <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
             <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="RuleTemplateApplicationToken" />
+                <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
               </node>
             </node>
           </node>
@@ -3096,10 +3096,10 @@
                   <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                 </node>
                 <node concept="3uibUv" id="7XdbJdyRODp" role="1Lm7xW">
-                  <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                   <node concept="3qUE_q" id="7XdbJdyRODq" role="11_B2D">
                     <node concept="3uibUv" id="7XdbJdyRODr" role="3qUE_r">
-                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                     </node>
                   </node>
                 </node>
@@ -3112,10 +3112,10 @@
                     <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                   </node>
                   <node concept="3uibUv" id="7XdbJdyRQxJ" role="1Lm7xW">
-                    <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                    <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                     <node concept="3qUE_q" id="7XdbJdyRQxK" role="11_B2D">
                       <node concept="3uibUv" id="7XdbJdyRQxL" role="3qUE_r">
-                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                       </node>
                     </node>
                   </node>
@@ -3206,10 +3206,10 @@
                           <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                         </node>
                         <node concept="3uibUv" id="7XdbJdyRSmQ" role="1Lm7xW">
-                          <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                           <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="RuleTemplateApplicationToken" />
+                              <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                             </node>
                           </node>
                         </node>
@@ -3263,7 +3263,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="7XdbJdyJLhe" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:1ffsG7bWyMV" resolve="isExactMatch" />
+                              <ref role="37wK5l" to="i348:7XdbJdz3PF6" resolve="isExactMatch" />
                             </node>
                           </node>
                         </node>
@@ -3277,10 +3277,10 @@
                         <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                       </node>
                       <node concept="3uibUv" id="7XdbJdySrgC" role="1Lm7xW">
-                        <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                         <node concept="3qUE_q" id="7XdbJdySrgD" role="11_B2D">
                           <node concept="3uibUv" id="7XdbJdySrgE" role="3qUE_r">
-                            <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+                            <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                           </node>
                         </node>
                       </node>
@@ -3337,10 +3337,10 @@
             <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
           </node>
           <node concept="3uibUv" id="7XdbJdyRWsv" role="1Lm7xW">
-            <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
             <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="RuleTemplateApplicationToken" />
+                <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
               </node>
             </node>
           </node>
@@ -3357,10 +3357,10 @@
                   <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                 </node>
                 <node concept="3uibUv" id="7XdbJdyS2mz" role="1Lm7xW">
-                  <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                   <node concept="3qUE_q" id="7XdbJdyS2m$" role="11_B2D">
                     <node concept="3uibUv" id="7XdbJdyS2m_" role="3qUE_r">
-                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                     </node>
                   </node>
                 </node>
@@ -3373,10 +3373,10 @@
                     <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                   </node>
                   <node concept="3uibUv" id="7XdbJdyS4j5" role="1Lm7xW">
-                    <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                    <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                     <node concept="3qUE_q" id="7XdbJdyS4j6" role="11_B2D">
                       <node concept="3uibUv" id="7XdbJdyS4j7" role="3qUE_r">
-                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                       </node>
                     </node>
                   </node>
@@ -3397,10 +3397,10 @@
                       <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                     </node>
                     <node concept="3uibUv" id="7XdbJdyS6dB" role="1Lm7xW">
-                      <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                       <node concept="3qUE_q" id="7XdbJdyS6dC" role="11_B2D">
                         <node concept="3uibUv" id="7XdbJdyS6dD" role="3qUE_r">
-                          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+                          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                         </node>
                       </node>
                     </node>
@@ -3437,10 +3437,10 @@
                     <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                   </node>
                   <node concept="3uibUv" id="7XdbJdySs6B" role="1Lm7xW">
-                    <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                    <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                     <node concept="3qUE_q" id="7XdbJdySs6C" role="11_B2D">
                       <node concept="3uibUv" id="7XdbJdySs6D" role="3qUE_r">
-                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                       </node>
                     </node>
                   </node>
@@ -3848,10 +3848,10 @@
                           <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                         </node>
                         <node concept="3uibUv" id="7XdbJdySsFg" role="1Lm7xW">
-                          <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                          <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                           <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="RuleTemplateApplicationToken" />
+                              <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                             </node>
                           </node>
                         </node>
@@ -3885,10 +3885,10 @@
                                     <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                                   </node>
                                   <node concept="3uibUv" id="7XdbJdySth5" role="1Lm7xW">
-                                    <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                                    <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                                     <node concept="3qUE_q" id="7XdbJdySth6" role="11_B2D">
                                       <node concept="3uibUv" id="7XdbJdySth7" role="3qUE_r">
-                                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+                                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                                       </node>
                                     </node>
                                   </node>
@@ -3924,6 +3924,11 @@
                   </node>
                 </node>
                 <node concept="3clFbH" id="1CcQBrPe57p" role="3cqZAp" />
+                <node concept="3SKdUt" id="3IIf9OAyhIq" role="3cqZAp">
+                  <node concept="3SKdUq" id="3IIf9OAyhIs" role="3SKWNk">
+                    <property role="3SKdUp" value="TODO: test the subtyping" />
+                  </node>
+                </node>
                 <node concept="3clFbF" id="4MqhgXUaPgl" role="3cqZAp">
                   <node concept="2OqwBi" id="4MqhgXUaPgm" role="3clFbG">
                     <node concept="37vLTw" id="4MqhgXUaPgn" role="2Oq$k0">
@@ -3934,8 +3939,20 @@
                         <node concept="37vLTw" id="1CcQBrPe4Ac" role="1Lso8e">
                           <ref role="3cqZAo" node="4MqhgXU9tzq" resolve="stage" />
                         </node>
-                        <node concept="37vLTw" id="1CcQBrPe4S0" role="1Lso8e">
-                          <ref role="3cqZAo" node="4MqhgXUaONz" resolve="ruleTemplate" />
+                        <node concept="1eOMI4" id="3IIf9OAyh5v" role="1Lso8e">
+                          <node concept="10QFUN" id="3IIf9OAyh5w" role="1eOMHV">
+                            <node concept="37vLTw" id="3IIf9OAyh5u" role="10QFUP">
+                              <ref role="3cqZAo" node="4MqhgXUaONz" resolve="ruleTemplate" />
+                            </node>
+                            <node concept="3uibUv" id="3IIf9OAyhfn" role="10QFUM">
+                              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                              <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" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -3948,7 +3965,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="RuleTemplateApplicationToken" />
+                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                     </node>
                   </node>
                 </node>
@@ -4201,10 +4218,10 @@
               <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
             </node>
             <node concept="3uibUv" id="7XdbJdyRSXd" role="1Lm7xW">
-              <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
               <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="RuleTemplateApplicationToken" />
+                  <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                 </node>
               </node>
             </node>
@@ -4220,10 +4237,10 @@
                 <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
               </node>
               <node concept="3uibUv" id="7XdbJdyRULm" role="1Lm7xW">
-                <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                 <node concept="3qUE_q" id="7XdbJdyRULn" role="11_B2D">
                   <node concept="3uibUv" id="7XdbJdyRULo" role="3qUE_r">
-                    <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+                    <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                   </node>
                 </node>
               </node>
@@ -5508,13 +5525,26 @@
     <node concept="3Tm1VV" id="CGeqIk8WWV" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="3GlpCDSxTG7">
-    <property role="TrG5h" value="ProgramBuilder" />
+    <property role="TrG5h" value="ProgramProducer" />
     <property role="3GE5qa" value="" />
     <node concept="2tJIrI" id="4QPCta1yWT2" role="jymVt" />
     <node concept="3clFbW" id="7DvO2M9pdut" role="jymVt">
       <node concept="3cqZAl" id="7DvO2M9pduv" role="3clF45" />
       <node concept="3Tm1VV" id="7DvO2M9pduw" role="1B3o_S" />
       <node concept="3clFbS" id="7DvO2M9pdux" role="3clF47">
+        <node concept="3clFbF" id="6OXbTDxtYkF" role="3cqZAp">
+          <node concept="37vLTI" id="6OXbTDxtYkH" role="3clFbG">
+            <node concept="2OqwBi" id="6OXbTDxu4Rq" role="37vLTJ">
+              <node concept="Xjq3P" id="6OXbTDxu4Sg" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6OXbTDxu4Rt" role="2OqNvi">
+                <ref role="2Oxat5" node="6OXbTDxtYkB" resolve="name" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="6OXbTDxtYkL" role="37vLTx">
+              <ref role="3cqZAo" node="6OXbTDxtJVO" resolve="name" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="7WKNeR9bpBj" role="3cqZAp">
           <node concept="37vLTI" id="7WKNeR9bpBl" role="3clFbG">
             <node concept="2OqwBi" id="7WKNeR9bvwG" role="37vLTJ">
@@ -5529,6 +5559,10 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="6OXbTDxtJVO" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="6OXbTDxtJZk" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="7DvO2M9peEl" role="3clF46">
         <property role="TrG5h" value="ruleProcessingSession" />
         <node concept="3uibUv" id="7DvO2M9peEk" role="1tU5fm">
@@ -5538,6 +5572,10 @@
     </node>
     <node concept="2tJIrI" id="7WKNeR9b5Ef" role="jymVt" />
     <node concept="3clFbW" id="7WKNeR9bcL$" role="jymVt">
+      <node concept="37vLTG" id="6OXbTDxtXtJ" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="6OXbTDxtYhn" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="7WKNeR9biVB" role="3clF46">
         <property role="TrG5h" value="ruleProcessingSession" />
         <node concept="3uibUv" id="7WKNeR9biVC" role="1tU5fm">
@@ -5546,13 +5584,26 @@
       </node>
       <node concept="37vLTG" id="7WKNeR9biTm" role="3clF46">
         <property role="TrG5h" value="queryTemplate" />
-        <node concept="3uibUv" id="7WKNeR9bpo1" role="1tU5fm">
-          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+        <node concept="3uibUv" id="6OXbTD$kKAJ" role="1tU5fm">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
         </node>
       </node>
       <node concept="3cqZAl" id="7WKNeR9bcLA" role="3clF45" />
       <node concept="3Tm1VV" id="7WKNeR9bcLB" role="1B3o_S" />
       <node concept="3clFbS" id="7WKNeR9bcLC" role="3clF47">
+        <node concept="3clFbF" id="6OXbTDxugPb" role="3cqZAp">
+          <node concept="37vLTI" id="6OXbTDxuhrI" role="3clFbG">
+            <node concept="37vLTw" id="6OXbTDxuhtx" role="37vLTx">
+              <ref role="3cqZAo" node="6OXbTDxtXtJ" resolve="name" />
+            </node>
+            <node concept="2OqwBi" id="6OXbTDxugWB" role="37vLTJ">
+              <node concept="Xjq3P" id="6OXbTDxugP9" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6OXbTDxuh2Z" role="2OqNvi">
+                <ref role="2Oxat5" node="6OXbTDxtYkB" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="7WKNeR9b_gH" role="3cqZAp">
           <node concept="37vLTI" id="7WKNeR9b_gI" role="3clFbG">
             <node concept="2OqwBi" id="7WKNeR9b_gJ" role="37vLTJ">
@@ -5583,7 +5634,7 @@
     </node>
     <node concept="2tJIrI" id="3GlpCDSxTK6" role="jymVt" />
     <node concept="3clFb_" id="7kTeLbPojCz" role="jymVt">
-      <property role="TrG5h" value="forEach" />
+      <property role="TrG5h" value="produce" />
       <node concept="3Tm1VV" id="7kTeLbPopUh" role="1B3o_S" />
       <node concept="3uibUv" id="7kTeLbPojC_" role="3clF45">
         <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
@@ -5594,57 +5645,122 @@
           <node concept="3Tqbb2" id="7kTeLbPolyb" role="A3Ik2" />
         </node>
       </node>
-      <node concept="37vLTG" id="7kTeLbPojCC" role="3clF46">
-        <property role="TrG5h" value="nameHint" />
-        <node concept="17QB3L" id="7kTeLbPojCD" role="1tU5fm" />
+      <node concept="37vLTG" id="6OXbTDxuNC6" role="3clF46">
+        <property role="TrG5h" value="queryParameter" />
+        <node concept="8X2XB" id="6OXbTDxuUTL" role="1tU5fm">
+          <node concept="3uibUv" id="6OXbTDxuTvz" role="8Xvag">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
       </node>
       <node concept="3clFbS" id="7kTeLbPojCE" role="3clF47">
         <node concept="3clFbF" id="7kTeLbPojCF" role="3cqZAp">
           <node concept="1rXfSq" id="7kTeLbPojCG" role="3clFbG">
-            <ref role="37wK5l" node="7kTeLbPnDc0" resolve="build" />
+            <ref role="37wK5l" node="7kTeLbPnDc0" resolve="doProduce" />
             <node concept="1bVj0M" id="7kTeLbPojCH" role="37wK5m">
               <node concept="37vLTG" id="7kTeLbPojCI" role="1bW2Oz">
                 <property role="TrG5h" value="factory" />
                 <node concept="3uibUv" id="7DvO2M9BgGr" role="1tU5fm">
-                  <ref role="3uigEE" node="12yN8DyF_E1" resolve="ProgramBuilder.ProgramFactory" />
-                </node>
-              </node>
-              <node concept="37vLTG" id="7kTeLbPojCM" role="1bW2Oz">
-                <property role="TrG5h" value="stage_builders" />
-                <node concept="_YKpA" id="4vBwiiVem7I" role="1tU5fm">
-                  <node concept="1LlUBW" id="4vBwiiVem7J" role="_ZDj9">
-                    <node concept="3uibUv" id="4vBwiiVem7K" role="1Lm7xW">
-                      <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                    </node>
-                    <node concept="3uibUv" id="4vBwiiVem7L" role="1Lm7xW">
-                      <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
-                    </node>
-                  </node>
+                  <ref role="3uigEE" node="12yN8DyF_E1" resolve="ProgramProducer.ProgramFactory" />
                 </node>
               </node>
               <node concept="3clFbS" id="7kTeLbPojCO" role="1bW5cS">
-                <node concept="3clFbF" id="7kTeLbPojCP" role="3cqZAp">
-                  <node concept="2OqwBi" id="7kTeLbPojCQ" role="3clFbG">
-                    <node concept="37vLTw" id="7kTeLbPojCR" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7kTeLbPojCI" resolve="factory" />
+                <node concept="3cpWs8" id="6OXbTDxOoZc" role="3cqZAp">
+                  <node concept="3cpWsn" id="6OXbTDxOoZd" role="3cpWs9">
+                    <property role="TrG5h" value="result" />
+                    <node concept="3uibUv" id="6OXbTDxOoZ1" role="1tU5fm">
+                      <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
                     </node>
-                    <node concept="liA8E" id="7kTeLbPojCS" role="2OqNvi">
-                      <ref role="37wK5l" node="4QPCta1bMC1" resolve="forEach" />
-                      <node concept="37vLTw" id="7kTeLbPojCT" role="37wK5m">
-                        <ref role="3cqZAo" node="7kTeLbPojCA" resolve="nodes" />
+                    <node concept="2YIFZM" id="6OXbTDzR350" role="33vP2m">
+                      <ref role="37wK5l" node="7Oc59RSEjeq" resolve="OK" />
+                      <ref role="1Pybhc" node="7Oc59RSEjdb" resolve="Result" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="6OXbTDzSpTD" role="3cqZAp" />
+                <node concept="3clFbF" id="6OXbTDxPpdh" role="3cqZAp">
+                  <node concept="37vLTI" id="6OXbTDzR3Ob" role="3clFbG">
+                    <node concept="37vLTw" id="6OXbTDzR41p" role="37vLTJ">
+                      <ref role="3cqZAo" node="6OXbTDxOoZd" resolve="result" />
+                    </node>
+                    <node concept="2OqwBi" id="6OXbTDxPpl6" role="37vLTx">
+                      <node concept="37vLTw" id="6OXbTDxPpdf" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6OXbTDxOoZd" resolve="result" />
                       </node>
-                      <node concept="37vLTw" id="7kTeLbPojCV" role="37wK5m">
-                        <ref role="3cqZAo" node="7kTeLbPojCM" resolve="stage_builders" />
+                      <node concept="liA8E" id="6OXbTDxPptb" role="2OqNvi">
+                        <ref role="37wK5l" node="7nkyKX7v7xb" resolve="and" />
+                        <node concept="2OqwBi" id="6OXbTDxPpIU" role="37wK5m">
+                          <node concept="37vLTw" id="6OXbTDxPp_9" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7kTeLbPojCI" resolve="factory" />
+                          </node>
+                          <node concept="liA8E" id="6OXbTDxPqb1" role="2OqNvi">
+                            <ref role="37wK5l" node="6OXbTDxOzxt" resolve="processQuery" />
+                            <node concept="37vLTw" id="6OXbTDxPqhF" role="37wK5m">
+                              <ref role="3cqZAo" node="6OXbTDxuNC6" resolve="queryParameter" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbH" id="7kTeLbPojCW" role="3cqZAp" />
+                <node concept="3clFbF" id="6OXbTDzR2PY" role="3cqZAp">
+                  <node concept="37vLTI" id="6OXbTDzR2Q0" role="3clFbG">
+                    <node concept="37vLTw" id="6OXbTDzR2Q4" role="37vLTJ">
+                      <ref role="3cqZAo" node="6OXbTDxOoZd" resolve="result" />
+                    </node>
+                    <node concept="2OqwBi" id="6OXbTDzR3sa" role="37vLTx">
+                      <node concept="37vLTw" id="6OXbTDzR3jB" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6OXbTDxOoZd" resolve="result" />
+                      </node>
+                      <node concept="liA8E" id="6OXbTDzR3$y" role="2OqNvi">
+                        <ref role="37wK5l" node="7nkyKX7v7xb" resolve="and" />
+                        <node concept="2OqwBi" id="6OXbTDxOoZe" role="37wK5m">
+                          <node concept="37vLTw" id="6OXbTDxOoZf" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7kTeLbPojCI" resolve="factory" />
+                          </node>
+                          <node concept="liA8E" id="6OXbTDxOoZg" role="2OqNvi">
+                            <ref role="37wK5l" node="4QPCta1bMC1" resolve="processInput" />
+                            <node concept="37vLTw" id="6OXbTDxOoZh" role="37wK5m">
+                              <ref role="3cqZAo" node="7kTeLbPojCA" resolve="nodes" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="6OXbTDzSpmG" role="3cqZAp">
+                  <node concept="37vLTI" id="6OXbTDzSpmH" role="3clFbG">
+                    <node concept="37vLTw" id="6OXbTDzSpmI" role="37vLTJ">
+                      <ref role="3cqZAo" node="6OXbTDxOoZd" resolve="result" />
+                    </node>
+                    <node concept="2OqwBi" id="6OXbTDzSpmJ" role="37vLTx">
+                      <node concept="37vLTw" id="6OXbTDzSpmK" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6OXbTDxOoZd" resolve="result" />
+                      </node>
+                      <node concept="liA8E" id="6OXbTDzSpmL" role="2OqNvi">
+                        <ref role="37wK5l" node="7nkyKX7v7xb" resolve="and" />
+                        <node concept="2OqwBi" id="6OXbTDzSpmM" role="37wK5m">
+                          <node concept="37vLTw" id="6OXbTDzSpmN" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7kTeLbPojCI" resolve="factory" />
+                          </node>
+                          <node concept="liA8E" id="6OXbTDzSpmO" role="2OqNvi">
+                            <ref role="37wK5l" node="6OXbTDzR_RU" resolve="buildProgram" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="6OXbTDzSpO_" role="3cqZAp" />
+                <node concept="3clFbF" id="6OXbTDzR49N" role="3cqZAp">
+                  <node concept="37vLTw" id="6OXbTDzR49L" role="3clFbG">
+                    <ref role="3cqZAo" node="6OXbTDxOoZd" resolve="result" />
+                  </node>
+                </node>
               </node>
             </node>
-            <node concept="37vLTw" id="7kTeLbPojCX" role="37wK5m">
-              <ref role="3cqZAo" node="7kTeLbPojCC" resolve="nameHint" />
-            </node>
           </node>
         </node>
       </node>
@@ -5730,54 +5846,20 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7WKNeR9e45a" role="jymVt" />
-    <node concept="3clFb_" id="7WKNeR9e9Q$" role="jymVt">
-      <property role="TrG5h" value="macroTemplates" />
-      <node concept="3uibUv" id="7WKNeR9emMw" role="3clF45">
-        <ref role="3uigEE" node="1hX44vNlSIA" resolve="MacroTemplateIndex" />
-      </node>
-      <node concept="3Tm6S6" id="7WKNeR9efQB" role="1B3o_S" />
-      <node concept="3clFbS" id="7WKNeR9e9QC" role="3clF47">
-        <node concept="3clFbF" id="7WKNeR9eS_5" role="3cqZAp">
-          <node concept="2OqwBi" id="7WKNeR9eSGJ" role="3clFbG">
-            <node concept="37vLTw" id="7WKNeR9eS_4" role="2Oq$k0">
-              <ref role="3cqZAo" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
-            </node>
-            <node concept="liA8E" id="7WKNeR9eSO9" role="2OqNvi">
-              <ref role="37wK5l" node="7DvO2M9Icas" resolve="macroTemplates" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7WKNeR9bOnB" role="jymVt" />
+    <node concept="2tJIrI" id="6OXbTDxQQYI" role="jymVt" />
     <node concept="3clFb_" id="7kTeLbPnDc0" role="jymVt">
-      <property role="TrG5h" value="build" />
+      <property role="TrG5h" value="doProduce" />
       <node concept="37vLTG" id="7kTeLbPnFaf" role="3clF46">
-        <property role="TrG5h" value="buildAction" />
+        <property role="TrG5h" value="produceAction" />
         <node concept="1ajhzC" id="7kTeLbPnFEB" role="1tU5fm">
           <node concept="3uibUv" id="7DvO2M9B7a5" role="1ajw0F">
-            <ref role="3uigEE" node="12yN8DyF_E1" resolve="ProgramBuilder.ProgramFactory" />
-          </node>
-          <node concept="_YKpA" id="4vBwiiVbNcz" role="1ajw0F">
-            <node concept="1LlUBW" id="4vBwiiVbNji" role="_ZDj9">
-              <node concept="3uibUv" id="4vBwiiVbNx9" role="1Lm7xW">
-                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-              </node>
-              <node concept="3uibUv" id="4vBwiiVbNJW" role="1Lm7xW">
-                <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
-              </node>
-            </node>
+            <ref role="3uigEE" node="12yN8DyF_E1" resolve="ProgramProducer.ProgramFactory" />
           </node>
           <node concept="3uibUv" id="7kTeLbPnOYu" role="1ajl9A">
             <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="7kTeLbPo56q" role="3clF46">
-        <property role="TrG5h" value="nameHint" />
-        <node concept="17QB3L" id="7kTeLbPo5FO" role="1tU5fm" />
-      </node>
       <node concept="3uibUv" id="7kTeLbPnVDn" role="3clF45">
         <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
       </node>
@@ -5811,22 +5893,6 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="4vBwiiVeBq4" role="3cqZAp">
-          <node concept="3cpWsn" id="4vBwiiVeBq5" role="3cpWs9">
-            <property role="TrG5h" value="factory" />
-            <node concept="3uibUv" id="7DvO2M9B6Nu" role="1tU5fm">
-              <ref role="3uigEE" node="12yN8DyF_E1" resolve="ProgramBuilder.ProgramFactory" />
-            </node>
-            <node concept="2ShNRf" id="4vBwiiVeBq6" role="33vP2m">
-              <node concept="1pGfFk" id="4vBwiiVeBq7" role="2ShVmc">
-                <ref role="37wK5l" node="7DvO2M9uuLO" resolve="ProgramBuilder.ProgramFactory" />
-                <node concept="37vLTw" id="4vBwiiVeBqa" role="37wK5m">
-                  <ref role="3cqZAo" node="7kTeLbPnP2m" resolve="mainConstraint" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3cpWs8" id="4vBwiiVefTj" role="3cqZAp">
           <node concept="3cpWsn" id="4vBwiiVefTk" role="3cpWs9">
             <property role="TrG5h" value="stage_builders" />
@@ -5836,7 +5902,7 @@
                   <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                 </node>
                 <node concept="3uibUv" id="4vBwiiVefS_" role="1Lm7xW">
-                  <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
+                  <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
                 </node>
               </node>
             </node>
@@ -5860,7 +5926,7 @@
                           </node>
                           <node concept="2ShNRf" id="4vBwiiVefTy" role="1Lso8e">
                             <node concept="1pGfFk" id="4vBwiiVefTz" role="2ShVmc">
-                              <ref role="37wK5l" to="7n8k:5rhZO$TZ9Ji" resolve="ChrProgramBuilder" />
+                              <ref role="37wK5l" to="7n8k:5rhZO$TZ9Ji" resolve="LogicProgramBuilder" />
                             </node>
                           </node>
                         </node>
@@ -5877,6 +5943,38 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="6OXbTDxQIa7" role="3cqZAp">
+          <node concept="3cpWsn" id="6OXbTDxQIa8" role="3cpWs9">
+            <property role="TrG5h" value="factory" />
+            <node concept="3uibUv" id="6OXbTDxQIa9" role="1tU5fm">
+              <ref role="3uigEE" node="12yN8DyF_E1" resolve="ProgramProducer.ProgramFactory" />
+            </node>
+            <node concept="2ShNRf" id="6OXbTDxQIaa" role="33vP2m">
+              <node concept="1pGfFk" id="6OXbTDxQIab" role="2ShVmc">
+                <ref role="37wK5l" node="7DvO2M9uuLO" resolve="ProgramProducer.ProgramFactory" />
+                <node concept="2ShNRf" id="6OXbTDxQIac" role="37wK5m">
+                  <node concept="1pGfFk" id="6OXbTDxQIad" role="2ShVmc">
+                    <ref role="37wK5l" node="7DvO2Ma0h_M" resolve="MacroProcessing" />
+                    <node concept="2OqwBi" id="6OXbTDxQIae" role="37wK5m">
+                      <node concept="37vLTw" id="6OXbTDxQIaf" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
+                      </node>
+                      <node concept="liA8E" id="6OXbTDxQIag" role="2OqNvi">
+                        <ref role="37wK5l" node="7DvO2M9Icas" resolve="macroTemplates" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="6OXbTDxQIah" role="37wK5m">
+                  <ref role="3cqZAo" node="7kTeLbPnP2m" resolve="mainConstraint" />
+                </node>
+                <node concept="37vLTw" id="6OXbTDxQIai" role="37wK5m">
+                  <ref role="3cqZAo" node="4vBwiiVefTk" resolve="stage_builders" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="4vBwiiVe5IU" role="3cqZAp" />
         <node concept="3cpWs8" id="7kTeLbPnP2A" role="3cqZAp">
           <node concept="3cpWsn" id="7kTeLbPnP2B" role="3cpWs9">
@@ -5891,13 +5989,10 @@
                   <node concept="3clFbF" id="4vBwiiVeFWQ" role="3cqZAp">
                     <node concept="2Sg_IR" id="4vBwiiVeFWR" role="3clFbG">
                       <node concept="37vLTw" id="4vBwiiVeFWS" role="2SgHGx">
-                        <ref role="3cqZAo" node="4vBwiiVeBq5" resolve="factory" />
-                      </node>
-                      <node concept="37vLTw" id="4vBwiiVeFWT" role="2SgHGx">
-                        <ref role="3cqZAo" node="4vBwiiVefTk" resolve="stage_builders" />
+                        <ref role="3cqZAo" node="6OXbTDxQIa8" resolve="factory" />
                       </node>
                       <node concept="37vLTw" id="4vBwiiVeFWU" role="2SgG2M">
-                        <ref role="3cqZAo" node="7kTeLbPnFaf" resolve="buildAction" />
+                        <ref role="3cqZAo" node="7kTeLbPnFaf" resolve="produceAction" />
                       </node>
                     </node>
                   </node>
@@ -5906,6 +6001,7 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="6OXbTDxvjN3" role="3cqZAp" />
         <node concept="3clFbJ" id="4vBwiiVen0J" role="3cqZAp">
           <node concept="3clFbS" id="4vBwiiVen0K" role="3clFbx">
             <node concept="3cpWs8" id="7kTeLbPnP2E" role="3cqZAp">
@@ -5955,8 +6051,8 @@
                             <ref role="37wK5l" to="7n8k:5rhZO$TZiL1" resolve="toProgram" />
                             <node concept="3cpWs3" id="4vBwiiVen0U" role="37wK5m">
                               <node concept="3cpWs3" id="4vBwiiVen0V" role="3uHU7B">
-                                <node concept="37vLTw" id="4vBwiiVen0W" role="3uHU7B">
-                                  <ref role="3cqZAo" node="7kTeLbPo56q" resolve="nameHint" />
+                                <node concept="37vLTw" id="6OXbTDxuHpv" role="3uHU7B">
+                                  <ref role="3cqZAo" node="6OXbTDxtYkB" resolve="name" />
                                 </node>
                                 <node concept="Xl_RD" id="4vBwiiVen0X" role="3uHU7w">
                                   <property role="Xl_RC" value="-" />
@@ -5984,7 +6080,7 @@
                     <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                   </node>
                   <node concept="3uibUv" id="4vBwiiVep10" role="1Lm7xW">
-                    <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
+                    <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
                   </node>
                 </node>
               </node>
@@ -6073,7 +6169,7 @@
       <node concept="2tJIrI" id="5ntLU8GlxKW" role="jymVt" />
       <node concept="3clFbW" id="7DvO2M9uuLO" role="jymVt">
         <node concept="3cqZAl" id="7DvO2M9uuLQ" role="3clF45" />
-        <node concept="3Tm1VV" id="7DvO2M9uuLR" role="1B3o_S" />
+        <node concept="3Tm6S6" id="6OXbTDzRLSE" role="1B3o_S" />
         <node concept="3clFbS" id="7DvO2M9uuLS" role="3clF47">
           <node concept="3clFbF" id="7DvO2M9uJI0" role="3cqZAp">
             <node concept="37vLTI" id="7DvO2M9uJI1" role="3clFbG">
@@ -6088,6 +6184,38 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="6OXbTDxv6BH" role="3cqZAp">
+            <node concept="37vLTI" id="6OXbTDxv6BJ" role="3clFbG">
+              <node concept="2OqwBi" id="6OXbTDxvc9O" role="37vLTJ">
+                <node concept="Xjq3P" id="6OXbTDxvci3" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6OXbTDxvc9R" role="2OqNvi">
+                  <ref role="2Oxat5" node="6OXbTDxv6BA" resolve="stage_builders" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="6OXbTDxv6BN" role="37vLTx">
+                <ref role="3cqZAo" node="6OXbTDxv1Kn" resolve="stage_builders" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6OXbTDxQh32" role="3cqZAp">
+            <node concept="37vLTI" id="6OXbTDxQi9x" role="3clFbG">
+              <node concept="2OqwBi" id="6OXbTDxQhiM" role="37vLTJ">
+                <node concept="Xjq3P" id="6OXbTDxQh30" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6OXbTDxQhDL" role="2OqNvi">
+                  <ref role="2Oxat5" node="7DvO2Mah9z5" resolve="processingSession" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="6OXbTDxQvEU" role="37vLTx">
+                <ref role="3cqZAo" node="6OXbTDxQtT2" resolve="processingSession" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6OXbTDxQtT2" role="3clF46">
+          <property role="TrG5h" value="processingSession" />
+          <node concept="3uibUv" id="6OXbTDxQuow" role="1tU5fm">
+            <ref role="3uigEE" to="psr6:18kNIl1vDPZ" resolve="AbstractMacroProcessing" />
+          </node>
         </node>
         <node concept="37vLTG" id="7DvO2M9uz54" role="3clF46">
           <property role="TrG5h" value="mainConstraint" />
@@ -6095,33 +6223,33 @@
             <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
           </node>
         </node>
+        <node concept="37vLTG" id="6OXbTDxv1Kn" role="3clF46">
+          <property role="TrG5h" value="stage_builders" />
+          <node concept="_YKpA" id="6OXbTDxv2zG" role="1tU5fm">
+            <node concept="1LlUBW" id="6OXbTDxv2zH" role="_ZDj9">
+              <node concept="3uibUv" id="6OXbTDxv2zI" role="1Lm7xW">
+                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+              </node>
+              <node concept="3uibUv" id="6OXbTDxv2zJ" role="1Lm7xW">
+                <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="6i42QSspmaL" role="jymVt" />
       <node concept="3clFb_" id="4QPCta1bMC1" role="jymVt">
-        <property role="TrG5h" value="forEach" />
+        <property role="TrG5h" value="processInput" />
         <node concept="37vLTG" id="4QPCta1bMC2" role="3clF46">
-          <property role="TrG5h" value="nodes" />
+          <property role="TrG5h" value="input" />
           <node concept="A3Dl8" id="4QPCta1bRUn" role="1tU5fm">
             <node concept="3Tqbb2" id="4QPCta1bRUo" role="A3Ik2" />
           </node>
         </node>
-        <node concept="37vLTG" id="4vBwiiVbJqu" role="3clF46">
-          <property role="TrG5h" value="stage_builders" />
-          <node concept="_YKpA" id="7DvO2M9$$6U" role="1tU5fm">
-            <node concept="1LlUBW" id="7DvO2M9$$6V" role="_ZDj9">
-              <node concept="3uibUv" id="7DvO2M9$$6W" role="1Lm7xW">
-                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-              </node>
-              <node concept="3uibUv" id="7DvO2M9$$6X" role="1Lm7xW">
-                <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3uibUv" id="4QPCta1bMC8" role="3clF45">
           <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
         </node>
-        <node concept="3Tm1VV" id="4QPCta1bMC9" role="1B3o_S" />
+        <node concept="3Tm6S6" id="6OXbTDzRGbl" role="1B3o_S" />
         <node concept="3clFbS" id="4QPCta1bMCa" role="3clF47">
           <node concept="3cpWs8" id="4QPCta1bMCb" role="3cqZAp">
             <node concept="3cpWsn" id="4QPCta1bMCc" role="3cpWs9">
@@ -6136,6 +6264,11 @@
             </node>
           </node>
           <node concept="3clFbH" id="4QPCta1bMCf" role="3cqZAp" />
+          <node concept="3SKdUt" id="6OXbTDxA$Dn" role="3cqZAp">
+            <node concept="3SKdUq" id="6OXbTDxA$Dp" role="3SKWNk">
+              <property role="3SKdUp" value="first apply templates with no input" />
+            </node>
+          </node>
           <node concept="3cpWs8" id="2Qe6u2cltUr" role="3cqZAp">
             <node concept="3cpWsn" id="2Qe6u2cltUs" role="3cpWs9">
               <property role="TrG5h" value="noInput" />
@@ -6148,7 +6281,7 @@
                 </node>
               </node>
               <node concept="1rXfSq" id="2Qe6u2cltUx" role="33vP2m">
-                <ref role="37wK5l" node="tIwzd1I3Xv" resolve="applyAndCollectRequired" />
+                <ref role="37wK5l" node="tIwzd1I3Xv" resolve="applyRuleTemplatesAndCollectRequired" />
                 <node concept="2OqwBi" id="2Qe6u2cltUy" role="37wK5m">
                   <node concept="1rXfSq" id="7WKNeR9dXvY" role="2Oq$k0">
                     <ref role="37wK5l" node="7WKNeR9c0Kn" resolve="ruleTemplates" />
@@ -6184,6 +6317,11 @@
               </node>
             </node>
           </node>
+          <node concept="3SKdUt" id="6OXbTDxAA$7" role="3cqZAp">
+            <node concept="3SKdUq" id="6OXbTDxAA$9" role="3SKWNk">
+              <property role="3SKdUp" value="then process all required as new input" />
+            </node>
+          </node>
           <node concept="3clFbF" id="4QPCta1bMCp" role="3cqZAp">
             <node concept="37vLTI" id="4QPCta1bMCq" role="3clFbG">
               <node concept="2OqwBi" id="4QPCta1bMCr" role="37vLTx">
@@ -6195,9 +6333,9 @@
                   <node concept="2OqwBi" id="4QPCta1bMCu" role="37wK5m">
                     <node concept="Xjq3P" id="4QPCta1bMCv" role="2Oq$k0" />
                     <node concept="liA8E" id="4QPCta1bMCw" role="2OqNvi">
-                      <ref role="37wK5l" node="4QPCta1aZLs" resolve="produceEach" />
+                      <ref role="37wK5l" node="4QPCta1aZLs" resolve="process" />
                       <node concept="37vLTw" id="4QPCta1bMCx" role="37wK5m">
-                        <ref role="3cqZAo" node="4QPCta1bMC2" resolve="nodes" />
+                        <ref role="3cqZAo" node="4QPCta1bMC2" resolve="input" />
                       </node>
                       <node concept="1LFfDK" id="2Qe6u2cltEq" role="37wK5m">
                         <node concept="3cmrfG" id="2Qe6u2cltMZ" role="1LF_Uc">
@@ -6217,62 +6355,6 @@
             </node>
           </node>
           <node concept="3clFbH" id="4vBwiiVccw1" role="3cqZAp" />
-          <node concept="1DcWWT" id="4vBwiiVcazU" role="3cqZAp">
-            <node concept="3clFbS" id="4vBwiiVcazX" role="2LFqv$">
-              <node concept="3clFbF" id="4QPCta1bMCz" role="3cqZAp">
-                <node concept="37vLTI" id="4QPCta1bMC$" role="3clFbG">
-                  <node concept="2OqwBi" id="4QPCta1bMC_" role="37vLTx">
-                    <node concept="37vLTw" id="4QPCta1bMCA" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4QPCta1bMCc" resolve="result" />
-                    </node>
-                    <node concept="liA8E" id="4QPCta1bMCB" role="2OqNvi">
-                      <ref role="37wK5l" node="7nkyKX7v7xb" resolve="and" />
-                      <node concept="2OqwBi" id="4QPCta1bMCC" role="37wK5m">
-                        <node concept="Xjq3P" id="4QPCta1bMCD" role="2Oq$k0" />
-                        <node concept="liA8E" id="4QPCta1bMCE" role="2OqNvi">
-                          <ref role="37wK5l" node="7nkyKX7ncaN" resolve="buildRules" />
-                          <node concept="1LFfDK" id="4vBwiiVckn9" role="37wK5m">
-                            <node concept="3cmrfG" id="4vBwiiVckvl" role="1LF_Uc">
-                              <property role="3cmrfH" value="0" />
-                            </node>
-                            <node concept="37vLTw" id="4vBwiiVcjTx" role="1LFl5Q">
-                              <ref role="3cqZAo" node="4vBwiiVcazY" resolve="stage_builder" />
-                            </node>
-                          </node>
-                          <node concept="1LFfDK" id="4vBwiiVclpG" role="37wK5m">
-                            <node concept="37vLTw" id="4vBwiiVckSh" role="1LFl5Q">
-                              <ref role="3cqZAo" node="4vBwiiVcazY" resolve="stage_builder" />
-                            </node>
-                            <node concept="3cmrfG" id="4vBwiiVclIG" role="1LF_Uc">
-                              <property role="3cmrfH" value="1" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="4QPCta1bMCI" role="37vLTJ">
-                    <ref role="3cqZAo" node="4QPCta1bMCc" resolve="result" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWsn" id="4vBwiiVcazY" role="1Duv9x">
-              <property role="TrG5h" value="stage_builder" />
-              <node concept="1LlUBW" id="4vBwiiVca$2" role="1tU5fm">
-                <node concept="3uibUv" id="4vBwiiVca$3" role="1Lm7xW">
-                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                </node>
-                <node concept="3uibUv" id="4vBwiiVca$4" role="1Lm7xW">
-                  <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
-                </node>
-              </node>
-            </node>
-            <node concept="37vLTw" id="4vBwiiVca$5" role="1DdaDG">
-              <ref role="3cqZAo" node="4vBwiiVbJqu" resolve="stage_builders" />
-            </node>
-          </node>
-          <node concept="3clFbH" id="4QPCta1bMCJ" role="3cqZAp" />
           <node concept="3clFbF" id="4QPCta1bMCK" role="3cqZAp">
             <node concept="37vLTw" id="4QPCta1bMCL" role="3clFbG">
               <ref role="3cqZAo" node="4QPCta1bMCc" resolve="result" />
@@ -6280,9 +6362,175 @@
           </node>
         </node>
       </node>
-      <node concept="2tJIrI" id="4QPCta1bMC0" role="jymVt" />
+      <node concept="2tJIrI" id="6OXbTDxOujb" role="jymVt" />
+      <node concept="3clFb_" id="6OXbTDxOzxt" role="jymVt">
+        <property role="TrG5h" value="processQuery" />
+        <node concept="37vLTG" id="6OXbTDxP7qn" role="3clF46">
+          <property role="TrG5h" value="parameter" />
+          <node concept="8X2XB" id="6OXbTDxPb_p" role="1tU5fm">
+            <node concept="3uibUv" id="6OXbTDxPbo6" role="8Xvag">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="6OXbTDxOCKa" role="3clF45">
+          <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+        </node>
+        <node concept="3Tm6S6" id="6OXbTDxOzxw" role="1B3o_S" />
+        <node concept="3clFbS" id="6OXbTDxOzxx" role="3clF47">
+          <node concept="3cpWs8" id="6OXbTDxPbTd" role="3cqZAp">
+            <node concept="3cpWsn" id="6OXbTDxPbTe" role="3cpWs9">
+              <property role="TrG5h" value="result" />
+              <node concept="3uibUv" id="6OXbTDxPbTf" role="1tU5fm">
+                <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+              </node>
+              <node concept="2YIFZM" id="6OXbTDxPbTg" role="33vP2m">
+                <ref role="1Pybhc" node="7Oc59RSEjdb" resolve="Result" />
+                <ref role="37wK5l" node="7Oc59RSEjeq" resolve="OK" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="6OXbTDxYdTp" role="3cqZAp">
+            <node concept="3clFbS" id="6OXbTDxYdTr" role="3clFbx">
+              <node concept="3clFbF" id="6OXbTDyhwPN" role="3cqZAp">
+                <node concept="37vLTI" id="6OXbTDyhxjF" role="3clFbG">
+                  <node concept="2OqwBi" id="6OXbTDyhxAR" role="37vLTx">
+                    <node concept="37vLTw" id="6OXbTDyhxq$" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6OXbTDxPbTe" resolve="result" />
+                    </node>
+                    <node concept="liA8E" id="6OXbTDyhxJe" role="2OqNvi">
+                      <ref role="37wK5l" node="7nkyKX7v7xb" resolve="and" />
+                      <node concept="1rXfSq" id="6OXbTDyhxQW" role="37wK5m">
+                        <ref role="37wK5l" node="6OXbTDy1oEg" resolve="applyQueryTemplates" />
+                        <node concept="2OqwBi" id="6OXbTD$nAce" role="37wK5m">
+                          <node concept="2OqwBi" id="6OXbTD$nAcf" role="2Oq$k0">
+                            <node concept="37vLTw" id="6OXbTD$nAcg" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
+                            </node>
+                            <node concept="liA8E" id="6OXbTD$nAch" role="2OqNvi">
+                              <ref role="37wK5l" node="7WKNeR9alW4" resolve="queryTemplates" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="6OXbTD$nAci" role="2OqNvi">
+                            <ref role="37wK5l" node="6OXbTD$m89z" resolve="allQueryStageTemplates" />
+                            <node concept="37vLTw" id="6OXbTD$nAcj" role="37wK5m">
+                              <ref role="3cqZAo" node="7WKNeR9b_iR" resolve="queryTemplate" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="6OXbTDyhxR8" role="37wK5m">
+                          <ref role="3cqZAo" node="6OXbTDxP7qn" resolve="parameter" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="6OXbTDyhwPL" role="37vLTJ">
+                    <ref role="3cqZAo" node="6OXbTDxPbTe" resolve="result" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3y3z36" id="6OXbTDxYeKq" role="3clFbw">
+              <node concept="10Nm6u" id="6OXbTDxYf5o" role="3uHU7w" />
+              <node concept="37vLTw" id="6OXbTDxYekV" role="3uHU7B">
+                <ref role="3cqZAo" node="7WKNeR9b_iR" resolve="queryTemplate" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6OXbTDxPc9M" role="3cqZAp">
+            <node concept="37vLTw" id="6OXbTDxPc9K" role="3clFbG">
+              <ref role="3cqZAo" node="6OXbTDxPbTe" resolve="result" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6OXbTDzRR6o" role="jymVt" />
+      <node concept="3clFb_" id="6OXbTDzR_RU" role="jymVt">
+        <property role="TrG5h" value="buildProgram" />
+        <node concept="3uibUv" id="6OXbTDzSiaf" role="3clF45">
+          <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+        </node>
+        <node concept="3Tm6S6" id="6OXbTDzR_RX" role="1B3o_S" />
+        <node concept="3clFbS" id="6OXbTDzR_RY" role="3clF47">
+          <node concept="3cpWs8" id="6OXbTDzSgzt" role="3cqZAp">
+            <node concept="3cpWsn" id="6OXbTDzSgzu" role="3cpWs9">
+              <property role="TrG5h" value="result" />
+              <node concept="3uibUv" id="6OXbTDzSgzv" role="1tU5fm">
+                <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+              </node>
+              <node concept="2YIFZM" id="6OXbTDzSgzw" role="33vP2m">
+                <ref role="37wK5l" node="7Oc59RSEjeq" resolve="OK" />
+                <ref role="1Pybhc" node="7Oc59RSEjdb" resolve="Result" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="6OXbTDzSnKQ" role="3cqZAp" />
+          <node concept="1DcWWT" id="6OXbTDzSgFL" role="3cqZAp">
+            <node concept="3clFbS" id="6OXbTDzSgFM" role="2LFqv$">
+              <node concept="3clFbF" id="6OXbTDzSgFN" role="3cqZAp">
+                <node concept="37vLTI" id="6OXbTDzSgFO" role="3clFbG">
+                  <node concept="2OqwBi" id="6OXbTDzSgFP" role="37vLTx">
+                    <node concept="37vLTw" id="6OXbTDzSgFQ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6OXbTDzSgzu" resolve="result" />
+                    </node>
+                    <node concept="liA8E" id="6OXbTDzSgFR" role="2OqNvi">
+                      <ref role="37wK5l" node="7nkyKX7v7xb" resolve="and" />
+                      <node concept="2OqwBi" id="6OXbTDzSgFS" role="37wK5m">
+                        <node concept="Xjq3P" id="6OXbTDzSgFT" role="2Oq$k0" />
+                        <node concept="liA8E" id="6OXbTDzSgFU" role="2OqNvi">
+                          <ref role="37wK5l" node="7nkyKX7ncaN" resolve="buildProgramStage" />
+                          <node concept="1LFfDK" id="6OXbTDzSgFV" role="37wK5m">
+                            <node concept="3cmrfG" id="6OXbTDzSgFW" role="1LF_Uc">
+                              <property role="3cmrfH" value="0" />
+                            </node>
+                            <node concept="37vLTw" id="6OXbTDzSgFX" role="1LFl5Q">
+                              <ref role="3cqZAo" node="6OXbTDzSgG2" resolve="stage_builder" />
+                            </node>
+                          </node>
+                          <node concept="1LFfDK" id="6OXbTDzSgFY" role="37wK5m">
+                            <node concept="37vLTw" id="6OXbTDzSgFZ" role="1LFl5Q">
+                              <ref role="3cqZAo" node="6OXbTDzSgG2" resolve="stage_builder" />
+                            </node>
+                            <node concept="3cmrfG" id="6OXbTDzSgG0" role="1LF_Uc">
+                              <property role="3cmrfH" value="1" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="6OXbTDzSgG1" role="37vLTJ">
+                    <ref role="3cqZAo" node="6OXbTDzSgzu" resolve="result" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWsn" id="6OXbTDzSgG2" role="1Duv9x">
+              <property role="TrG5h" value="stage_builder" />
+              <node concept="1LlUBW" id="6OXbTDzSgG3" role="1tU5fm">
+                <node concept="3uibUv" id="6OXbTDzSgG4" role="1Lm7xW">
+                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+                </node>
+                <node concept="3uibUv" id="6OXbTDzSgG5" role="1Lm7xW">
+                  <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="6OXbTDzSgG6" role="1DdaDG">
+              <ref role="3cqZAo" node="6OXbTDxv6BA" resolve="stage_builders" />
+            </node>
+          </node>
+          <node concept="3clFbH" id="6OXbTDzSoqA" role="3cqZAp" />
+          <node concept="3clFbF" id="6OXbTDzSgG8" role="3cqZAp">
+            <node concept="37vLTw" id="6OXbTDzSgG9" role="3clFbG">
+              <ref role="3cqZAo" node="6OXbTDzSgzu" resolve="result" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6OXbTDzRXc5" role="jymVt" />
       <node concept="3clFb_" id="7nkyKX7ncaN" role="jymVt">
-        <property role="TrG5h" value="buildRules" />
+        <property role="TrG5h" value="buildProgramStage" />
         <node concept="37vLTG" id="4vBwiiVccBe" role="3clF46">
           <property role="TrG5h" value="stage" />
           <node concept="3uibUv" id="4vBwiiVcgAO" role="1tU5fm">
@@ -6292,7 +6540,7 @@
         <node concept="37vLTG" id="1CcQBrPh8x2" role="3clF46">
           <property role="TrG5h" value="programBuilder" />
           <node concept="3uibUv" id="1CcQBrPhbzq" role="1tU5fm">
-            <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
+            <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
           </node>
         </node>
         <node concept="3uibUv" id="7nkyKX7nfei" role="3clF45">
@@ -6363,7 +6611,7 @@
                     <node concept="1pGfFk" id="6i42QSskaRE" role="2ShVmc">
                       <ref role="37wK5l" to="6pyv:6lpwCiZjdph" resolve="RuleBuilder" />
                       <node concept="Xl_RD" id="6i42QSskaRF" role="37wK5m">
-                        <property role="Xl_RC" value="main" />
+                        <property role="Xl_RC" value="finish" />
                       </node>
                     </node>
                   </node>
@@ -6412,7 +6660,7 @@
                     <node concept="1pGfFk" id="4MqhgXUQinx" role="2ShVmc">
                       <ref role="37wK5l" to="6pyv:4MqhgXUMb4h" resolve="HandlerBuilder" />
                       <node concept="Xl_RD" id="4MqhgXUQiny" role="37wK5m">
-                        <property role="Xl_RC" value="main" />
+                        <property role="Xl_RC" value="finish" />
                       </node>
                       <node concept="2ShNRf" id="2TtA2rKaiYZ" role="37wK5m">
                         <node concept="kMnCb" id="2TtA2rKaiTa" role="2ShVmc">
@@ -6512,126 +6760,10 @@
         </node>
       </node>
       <node concept="2tJIrI" id="7Oc59RSy_Bt" role="jymVt" />
-      <node concept="3clFb_" id="12yN8DyNqcj" role="jymVt">
-        <property role="TrG5h" value="produceAllFromRoot" />
-        <node concept="37vLTG" id="12yN8DyNqcH" role="3clF46">
-          <property role="TrG5h" value="root" />
-          <node concept="3Tqbb2" id="12yN8DyNqcW" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="2Qe6u2ckdn0" role="3clF46">
-          <property role="TrG5h" value="required" />
-          <node concept="A3Dl8" id="2Qe6u2cklrC" role="1tU5fm">
-            <node concept="3Tqbb2" id="2Qe6u2ckly6" role="A3Ik2" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="7Oc59RSFzo8" role="3clF45">
-          <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
-        </node>
-        <node concept="3Tm6S6" id="6i42QSspDOE" role="1B3o_S" />
-        <node concept="3clFbS" id="12yN8DyNqcn" role="3clF47">
-          <node concept="3SKdUt" id="2JQZWxFb3w_" role="3cqZAp">
-            <node concept="3SKdUq" id="2JQZWxFb4lU" role="3SKWNk">
-              <property role="3SKdUp" value="walk the AST and apply templates" />
-            </node>
-          </node>
-          <node concept="3cpWs8" id="2JQZWxFb1vW" role="3cqZAp">
-            <node concept="3cpWsn" id="2JQZWxFb1vX" role="3cpWs9">
-              <property role="TrG5h" value="applyingResult" />
-              <node concept="1rXfSq" id="2JQZWxFb1vY" role="33vP2m">
-                <ref role="37wK5l" node="tIwzd1LouZ" resolve="applyDeep" />
-                <node concept="37vLTw" id="2JQZWxFb1w1" role="37wK5m">
-                  <ref role="3cqZAo" node="12yN8DyNqcH" resolve="root" />
-                </node>
-                <node concept="3clFbT" id="2JQZWxFb1w2" role="37wK5m">
-                  <property role="3clFbU" value="false" />
-                </node>
-              </node>
-              <node concept="3uibUv" id="4MqhgXU_SOU" role="1tU5fm">
-                <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="6i42QSsvMaB" role="3cqZAp">
-            <node concept="3cpWsn" id="6i42QSsvMaC" role="3cpWs9">
-              <property role="TrG5h" value="result" />
-              <node concept="3uibUv" id="6i42QSsvMa_" role="1tU5fm">
-                <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
-              </node>
-              <node concept="2OqwBi" id="4MqhgXU_Uib" role="33vP2m">
-                <node concept="37vLTw" id="4MqhgXU_TWF" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2JQZWxFb1vX" resolve="applyingResult" />
-                </node>
-                <node concept="2OwXpG" id="4MqhgXU_UvP" role="2OqNvi">
-                  <ref role="2Oxat5" node="4MqhgXU_0Wz" resolve="result" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="6i42QSswg8x" role="3cqZAp" />
-          <node concept="3SKdUt" id="2JQZWxFb5kF" role="3cqZAp">
-            <node concept="3SKdUq" id="2JQZWxFb6a2" role="3SKWNk">
-              <property role="3SKdUp" value="process the required roots" />
-            </node>
-          </node>
-          <node concept="3cpWs8" id="2Qe6u2cm_eh" role="3cqZAp">
-            <node concept="3cpWsn" id="2Qe6u2cm_ei" role="3cpWs9">
-              <property role="TrG5h" value="visited" />
-              <node concept="3vKaQO" id="2Qe6u2cm_uP" role="1tU5fm">
-                <node concept="3Tqbb2" id="2Qe6u2cm_U6" role="3O5elw" />
-              </node>
-              <node concept="2OqwBi" id="2Qe6u2cm_ej" role="33vP2m">
-                <node concept="2OqwBi" id="2Qe6u2cm_ek" role="2Oq$k0">
-                  <node concept="2OqwBi" id="2Qe6u2cm_el" role="2Oq$k0">
-                    <node concept="37vLTw" id="2Qe6u2cm_em" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2JQZWxFb1vX" resolve="applyingResult" />
-                    </node>
-                    <node concept="2OwXpG" id="2Qe6u2cm_en" role="2OqNvi">
-                      <ref role="2Oxat5" node="4MqhgXU_1wg" resolve="visited" />
-                    </node>
-                  </node>
-                  <node concept="3QWeyG" id="2Qe6u2cm_eo" role="2OqNvi">
-                    <node concept="37vLTw" id="2Qe6u2cm_ep" role="576Qk">
-                      <ref role="3cqZAo" node="2Qe6u2ckdn0" resolve="required" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="ANE8D" id="2Qe6u2cm_eq" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="6i42QSsw9Xa" role="3cqZAp">
-            <node concept="2OqwBi" id="6i42QSsw9Xc" role="3clFbG">
-              <node concept="37vLTw" id="6i42QSsw9Xd" role="2Oq$k0">
-                <ref role="3cqZAo" node="6i42QSsvMaC" resolve="result" />
-              </node>
-              <node concept="liA8E" id="6i42QSsw9Xe" role="2OqNvi">
-                <ref role="37wK5l" node="7nkyKX7v7xb" resolve="and" />
-                <node concept="1rXfSq" id="6i42QSsw9Xf" role="37wK5m">
-                  <ref role="37wK5l" node="tIwzd1MM22" resolve="produceRequired" />
-                  <node concept="1Ls8ON" id="6i42QSsw9Xg" role="37wK5m">
-                    <node concept="2OqwBi" id="4MqhgXU_Vnf" role="1Lso8e">
-                      <node concept="37vLTw" id="4MqhgXU_V6z" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2JQZWxFb1vX" resolve="applyingResult" />
-                      </node>
-                      <node concept="2OwXpG" id="4MqhgXU_VyO" role="2OqNvi">
-                        <ref role="2Oxat5" node="4MqhgXU_1ti" resolve="required" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="2Qe6u2cm_er" role="1Lso8e">
-                      <ref role="3cqZAo" node="2Qe6u2cm_ei" resolve="visited" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="4QPCta1b3Og" role="jymVt" />
       <node concept="3clFb_" id="4QPCta1aZLs" role="jymVt">
-        <property role="TrG5h" value="produceEach" />
+        <property role="TrG5h" value="process" />
         <node concept="37vLTG" id="4QPCta1aZLt" role="3clF46">
-          <property role="TrG5h" value="nodes" />
+          <property role="TrG5h" value="input" />
           <node concept="A3Dl8" id="4QPCta1bceI" role="1tU5fm">
             <node concept="3Tqbb2" id="4QPCta1bceJ" role="A3Ik2" />
           </node>
@@ -6658,14 +6790,14 @@
               <node concept="1rXfSq" id="4QPCta1aZLA" role="33vP2m">
                 <ref role="37wK5l" node="3IIf9O_gMkQ" resolve="applyEachDeep" />
                 <node concept="37vLTw" id="4QPCta1aZLB" role="37wK5m">
-                  <ref role="3cqZAo" node="4QPCta1aZLt" resolve="nodes" />
+                  <ref role="3cqZAo" node="4QPCta1aZLt" resolve="input" />
                 </node>
                 <node concept="3clFbT" id="3IIf9O_govW" role="37wK5m">
                   <property role="3clFbU" value="false" />
                 </node>
               </node>
               <node concept="3uibUv" id="4QPCta1aZLD" role="1tU5fm">
-                <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+                <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
               </node>
             </node>
           </node>
@@ -6688,7 +6820,7 @@
           <node concept="3clFbH" id="4QPCta1aZLK" role="3cqZAp" />
           <node concept="3SKdUt" id="4QPCta1aZLL" role="3cqZAp">
             <node concept="3SKdUq" id="4QPCta1aZLM" role="3SKWNk">
-              <property role="3SKdUp" value="process the required roots" />
+              <property role="3SKdUp" value="process the required nodes" />
             </node>
           </node>
           <node concept="3cpWs8" id="2Qe6u2cmBeW" role="3cqZAp">
@@ -6725,7 +6857,7 @@
               <node concept="liA8E" id="4QPCta1aZLQ" role="2OqNvi">
                 <ref role="37wK5l" node="7nkyKX7v7xb" resolve="and" />
                 <node concept="1rXfSq" id="4QPCta1aZLR" role="37wK5m">
-                  <ref role="37wK5l" node="tIwzd1MM22" resolve="produceRequired" />
+                  <ref role="37wK5l" node="tIwzd1MM22" resolve="processRequired" />
                   <node concept="1Ls8ON" id="4QPCta1aZLS" role="37wK5m">
                     <node concept="2OqwBi" id="4QPCta1aZLT" role="1Lso8e">
                       <node concept="37vLTw" id="4QPCta1aZLU" role="2Oq$k0">
@@ -6746,97 +6878,8 @@
         </node>
       </node>
       <node concept="2tJIrI" id="tIwzd1LqJe" role="jymVt" />
-      <node concept="3clFb_" id="3cHjmmLLyCb" role="jymVt">
-        <property role="TrG5h" value="produceInterfacePartFromRoot" />
-        <node concept="37vLTG" id="3cHjmmLLyCc" role="3clF46">
-          <property role="TrG5h" value="root" />
-          <node concept="3Tqbb2" id="3cHjmmLLyCd" role="1tU5fm" />
-        </node>
-        <node concept="3uibUv" id="3cHjmmLLyCg" role="3clF45">
-          <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
-        </node>
-        <node concept="3Tm6S6" id="6i42QSspF_Y" role="1B3o_S" />
-        <node concept="3clFbS" id="3cHjmmLLyCi" role="3clF47">
-          <node concept="3SKdUt" id="6i42QSswp5A" role="3cqZAp">
-            <node concept="3SKdUq" id="6i42QSswp5B" role="3SKWNk">
-              <property role="3SKdUp" value="walk the AST and apply templates" />
-            </node>
-          </node>
-          <node concept="3cpWs8" id="6i42QSswp5C" role="3cqZAp">
-            <node concept="3cpWsn" id="6i42QSswp5D" role="3cpWs9">
-              <property role="TrG5h" value="applyingResult" />
-              <node concept="1rXfSq" id="6i42QSswp5K" role="33vP2m">
-                <ref role="37wK5l" node="tIwzd1LouZ" resolve="applyDeep" />
-                <node concept="37vLTw" id="6i42QSswp5L" role="37wK5m">
-                  <ref role="3cqZAo" node="3cHjmmLLyCc" resolve="root" />
-                </node>
-                <node concept="3clFbT" id="6i42QSswp5M" role="37wK5m">
-                  <property role="3clFbU" value="true" />
-                </node>
-              </node>
-              <node concept="3uibUv" id="4MqhgXU_SCL" role="1tU5fm">
-                <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs8" id="6i42QSswp5N" role="3cqZAp">
-            <node concept="3cpWsn" id="6i42QSswp5O" role="3cpWs9">
-              <property role="TrG5h" value="result" />
-              <node concept="3uibUv" id="6i42QSswp5P" role="1tU5fm">
-                <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
-              </node>
-              <node concept="2OqwBi" id="4MqhgXU_XJN" role="33vP2m">
-                <node concept="37vLTw" id="4MqhgXU_Xv$" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6i42QSswp5D" resolve="applyingResult" />
-                </node>
-                <node concept="2OwXpG" id="4MqhgXU_XU9" role="2OqNvi">
-                  <ref role="2Oxat5" node="4MqhgXU_0Wz" resolve="result" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="6i42QSswp5T" role="3cqZAp" />
-          <node concept="3SKdUt" id="6i42QSswp5U" role="3cqZAp">
-            <node concept="3SKdUq" id="6i42QSswp5V" role="3SKWNk">
-              <property role="3SKdUp" value="process the required roots" />
-            </node>
-          </node>
-          <node concept="3clFbF" id="6i42QSswp5W" role="3cqZAp">
-            <node concept="2OqwBi" id="6i42QSswp5X" role="3clFbG">
-              <node concept="37vLTw" id="6i42QSswp5Y" role="2Oq$k0">
-                <ref role="3cqZAo" node="6i42QSswp5O" resolve="result" />
-              </node>
-              <node concept="liA8E" id="6i42QSswp5Z" role="2OqNvi">
-                <ref role="37wK5l" node="7nkyKX7v7xb" resolve="and" />
-                <node concept="1rXfSq" id="6i42QSswp60" role="37wK5m">
-                  <ref role="37wK5l" node="tIwzd1MM22" resolve="produceRequired" />
-                  <node concept="1Ls8ON" id="6i42QSswp61" role="37wK5m">
-                    <node concept="2OqwBi" id="4MqhgXU_YJM" role="1Lso8e">
-                      <node concept="37vLTw" id="4MqhgXU_Yiq" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6i42QSswp5D" resolve="applyingResult" />
-                      </node>
-                      <node concept="2OwXpG" id="4MqhgXU_Z0n" role="2OqNvi">
-                        <ref role="2Oxat5" node="4MqhgXU_1ti" resolve="required" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="4MqhgXU_ZMr" role="1Lso8e">
-                      <node concept="37vLTw" id="4MqhgXU_Zuy" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6i42QSswp5D" resolve="applyingResult" />
-                      </node>
-                      <node concept="2OwXpG" id="4MqhgXUA05I" role="2OqNvi">
-                        <ref role="2Oxat5" node="4MqhgXU_1wg" resolve="visited" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="tIwzd1MNCr" role="jymVt" />
       <node concept="3clFb_" id="tIwzd1MM22" role="jymVt">
-        <property role="TrG5h" value="produceRequired" />
+        <property role="TrG5h" value="processRequired" />
         <node concept="3Tm6S6" id="tIwzd1MM23" role="1B3o_S" />
         <node concept="3uibUv" id="6i42QSsq0Nv" role="3clF45">
           <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
@@ -6928,7 +6971,7 @@
                     </node>
                   </node>
                   <node concept="3uibUv" id="4MqhgXU_RVs" role="1tU5fm">
-                    <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+                    <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
                   </node>
                 </node>
               </node>
@@ -7017,87 +7060,11 @@
         </node>
       </node>
       <node concept="2tJIrI" id="7Oc59RS_GdO" role="jymVt" />
-      <node concept="3clFb_" id="tIwzd1LouZ" role="jymVt">
-        <property role="TrG5h" value="applyDeep" />
-        <node concept="3Tm6S6" id="tIwzd1Lov0" role="1B3o_S" />
-        <node concept="3uibUv" id="4MqhgXU_OfN" role="3clF45">
-          <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
-        </node>
-        <node concept="37vLTG" id="tIwzd1LouK" role="3clF46">
-          <property role="TrG5h" value="startFrom" />
-          <node concept="3Tqbb2" id="tIwzd1LouL" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="tIwzd1Luww" role="3clF46">
-          <property role="TrG5h" value="interfacePartOnly" />
-          <node concept="10P_77" id="tIwzd1Lvg1" role="1tU5fm" />
-        </node>
-        <node concept="3clFbS" id="tIwzd1Lou5" role="3clF47">
-          <node concept="3clFbJ" id="4UTrqZZOnSV" role="3cqZAp">
-            <node concept="3clFbS" id="4UTrqZZOnSX" role="3clFbx">
-              <node concept="3cpWs6" id="4UTrqZZOrY5" role="3cqZAp">
-                <node concept="2OqwBi" id="4UTrqZZP0nv" role="3cqZAk">
-                  <node concept="2ShNRf" id="4UTrqZZOM$5" role="2Oq$k0">
-                    <node concept="1pGfFk" id="4UTrqZZOP9j" role="2ShVmc">
-                      <ref role="37wK5l" node="4UTrqZZOaY6" resolve="ProgramBuilder.NodeWalker.INTERFACE_PART_DEEP" />
-                      <node concept="37vLTw" id="4UTrqZZOUpV" role="37wK5m">
-                        <ref role="3cqZAo" node="tIwzd1LouK" resolve="startFrom" />
-                      </node>
-                      <node concept="2ShNRf" id="4UTrqZZOX4z" role="37wK5m">
-                        <node concept="HV5vD" id="4UTrqZZOX4$" role="2ShVmc">
-                          <ref role="HV5vE" node="5ntLU8Glzc7" resolve="ProgramBuilder.ProgramFactory.TemplateApplicator" />
-                        </node>
-                      </node>
-                      <node concept="3uibUv" id="4UTrqZZP95r" role="1pMfVU">
-                        <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="4UTrqZZP3bh" role="2OqNvi">
-                    <ref role="37wK5l" node="4UTrqZZNWym" resolve="doWalk" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="4UTrqZZPfA1" role="3cqZAp" />
-            </node>
-            <node concept="37vLTw" id="4UTrqZZOrNp" role="3clFbw">
-              <ref role="3cqZAo" node="tIwzd1Luww" resolve="interfacePartOnly" />
-            </node>
-            <node concept="9aQIb" id="4UTrqZZPc0p" role="9aQIa">
-              <node concept="3clFbS" id="4UTrqZZPc0q" role="9aQI4">
-                <node concept="3cpWs6" id="4UTrqZZPi6d" role="3cqZAp">
-                  <node concept="2OqwBi" id="4UTrqZZPi6e" role="3cqZAk">
-                    <node concept="2ShNRf" id="4UTrqZZPi6f" role="2Oq$k0">
-                      <node concept="1pGfFk" id="4UTrqZZPi6g" role="2ShVmc">
-                        <ref role="37wK5l" node="4UTrqZZNYyd" resolve="ProgramBuilder.NodeWalker.ALL_DEEP" />
-                        <node concept="37vLTw" id="4UTrqZZPi6h" role="37wK5m">
-                          <ref role="3cqZAo" node="tIwzd1LouK" resolve="startFrom" />
-                        </node>
-                        <node concept="2ShNRf" id="4UTrqZZPi6i" role="37wK5m">
-                          <node concept="HV5vD" id="4UTrqZZPi6j" role="2ShVmc">
-                            <ref role="HV5vE" node="5ntLU8Glzc7" resolve="ProgramBuilder.ProgramFactory.TemplateApplicator" />
-                          </node>
-                        </node>
-                        <node concept="3uibUv" id="4UTrqZZPi6k" role="1pMfVU">
-                          <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="4UTrqZZPi6l" role="2OqNvi">
-                      <ref role="37wK5l" node="4UTrqZZNWym" resolve="doWalk" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="3IIf9O_gRX5" role="jymVt" />
       <node concept="3clFb_" id="3IIf9O_gMkQ" role="jymVt">
         <property role="TrG5h" value="applyEachDeep" />
         <node concept="3Tm6S6" id="3IIf9O_gMkR" role="1B3o_S" />
         <node concept="3uibUv" id="3IIf9O_gMkS" role="3clF45">
-          <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+          <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
         </node>
         <node concept="37vLTG" id="3IIf9O_gMkT" role="3clF46">
           <property role="TrG5h" value="startFrom" />
@@ -7116,17 +7083,17 @@
                 <node concept="2OqwBi" id="3IIf9O_gMl1" role="3cqZAk">
                   <node concept="2ShNRf" id="3IIf9O_gMl2" role="2Oq$k0">
                     <node concept="1pGfFk" id="3IIf9O_gMl3" role="2ShVmc">
-                      <ref role="37wK5l" node="3IIf9O_hpaa" resolve="ProgramBuilder.NodeWalker.INTERFACE_PART_DEEP" />
+                      <ref role="37wK5l" node="3IIf9O_hpaa" resolve="ProgramProducer.NodeWalker.INTERFACE_PART_DEEP" />
                       <node concept="37vLTw" id="3IIf9O_gMl4" role="37wK5m">
                         <ref role="3cqZAo" node="3IIf9O_gMkT" resolve="startFrom" />
                       </node>
                       <node concept="2ShNRf" id="3IIf9O_gMl5" role="37wK5m">
                         <node concept="HV5vD" id="3IIf9O_gMl6" role="2ShVmc">
-                          <ref role="HV5vE" node="5ntLU8Glzc7" resolve="ProgramBuilder.ProgramFactory.TemplateApplicator" />
+                          <ref role="HV5vE" node="5ntLU8Glzc7" resolve="ProgramProducer.ProgramFactory.TemplateApplicator" />
                         </node>
                       </node>
                       <node concept="3uibUv" id="3IIf9O_gMl7" role="1pMfVU">
-                        <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+                        <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
                       </node>
                     </node>
                   </node>
@@ -7146,17 +7113,17 @@
                   <node concept="2OqwBi" id="3IIf9O_gMle" role="3cqZAk">
                     <node concept="2ShNRf" id="3IIf9O_gMlf" role="2Oq$k0">
                       <node concept="1pGfFk" id="3IIf9O_gMlg" role="2ShVmc">
-                        <ref role="37wK5l" node="3IIf9O_hbbq" resolve="ProgramBuilder.NodeWalker.ALL_DEEP" />
+                        <ref role="37wK5l" node="3IIf9O_hbbq" resolve="ProgramProducer.NodeWalker.ALL_DEEP" />
                         <node concept="37vLTw" id="3IIf9O_gMlh" role="37wK5m">
                           <ref role="3cqZAo" node="3IIf9O_gMkT" resolve="startFrom" />
                         </node>
                         <node concept="2ShNRf" id="3IIf9O_gMli" role="37wK5m">
                           <node concept="HV5vD" id="3IIf9O_gMlj" role="2ShVmc">
-                            <ref role="HV5vE" node="5ntLU8Glzc7" resolve="ProgramBuilder.ProgramFactory.TemplateApplicator" />
+                            <ref role="HV5vE" node="5ntLU8Glzc7" resolve="ProgramProducer.ProgramFactory.TemplateApplicator" />
                           </node>
                         </node>
                         <node concept="3uibUv" id="3IIf9O_gMlk" role="1pMfVU">
-                          <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+                          <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
                         </node>
                       </node>
                     </node>
@@ -7175,7 +7142,7 @@
         <property role="TrG5h" value="applyEachSingle" />
         <node concept="3Tm6S6" id="tIwzd1LKZZ" role="1B3o_S" />
         <node concept="3uibUv" id="4MqhgXU_Ik5" role="3clF45">
-          <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+          <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
         </node>
         <node concept="37vLTG" id="tIwzd1LL0a" role="3clF46">
           <property role="TrG5h" value="nodes" />
@@ -7188,17 +7155,17 @@
             <node concept="2OqwBi" id="4UTrqZZPyYS" role="3cqZAk">
               <node concept="2ShNRf" id="4UTrqZZPyYT" role="2Oq$k0">
                 <node concept="1pGfFk" id="4UTrqZZPyYU" role="2ShVmc">
-                  <ref role="37wK5l" node="4UTrqZZOjgP" resolve="ProgramBuilder.NodeWalker.SINGLE" />
+                  <ref role="37wK5l" node="4UTrqZZOjgP" resolve="ProgramProducer.NodeWalker.SINGLE" />
                   <node concept="37vLTw" id="4UTrqZZPKD$" role="37wK5m">
                     <ref role="3cqZAo" node="tIwzd1LL0a" resolve="nodes" />
                   </node>
                   <node concept="2ShNRf" id="4UTrqZZPyYW" role="37wK5m">
                     <node concept="HV5vD" id="4UTrqZZPyYX" role="2ShVmc">
-                      <ref role="HV5vE" node="5ntLU8Glzc7" resolve="ProgramBuilder.ProgramFactory.TemplateApplicator" />
+                      <ref role="HV5vE" node="5ntLU8Glzc7" resolve="ProgramProducer.ProgramFactory.TemplateApplicator" />
                     </node>
                   </node>
                   <node concept="3uibUv" id="4UTrqZZPyYY" role="1pMfVU">
-                    <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+                    <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
                   </node>
                 </node>
               </node>
@@ -7211,12 +7178,12 @@
       </node>
       <node concept="2tJIrI" id="tIwzd1LKZX" role="jymVt" />
       <node concept="3clFb_" id="5ntLU8GlSnU" role="jymVt">
-        <property role="TrG5h" value="applyTemplate" />
+        <property role="TrG5h" value="applyRuleTemplate" />
         <node concept="3Tm6S6" id="5ntLU8GlSnV" role="1B3o_S" />
         <node concept="37vLTG" id="5ntLU8GlSnJ" role="3clF46">
           <property role="TrG5h" value="tpl" />
           <node concept="3uibUv" id="1ffsG7c51iR" role="1tU5fm">
-            <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
             <node concept="16syzq" id="7XdbJdyQi3s" role="11_B2D">
               <ref role="16sUi3" node="7XdbJdyQdwM" resolve="Token" />
             </node>
@@ -7242,7 +7209,7 @@
                       <ref role="3cqZAo" node="5ntLU8GlSnJ" resolve="tpl" />
                     </node>
                     <node concept="liA8E" id="7XdbJdyLAB$" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:7XdbJdyhRyL" resolve="applyReduce" />
+                      <ref role="37wK5l" to="i348:7XdbJdyi9Ld" resolve="applyReduce" />
                       <node concept="37vLTw" id="7XdbJdyLAMJ" role="37wK5m">
                         <ref role="3cqZAo" node="5ntLU8GlSnL" resolve="node" />
                       </node>
@@ -7265,7 +7232,7 @@
                         <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="RuleTemplateApplicationToken" />
+                            <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                           </node>
                         </node>
                         <node concept="3clFbS" id="7XdbJdyLDL6" role="1bW5cS">
@@ -7284,7 +7251,7 @@
                                       <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="macroProcessing" />
+                                          <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="processingSession" />
                                         </node>
                                       </node>
                                     </node>
@@ -7458,7 +7425,167 @@
         <node concept="16euLQ" id="7XdbJdyQdwM" role="16eVyc">
           <property role="TrG5h" value="Token" />
           <node concept="3uibUv" id="7XdbJdyQhEU" role="3ztrMU">
-            <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+            <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6OXbTDyaRKT" role="jymVt" />
+      <node concept="3clFb_" id="6OXbTDyaLzV" role="jymVt">
+        <property role="TrG5h" value="applyQueryTemplate" />
+        <node concept="3Tm6S6" id="6OXbTDyaLzW" role="1B3o_S" />
+        <node concept="37vLTG" id="6OXbTDycruw" role="3clF46">
+          <property role="TrG5h" value="stage" />
+          <node concept="17QB3L" id="6OXbTDycwcQ" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="6OXbTDyaLzX" role="3clF46">
+          <property role="TrG5h" value="tpl" />
+          <node concept="3uibUv" id="6OXbTDybcP0" role="1tU5fm">
+            <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="BaseQueryStageTemplate" />
+            <node concept="16syzq" id="6OXbTDybqOL" role="11_B2D">
+              <ref role="16sUi3" node="6OXbTDyaL_y" resolve="Token" />
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6OXbTDycbjU" role="3clF46">
+          <property role="TrG5h" value="parameter" />
+          <node concept="8X2XB" id="6OXbTDycfvT" role="1tU5fm">
+            <node concept="3uibUv" id="6OXbTDycfht" role="8Xvag">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+        </node>
+        <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:mJ_D14Alpb" 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" />
+                  <node concept="A3Dl8" id="6OXbTDycmSS" role="1tU5fm">
+                    <node concept="3uibUv" id="6OXbTDycmSV" role="A3Ik2">
+                      <ref role="3uigEE" to="6pyv:7eGEHDlc$ap" resolve="RuleBuilder" />
+                    </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>
+                    <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="processingSession" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs6" id="6OXbTDyc$Kv" role="3cqZAp">
+                <node concept="1Ls8ON" id="6OXbTDyc$Kw" role="3cqZAk">
+                  <node concept="2YIFZM" id="6OXbTDyc$Kx" role="1Lso8e">
+                    <ref role="37wK5l" node="7Oc59RSEjeq" resolve="OK" />
+                    <ref role="1Pybhc" node="7Oc59RSEjdb" resolve="Result" />
+                  </node>
+                  <node concept="37vLTw" id="6OXbTDyc$Ky" role="1Lso8e">
+                    <ref role="3cqZAo" node="6OXbTDycmTj" resolve="builders" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="6OXbTDyaL$F" role="3cqZAp" />
+            </node>
+            <node concept="TDmWw" id="6OXbTDyaL$G" role="TEbGg">
+              <node concept="3cpWsn" id="6OXbTDyaL$H" role="TDEfY">
+                <property role="TrG5h" value="ex" />
+                <node concept="3uibUv" id="6OXbTDyaL$I" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="6OXbTDyaL$J" role="TDEfX">
+                <node concept="3clFbH" id="6OXbTDyaL$K" role="3cqZAp" />
+                <node concept="3cpWs8" id="6OXbTDyaL$L" role="3cqZAp">
+                  <node concept="3cpWsn" id="6OXbTDyaL$M" role="3cpWs9">
+                    <property role="TrG5h" value="details" />
+                    <node concept="17QB3L" id="6OXbTDyaL$N" role="1tU5fm" />
+                    <node concept="2YIFZM" id="6OXbTDycVSX" role="33vP2m">
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                      <node concept="37vLTw" id="6OXbTDyd7qU" role="37wK5m">
+                        <ref role="3cqZAo" node="6OXbTDycbjU" resolve="parameter" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs6" id="6OXbTDyaL_g" role="3cqZAp">
+                  <node concept="1Ls8ON" id="6OXbTDyaL_h" role="3cqZAk">
+                    <node concept="2YIFZM" id="6OXbTDyaL_i" role="1Lso8e">
+                      <ref role="37wK5l" node="6i42QSsr2_r" resolve="FAIL" />
+                      <ref role="1Pybhc" node="7Oc59RSEjdb" resolve="Result" />
+                      <node concept="3cpWs3" id="6OXbTDyaL_j" role="37wK5m">
+                        <node concept="37vLTw" id="6OXbTDyaL_k" role="3uHU7w">
+                          <ref role="3cqZAo" node="6OXbTDyaL$M" resolve="details" />
+                        </node>
+                        <node concept="3cpWs3" id="6OXbTDyaL_l" role="3uHU7B">
+                          <node concept="3cpWs3" id="6OXbTDyaL_m" role="3uHU7B">
+                            <node concept="Xl_RD" id="6OXbTDyaL_n" role="3uHU7B">
+                              <property role="Xl_RC" value="Error applying template (" />
+                            </node>
+                            <node concept="37vLTw" id="6OXbTDyaL_o" role="3uHU7w">
+                              <ref role="3cqZAo" node="6OXbTDyaLzX" resolve="tpl" />
+                            </node>
+                          </node>
+                          <node concept="Xl_RD" id="6OXbTDyaL_p" role="3uHU7w">
+                            <property role="Xl_RC" value=")" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="6OXbTDyaL_q" role="37wK5m">
+                        <ref role="3cqZAo" node="6OXbTDyaL$H" resolve="ex" />
+                      </node>
+                    </node>
+                    <node concept="2ShNRf" id="6OXbTDyaL_r" role="1Lso8e">
+                      <node concept="kMnCb" id="6OXbTDyaL_s" role="2ShVmc">
+                        <node concept="3uibUv" id="6OXbTDyaL_t" role="kMuH3">
+                          <ref role="3uigEE" to="6pyv:7eGEHDlc$ap" resolve="RuleBuilder" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1LlUBW" id="6OXbTDyaL_u" role="3clF45">
+          <node concept="3uibUv" id="6OXbTDyaL_v" role="1Lm7xW">
+            <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+          </node>
+          <node concept="A3Dl8" id="6OXbTDyaL_w" role="1Lm7xW">
+            <node concept="3uibUv" id="6OXbTDyaL_x" role="A3Ik2">
+              <ref role="3uigEE" to="6pyv:7eGEHDlc$ap" resolve="RuleBuilder" />
+            </node>
+          </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" />
           </node>
         </node>
       </node>
@@ -7468,7 +7595,7 @@
         <node concept="37vLTG" id="7XdbJdyNeFb" role="3clF46">
           <property role="TrG5h" value="tpl" />
           <node concept="3uibUv" id="7XdbJdyNeFc" role="1tU5fm">
-            <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+            <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
             <node concept="16syzq" id="7XdbJdyQuae" role="11_B2D">
               <ref role="16sUi3" node="7XdbJdyQn2x" resolve="Token" />
             </node>
@@ -7500,7 +7627,7 @@
                   <ref role="3cqZAo" node="7XdbJdyNeFb" resolve="tpl" />
                 </node>
                 <node concept="liA8E" id="7XdbJdyNlwX" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7XdbJdyhRyL" resolve="applyReduce" />
+                  <ref role="37wK5l" to="i348:7XdbJdyi9Ld" resolve="applyReduce" />
                   <node concept="37vLTw" id="7XdbJdyNlwY" role="37wK5m">
                     <ref role="3cqZAo" node="7XdbJdyNeFd" resolve="node" />
                   </node>
@@ -7519,7 +7646,7 @@
                     <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="RuleTemplateApplicationToken" />
+                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                       </node>
                     </node>
                     <node concept="3clFbS" id="7XdbJdyNlx8" role="1bW5cS">
@@ -7746,13 +7873,13 @@
         <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="RuleTemplateApplicationToken" />
+            <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
           </node>
         </node>
       </node>
       <node concept="2tJIrI" id="7XdbJdyMFSz" role="jymVt" />
       <node concept="3clFb_" id="tIwzd1I3Xv" role="jymVt">
-        <property role="TrG5h" value="applyAndCollectRequired" />
+        <property role="TrG5h" value="applyRuleTemplatesAndCollectRequired" />
         <node concept="3Tm6S6" id="tIwzd1I3Xw" role="1B3o_S" />
         <node concept="37vLTG" id="tIwzd1I3Xm" role="3clF46">
           <property role="TrG5h" value="stage_tpls" />
@@ -7762,10 +7889,10 @@
                 <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
               </node>
               <node concept="3uibUv" id="1ffsG7c4WJ7" role="1Lm7xW">
-                <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                 <node concept="3qUE_q" id="7XdbJdyRon3" role="11_B2D">
                   <node concept="3uibUv" id="7XdbJdyRsyk" role="3qUE_r">
-                    <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+                    <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                   </node>
                 </node>
               </node>
@@ -7819,7 +7946,7 @@
           </node>
           <node concept="3cpWs8" id="4vBwiiV7yNU" role="3cqZAp">
             <node concept="3cpWsn" id="4vBwiiV7yNV" role="3cpWs9">
-              <property role="TrG5h" value="collectAsType" />
+              <property role="TrG5h" value="requiredCollector" />
               <node concept="3uibUv" id="4vBwiiV7yNT" role="1tU5fm">
                 <ref role="3uigEE" to="psr6:4vBwiiV6130" resolve="AbstractMacroProcessing.MacroProcessingListener" />
               </node>
@@ -7930,34 +8057,16 @@
                 </node>
               </node>
               <node concept="3clFbH" id="7DvO2MafiMe" role="3cqZAp" />
-              <node concept="3clFbF" id="7DvO2Mah9ze" role="3cqZAp">
-                <node concept="37vLTI" id="7DvO2Mah9zf" role="3clFbG">
-                  <node concept="2OqwBi" id="7DvO2Mah9zg" role="37vLTJ">
-                    <node concept="Xjq3P" id="7DvO2Mah9zh" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="7DvO2Mah9zi" role="2OqNvi">
-                      <ref role="2Oxat5" node="7DvO2Mah9z5" resolve="macroProcessing" />
-                    </node>
-                  </node>
-                  <node concept="2ShNRf" id="7DvO2Mah9zj" role="37vLTx">
-                    <node concept="1pGfFk" id="7DvO2Mah9zk" role="2ShVmc">
-                      <ref role="37wK5l" node="7DvO2Ma0h_M" resolve="MacroProcessing" />
-                      <node concept="1rXfSq" id="7WKNeR9f2QG" role="37wK5m">
-                        <ref role="37wK5l" node="7WKNeR9e9Q$" resolve="macroTemplates" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
               <node concept="3clFbF" id="4vBwiiV7uJ1" role="3cqZAp">
                 <node concept="2OqwBi" id="4vBwiiV7w5X" role="3clFbG">
                   <node concept="liA8E" id="4vBwiiV7x2n" role="2OqNvi">
                     <ref role="37wK5l" to="psr6:7DvO2M9IiN4" resolve="addListener" />
                     <node concept="37vLTw" id="4vBwiiV7yO6" role="37wK5m">
-                      <ref role="3cqZAo" node="4vBwiiV7yNV" resolve="collectAsType" />
+                      <ref role="3cqZAo" node="4vBwiiV7yNV" resolve="requiredCollector" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="7DvO2Mai8k2" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="macroProcessing" />
+                    <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="processingSession" />
                   </node>
                 </node>
               </node>
@@ -7983,10 +8092,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:1ffsG7bW_V4" resolve="RuleTemplate" />
+                        <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                         <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="RuleTemplateApplicationToken" />
+                            <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                           </node>
                         </node>
                       </node>
@@ -8015,7 +8124,7 @@
                         </node>
                       </node>
                       <node concept="1rXfSq" id="6i42QSsrrpN" role="33vP2m">
-                        <ref role="37wK5l" node="5ntLU8GlSnU" resolve="applyTemplate" />
+                        <ref role="37wK5l" node="5ntLU8GlSnU" resolve="applyRuleTemplate" />
                         <node concept="37vLTw" id="4MqhgXUBzFs" role="37wK5m">
                           <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
                         </node>
@@ -8054,6 +8163,7 @@
                       </node>
                       <node concept="SfApY" id="tIwzd1I3W$" role="3cqZAp">
                         <node concept="3clFbS" id="tIwzd1I3W_" role="SfCbr">
+                          <node concept="3clFbH" id="6OXbTDydKIb" role="3cqZAp" />
                           <node concept="2Gpval" id="tIwzd1I3Wy" role="3cqZAp">
                             <node concept="3clFbS" id="tIwzd1I3Wz" role="2LFqv$">
                               <node concept="3clFbJ" id="6i42QSsjOPU" role="3cqZAp">
@@ -8145,60 +8255,13 @@
                             </node>
                           </node>
                           <node concept="3clFbH" id="4MqhgXUBpUs" role="3cqZAp" />
-                          <node concept="3cpWs8" id="1CcQBrPh2t3" role="3cqZAp">
-                            <node concept="3cpWsn" id="1CcQBrPh2t4" role="3cpWs9">
-                              <property role="TrG5h" value="ruleTable" />
-                              <node concept="3uibUv" id="1CcQBrPh2s$" role="1tU5fm">
-                                <ref role="3uigEE" node="7DvO2M9Uago" resolve="ProgramBuilder.RuleTable" />
-                              </node>
-                              <node concept="3EllGN" id="1CcQBrPh2t5" role="33vP2m">
-                                <node concept="37vLTw" id="1CcQBrPh2t6" role="3ElVtu">
-                                  <ref role="3cqZAo" node="1CcQBrPen4s" resolve="stage" />
-                                </node>
-                                <node concept="37vLTw" id="1CcQBrPh2t7" role="3ElQJh">
-                                  <ref role="3cqZAo" node="4MqhgXUBtmF" resolve="ruleTables" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbJ" id="1CcQBrPh3Pg" role="3cqZAp">
-                            <node concept="3clFbS" id="1CcQBrPh3Po" role="3clFbx">
-                              <node concept="3clFbF" id="1CcQBrPh4GF" role="3cqZAp">
-                                <node concept="37vLTI" id="1CcQBrPh5MG" role="3clFbG">
-                                  <node concept="1eOMI4" id="1CcQBrPh67T" role="37vLTx">
-                                    <node concept="37vLTI" id="1CcQBrPh6FM" role="1eOMHV">
-                                      <node concept="2ShNRf" id="1CcQBrPh6MF" role="37vLTx">
-                                        <node concept="HV5vD" id="1CcQBrPh7an" role="2ShVmc">
-                                          <ref role="HV5vE" node="7DvO2M9Uago" resolve="ProgramBuilder.RuleTable" />
-                                        </node>
-                                      </node>
-                                      <node concept="37vLTw" id="1CcQBrPh6pe" role="37vLTJ">
-                                        <ref role="3cqZAo" node="1CcQBrPh2t4" resolve="ruleTable" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3EllGN" id="1CcQBrPh5e7" role="37vLTJ">
-                                    <node concept="37vLTw" id="1CcQBrPh5uh" role="3ElVtu">
-                                      <ref role="3cqZAo" node="1CcQBrPen4s" resolve="stage" />
-                                    </node>
-                                    <node concept="37vLTw" id="1CcQBrPh4GE" role="3ElQJh">
-                                      <ref role="3cqZAo" node="4MqhgXUBtmF" resolve="ruleTables" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbC" id="1CcQBrPh4j8" role="3clFbw">
-                              <node concept="10Nm6u" id="1CcQBrPh4j9" role="3uHU7w" />
-                              <node concept="37vLTw" id="1CcQBrPh4ja" role="3uHU7B">
-                                <ref role="3cqZAo" node="1CcQBrPh2t4" resolve="ruleTable" />
-                              </node>
-                            </node>
-                          </node>
                           <node concept="3clFbF" id="4MqhgXUByvU" role="3cqZAp">
                             <node concept="2OqwBi" id="4MqhgXUBz8e" role="3clFbG">
-                              <node concept="37vLTw" id="1CcQBrPh7vr" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1CcQBrPh2t4" resolve="ruleTable" />
+                              <node concept="1rXfSq" id="6OXbTDydKqe" role="2Oq$k0">
+                                <ref role="37wK5l" node="6OXbTDyd_U2" resolve="ruleTable" />
+                                <node concept="37vLTw" id="6OXbTDydKqf" role="37wK5m">
+                                  <ref role="3cqZAo" node="1CcQBrPen4s" resolve="stage" />
+                                </node>
                               </node>
                               <node concept="liA8E" id="4MqhgXUBzq2" role="2OqNvi">
                                 <ref role="37wK5l" node="7DvO2M9Uagq" resolve="update" />
@@ -8297,7 +8360,7 @@
                                                 <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
                                               </node>
                                               <node concept="liA8E" id="6i42QSss4S4" role="2OqNvi">
-                                                <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                                                <ref role="37wK5l" to="i348:1ffsG7bUgP4" resolve="toString" />
                                               </node>
                                             </node>
                                           </node>
@@ -8396,22 +8459,11 @@
                       <node concept="liA8E" id="4vBwiiV7_an" role="2OqNvi">
                         <ref role="37wK5l" to="psr6:7DvO2M9IiNh" resolve="removeListener" />
                         <node concept="37vLTw" id="4vBwiiV7_ao" role="37wK5m">
-                          <ref role="3cqZAo" node="4vBwiiV7yNV" resolve="collectAsType" />
+                          <ref role="3cqZAo" node="4vBwiiV7yNV" resolve="requiredCollector" />
                         </node>
                       </node>
                       <node concept="37vLTw" id="7DvO2Mai8Ie" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="macroProcessing" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbF" id="7DvO2Mai969" role="3cqZAp">
-                    <node concept="37vLTI" id="7DvO2Maianj" role="3clFbG">
-                      <node concept="10Nm6u" id="7DvO2Maiayk" role="37vLTx" />
-                      <node concept="2OqwBi" id="7DvO2Mai9mM" role="37vLTJ">
-                        <node concept="Xjq3P" id="7DvO2Mai967" role="2Oq$k0" />
-                        <node concept="2OwXpG" id="7DvO2Mai9Q3" role="2OqNvi">
-                          <ref role="2Oxat5" node="7DvO2Mah9z5" resolve="macroProcessing" />
-                        </node>
+                        <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="processingSession" />
                       </node>
                     </node>
                   </node>
@@ -8426,10 +8478,10 @@
                   <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                 </node>
                 <node concept="3uibUv" id="1ffsG7c4Zfy" role="1Lm7xW">
-                  <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                   <node concept="3qUE_q" id="7XdbJdyRwgl" role="11_B2D">
                     <node concept="3uibUv" id="7XdbJdyRx9N" role="3qUE_r">
-                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                     </node>
                   </node>
                 </node>
@@ -8460,7 +8512,435 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="6OXbTDzFf$i" role="jymVt" />
+      <node concept="3clFb_" id="6OXbTDy1oEg" role="jymVt">
+        <property role="TrG5h" value="applyQueryTemplates" />
+        <node concept="3uibUv" id="6OXbTDyaHuW" role="3clF45">
+          <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+        </node>
+        <node concept="3Tm6S6" id="6OXbTDy1oEj" role="1B3o_S" />
+        <node concept="3clFbS" id="6OXbTDy1oEk" role="3clF47">
+          <node concept="3cpWs8" id="6OXbTDyef8q" role="3cqZAp">
+            <node concept="3cpWsn" id="6OXbTDyef8r" role="3cpWs9">
+              <property role="TrG5h" value="result" />
+              <node concept="3uibUv" id="6OXbTDyef8s" role="1tU5fm">
+                <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+              </node>
+              <node concept="2YIFZM" id="6OXbTDyef8t" role="33vP2m">
+                <ref role="37wK5l" node="7Oc59RSEjeq" resolve="OK" />
+                <ref role="1Pybhc" node="7Oc59RSEjdb" resolve="Result" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="6OXbTDyeezy" role="3cqZAp" />
+          <node concept="2GUZhq" id="6OXbTDye_gp" role="3cqZAp">
+            <node concept="3clFbS" id="6OXbTDy1Beq" role="2GV8ay">
+              <node concept="2Gpval" id="6OXbTDydnj0" role="3cqZAp">
+                <node concept="3clFbS" id="6OXbTDydn2g" role="2LFqv$">
+                  <node concept="3cpWs8" id="6OXbTDydyNR" role="3cqZAp">
+                    <node concept="3cpWsn" id="6OXbTDydyNS" role="3cpWs9">
+                      <property role="TrG5h" value="result_builders" />
+                      <node concept="1LlUBW" id="6OXbTDydyMo" role="1tU5fm">
+                        <node concept="3uibUv" id="6OXbTDydyMz" role="1Lm7xW">
+                          <ref role="3uigEE" node="7Oc59RSEjdb" resolve="Result" />
+                        </node>
+                        <node concept="A3Dl8" id="6OXbTDydyMx" role="1Lm7xW">
+                          <node concept="3uibUv" id="6OXbTDydyMy" role="A3Ik2">
+                            <ref role="3uigEE" to="6pyv:7eGEHDlc$ap" resolve="RuleBuilder" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1rXfSq" id="6OXbTDydyNT" role="33vP2m">
+                        <ref role="37wK5l" node="6OXbTDyaLzV" resolve="applyQueryTemplate" />
+                        <node concept="2OqwBi" id="6OXbTDyd$Ss" role="37wK5m">
+                          <node concept="liA8E" id="6OXbTDyd_gt" role="2OqNvi">
+                            <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
+                          </node>
+                          <node concept="1LFfDK" id="6OXbTD$lB7G" role="2Oq$k0">
+                            <node concept="3cmrfG" id="6OXbTD$lBeM" role="1LF_Uc">
+                              <property role="3cmrfH" value="0" />
+                            </node>
+                            <node concept="2GrUjf" id="6OXbTDygBSH" role="1LFl5Q">
+                              <ref role="2Gs0qQ" node="6OXbTDydnjC" resolve="stage_tpl" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1LFfDK" id="6OXbTD$lEac" role="37wK5m">
+                          <node concept="3cmrfG" id="6OXbTD$lEYT" role="1LF_Uc">
+                            <property role="3cmrfH" value="1" />
+                          </node>
+                          <node concept="2GrUjf" id="6OXbTD$lDd6" role="1LFl5Q">
+                            <ref role="2Gs0qQ" node="6OXbTDydnjC" resolve="stage_tpl" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="6OXbTDydyO0" role="37wK5m">
+                          <ref role="3cqZAo" node="6OXbTDyaDvN" resolve="parameter" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="6OXbTDyd$2C" role="3cqZAp" />
+                  <node concept="3clFbJ" id="6OXbTDydW47" role="3cqZAp">
+                    <node concept="3clFbS" id="6OXbTDydW49" role="3clFbx">
+                      <node concept="3clFbH" id="6OXbTDydW48" role="3cqZAp" />
+                      <node concept="3cpWs8" id="6OXbTDzFnYI" role="3cqZAp">
+                        <node concept="3cpWsn" id="6OXbTDzFnYJ" role="3cpWs9">
+                          <property role="TrG5h" value="builders" />
+                          <node concept="3vKaQO" id="6OXbTDzFnYK" role="1tU5fm">
+                            <node concept="3uibUv" id="6OXbTDzFnYL" role="3O5elw">
+                              <ref role="3uigEE" to="6pyv:7eGEHDlc$ap" resolve="RuleBuilder" />
+                            </node>
+                          </node>
+                          <node concept="2ShNRf" id="6OXbTDzFnYM" role="33vP2m">
+                            <node concept="Tc6Ow" id="6OXbTDzFnYN" role="2ShVmc">
+                              <node concept="3uibUv" id="6OXbTDzFnYO" role="HW$YZ">
+                                <ref role="3uigEE" to="6pyv:7eGEHDlc$ap" resolve="RuleBuilder" />
+                              </node>
+                              <node concept="1LFfDK" id="6OXbTDzFnYP" role="I$8f6">
+                                <node concept="3cmrfG" id="6OXbTDzFnYQ" role="1LF_Uc">
+                                  <property role="3cmrfH" value="1" />
+                                </node>
+                                <node concept="37vLTw" id="6OXbTDzFoOp" role="1LFl5Q">
+                                  <ref role="3cqZAo" node="6OXbTDydyNS" resolve="result_builders" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="SfApY" id="6OXbTDye1zC" role="3cqZAp">
+                        <node concept="3clFbS" id="6OXbTDye1zE" role="SfCbr">
+                          <node concept="2Gpval" id="6OXbTDzFl4o" role="3cqZAp">
+                            <node concept="3clFbS" id="6OXbTDzFl4p" role="2LFqv$">
+                              <node concept="3clFbJ" id="6OXbTDzFl4q" role="3cqZAp">
+                                <node concept="3clFbS" id="6OXbTDzFl4r" role="3clFbx">
+                                  <node concept="3SKdUt" id="6OXbTDzFl4s" role="3cqZAp">
+                                    <node concept="3SKdUq" id="6OXbTDzFl4t" role="3SKWNk">
+                                      <property role="3SKdUp" value="goals get triggered by the &quot;main&quot; constraint" />
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbF" id="6OXbTDzFl4u" role="3cqZAp">
+                                    <node concept="2OqwBi" id="6OXbTDzFl4v" role="3clFbG">
+                                      <node concept="2GrUjf" id="6OXbTDzFl4w" role="2Oq$k0">
+                                        <ref role="2Gs0qQ" node="6OXbTDzFl4V" resolve="builder" />
+                                      </node>
+                                      <node concept="liA8E" id="6OXbTDzFl4x" role="2OqNvi">
+                                        <ref role="37wK5l" to="6pyv:7eGEHDlc$bR" resolve="appendHeadKept" />
+                                        <node concept="37vLTw" id="6OXbTDzFl4y" role="37wK5m">
+                                          <ref role="3cqZAo" node="6i42QSsj_y2" resolve="mainConstraint" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3fqX7Q" id="6OXbTDzFl4z" role="3clFbw">
+                                  <node concept="2OqwBi" id="6OXbTDzFl4$" role="3fr31v">
+                                    <node concept="2GrUjf" id="6OXbTDzFl4_" role="2Oq$k0">
+                                      <ref role="2Gs0qQ" node="6OXbTDzFl4V" resolve="builder" />
+                                    </node>
+                                    <node concept="liA8E" id="6OXbTDzFl4A" role="2OqNvi">
+                                      <ref role="37wK5l" to="6pyv:7nkyKX7mcq7" resolve="hasHead" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbJ" id="6OXbTDzFl4B" role="3cqZAp">
+                                <node concept="3clFbS" id="6OXbTDzFl4C" role="3clFbx">
+                                  <node concept="3SKdUt" id="6OXbTDzFl4D" role="3cqZAp">
+                                    <node concept="3SKdUq" id="6OXbTDzFl4E" role="3SKWNk">
+                                      <property role="3SKdUp" value="facts have &quot;assert(true)&quot; in the body" />
+                                    </node>
+                                  </node>
+                                  <node concept="3SKdUt" id="6OXbTDzFl4F" role="3cqZAp">
+                                    <node concept="3SKdUq" id="6OXbTDzFl4G" role="3SKWNk">
+                                      <property role="3SKdUp" value="TODO: support facts" />
+                                    </node>
+                                  </node>
+                                  <node concept="3SKdUt" id="6OXbTDzFl4H" role="3cqZAp">
+                                    <node concept="3SKdUq" id="6OXbTDzFl4I" role="3SKWNk">
+                                      <property role="3SKdUp" value="FIXME: support rules that only add required roots instead of this hack!s" />
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbF" id="6OXbTDzFl4J" role="3cqZAp">
+                                    <node concept="2OqwBi" id="6OXbTDzFl4K" role="3clFbG">
+                                      <node concept="2GrUjf" id="6OXbTDzFl4L" role="2Oq$k0">
+                                        <ref role="2Gs0qQ" node="6OXbTDzFl4V" resolve="builder" />
+                                      </node>
+                                      <node concept="liA8E" id="6OXbTDzFl4M" role="2OqNvi">
+                                        <ref role="37wK5l" to="6pyv:7eGEHDlc$aw" resolve="appendBody" />
+                                        <node concept="2ShNRf" id="6OXbTDzFl4N" role="37wK5m">
+                                          <node concept="1pGfFk" id="6OXbTDzFl4O" role="2ShVmc">
+                                            <ref role="37wK5l" to="cxk7:4xBopTzrPWl" resolve="AssertPredicate" />
+                                            <node concept="10M0yZ" id="6OXbTDzFl4P" role="37wK5m">
+                                              <ref role="3cqZAo" to="wyt6:~Boolean.TRUE" resolve="TRUE" />
+                                              <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3fqX7Q" id="6OXbTDzFl4Q" role="3clFbw">
+                                  <node concept="2OqwBi" id="6OXbTDzFl4R" role="3fr31v">
+                                    <node concept="2GrUjf" id="6OXbTDzFl4S" role="2Oq$k0">
+                                      <ref role="2Gs0qQ" node="6OXbTDzFl4V" resolve="builder" />
+                                    </node>
+                                    <node concept="liA8E" id="6OXbTDzFl4T" role="2OqNvi">
+                                      <ref role="37wK5l" to="6pyv:7nkyKX7mnWq" resolve="hasBody" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="6OXbTDzFwae" role="2GsD0m">
+                              <ref role="3cqZAo" node="6OXbTDzFnYJ" resolve="builders" />
+                            </node>
+                            <node concept="2GrKxI" id="6OXbTDzFl4V" role="2Gsz3X">
+                              <property role="TrG5h" value="builder" />
+                            </node>
+                          </node>
+                          <node concept="3clFbH" id="6OXbTDzFx5d" role="3cqZAp" />
+                          <node concept="3clFbF" id="6OXbTDydLjm" role="3cqZAp">
+                            <node concept="2OqwBi" id="6OXbTDydLjn" role="3clFbG">
+                              <node concept="1rXfSq" id="6OXbTDydLjo" role="2Oq$k0">
+                                <ref role="37wK5l" node="6OXbTDyd_U2" resolve="ruleTable" />
+                                <node concept="1LFfDK" id="6OXbTD$lHtx" role="37wK5m">
+                                  <node concept="3cmrfG" id="6OXbTD$lH$B" role="1LF_Uc">
+                                    <property role="3cmrfH" value="0" />
+                                  </node>
+                                  <node concept="2GrUjf" id="6OXbTDyho8i" role="1LFl5Q">
+                                    <ref role="2Gs0qQ" node="6OXbTDydnjC" resolve="stage_tpl" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="6OXbTDydLjq" role="2OqNvi">
+                                <ref role="37wK5l" node="6OXbTDy0Er4" resolve="update" />
+                                <node concept="1LFfDK" id="6OXbTD$lMFE" role="37wK5m">
+                                  <node concept="3cmrfG" id="6OXbTD$lMML" role="1LF_Uc">
+                                    <property role="3cmrfH" value="1" />
+                                  </node>
+                                  <node concept="2GrUjf" id="6OXbTD$lIsP" role="1LFl5Q">
+                                    <ref role="2Gs0qQ" node="6OXbTDydnjC" resolve="stage_tpl" />
+                                  </node>
+                                </node>
+                                <node concept="37vLTw" id="6OXbTDzOgMw" role="37wK5m">
+                                  <ref role="3cqZAo" node="6OXbTDzFnYJ" resolve="builders" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbH" id="6OXbTDyecwE" role="3cqZAp" />
+                        </node>
+                        <node concept="TDmWw" id="6OXbTDydX1w" role="TEbGg">
+                          <node concept="3cpWsn" id="6OXbTDydX1x" role="TDEfY">
+                            <property role="TrG5h" value="e" />
+                            <node concept="3uibUv" id="6OXbTDydXmU" role="1tU5fm">
+                              <ref role="3uigEE" to="av0y:~InvalidRuleException" resolve="InvalidRuleException" />
+                            </node>
+                          </node>
+                          <node concept="3clFbS" id="6OXbTDydX1z" role="TDEfX">
+                            <node concept="3cpWs8" id="6OXbTDydY23" role="3cqZAp">
+                              <node concept="3cpWsn" id="6OXbTDydY24" role="3cpWs9">
+                                <property role="TrG5h" value="details" />
+                                <node concept="17QB3L" id="6OXbTDydY25" role="1tU5fm" />
+                                <node concept="2YIFZM" id="6OXbTDyeyio" role="33vP2m">
+                                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                  <node concept="37vLTw" id="6OXbTDyeyYP" role="37wK5m">
+                                    <ref role="3cqZAo" node="6OXbTDyaDvN" resolve="parameter" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbF" id="6OXbTDydY2n" role="3cqZAp">
+                              <node concept="37vLTI" id="6OXbTDydY2o" role="3clFbG">
+                                <node concept="2OqwBi" id="6OXbTDydY2p" role="37vLTx">
+                                  <node concept="37vLTw" id="6OXbTDyegrm" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="6OXbTDyef8r" resolve="result" />
+                                  </node>
+                                  <node concept="liA8E" id="6OXbTDydY2r" role="2OqNvi">
+                                    <ref role="37wK5l" node="7nkyKX7v7xb" resolve="and" />
+                                    <node concept="2YIFZM" id="6OXbTDydY2s" role="37wK5m">
+                                      <ref role="37wK5l" node="7Oc59RSH6VB" resolve="FAIL" />
+                                      <ref role="1Pybhc" node="7Oc59RSEjdb" resolve="Result" />
+                                      <node concept="3cpWs3" id="6OXbTDydY2t" role="37wK5m">
+                                        <node concept="37vLTw" id="6OXbTDydY2u" role="3uHU7w">
+                                          <ref role="3cqZAo" node="6OXbTDydY24" resolve="details" />
+                                        </node>
+                                        <node concept="3cpWs3" id="6OXbTDydY2v" role="3uHU7B">
+                                          <node concept="3cpWs3" id="6OXbTDydY2w" role="3uHU7B">
+                                            <node concept="3cpWs3" id="6OXbTDydY2x" role="3uHU7B">
+                                              <node concept="2OqwBi" id="6OXbTDydY2y" role="3uHU7B">
+                                                <node concept="37vLTw" id="6OXbTDyeu9V" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="6OXbTDydX1x" resolve="e" />
+                                                </node>
+                                                <node concept="liA8E" id="6OXbTDydY2$" role="2OqNvi">
+                                                  <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                                                </node>
+                                              </node>
+                                              <node concept="Xl_RD" id="6OXbTDydY2_" role="3uHU7w">
+                                                <property role="Xl_RC" value="(" />
+                                              </node>
+                                            </node>
+                                            <node concept="2OqwBi" id="6OXbTDydY2A" role="3uHU7w">
+                                              <node concept="liA8E" id="6OXbTDydY2C" role="2OqNvi">
+                                                <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                                              </node>
+                                              <node concept="37vLTw" id="6OXbTDyhq$c" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="7WKNeR9b_iR" resolve="queryTemplate" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="Xl_RD" id="6OXbTDydY2D" role="3uHU7w">
+                                            <property role="Xl_RC" value=")" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="37vLTw" id="6OXbTDyefYD" role="37vLTJ">
+                                  <ref role="3cqZAo" node="6OXbTDyef8r" resolve="result" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="6OXbTDye0r$" role="3clFbw">
+                      <node concept="1LFfDK" id="6OXbTDydZtr" role="2Oq$k0">
+                        <node concept="37vLTw" id="6OXbTDydZ0n" role="1LFl5Q">
+                          <ref role="3cqZAo" node="6OXbTDydyNS" resolve="result_builders" />
+                        </node>
+                        <node concept="3cmrfG" id="6OXbTDye03w" role="1LF_Uc">
+                          <property role="3cmrfH" value="0" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="6OXbTDye0IL" role="2OqNvi">
+                        <ref role="37wK5l" node="7Oc59RS_hsj" resolve="isSuccessful" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="6OXbTDydn2q" role="2GsD0m">
+                  <ref role="3cqZAo" node="6OXbTDydhIZ" resolve="stage_tpls" />
+                </node>
+                <node concept="2GrKxI" id="6OXbTDydnjC" role="2Gsz3X">
+                  <property role="TrG5h" value="stage_tpl" />
+                </node>
+              </node>
+              <node concept="3clFbH" id="6OXbTDydmGN" role="3cqZAp" />
+            </node>
+            <node concept="3clFbS" id="6OXbTDye_gs" role="2GVbov" />
+          </node>
+          <node concept="3clFbH" id="6OXbTDye$9R" role="3cqZAp" />
+          <node concept="3clFbF" id="6OXbTDye$GS" role="3cqZAp">
+            <node concept="37vLTw" id="6OXbTDye$GQ" role="3clFbG">
+              <ref role="3cqZAo" node="6OXbTDyef8r" resolve="result" />
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6OXbTDydhIZ" role="3clF46">
+          <property role="TrG5h" value="stage_tpls" />
+          <node concept="A3Dl8" id="6OXbTD$lw9a" role="1tU5fm">
+            <node concept="1LlUBW" id="6OXbTD$lw9b" role="A3Ik2">
+              <node concept="3uibUv" id="6OXbTD$lw9c" role="1Lm7xW">
+                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+              </node>
+              <node concept="3uibUv" id="6OXbTD$lw9d" role="1Lm7xW">
+                <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="BaseQueryStageTemplate" />
+                <node concept="3qUE_q" id="6OXbTD$lw9e" role="11_B2D">
+                  <node concept="3uibUv" id="6OXbTD$l$e7" role="3qUE_r">
+                    <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6OXbTDyaDvN" role="3clF46">
+          <property role="TrG5h" value="parameter" />
+          <node concept="8X2XB" id="6OXbTDyaGSr" role="1tU5fm">
+            <node concept="3uibUv" id="6OXbTDyaDvM" role="8Xvag">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="2tJIrI" id="7nkyKX7nb0M" role="jymVt" />
+      <node concept="3clFb_" id="6OXbTDyd_U2" role="jymVt">
+        <property role="TrG5h" value="ruleTable" />
+        <node concept="3Tm6S6" id="6OXbTDyd_U3" role="1B3o_S" />
+        <node concept="3uibUv" id="6OXbTDyd_U4" role="3clF45">
+          <ref role="3uigEE" node="7DvO2M9Uago" resolve="ProgramProducer.RuleTable" />
+        </node>
+        <node concept="37vLTG" id="6OXbTDyd_TW" role="3clF46">
+          <property role="TrG5h" value="stage" />
+          <node concept="3uibUv" id="6OXbTDyd_TX" role="1tU5fm">
+            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="6OXbTDyd_Ty" role="3clF47">
+          <node concept="3cpWs8" id="6OXbTDyd_T_" role="3cqZAp">
+            <node concept="3cpWsn" id="6OXbTDyd_TA" role="3cpWs9">
+              <property role="TrG5h" value="ruleTable" />
+              <node concept="3uibUv" id="6OXbTDyd_TB" role="1tU5fm">
+                <ref role="3uigEE" node="7DvO2M9Uago" resolve="ProgramProducer.RuleTable" />
+              </node>
+              <node concept="3EllGN" id="6OXbTDyd_TC" role="33vP2m">
+                <node concept="37vLTw" id="6OXbTDyd_TY" role="3ElVtu">
+                  <ref role="3cqZAo" node="6OXbTDyd_TW" resolve="stage" />
+                </node>
+                <node concept="37vLTw" id="6OXbTDyd_TE" role="3ElQJh">
+                  <ref role="3cqZAo" node="4MqhgXUBtmF" resolve="ruleTables" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="6OXbTDyd_TF" role="3cqZAp">
+            <node concept="3clFbS" id="6OXbTDyd_TG" role="3clFbx">
+              <node concept="3clFbF" id="6OXbTDyd_TH" role="3cqZAp">
+                <node concept="37vLTI" id="6OXbTDyd_TI" role="3clFbG">
+                  <node concept="1eOMI4" id="6OXbTDyd_TJ" role="37vLTx">
+                    <node concept="37vLTI" id="6OXbTDyd_TK" role="1eOMHV">
+                      <node concept="2ShNRf" id="6OXbTDyd_TL" role="37vLTx">
+                        <node concept="HV5vD" id="6OXbTDyd_TM" role="2ShVmc">
+                          <ref role="HV5vE" node="7DvO2M9Uago" resolve="ProgramProducer.RuleTable" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="6OXbTDyd_TN" role="37vLTJ">
+                        <ref role="3cqZAo" node="6OXbTDyd_TA" resolve="ruleTable" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3EllGN" id="6OXbTDyd_TO" role="37vLTJ">
+                    <node concept="37vLTw" id="6OXbTDyd_TZ" role="3ElVtu">
+                      <ref role="3cqZAo" node="6OXbTDyd_TW" resolve="stage" />
+                    </node>
+                    <node concept="37vLTw" id="6OXbTDyd_TQ" role="3ElQJh">
+                      <ref role="3cqZAo" node="4MqhgXUBtmF" resolve="ruleTables" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbC" id="6OXbTDyd_TR" role="3clFbw">
+              <node concept="10Nm6u" id="6OXbTDyd_TS" role="3uHU7w" />
+              <node concept="37vLTw" id="6OXbTDyd_TT" role="3uHU7B">
+                <ref role="3cqZAo" node="6OXbTDyd_TA" resolve="ruleTable" />
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs6" id="6OXbTDyd_TU" role="3cqZAp">
+            <node concept="37vLTw" id="6OXbTDyd_TV" role="3cqZAk">
+              <ref role="3cqZAo" node="6OXbTDyd_TA" resolve="ruleTable" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6OXbTDy1jF3" role="jymVt" />
       <node concept="312cEu" id="5ntLU8Glzc7" role="jymVt">
         <property role="2bfB8j" value="true" />
         <property role="TrG5h" value="TemplateApplicator" />
@@ -8483,10 +8963,10 @@
                       <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                     </node>
                     <node concept="3uibUv" id="1ffsG7c5hrm" role="1Lm7xW">
-                      <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
                       <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="RuleTemplateApplicationToken" />
+                          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                         </node>
                       </node>
                     </node>
@@ -8533,7 +9013,7 @@
                   </node>
                 </node>
                 <node concept="1rXfSq" id="6i42QSssRXY" role="33vP2m">
-                  <ref role="37wK5l" node="tIwzd1I3Xv" resolve="applyAndCollectRequired" />
+                  <ref role="37wK5l" node="tIwzd1I3Xv" resolve="applyRuleTemplatesAndCollectRequired" />
                   <node concept="37vLTw" id="6i42QSssRXZ" role="37wK5m">
                     <ref role="3cqZAo" node="5ntLU8GlzSJ" resolve="tpls" />
                   </node>
@@ -8547,7 +9027,7 @@
             <node concept="3clFbF" id="4MqhgXU__BJ" role="3cqZAp">
               <node concept="2ShNRf" id="4MqhgXU__BF" role="3clFbG">
                 <node concept="1pGfFk" id="4MqhgXU_A60" role="2ShVmc">
-                  <ref role="37wK5l" node="4MqhgXU_xEx" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+                  <ref role="37wK5l" node="4MqhgXU_xEx" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
                   <node concept="1LFfDK" id="4MqhgXU_Aq9" role="37wK5m">
                     <node concept="3cmrfG" id="4MqhgXU_Aqa" role="1LF_Uc">
                       <property role="3cmrfH" value="0" />
@@ -8572,14 +9052,14 @@
             </node>
           </node>
           <node concept="3uibUv" id="4MqhgXU_2zy" role="3clF45">
-            <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+            <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
           </node>
         </node>
         <node concept="3Tm6S6" id="5ntLU8Glzld" role="1B3o_S" />
         <node concept="3uibUv" id="5ntLU8Glzg8" role="EKbjA">
-          <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramBuilder.NodeWalker.NodeAction" />
+          <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramProducer.NodeWalker.NodeAction" />
           <node concept="3uibUv" id="4MqhgXU_ix8" role="11_B2D">
-            <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+            <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
           </node>
         </node>
         <node concept="2tJIrI" id="7Oc59RSFIrK" role="jymVt" />
@@ -8589,13 +9069,13 @@
           <node concept="37vLTG" id="tIwzd1IJm6" role="3clF46">
             <property role="TrG5h" value="a" />
             <node concept="3uibUv" id="4MqhgXU_lQw" role="1tU5fm">
-              <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+              <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
             </node>
           </node>
           <node concept="37vLTG" id="tIwzd1IJm8" role="3clF46">
             <property role="TrG5h" value="b" />
             <node concept="3uibUv" id="4MqhgXU_mDE" role="1tU5fm">
-              <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+              <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
             </node>
           </node>
           <node concept="3Tm1VV" id="tIwzd1IJmb" role="1B3o_S" />
@@ -8684,7 +9164,7 @@
             </node>
           </node>
           <node concept="3uibUv" id="4MqhgXU_kHc" role="3clF45">
-            <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+            <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
           </node>
         </node>
         <node concept="2tJIrI" id="tIwzd1IJBd" role="jymVt" />
@@ -8696,13 +9176,13 @@
             <node concept="3clFbF" id="4MqhgXU_aAO" role="3cqZAp">
               <node concept="2ShNRf" id="4MqhgXU_aAK" role="3clFbG">
                 <node concept="1pGfFk" id="4MqhgXU_aVw" role="2ShVmc">
-                  <ref role="37wK5l" node="4MqhgXU_6Bn" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+                  <ref role="37wK5l" node="4MqhgXU_6Bn" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
                 </node>
               </node>
             </node>
           </node>
           <node concept="3uibUv" id="4MqhgXU_59g" role="3clF45">
-            <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramBuilder.ProgramFactory.ResultTriple" />
+            <ref role="3uigEE" node="4MqhgXU$YdP" resolve="ProgramProducer.ProgramFactory.ResultTriple" />
           </node>
         </node>
         <node concept="2tJIrI" id="1CcQBrPgAwx" role="jymVt" />
@@ -8852,6 +9332,13 @@
         <node concept="3Tm6S6" id="4MqhgXU_10h" role="1B3o_S" />
       </node>
       <node concept="2tJIrI" id="7kTeLbPhr4f" role="jymVt" />
+      <node concept="312cEg" id="7DvO2Mah9z5" role="jymVt">
+        <property role="TrG5h" value="processingSession" />
+        <node concept="3Tm6S6" id="7DvO2Mah9z3" role="1B3o_S" />
+        <node concept="3uibUv" id="6OXbTDxQvHL" role="1tU5fm">
+          <ref role="3uigEE" to="psr6:18kNIl1vDPZ" resolve="AbstractMacroProcessing" />
+        </node>
+      </node>
       <node concept="312cEg" id="6i42QSsj_y2" role="jymVt">
         <property role="TrG5h" value="mainConstraint" />
         <node concept="3Tm6S6" id="6i42QSsj_y3" role="1B3o_S" />
@@ -8867,7 +9354,7 @@
             <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
           </node>
           <node concept="3uibUv" id="1CcQBrPgZJH" role="3rvSg0">
-            <ref role="3uigEE" node="7DvO2M9Uago" resolve="ProgramBuilder.RuleTable" />
+            <ref role="3uigEE" node="7DvO2M9Uago" resolve="ProgramProducer.RuleTable" />
           </node>
         </node>
         <node concept="2ShNRf" id="1CcQBrPh0w5" role="33vP2m">
@@ -8876,16 +9363,23 @@
               <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
             </node>
             <node concept="3uibUv" id="1CcQBrPh0rq" role="3rHtpV">
-              <ref role="3uigEE" node="7DvO2M9Uago" resolve="ProgramBuilder.RuleTable" />
+              <ref role="3uigEE" node="7DvO2M9Uago" resolve="ProgramProducer.RuleTable" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="312cEg" id="7DvO2Mah9z5" role="jymVt">
-        <property role="TrG5h" value="macroProcessing" />
-        <node concept="3Tm6S6" id="7DvO2Mah9z3" role="1B3o_S" />
-        <node concept="3uibUv" id="7DvO2Mah9z4" role="1tU5fm">
-          <ref role="3uigEE" node="7DvO2M9IiKB" resolve="MacroProcessing" />
+      <node concept="312cEg" id="6OXbTDxv6BA" role="jymVt">
+        <property role="TrG5h" value="stage_builders" />
+        <node concept="3Tm6S6" id="6OXbTDxv6BB" role="1B3o_S" />
+        <node concept="_YKpA" id="6OXbTDxv6BD" role="1tU5fm">
+          <node concept="1LlUBW" id="6OXbTDxv6BE" role="_ZDj9">
+            <node concept="3uibUv" id="6OXbTDxv6BF" role="1Lm7xW">
+              <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+            </node>
+            <node concept="3uibUv" id="6OXbTDxv6BG" role="1Lm7xW">
+              <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="3Tm6S6" id="7DvO2M9BJbW" role="1B3o_S" />
@@ -8970,7 +9464,7 @@
           <node concept="37vLTG" id="4UTrqZZNYZf" role="3clF46">
             <property role="TrG5h" value="action" />
             <node concept="3uibUv" id="4UTrqZZNYZg" role="1tU5fm">
-              <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramBuilder.NodeWalker.NodeAction" />
+              <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramProducer.NodeWalker.NodeAction" />
               <node concept="16syzq" id="4UTrqZZNZlu" role="11_B2D">
                 <ref role="16sUi3" node="4UTrqZZNWwV" resolve="S" />
               </node>
@@ -8980,7 +9474,7 @@
           <node concept="3Tm1VV" id="4UTrqZZNYyg" role="1B3o_S" />
           <node concept="3clFbS" id="4UTrqZZNYyh" role="3clF47">
             <node concept="XkiVB" id="4UTrqZZNYRo" role="3cqZAp">
-              <ref role="37wK5l" node="12yN8DyNqja" resolve="ProgramBuilder.NodeWalker" />
+              <ref role="37wK5l" node="12yN8DyNqja" resolve="ProgramProducer.NodeWalker" />
               <node concept="37vLTw" id="4UTrqZZNZus" role="37wK5m">
                 <ref role="3cqZAo" node="4UTrqZZNYZf" resolve="action" />
               </node>
@@ -9016,7 +9510,7 @@
           <node concept="37vLTG" id="3IIf9O_hbbt" role="3clF46">
             <property role="TrG5h" value="action" />
             <node concept="3uibUv" id="3IIf9O_hbbu" role="1tU5fm">
-              <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramBuilder.NodeWalker.NodeAction" />
+              <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramProducer.NodeWalker.NodeAction" />
               <node concept="16syzq" id="3IIf9O_hbbv" role="11_B2D">
                 <ref role="16sUi3" node="4UTrqZZNWwV" resolve="S" />
               </node>
@@ -9026,7 +9520,7 @@
           <node concept="3Tm1VV" id="3IIf9O_hbbx" role="1B3o_S" />
           <node concept="3clFbS" id="3IIf9O_hbby" role="3clF47">
             <node concept="XkiVB" id="3IIf9O_hbbz" role="3cqZAp">
-              <ref role="37wK5l" node="12yN8DyNqja" resolve="ProgramBuilder.NodeWalker" />
+              <ref role="37wK5l" node="12yN8DyNqja" resolve="ProgramProducer.NodeWalker" />
               <node concept="37vLTw" id="3IIf9O_hbb$" role="37wK5m">
                 <ref role="3cqZAo" node="3IIf9O_hbbt" resolve="action" />
               </node>
@@ -9207,7 +9701,7 @@
         <node concept="2tJIrI" id="4UTrqZZNWox" role="jymVt" />
         <node concept="3Tm1VV" id="4UTrqZZNVSK" role="1B3o_S" />
         <node concept="3uibUv" id="4UTrqZZNWuC" role="1zkMxy">
-          <ref role="3uigEE" node="12yN8DyNqdl" resolve="ProgramBuilder.NodeWalker" />
+          <ref role="3uigEE" node="12yN8DyNqdl" resolve="ProgramProducer.NodeWalker" />
           <node concept="16syzq" id="4UTrqZZNWxK" role="11_B2D">
             <ref role="16sUi3" node="4UTrqZZNWwV" resolve="S" />
           </node>
@@ -9259,7 +9753,7 @@
           <node concept="37vLTG" id="4UTrqZZOb7I" role="3clF46">
             <property role="TrG5h" value="action" />
             <node concept="3uibUv" id="4UTrqZZOb9_" role="1tU5fm">
-              <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramBuilder.NodeWalker.NodeAction" />
+              <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramProducer.NodeWalker.NodeAction" />
               <node concept="16syzq" id="4UTrqZZObkm" role="11_B2D">
                 <ref role="16sUi3" node="4UTrqZZOaLH" resolve="S" />
               </node>
@@ -9269,7 +9763,7 @@
           <node concept="3Tm1VV" id="4UTrqZZOaY9" role="1B3o_S" />
           <node concept="3clFbS" id="4UTrqZZOaYa" role="3clF47">
             <node concept="XkiVB" id="4UTrqZZObpZ" role="3cqZAp">
-              <ref role="37wK5l" node="4UTrqZZNYyd" resolve="ProgramBuilder.NodeWalker.ALL_DEEP" />
+              <ref role="37wK5l" node="4UTrqZZNYyd" resolve="ProgramProducer.NodeWalker.ALL_DEEP" />
               <node concept="37vLTw" id="4UTrqZZObxU" role="37wK5m">
                 <ref role="3cqZAo" node="4UTrqZZOb46" resolve="startFrom" />
               </node>
@@ -9290,7 +9784,7 @@
           <node concept="37vLTG" id="3IIf9O_hpad" role="3clF46">
             <property role="TrG5h" value="action" />
             <node concept="3uibUv" id="3IIf9O_hpae" role="1tU5fm">
-              <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramBuilder.NodeWalker.NodeAction" />
+              <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramProducer.NodeWalker.NodeAction" />
               <node concept="16syzq" id="3IIf9O_hpaf" role="11_B2D">
                 <ref role="16sUi3" node="4UTrqZZOaLH" resolve="S" />
               </node>
@@ -9300,7 +9794,7 @@
           <node concept="3Tm1VV" id="3IIf9O_hpah" role="1B3o_S" />
           <node concept="3clFbS" id="3IIf9O_hpai" role="3clF47">
             <node concept="XkiVB" id="3IIf9O_hpaj" role="3cqZAp">
-              <ref role="37wK5l" node="3IIf9O_hbbq" resolve="ProgramBuilder.NodeWalker.ALL_DEEP" />
+              <ref role="37wK5l" node="3IIf9O_hbbq" resolve="ProgramProducer.NodeWalker.ALL_DEEP" />
               <node concept="37vLTw" id="3IIf9O_hpak" role="37wK5m">
                 <ref role="3cqZAo" node="3IIf9O_hpab" resolve="startFrom" />
               </node>
@@ -9355,7 +9849,7 @@
         <node concept="2tJIrI" id="4UTrqZZOe9Q" role="jymVt" />
         <node concept="3Tm1VV" id="4UTrqZZO9qz" role="1B3o_S" />
         <node concept="3uibUv" id="4UTrqZZOaEu" role="1zkMxy">
-          <ref role="3uigEE" node="4UTrqZZNVSJ" resolve="ProgramBuilder.NodeWalker.ALL_DEEP" />
+          <ref role="3uigEE" node="4UTrqZZNVSJ" resolve="ProgramProducer.NodeWalker.ALL_DEEP" />
           <node concept="16syzq" id="4UTrqZZOaRM" role="11_B2D">
             <ref role="16sUi3" node="4UTrqZZOaLH" resolve="S" />
           </node>
@@ -9386,7 +9880,7 @@
           <node concept="37vLTG" id="4UTrqZZOjsI" role="3clF46">
             <property role="TrG5h" value="action" />
             <node concept="3uibUv" id="4UTrqZZOjuZ" role="1tU5fm">
-              <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramBuilder.NodeWalker.NodeAction" />
+              <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramProducer.NodeWalker.NodeAction" />
               <node concept="16syzq" id="4UTrqZZOjG1" role="11_B2D">
                 <ref role="16sUi3" node="4UTrqZZOiH2" resolve="S" />
               </node>
@@ -9396,7 +9890,7 @@
           <node concept="3Tm1VV" id="4UTrqZZOjgS" role="1B3o_S" />
           <node concept="3clFbS" id="4UTrqZZOjgT" role="3clF47">
             <node concept="XkiVB" id="4UTrqZZOjLW" role="3cqZAp">
-              <ref role="37wK5l" node="12yN8DyNqja" resolve="ProgramBuilder.NodeWalker" />
+              <ref role="37wK5l" node="12yN8DyNqja" resolve="ProgramProducer.NodeWalker" />
               <node concept="37vLTw" id="4UTrqZZOjRC" role="37wK5m">
                 <ref role="3cqZAo" node="4UTrqZZOjsI" resolve="action" />
               </node>
@@ -9444,7 +9938,7 @@
           <property role="TrG5h" value="S" />
         </node>
         <node concept="3uibUv" id="4UTrqZZOj1t" role="1zkMxy">
-          <ref role="3uigEE" node="12yN8DyNqdl" resolve="ProgramBuilder.NodeWalker" />
+          <ref role="3uigEE" node="12yN8DyNqdl" resolve="ProgramProducer.NodeWalker" />
           <node concept="16syzq" id="4UTrqZZOjas" role="11_B2D">
             <ref role="16sUi3" node="4UTrqZZOiH2" resolve="S" />
           </node>
@@ -9459,7 +9953,7 @@
         <node concept="3UR2Jj" id="4UTrqZZQQeD" role="lGtFl">
           <node concept="TZ5HA" id="4UTrqZZQQeE" role="TZ5H$">
             <node concept="1dT_AC" id="4UTrqZZQQeF" role="1dT_Ay">
-              <property role="1dT_AB" value="Walks the nodes in the given sequence." />
+              <property role="1dT_AB" value="Walks the nodes in the given sequence individually." />
             </node>
           </node>
         </node>
@@ -9469,7 +9963,7 @@
         <node concept="37vLTG" id="12yN8DyNqjA" role="3clF46">
           <property role="TrG5h" value="action" />
           <node concept="3uibUv" id="12yN8DyNqjI" role="1tU5fm">
-            <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramBuilder.NodeWalker.NodeAction" />
+            <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramProducer.NodeWalker.NodeAction" />
             <node concept="16syzq" id="tIwzd1IBE1" role="11_B2D">
               <ref role="16sUi3" node="tIwzd1IC9f" resolve="T" />
             </node>
@@ -9683,7 +10177,7 @@
         <property role="TrG5h" value="action" />
         <node concept="3Tm6S6" id="12yN8DyNqkh" role="1B3o_S" />
         <node concept="3uibUv" id="12yN8DyNqkj" role="1tU5fm">
-          <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramBuilder.NodeWalker.NodeAction" />
+          <ref role="3uigEE" node="12yN8DyNqe8" resolve="ProgramProducer.NodeWalker.NodeAction" />
           <node concept="16syzq" id="tIwzd1ID1q" role="11_B2D">
             <ref role="16sUi3" node="tIwzd1IC9f" resolve="T" />
           </node>
@@ -9774,6 +10268,68 @@
         </node>
       </node>
       <node concept="2tJIrI" id="7DvO2M9UagT" role="jymVt" />
+      <node concept="3clFb_" id="6OXbTDy0Er4" role="jymVt">
+        <property role="TrG5h" value="update" />
+        <node concept="3cqZAl" id="6OXbTDy0Er6" role="3clF45" />
+        <node concept="3Tm1VV" id="6OXbTDy0Er7" role="1B3o_S" />
+        <node concept="3clFbS" id="6OXbTDy0Er8" role="3clF47">
+          <node concept="3clFbH" id="6OXbTDzvlJN" role="3cqZAp" />
+          <node concept="2Gpval" id="6OXbTDyyjVd" role="3cqZAp">
+            <node concept="3clFbS" id="6OXbTDy10Jh" role="2LFqv$">
+              <node concept="3clFbF" id="6OXbTDy1aOX" role="3cqZAp">
+                <node concept="2OqwBi" id="6OXbTDy1bak" role="3clFbG">
+                  <node concept="1rXfSq" id="6OXbTDy1aOW" role="2Oq$k0">
+                    <ref role="37wK5l" node="6OXbTDy166r" resolve="queryHandlerBuilder" />
+                    <node concept="37vLTw" id="6OXbTDy1aSW" role="37wK5m">
+                      <ref role="3cqZAo" node="6OXbTDy0I1M" resolve="queryStageTemplate" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="6OXbTDy1cVH" role="2OqNvi">
+                    <ref role="37wK5l" to="6pyv:4MqhgXUMbtk" resolve="addRule" />
+                    <node concept="37vLTw" id="6OXbTDzw0p5" role="37wK5m">
+                      <ref role="3cqZAo" node="6OXbTDy0I1M" resolve="queryStageTemplate" />
+                    </node>
+                    <node concept="2OqwBi" id="6OXbTDy1d8D" role="37wK5m">
+                      <node concept="2GrUjf" id="6OXbTDyyjW7" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="6OXbTDyyjW5" resolve="ruleBuilder" />
+                      </node>
+                      <node concept="liA8E" id="6OXbTDy1dgn" role="2OqNvi">
+                        <ref role="37wK5l" to="6pyv:7eGEHDlc$ck" resolve="toRule" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="6OXbTDy10Jn" role="2GsD0m">
+              <ref role="3cqZAo" node="6OXbTDy0Z6U" resolve="ruleBuilders" />
+            </node>
+            <node concept="2GrKxI" id="6OXbTDyyjW5" role="2Gsz3X">
+              <property role="TrG5h" value="ruleBuilder" />
+            </node>
+          </node>
+          <node concept="3clFbH" id="6OXbTDy0KT9" role="3cqZAp" />
+        </node>
+        <node concept="37vLTG" id="6OXbTDy0I1M" role="3clF46">
+          <property role="TrG5h" value="queryStageTemplate" />
+          <node concept="3uibUv" id="6OXbTD$xzi7" role="1tU5fm">
+            <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryStageTemplate" />
+            <node concept="3qTvmN" id="6OXbTD$xEq3" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="6OXbTDy0Z6U" role="3clF46">
+          <property role="TrG5h" value="ruleBuilders" />
+          <node concept="A3Dl8" id="6OXbTDy0Z6V" role="1tU5fm">
+            <node concept="3uibUv" id="6OXbTDy0Z6W" role="A3Ik2">
+              <ref role="3uigEE" to="6pyv:7eGEHDlc$ap" resolve="RuleBuilder" />
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="6OXbTDy1iXV" role="Sfmx6">
+          <ref role="3uigEE" to="av0y:~InvalidRuleException" resolve="InvalidRuleException" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6OXbTDy0F6L" role="jymVt" />
       <node concept="3clFb_" id="7DvO2M9UagU" role="jymVt">
         <property role="TrG5h" value="allHandlers" />
         <node concept="A3Dl8" id="7DvO2M9UagV" role="3clF45">
@@ -9833,6 +10389,44 @@
               <node concept="T8wYR" id="7DvO2M9Uahj" role="2OqNvi" />
             </node>
           </node>
+          <node concept="3SKdUt" id="6OXbTDzUJv_" role="3cqZAp">
+            <node concept="3SKdUq" id="6OXbTDzUJvB" role="3SKWNk">
+              <property role="3SKdUp" value="queries should go last" />
+            </node>
+          </node>
+          <node concept="1DcWWT" id="6OXbTDzHkql" role="3cqZAp">
+            <node concept="3clFbS" id="6OXbTDzHkqm" role="2LFqv$">
+              <node concept="3clFbF" id="6OXbTDzHkqn" role="3cqZAp">
+                <node concept="2OqwBi" id="6OXbTDzHkqo" role="3clFbG">
+                  <node concept="37vLTw" id="6OXbTDzHkqp" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7DvO2M9Uah0" resolve="allHandlers" />
+                  </node>
+                  <node concept="TSZUe" id="6OXbTDzHkqq" role="2OqNvi">
+                    <node concept="2OqwBi" id="6OXbTDzHkqr" role="25WWJ7">
+                      <node concept="37vLTw" id="6OXbTDzHkqs" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6OXbTDzHkqu" resolve="handlerBuilder" />
+                      </node>
+                      <node concept="liA8E" id="6OXbTDzHkqt" role="2OqNvi">
+                        <ref role="37wK5l" to="6pyv:4MqhgXUNDLG" resolve="toHandler" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWsn" id="6OXbTDzHkqu" role="1Duv9x">
+              <property role="TrG5h" value="handlerBuilder" />
+              <node concept="3uibUv" id="6OXbTDzHkqv" role="1tU5fm">
+                <ref role="3uigEE" to="6pyv:4MqhgXUMauK" resolve="HandlerBuilder" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6OXbTDzHkqw" role="1DdaDG">
+              <node concept="37vLTw" id="6OXbTDzHkPF" role="2Oq$k0">
+                <ref role="3cqZAo" node="6OXbTDy15hb" resolve="queryHandlerBuilders" />
+              </node>
+              <node concept="T8wYR" id="6OXbTDzHkqy" role="2OqNvi" />
+            </node>
+          </node>
           <node concept="3clFbF" id="7DvO2M9Uahk" role="3cqZAp">
             <node concept="2OqwBi" id="7DvO2M9Uahl" role="3clFbG">
               <node concept="37vLTw" id="7DvO2M9Uahm" role="2Oq$k0">
@@ -9980,6 +10574,106 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="6OXbTDy16SM" role="jymVt" />
+      <node concept="3clFb_" id="6OXbTDy166r" role="jymVt">
+        <property role="TrG5h" value="queryHandlerBuilder" />
+        <node concept="37vLTG" id="6OXbTDy166s" role="3clF46">
+          <property role="TrG5h" value="queryStageTemplate" />
+          <node concept="3uibUv" id="6OXbTD$xHlq" role="1tU5fm">
+            <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryStageTemplate" />
+            <node concept="3qTvmN" id="6OXbTD$xHAd" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="6OXbTDzvEX_" role="3clF45">
+          <ref role="3uigEE" to="6pyv:4MqhgXUMauK" resolve="HandlerBuilder" />
+        </node>
+        <node concept="3Tm6S6" id="6OXbTDy166v" role="1B3o_S" />
+        <node concept="3clFbS" id="6OXbTDy166w" role="3clF47">
+          <node concept="3cpWs8" id="6OXbTDy166x" role="3cqZAp">
+            <node concept="3cpWsn" id="6OXbTDy166y" role="3cpWs9">
+              <property role="TrG5h" value="handlerBuilder" />
+              <node concept="3uibUv" id="6OXbTDzvoxW" role="1tU5fm">
+                <ref role="3uigEE" to="6pyv:4MqhgXUMauK" resolve="HandlerBuilder" />
+              </node>
+              <node concept="3EllGN" id="6OXbTDy166$" role="33vP2m">
+                <node concept="37vLTw" id="6OXbTDy166_" role="3ElVtu">
+                  <ref role="3cqZAo" node="6OXbTDy166s" resolve="queryStageTemplate" />
+                </node>
+                <node concept="37vLTw" id="6OXbTDy19TR" role="3ElQJh">
+                  <ref role="3cqZAo" node="6OXbTDy15hb" resolve="queryHandlerBuilders" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="6OXbTDy166B" role="3cqZAp">
+            <node concept="3clFbS" id="6OXbTDy166C" role="3clFbx">
+              <node concept="3clFbF" id="6OXbTDzvpO9" role="3cqZAp">
+                <node concept="37vLTI" id="6OXbTDzvpOb" role="3clFbG">
+                  <node concept="2ShNRf" id="6OXbTDzvnFP" role="37vLTx">
+                    <node concept="1pGfFk" id="6OXbTDzvnFQ" role="2ShVmc">
+                      <ref role="37wK5l" to="6pyv:4MqhgXUMb4h" resolve="HandlerBuilder" />
+                      <node concept="2OqwBi" id="6OXbTDzvnFR" role="37wK5m">
+                        <node concept="37vLTw" id="6OXbTD$xJB6" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6OXbTDy166s" resolve="queryStageTemplate" />
+                        </node>
+                        <node concept="liA8E" id="6OXbTDzvnFT" role="2OqNvi">
+                          <ref role="37wK5l" to="i348:6OXbTD$oRWJ" resolve="stageName" />
+                        </node>
+                      </node>
+                      <node concept="2ShNRf" id="6OXbTDzvnFU" role="37wK5m">
+                        <node concept="kMnCb" id="6OXbTDzvnFV" role="2ShVmc">
+                          <node concept="3uibUv" id="6OXbTDzvnFW" role="kMuH3">
+                            <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2ShNRf" id="6OXbTDzvnFX" role="37wK5m">
+                        <node concept="2HTt$P" id="6OXbTDzvnFY" role="2ShVmc">
+                          <node concept="3uibUv" id="6OXbTDzvnFZ" role="2HTBi0">
+                            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                          </node>
+                          <node concept="37vLTw" id="6OXbTDzvnG0" role="2HTEbv">
+                            <ref role="3cqZAo" node="6OXbTDy166s" resolve="queryStageTemplate" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="6OXbTDzvpOf" role="37vLTJ">
+                    <ref role="3cqZAo" node="6OXbTDy166y" resolve="handlerBuilder" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="6OXbTDy1676" role="3cqZAp">
+                <node concept="37vLTI" id="6OXbTDy1677" role="3clFbG">
+                  <node concept="37vLTw" id="6OXbTDy1678" role="37vLTx">
+                    <ref role="3cqZAo" node="6OXbTDy166y" resolve="handlerBuilder" />
+                  </node>
+                  <node concept="3EllGN" id="6OXbTDy1679" role="37vLTJ">
+                    <node concept="37vLTw" id="6OXbTDy167a" role="3ElVtu">
+                      <ref role="3cqZAo" node="6OXbTDy166s" resolve="queryStageTemplate" />
+                    </node>
+                    <node concept="37vLTw" id="6OXbTDy1aJG" role="3ElQJh">
+                      <ref role="3cqZAo" node="6OXbTDy15hb" resolve="queryHandlerBuilders" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbC" id="6OXbTDy167c" role="3clFbw">
+              <node concept="10Nm6u" id="6OXbTDy167d" role="3uHU7w" />
+              <node concept="37vLTw" id="6OXbTDy167e" role="3uHU7B">
+                <ref role="3cqZAo" node="6OXbTDy166y" resolve="handlerBuilder" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6OXbTDy167f" role="3cqZAp">
+            <node concept="37vLTw" id="6OXbTDzvEUp" role="3clFbG">
+              <ref role="3cqZAo" node="6OXbTDy166y" resolve="handlerBuilder" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="2tJIrI" id="7DvO2M9Uaif" role="jymVt" />
       <node concept="312cEg" id="7DvO2M9Uaig" role="jymVt">
         <property role="TrG5h" value="handlerBuilders" />
@@ -10003,6 +10697,30 @@
           </node>
         </node>
       </node>
+      <node concept="312cEg" id="6OXbTDy15hb" role="jymVt">
+        <property role="TrG5h" value="queryHandlerBuilders" />
+        <node concept="3Tm6S6" id="6OXbTDy15hc" role="1B3o_S" />
+        <node concept="3rvAFt" id="6OXbTDy15UP" role="1tU5fm">
+          <node concept="3uibUv" id="6OXbTD$xHLp" role="3rvQeY">
+            <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryStageTemplate" />
+            <node concept="3qTvmN" id="6OXbTD$xIpJ" role="11_B2D" />
+          </node>
+          <node concept="3uibUv" id="6OXbTDzvogx" role="3rvSg0">
+            <ref role="3uigEE" to="6pyv:4MqhgXUMauK" resolve="HandlerBuilder" />
+          </node>
+        </node>
+        <node concept="2ShNRf" id="6OXbTDy164P" role="33vP2m">
+          <node concept="3rGOSV" id="6OXbTDy163E" role="2ShVmc">
+            <node concept="3uibUv" id="6OXbTD$xIHz" role="3rHrn6">
+              <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryStageTemplate" />
+              <node concept="3qTvmN" id="6OXbTD$xJlQ" role="11_B2D" />
+            </node>
+            <node concept="3uibUv" id="6OXbTDzvor7" role="3rHtpV">
+              <ref role="3uigEE" to="6pyv:4MqhgXUMauK" resolve="HandlerBuilder" />
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="2tJIrI" id="7DvO2M9Uaip" role="jymVt" />
       <node concept="3Tm1VV" id="7DvO2M9Uaiq" role="1B3o_S" />
     </node>
@@ -10032,7 +10750,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7P_FdVPwf9L" role="jymVt" />
     <node concept="3Tm1VV" id="3GlpCDSxTG8" role="1B3o_S" />
     <node concept="312cEg" id="7WKNeR9bpBf" role="jymVt">
       <property role="TrG5h" value="ruleProcessingSession" />
@@ -10041,14 +10758,19 @@
         <ref role="3uigEE" node="CGeqIk8WWU" resolve="RuleProcessingSession" />
       </node>
     </node>
-    <node concept="2tJIrI" id="7WKNeR9bJ9p" role="jymVt" />
     <node concept="312cEg" id="7WKNeR9b_iR" role="jymVt">
       <property role="TrG5h" value="queryTemplate" />
       <node concept="3Tm6S6" id="7WKNeR9b_iS" role="1B3o_S" />
-      <node concept="3uibUv" id="7WKNeR9b_iU" role="1tU5fm">
-        <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+      <node concept="3uibUv" id="6OXbTD$kSq3" role="1tU5fm">
+        <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
       </node>
     </node>
+    <node concept="312cEg" id="6OXbTDxtYkB" role="jymVt">
+      <property role="TrG5h" value="name" />
+      <node concept="3Tm6S6" id="6OXbTDxtYkC" role="1B3o_S" />
+      <node concept="17QB3L" id="6OXbTDxtYkE" role="1tU5fm" />
+    </node>
+    <node concept="2tJIrI" id="6OXbTD$xs00" role="jymVt" />
   </node>
   <node concept="312cEu" id="7DvO2M9IiKB">
     <property role="TrG5h" value="MacroProcessing" />
@@ -11431,8 +12153,8 @@
     <node concept="3clFb_" id="7WKNeR94Nd_" role="jymVt">
       <property role="TrG5h" value="allQueryTemplates" />
       <node concept="3vKaQO" id="7WKNeR94Nkz" role="3clF45">
-        <node concept="3uibUv" id="7WKNeR94Nlu" role="3O5elw">
-          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+        <node concept="3uibUv" id="6OXbTD$kD9J" role="3O5elw">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7WKNeR94NdC" role="1B3o_S" />
@@ -11460,8 +12182,8 @@
         <property role="TrG5h" value="queryFqName" />
         <node concept="17QB3L" id="7WKNeR95RU3" role="1tU5fm" />
       </node>
-      <node concept="3uibUv" id="7WKNeR95RRJ" role="3clF45">
-        <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+      <node concept="3uibUv" id="6OXbTD$kEkB" role="3clF45">
+        <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
       </node>
       <node concept="3Tm1VV" id="7WKNeR95RQ2" role="1B3o_S" />
       <node concept="3clFbS" id="7WKNeR95RQ3" role="3clF47">
@@ -11482,8 +12204,8 @@
       <property role="TrG5h" value="ruleTemplates" />
       <node concept="37vLTG" id="7WKNeR98uXx" role="3clF46">
         <property role="TrG5h" value="qt" />
-        <node concept="3uibUv" id="7WKNeR98vto" role="1tU5fm">
-          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+        <node concept="3uibUv" id="6OXbTD$lcLk" role="1tU5fm">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
         </node>
       </node>
       <node concept="3uibUv" id="7WKNeR98tsh" role="3clF45">
@@ -11493,17 +12215,157 @@
       <node concept="3clFbS" id="7WKNeR98sU8" role="3clF47">
         <node concept="3clFbF" id="7WKNeR98vvL" role="3cqZAp">
           <node concept="3EllGN" id="7WKNeR98vUB" role="3clFbG">
-            <node concept="37vLTw" id="7WKNeR98vYr" role="3ElVtu">
-              <ref role="3cqZAo" node="7WKNeR98uXx" resolve="qt" />
+            <node concept="2OqwBi" id="6OXbTDyl7Z7" role="3ElVtu">
+              <node concept="37vLTw" id="7WKNeR98vYr" role="2Oq$k0">
+                <ref role="3cqZAo" node="7WKNeR98uXx" resolve="qt" />
+              </node>
+              <node concept="liA8E" id="6OXbTDyl8c4" role="2OqNvi">
+                <ref role="37wK5l" to="i348:6OXbTD$iO0_" resolve="fqName" />
+              </node>
             </node>
             <node concept="37vLTw" id="7WKNeR98vvK" role="3ElQJh">
-              <ref role="3cqZAo" node="7WKNeR97s2V" resolve="queryTemplate2index" />
+              <ref role="3cqZAo" node="7WKNeR97s2V" resolve="queryTemplateFqname2index" />
             </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7WKNeR96a4r" role="jymVt" />
+    <node concept="2tJIrI" id="6OXbTD$mY$J" role="jymVt" />
+    <node concept="3clFb_" id="6OXbTD$m89z" role="jymVt">
+      <property role="TrG5h" value="allQueryStageTemplates" />
+      <node concept="37vLTG" id="6OXbTD$n1a1" role="3clF46">
+        <property role="TrG5h" value="queryTemplate" />
+        <node concept="3uibUv" id="6OXbTD$nbHg" role="1tU5fm">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="A3Dl8" id="6OXbTD$m89$" role="3clF45">
+        <node concept="1LlUBW" id="6OXbTD$m89_" role="A3Ik2">
+          <node concept="3uibUv" id="6OXbTD$m89A" role="1Lm7xW">
+            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+          </node>
+          <node concept="3uibUv" id="6OXbTD$m89B" role="1Lm7xW">
+            <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="BaseQueryStageTemplate" />
+            <node concept="3qUE_q" id="6OXbTD$m89C" role="11_B2D">
+              <node concept="3uibUv" id="6OXbTD$mqfG" role="3qUE_r">
+                <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6OXbTD$m89E" role="1B3o_S" />
+      <node concept="3clFbS" id="6OXbTD$m89F" role="3clF47">
+        <node concept="3cpWs8" id="6OXbTD$m89G" role="3cqZAp">
+          <node concept="3cpWsn" id="6OXbTD$m89H" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="_YKpA" id="6OXbTD$m89I" role="1tU5fm">
+              <node concept="1LlUBW" id="6OXbTD$m89J" role="_ZDj9">
+                <node concept="3uibUv" id="6OXbTD$m89K" role="1Lm7xW">
+                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+                </node>
+                <node concept="3uibUv" id="6OXbTD$mMGd" role="1Lm7xW">
+                  <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="BaseQueryStageTemplate" />
+                  <node concept="3qUE_q" id="6OXbTD$mMGe" role="11_B2D">
+                    <node concept="3uibUv" id="6OXbTD$mMGf" role="3qUE_r">
+                      <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2ShNRf" id="6OXbTD$m89O" role="33vP2m">
+              <node concept="Tc6Ow" id="6OXbTD$m89P" role="2ShVmc">
+                <node concept="1LlUBW" id="6OXbTD$m89Q" role="HW$YZ">
+                  <node concept="3uibUv" id="6OXbTD$m89R" role="1Lm7xW">
+                    <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+                  </node>
+                  <node concept="3uibUv" id="6OXbTD$mQby" role="1Lm7xW">
+                    <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="BaseQueryStageTemplate" />
+                    <node concept="3qUE_q" id="6OXbTD$mQbz" role="11_B2D">
+                      <node concept="3uibUv" id="6OXbTD$mQb$" role="3qUE_r">
+                        <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6OXbTD$m89V" role="3cqZAp" />
+        <node concept="3cpWs8" id="6OXbTD$m89Y" role="3cqZAp">
+          <node concept="3cpWsn" id="6OXbTD$m89Z" role="3cpWs9">
+            <property role="TrG5h" value="matching" />
+            <node concept="3vKaQO" id="6OXbTD$m8a0" role="1tU5fm">
+              <node concept="1LlUBW" id="6OXbTD$m8a1" role="3O5elw">
+                <node concept="3uibUv" id="6OXbTD$m8a2" role="1Lm7xW">
+                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+                </node>
+                <node concept="3uibUv" id="6OXbTD$nOCc" role="1Lm7xW">
+                  <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="BaseQueryStageTemplate" />
+                  <node concept="3qUE_q" id="6OXbTD$nOCd" role="11_B2D">
+                    <node concept="3uibUv" id="6OXbTD$nOCe" role="3qUE_r">
+                      <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3EllGN" id="6OXbTD$nM4$" role="33vP2m">
+              <node concept="37vLTw" id="6OXbTD$nMFT" role="3ElVtu">
+                <ref role="3cqZAo" node="6OXbTD$n1a1" resolve="queryTemplate" />
+              </node>
+              <node concept="37vLTw" id="6OXbTD$nKz7" role="3ElQJh">
+                <ref role="3cqZAo" node="6OXbTD$nH5r" resolve="queryTemplate2stage_templates" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="6OXbTD$m8aa" role="3cqZAp">
+          <node concept="3clFbS" id="6OXbTD$m8ab" role="2LFqv$">
+            <node concept="3clFbF" id="6OXbTD$m8ac" role="3cqZAp">
+              <node concept="2OqwBi" id="6OXbTD$m8ad" role="3clFbG">
+                <node concept="37vLTw" id="6OXbTD$m8ae" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6OXbTD$m89H" resolve="result" />
+                </node>
+                <node concept="TSZUe" id="6OXbTD$m8af" role="2OqNvi">
+                  <node concept="37vLTw" id="6OXbTD$m8ag" role="25WWJ7">
+                    <ref role="3cqZAo" node="6OXbTD$m8ah" resolve="tpl" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="6OXbTD$m8ah" role="1Duv9x">
+            <property role="TrG5h" value="tpl" />
+            <node concept="1LlUBW" id="6OXbTD$m8ai" role="1tU5fm">
+              <node concept="3uibUv" id="6OXbTD$m8aj" role="1Lm7xW">
+                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+              </node>
+              <node concept="3uibUv" id="6OXbTD$nPge" role="1Lm7xW">
+                <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="BaseQueryStageTemplate" />
+                <node concept="3qUE_q" id="6OXbTD$nPgf" role="11_B2D">
+                  <node concept="3uibUv" id="6OXbTD$nPgg" role="3qUE_r">
+                    <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="6OXbTD$m8an" role="1DdaDG">
+            <ref role="3cqZAo" node="6OXbTD$m89Z" resolve="matching" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="6OXbTD$nPT7" role="3cqZAp" />
+        <node concept="3cpWs6" id="6OXbTD$m8at" role="3cqZAp">
+          <node concept="37vLTw" id="6OXbTD$m8au" role="3cqZAk">
+            <ref role="3cqZAo" node="6OXbTD$m89H" resolve="result" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6OXbTD$m89y" role="jymVt" />
     <node concept="3clFb_" id="7WKNeR96ejn" role="jymVt">
       <property role="TrG5h" value="init" />
       <node concept="37vLTG" id="7WKNeR96eOL" role="3clF46">
@@ -11521,8 +12383,8 @@
           <node concept="3cpWsn" id="7WKNeR97vRN" role="3cpWs9">
             <property role="TrG5h" value="queryTemplates" />
             <node concept="A3Dl8" id="7WKNeR97vRj" role="1tU5fm">
-              <node concept="3uibUv" id="7WKNeR97vRm" role="A3Ik2">
-                <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+              <node concept="3uibUv" id="6OXbTD$ktkA" role="A3Ik2">
+                <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
               </node>
             </node>
             <node concept="2OqwBi" id="7WKNeR97vRO" role="33vP2m">
@@ -11556,7 +12418,7 @@
           <node concept="3clFbS" id="7WKNeR97wtM" role="2LFqv$">
             <node concept="3clFbF" id="7WKNeR96jDw" role="3cqZAp">
               <node concept="37vLTI" id="7WKNeR96mxm" role="3clFbG">
-                <node concept="2GrUjf" id="7WKNeR97x_V" role="37vLTx">
+                <node concept="2GrUjf" id="6OXbTD$kBp7" role="37vLTx">
                   <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
                 </node>
                 <node concept="3EllGN" id="7WKNeR96lbe" role="37vLTJ">
@@ -11565,7 +12427,7 @@
                       <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
                     </node>
                     <node concept="liA8E" id="7WKNeR96m6R" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:7WKNeR94Np2" resolve="fqName" />
+                      <ref role="37wK5l" to="i348:6OXbTD$iO0_" resolve="fqName" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="7WKNeR96jDv" role="3ElQJh">
@@ -11574,6 +12436,7 @@
                 </node>
               </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" />
@@ -11589,7 +12452,71 @@
                         <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
                       </node>
                       <node concept="liA8E" id="7WKNeR97HM$" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:7P_FdVQBl1a" resolve="usedHandlersFqNames" />
+                        <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" />
+                <node concept="3uibUv" id="6OXbTD$o4W_" role="1tU5fm">
+                  <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="acceptHandlerTemplate" />
+                        <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="HandlerTemplate" />
+                          </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>
                   </node>
@@ -11598,68 +12525,149 @@
             </node>
             <node concept="3clFbF" id="7WKNeR97y2N" role="3cqZAp">
               <node concept="37vLTI" id="7WKNeR97yN$" role="3clFbG">
-                <node concept="2ShNRf" id="7WKNeR97yUL" role="37vLTx">
-                  <node concept="YeOm9" id="7WKNeR97$de" role="2ShVmc">
-                    <node concept="1Y3b0j" id="7WKNeR97$dh" 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="7WKNeR97$di" role="1B3o_S" />
-                      <node concept="37vLTw" id="7WKNeR97zYe" role="37wK5m">
-                        <ref role="3cqZAo" node="7WKNeR96eOL" resolve="manifests" />
-                      </node>
-                      <node concept="3clFb_" id="7WKNeR97$sU" role="jymVt">
-                        <property role="TrG5h" value="acceptHandlerTemplate" />
-                        <property role="1EzhhJ" value="false" />
-                        <node concept="37vLTG" id="7WKNeR97$sV" role="3clF46">
-                          <property role="TrG5h" value="ht" />
-                          <node concept="3uibUv" id="7WKNeR97$sW" role="1tU5fm">
-                            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-                          </node>
-                        </node>
-                        <node concept="10P_77" id="7WKNeR97$sX" role="3clF45" />
-                        <node concept="3Tmbuc" id="7WKNeR97$sY" role="1B3o_S" />
-                        <node concept="3clFbS" id="7WKNeR97$t3" role="3clF47">
-                          <node concept="1X3_iC" id="7WKNeR99siZ" role="lGtFl">
-                            <property role="3V$3am" value="statement" />
-                            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                            <node concept="3clFbF" id="7WKNeR97JQ0" role="8Wnug">
-                              <node concept="2OqwBi" id="7WKNeR97Kz3" role="3clFbG">
-                                <node concept="37vLTw" id="7WKNeR97JPY" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7WKNeR97HMu" resolve="handlerFqNames" />
-                                </node>
-                                <node concept="3JPx81" id="7WKNeR97Luz" role="2OqNvi">
-                                  <node concept="2OqwBi" id="7WKNeR97Mqs" role="25WWJ7">
-                                    <node concept="37vLTw" id="7WKNeR97Lxn" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7WKNeR97$sV" resolve="ht" />
-                                    </node>
-                                    <node concept="liA8E" id="7WKNeR97Mz6" role="2OqNvi">
-                                      <ref role="37wK5l" to="i348:7P_FdVQoZmr" resolve="fqName" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbF" id="7WKNeR99snV" role="3cqZAp">
-                            <node concept="3clFbT" id="7WKNeR99snU" role="3clFbG">
-                              <property role="3clFbU" value="true" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2AHcQZ" id="7WKNeR97$t4" role="2AJF6D">
-                          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                <node concept="37vLTw" id="6OXbTD$o4WY" role="37vLTx">
+                  <ref role="3cqZAo" node="6OXbTD$o4WB" resolve="index" />
+                </node>
+                <node concept="3EllGN" id="7WKNeR97yt4" role="37vLTJ">
+                  <node concept="2OqwBi" id="6OXbTDyl5C1" role="3ElVtu">
+                    <node concept="2GrUjf" id="7WKNeR97ywI" role="2Oq$k0">
+                      <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                    </node>
+                    <node concept="liA8E" id="6OXbTDyl6pw" role="2OqNvi">
+                      <ref role="37wK5l" to="i348:6OXbTD$iO0_" resolve="fqName" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="7WKNeR97y2L" role="3ElQJh">
+                    <ref role="3cqZAo" node="7WKNeR97s2V" resolve="queryTemplateFqname2index" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="6OXbTD$nRXy" role="3cqZAp" />
+            <node concept="3cpWs8" id="6OXbTD$pphd" role="3cqZAp">
+              <node concept="3cpWsn" id="6OXbTD$pphg" role="3cpWs9">
+                <property role="TrG5h" value="stage_qsts" />
+                <node concept="_YKpA" id="6OXbTD$pph9" role="1tU5fm">
+                  <node concept="1LlUBW" id="6OXbTD$ppRz" role="_ZDj9">
+                    <node concept="3uibUv" id="6OXbTD$ppSw" role="1Lm7xW">
+                      <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+                    </node>
+                    <node concept="3uibUv" id="6OXbTD$ppTM" role="1Lm7xW">
+                      <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="BaseQueryStageTemplate" />
+                      <node concept="3qUE_q" id="6OXbTD$ppTN" role="11_B2D">
+                        <node concept="3uibUv" id="6OXbTD$ppTO" role="3qUE_r">
+                          <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3EllGN" id="7WKNeR97yt4" role="37vLTJ">
-                  <node concept="2GrUjf" id="7WKNeR97ywI" role="3ElVtu">
+                <node concept="2ShNRf" id="6OXbTD$pq0G" role="33vP2m">
+                  <node concept="Tc6Ow" id="6OXbTD$ppZY" role="2ShVmc">
+                    <node concept="1LlUBW" id="6OXbTD$ppZZ" role="HW$YZ">
+                      <node concept="3uibUv" id="6OXbTD$pq00" role="1Lm7xW">
+                        <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+                      </node>
+                      <node concept="3uibUv" id="6OXbTD$pq01" role="1Lm7xW">
+                        <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="BaseQueryStageTemplate" />
+                        <node concept="3qUE_q" id="6OXbTD$pq02" role="11_B2D">
+                          <node concept="3uibUv" id="6OXbTD$pq03" role="3qUE_r">
+                            <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2Gpval" id="6OXbTD$o$J_" role="3cqZAp">
+              <node concept="3clFbS" id="6OXbTD$o$3q" role="2LFqv$">
+                <node concept="3cpWs8" id="6OXbTD$pboO" role="3cqZAp">
+                  <node concept="3cpWsn" id="6OXbTD$pboP" role="3cpWs9">
+                    <property role="TrG5h" value="qst" />
+                    <node concept="3uibUv" id="6OXbTD$pblN" role="1tU5fm">
+                      <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryStageTemplate" />
+                    </node>
+                    <node concept="2OqwBi" id="6OXbTD$pboQ" role="33vP2m">
+                      <node concept="2GrUjf" id="6OXbTD$pboR" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                      </node>
+                      <node concept="liA8E" id="6OXbTD$pboS" role="2OqNvi">
+                        <ref role="37wK5l" to="i348:6OXbTD$oET6" resolve="stageTemplate" />
+                        <node concept="2OqwBi" id="6OXbTD$pboT" role="37wK5m">
+                          <node concept="2GrUjf" id="6OXbTD$pboU" role="2Oq$k0">
+                            <ref role="2Gs0qQ" node="6OXbTD$o$K5" resolve="hstage" />
+                          </node>
+                          <node concept="liA8E" id="6OXbTD$pboV" role="2OqNvi">
+                            <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="6OXbTD$pdHJ" role="3cqZAp">
+                  <node concept="3clFbS" id="6OXbTD$pdHL" role="3clFbx">
+                    <node concept="3clFbF" id="6OXbTD$pqdE" role="3cqZAp">
+                      <node concept="2OqwBi" id="6OXbTD$prNa" role="3clFbG">
+                        <node concept="37vLTw" id="6OXbTD$pqdC" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6OXbTD$pphg" resolve="stage_qsts" />
+                        </node>
+                        <node concept="TSZUe" id="6OXbTD$ptjJ" role="2OqNvi">
+                          <node concept="1Ls8ON" id="6OXbTD$pudL" role="25WWJ7">
+                            <node concept="2GrUjf" id="6OXbTD$purk" role="1Lso8e">
+                              <ref role="2Gs0qQ" node="6OXbTD$o$K5" resolve="hstage" />
+                            </node>
+                            <node concept="10QFUN" id="6OXbTD$pvtk" role="1Lso8e">
+                              <node concept="37vLTw" id="6OXbTD$pvti" role="10QFUP">
+                                <ref role="3cqZAo" node="6OXbTD$pboP" resolve="qst" />
+                              </node>
+                              <node concept="3uibUv" id="6OXbTD$pv_C" role="10QFUM">
+                                <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="BaseQueryStageTemplate" />
+                                <node concept="3qUE_q" id="6OXbTD$pv_D" role="11_B2D">
+                                  <node concept="3uibUv" id="6OXbTD$pv_E" role="3qUE_r">
+                                    <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3y3z36" id="6OXbTD$pdSy" role="3clFbw">
+                    <node concept="10Nm6u" id="6OXbTD$pdT$" role="3uHU7w" />
+                    <node concept="37vLTw" id="6OXbTD$pdKT" role="3uHU7B">
+                      <ref role="3cqZAo" node="6OXbTD$pboP" resolve="qst" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6OXbTD$o$3w" role="2GsD0m">
+                <node concept="37vLTw" id="6OXbTD$o$3x" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6OXbTD$o4WB" resolve="index" />
+                </node>
+                <node concept="liA8E" id="6OXbTD$o$3y" role="2OqNvi">
+                  <ref role="37wK5l" node="4QPCta1zKCT" resolve="stages" />
+                </node>
+              </node>
+              <node concept="2GrKxI" id="6OXbTD$o$K5" role="2Gsz3X">
+                <property role="TrG5h" value="hstage" />
+              </node>
+            </node>
+            <node concept="3clFbF" id="6OXbTD$pwIW" role="3cqZAp">
+              <node concept="37vLTI" id="6OXbTD$pyVB" role="3clFbG">
+                <node concept="37vLTw" id="6OXbTD$pzEF" role="37vLTx">
+                  <ref role="3cqZAo" node="6OXbTD$pphg" resolve="stage_qsts" />
+                </node>
+                <node concept="3EllGN" id="6OXbTD$pxCg" role="37vLTJ">
+                  <node concept="2GrUjf" id="6OXbTD$pxS$" role="3ElVtu">
                     <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
                   </node>
-                  <node concept="37vLTw" id="7WKNeR97y2L" role="3ElQJh">
-                    <ref role="3cqZAo" node="7WKNeR97s2V" resolve="queryTemplate2index" />
+                  <node concept="37vLTw" id="6OXbTD$pwIU" role="3ElQJh">
+                    <ref role="3cqZAo" node="6OXbTD$nH5r" resolve="queryTemplate2stage_templates" />
                   </node>
                 </node>
               </node>
@@ -11680,36 +12688,77 @@
       <node concept="3Tm6S6" id="7WKNeR96fg3" role="1B3o_S" />
       <node concept="3rvAFt" id="7WKNeR96foD" role="1tU5fm">
         <node concept="17QB3L" id="7WKNeR96fvo" role="3rvQeY" />
-        <node concept="3uibUv" id="7WKNeR96fz0" role="3rvSg0">
-          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+        <node concept="3uibUv" id="6OXbTD$k_bN" role="3rvSg0">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
         </node>
       </node>
       <node concept="2ShNRf" id="7WKNeR96gm5" role="33vP2m">
         <node concept="3rGOSV" id="7WKNeR96gl8" role="2ShVmc">
           <node concept="17QB3L" id="7WKNeR96gl9" role="3rHrn6" />
-          <node concept="3uibUv" id="7WKNeR96gla" role="3rHtpV">
-            <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+          <node concept="3uibUv" id="6OXbTD$kAyf" role="3rHtpV">
+            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="6OXbTD$nH5r" role="jymVt">
+      <property role="TrG5h" value="queryTemplate2stage_templates" />
+      <node concept="3Tm6S6" id="6OXbTD$nH5s" role="1B3o_S" />
+      <node concept="3rvAFt" id="6OXbTD$nIXh" role="1tU5fm">
+        <node concept="3uibUv" id="6OXbTD$nIXK" role="3rvQeY">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+        </node>
+        <node concept="3vKaQO" id="6OXbTD$nIYk" role="3rvSg0">
+          <node concept="1LlUBW" id="6OXbTD$nJ0c" role="3O5elw">
+            <node concept="3uibUv" id="6OXbTD$nJ27" role="1Lm7xW">
+              <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+            </node>
+            <node concept="3uibUv" id="6OXbTD$nJ3N" role="1Lm7xW">
+              <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="BaseQueryStageTemplate" />
+              <node concept="3qUE_q" id="6OXbTD$nJ6t" role="11_B2D">
+                <node concept="3uibUv" id="6OXbTD$nJ7A" role="3qUE_r">
+                  <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2ShNRf" id="6OXbTD$nJcF" role="33vP2m">
+        <node concept="3rGOSV" id="6OXbTD$nJbL" role="2ShVmc">
+          <node concept="3uibUv" id="6OXbTD$nJbM" role="3rHrn6">
+            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          </node>
+          <node concept="3vKaQO" id="6OXbTD$nJbN" role="3rHtpV">
+            <node concept="1LlUBW" id="6OXbTD$nJbO" role="3O5elw">
+              <node concept="3uibUv" id="6OXbTD$nJbP" role="1Lm7xW">
+                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+              </node>
+              <node concept="3uibUv" id="6OXbTD$nJbQ" role="1Lm7xW">
+                <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="BaseQueryStageTemplate" />
+                <node concept="3qUE_q" id="6OXbTD$nJbR" role="11_B2D">
+                  <node concept="3uibUv" id="6OXbTD$nJbS" role="3qUE_r">
+                    <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7WKNeR97rJT" role="jymVt" />
     <node concept="312cEg" id="7WKNeR97s2V" role="jymVt">
-      <property role="TrG5h" value="queryTemplate2index" />
+      <property role="TrG5h" value="queryTemplateFqname2index" />
       <node concept="3Tm6S6" id="7WKNeR97s2W" role="1B3o_S" />
       <node concept="3rvAFt" id="7WKNeR97skz" role="1tU5fm">
-        <node concept="3uibUv" id="7WKNeR97sro" role="3rvQeY">
-          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
-        </node>
+        <node concept="17QB3L" id="6OXbTDyhJf2" role="3rvQeY" />
         <node concept="3uibUv" id="7WKNeR97sCA" role="3rvSg0">
           <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
         </node>
       </node>
       <node concept="2ShNRf" id="7WKNeR97tyT" role="33vP2m">
         <node concept="3rGOSV" id="7WKNeR97txW" role="2ShVmc">
-          <node concept="3uibUv" id="7WKNeR97txX" role="3rHrn6">
-            <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
-          </node>
+          <node concept="17QB3L" id="6OXbTDyhL3B" role="3rHrn6" />
           <node concept="3uibUv" id="7WKNeR97txY" role="3rHtpV">
             <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
           </node>
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
index 19eeecbe..9a27c646 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
@@ -11,7 +11,7 @@
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="true">da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)</dependency>
   </dependencies>
   <languageVersions>
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
index 27a1c0de..6488b8a3 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
@@ -250,8 +250,8 @@
       <property role="TrG5h" value="queryTemplates" />
       <property role="1EzhhJ" value="true" />
       <node concept="_YKpA" id="7P_FdVPtqGB" role="3clF45">
-        <node concept="3uibUv" id="7P_FdVPtr81" role="_ZDj9">
-          <ref role="3uigEE" node="7P_FdVPs4aA" resolve="QueryTemplate" />
+        <node concept="3uibUv" id="6OXbTD$jYJi" role="_ZDj9">
+          <ref role="3uigEE" node="6OXbTD$iNPP" resolve="QueryTemplate" />
         </node>
       </node>
       <node concept="3Tm1VV" id="7P_FdVPtq82" role="1B3o_S" />
@@ -905,21 +905,8 @@
               <ref role="16sUi3" node="1ffsG7bUbY4" resolve="Token" />
             </node>
             <node concept="1rXfSq" id="7XdbJdyicoz" role="33vP2m">
-              <ref role="37wK5l" node="7XdbJdz5lDL" resolve="createToken" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7XdbJdyiehQ" role="3cqZAp">
-          <node concept="37vLTI" id="7XdbJdyifLD" role="3clFbG">
-            <node concept="37vLTw" id="7XdbJdyig4m" role="37vLTJ">
-              <ref role="3cqZAo" node="7XdbJdyicoy" resolve="token" />
-            </node>
-            <node concept="1rXfSq" id="7XdbJdyiehO" role="37vLTx">
-              <ref role="37wK5l" node="75vUFrSIQhr" resolve="initToken" />
-              <node concept="37vLTw" id="7XdbJdyifag" role="37wK5m">
-                <ref role="3cqZAo" node="7XdbJdyicoy" resolve="token" />
-              </node>
-              <node concept="37vLTw" id="7XdbJdyieIP" role="37wK5m">
+              <ref role="37wK5l" node="3IIf9OAJOPP" resolve="newToken" />
+              <node concept="37vLTw" id="mJ_D13ZSBm" role="37wK5m">
                 <ref role="3cqZAo" node="7XdbJdyi9Lh" resolve="input" />
               </node>
             </node>
@@ -961,9 +948,6 @@
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="7XdbJdyi9Lt" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
     </node>
     <node concept="2tJIrI" id="7XdbJdyiayM" role="jymVt" />
     <node concept="3clFb_" id="7XdbJdyi9Lu" role="jymVt">
@@ -992,21 +976,8 @@
               <ref role="16sUi3" node="1ffsG7bUbY4" resolve="Token" />
             </node>
             <node concept="1rXfSq" id="7XdbJdyinIX" role="33vP2m">
-              <ref role="37wK5l" node="7XdbJdz5lDL" resolve="createToken" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7XdbJdyinIY" role="3cqZAp">
-          <node concept="37vLTI" id="7XdbJdyinIZ" role="3clFbG">
-            <node concept="37vLTw" id="7XdbJdyinJ0" role="37vLTJ">
-              <ref role="3cqZAo" node="7XdbJdyinIV" resolve="token" />
-            </node>
-            <node concept="1rXfSq" id="7XdbJdyinJ1" role="37vLTx">
-              <ref role="37wK5l" node="75vUFrSIQhr" resolve="initToken" />
-              <node concept="37vLTw" id="7XdbJdyinJ3" role="37wK5m">
-                <ref role="3cqZAo" node="7XdbJdyinIV" resolve="token" />
-              </node>
-              <node concept="37vLTw" id="7XdbJdyinJ2" role="37wK5m">
+              <ref role="37wK5l" node="3IIf9OAJOPP" resolve="newToken" />
+              <node concept="37vLTw" id="mJ_D13ZU0N" role="37wK5m">
                 <ref role="3cqZAo" node="7XdbJdyi9Ly" resolve="input" />
               </node>
             </node>
@@ -1035,9 +1006,6 @@
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="7XdbJdyi9LE" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
     </node>
     <node concept="2tJIrI" id="7XdbJdz5jXz" role="jymVt" />
     <node concept="3clFb_" id="7XdbJdz5lDL" role="jymVt">
@@ -1164,7 +1132,7 @@
     <node concept="16euLQ" id="1ffsG7bUbY4" role="16eVyc">
       <property role="TrG5h" value="Token" />
       <node concept="3uibUv" id="7XdbJdy7jWi" role="3ztrMU">
-        <ref role="3uigEE" node="2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+        <ref role="3uigEE" node="2RRx4MZ6_68" resolve="RuleTemplateToken" />
       </node>
     </node>
     <node concept="3uibUv" id="1ffsG7bWFot" role="EKbjA">
@@ -1225,64 +1193,6 @@
       <node concept="3Tm1VV" id="4MqhgXUndvs" role="1B3o_S" />
       <node concept="3clFbS" id="4MqhgXUndvt" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="7XdbJdyhO3t" role="jymVt" />
-    <node concept="3clFb_" id="7XdbJdyhRyL" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="applyReduce" />
-      <node concept="16syzq" id="7XdbJdyhZ4O" role="3clF45">
-        <ref role="16sUi3" node="7XdbJdyhY34" resolve="T" />
-      </node>
-      <node concept="3Tm1VV" id="7XdbJdyhRyO" role="1B3o_S" />
-      <node concept="3clFbS" id="7XdbJdyhRyP" role="3clF47" />
-      <node concept="37vLTG" id="7XdbJdyi5db" role="3clF46">
-        <property role="TrG5h" value="input" />
-        <node concept="3Tqbb2" id="7XdbJdyi5sw" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7XdbJdyhY6X" role="3clF46">
-        <property role="TrG5h" value="init" />
-        <node concept="16syzq" id="7XdbJdyhYlg" role="1tU5fm">
-          <ref role="16sUi3" node="7XdbJdyhY34" resolve="T" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="7XdbJdyhUPC" role="3clF46">
-        <property role="TrG5h" value="applyFun" />
-        <node concept="1ajhzC" id="7XdbJdyhUPA" role="1tU5fm">
-          <node concept="16syzq" id="7XdbJdyhYHj" role="1ajw0F">
-            <ref role="16sUi3" node="7XdbJdyhY34" resolve="T" />
-          </node>
-          <node concept="16syzq" id="7XdbJdyhVff" role="1ajw0F">
-            <ref role="16sUi3" node="1ffsG7bWA35" resolve="Token" />
-          </node>
-          <node concept="16syzq" id="7XdbJdyhYT4" role="1ajl9A">
-            <ref role="16sUi3" node="7XdbJdyhY34" resolve="T" />
-          </node>
-        </node>
-      </node>
-      <node concept="16euLQ" id="7XdbJdyhY34" role="16eVyc">
-        <property role="TrG5h" value="T" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7XdbJdyi7e7" role="jymVt" />
-    <node concept="3clFb_" id="7XdbJdyi6U_" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="apply" />
-      <node concept="3cqZAl" id="7XdbJdyi7Qa" role="3clF45" />
-      <node concept="3Tm1VV" id="7XdbJdyi6UB" role="1B3o_S" />
-      <node concept="3clFbS" id="7XdbJdyi6UC" role="3clF47" />
-      <node concept="37vLTG" id="7XdbJdyi6UD" role="3clF46">
-        <property role="TrG5h" value="input" />
-        <node concept="3Tqbb2" id="7XdbJdyi6UE" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7XdbJdyi6UH" role="3clF46">
-        <property role="TrG5h" value="applyFun" />
-        <node concept="1ajhzC" id="7XdbJdyi6UI" role="1tU5fm">
-          <node concept="16syzq" id="7XdbJdyi6UK" role="1ajw0F">
-            <ref role="16sUi3" node="1ffsG7bWA35" resolve="Token" />
-          </node>
-          <node concept="3cqZAl" id="7XdbJdyi8nK" role="1ajl9A" />
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="PB1R3YsIZx" role="jymVt" />
     <node concept="3clFb_" id="6i42QSs8m5b" role="jymVt">
       <property role="1EzhhJ" value="true" />
@@ -1293,12 +1203,30 @@
       <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="1EzhhJ" value="true" />
+      <property role="TrG5h" value="newToken" />
+      <node concept="37vLTG" id="3IIf9OAJRcv" 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>
+      </node>
+      <node concept="16syzq" id="3IIf9OAJQ56" role="3clF45">
+        <ref role="16sUi3" node="1ffsG7bWA35" resolve="Token" />
+      </node>
+      <node concept="3Tm1VV" id="3IIf9OAJOPS" role="1B3o_S" />
+      <node concept="3clFbS" id="3IIf9OAJOPT" role="3clF47" />
+    </node>
     <node concept="2tJIrI" id="6i42QSs8m2v" role="jymVt" />
     <node concept="3Tm1VV" id="1ffsG7bW_V5" role="1B3o_S" />
     <node concept="16euLQ" id="1ffsG7bWA35" role="16eVyc">
       <property role="TrG5h" value="Token" />
       <node concept="3uibUv" id="7XdbJdy67uN" role="3ztrMU">
-        <ref role="3uigEE" node="2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+        <ref role="3uigEE" node="2RRx4MZ6_68" resolve="RuleTemplateToken" />
       </node>
     </node>
   </node>
@@ -1418,27 +1346,14 @@
               <ref role="16sUi3" node="1ffsG7bX2zU" resolve="Token" />
             </node>
             <node concept="1rXfSq" id="7XdbJdyiHdn" role="33vP2m">
-              <ref role="37wK5l" node="7XdbJdz5lDL" resolve="createToken" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5wZaC7Xy9pq" role="3cqZAp">
-          <node concept="37vLTI" id="5wZaC7Xy9pr" role="3clFbG">
-            <node concept="37vLTw" id="5wZaC7Xy9ps" role="37vLTJ">
-              <ref role="3cqZAo" node="7XdbJdyiBPP" resolve="token" />
-            </node>
-            <node concept="1rXfSq" id="5wZaC7Xy9pt" role="37vLTx">
-              <ref role="37wK5l" node="7XdbJdz9vbo" resolve="initToken" />
-              <node concept="37vLTw" id="5wZaC7Xy9pw" role="37wK5m">
-                <ref role="3cqZAo" node="7XdbJdyiBPP" resolve="token" />
-              </node>
-              <node concept="37vLTw" id="5wZaC7Xy9pu" role="37wK5m">
+              <ref role="37wK5l" node="3IIf9OAJOPP" resolve="newToken" />
+              <node concept="37vLTw" id="mJ_D13ZP76" role="37wK5m">
                 <ref role="3cqZAo" node="7XdbJdyiuF2" resolve="input" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="7XdbJdyiVvC" role="3cqZAp" />
+        <node concept="3clFbH" id="mJ_D14cdrg" role="3cqZAp" />
         <node concept="1DcWWT" id="7XdbJdyiAvZ" role="3cqZAp">
           <node concept="3clFbS" id="7XdbJdyiAw0" role="2LFqv$">
             <node concept="3SKdUt" id="7XdbJdyiBPM" role="3cqZAp">
@@ -1550,21 +1465,8 @@
               <ref role="16sUi3" node="1ffsG7bX2zU" resolve="Token" />
             </node>
             <node concept="1rXfSq" id="7XdbJdyiVDI" role="33vP2m">
-              <ref role="37wK5l" node="7XdbJdz5lDL" resolve="createToken" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5wZaC7XycOO" role="3cqZAp">
-          <node concept="37vLTI" id="5wZaC7XycOP" role="3clFbG">
-            <node concept="37vLTw" id="5wZaC7XycOQ" role="37vLTJ">
-              <ref role="3cqZAo" node="7XdbJdyiVDG" resolve="token" />
-            </node>
-            <node concept="1rXfSq" id="5wZaC7XycOR" role="37vLTx">
-              <ref role="37wK5l" node="7XdbJdz9vbo" resolve="initToken" />
-              <node concept="37vLTw" id="5wZaC7XycOU" role="37wK5m">
-                <ref role="3cqZAo" node="7XdbJdyiVDG" resolve="token" />
-              </node>
-              <node concept="37vLTw" id="5wZaC7XycOS" role="37wK5m">
+              <ref role="37wK5l" node="3IIf9OAJOPP" resolve="newToken" />
+              <node concept="37vLTw" id="mJ_D13ZQKZ" role="37wK5m">
                 <ref role="3cqZAo" node="7XdbJdyiuFB" resolve="input" />
               </node>
             </node>
@@ -1806,6 +1708,7 @@
       <node concept="A3Dl8" id="4MqhgXUaiPw" role="3clF45">
         <node concept="3uibUv" id="4MqhgXUaiPX" role="A3Ik2">
           <ref role="3uigEE" node="1ffsG7bW_V4" resolve="RuleTemplate" />
+          <node concept="3qTvmN" id="6OXbTD$GpJw" role="11_B2D" />
         </node>
       </node>
       <node concept="3Tm1VV" id="4MqhgXUaiOQ" role="1B3o_S" />
@@ -1815,7 +1718,7 @@
     <node concept="3Tm1VV" id="4MqhgXU9fm4" role="1B3o_S" />
   </node>
   <node concept="3HP615" id="2RRx4MZ6_68">
-    <property role="TrG5h" value="RuleTemplateApplicationToken" />
+    <property role="TrG5h" value="RuleTemplateToken" />
     <property role="3GE5qa" value="ruleTemplate.token" />
     <node concept="2tJIrI" id="2RRx4MZSLs8" role="jymVt" />
     <node concept="3clFb_" id="2RRx4MZ6CBV" role="jymVt">
@@ -1852,9 +1755,15 @@
       </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="BaseRuleTemplateApplicationToken" />
@@ -1897,7 +1806,7 @@
     <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="RuleTemplateApplicationToken" />
+      <ref role="3uigEE" node="2RRx4MZ6_68" resolve="RuleTemplateToken" />
     </node>
   </node>
   <node concept="3HP615" id="23fvq3KaSFM">
@@ -1918,7 +1827,7 @@
     <node concept="2tJIrI" id="23fvq3KaT8y" role="jymVt" />
     <node concept="3Tm1VV" id="23fvq3KaSFN" role="1B3o_S" />
     <node concept="3uibUv" id="23fvq3KaSPQ" role="3HQHJm">
-      <ref role="3uigEE" node="2RRx4MZ6_68" resolve="RuleTemplateApplicationToken" />
+      <ref role="3uigEE" node="2RRx4MZ6_68" resolve="RuleTemplateToken" />
     </node>
     <node concept="16euLQ" id="23fvq3KaTe2" role="16eVyc">
       <property role="TrG5h" value="Iter" />
@@ -1995,34 +1904,192 @@
     <node concept="3Tm1VV" id="36tQV5AurZX" role="1B3o_S" />
   </node>
   <node concept="3HP615" id="7P_FdVPs4aA">
-    <property role="TrG5h" value="QueryTemplate" />
+    <property role="TrG5h" value="QueryStageTemplate" />
     <node concept="2tJIrI" id="7P_FdVPs4b8" role="jymVt" />
-    <node concept="3clFb_" id="7P_FdVQ_scW" role="jymVt">
+    <node concept="3clFb_" id="6OXbTD$oRWJ" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="stageName" />
+      <node concept="3clFbS" id="6OXbTD$oRWM" role="3clF47" />
+      <node concept="3Tm1VV" id="6OXbTD$oRWN" role="1B3o_S" />
+      <node concept="17QB3L" id="6OXbTD$oRqh" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="6OXbTD$oQQW" role="jymVt" />
+    <node concept="3clFb_" id="mJ_D14Alpb" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="newToken" />
+      <node concept="37vLTG" id="mJ_D14AlJJ" role="3clF46">
+        <property role="TrG5h" value="parameter" />
+        <node concept="8X2XB" id="mJ_D14AlWD" role="1tU5fm">
+          <node concept="3uibUv" id="mJ_D14AlQr" role="8Xvag">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="16syzq" id="mJ_D14Alxk" role="3clF45">
+        <ref role="16sUi3" node="mJ_D14AkFa" resolve="Token" />
+      </node>
+      <node concept="3Tm1VV" id="mJ_D14Alpe" role="1B3o_S" />
+      <node concept="3clFbS" id="mJ_D14Alpf" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQ_jBm" role="jymVt" />
+    <node concept="3Tm1VV" id="7P_FdVPs4aB" role="1B3o_S" />
+    <node concept="16euLQ" id="mJ_D14AkFa" role="16eVyc">
+      <property role="TrG5h" value="Token" />
+      <node concept="3uibUv" id="mJ_D14Ald9" role="3ztrMU">
+        <ref role="3uigEE" node="mJ_D14woL$" resolve="TemplateToken" />
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="7P_FdVPsPNk">
+    <property role="3GE5qa" value="ruleTemplate" />
+    <property role="TrG5h" value="BaseQueryStageTemplate" />
+    <property role="1sVAO0" value="true" />
+    <node concept="2tJIrI" id="6OXbTDz035d" role="jymVt" />
+    <node concept="3clFbW" id="6OXbTDz039g" role="jymVt">
+      <node concept="37vLTG" id="6OXbTDz03ly" role="3clF46">
+        <property role="TrG5h" value="templateRef" />
+        <node concept="3uibUv" id="6OXbTDz03q5" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6OXbTDz039i" role="3clF45" />
+      <node concept="3Tm1VV" id="6OXbTDz039j" role="1B3o_S" />
+      <node concept="3clFbS" id="6OXbTDz039k" role="3clF47">
+        <node concept="3clFbF" id="6OXbTDz03UI" role="3cqZAp">
+          <node concept="37vLTI" id="6OXbTDz03UJ" role="3clFbG">
+            <node concept="2OqwBi" id="6OXbTDz03UK" role="37vLTJ">
+              <node concept="Xjq3P" id="6OXbTDz03UL" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6OXbTDz03UM" role="2OqNvi">
+                <ref role="2Oxat5" node="6OXbTDz03H0" resolve="templateRef" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="6OXbTDz03UN" role="37vLTx">
+              <ref role="3cqZAo" node="6OXbTDz03ly" resolve="templateRef" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6OXbTDz03CP" 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="6OXbTDz047G" 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>
+    </node>
+    <node concept="3Tm1VV" id="7P_FdVPsPNl" role="1B3o_S" />
+    <node concept="3uibUv" id="7P_FdVPsPOy" role="EKbjA">
+      <ref role="3uigEE" node="7P_FdVPs4aA" resolve="QueryStageTemplate" />
+      <node concept="16syzq" id="mJ_D14ApBL" role="11_B2D">
+        <ref role="16sUi3" node="mJ_D14ApAA" resolve="Token" />
+      </node>
+    </node>
+    <node concept="16euLQ" id="mJ_D14ApAA" role="16eVyc">
+      <property role="TrG5h" value="Token" />
+      <node concept="3uibUv" id="mJ_D14ApBe" role="3ztrMU">
+        <ref role="3uigEE" node="mJ_D14woL$" resolve="TemplateToken" />
+      </node>
+    </node>
+  </node>
+  <node concept="3HP615" id="mJ_D14woL$">
+    <property role="3GE5qa" value="ruleTemplate.token" />
+    <property role="TrG5h" value="TemplateToken" />
+    <node concept="2tJIrI" id="mJ_D14woOn" role="jymVt" />
+    <node concept="3clFb_" id="mJ_D14woVW" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="apply" />
+      <node concept="A3Dl8" id="mJ_D14woVX" role="3clF45">
+        <node concept="3uibUv" id="mJ_D14woVY" role="A3Ik2">
+          <ref role="3uigEE" to="6pyv: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" to="psr6:18kNIl1vDPZ" resolve="AbstractMacroProcessing" />
+        </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="ruleTemplate" />
+    <property role="TrG5h" value="QueryTemplate" />
+    <node concept="2tJIrI" id="6OXbTD$iO0e" role="jymVt" />
+    <node concept="3clFb_" id="6OXbTD$iO0w" role="jymVt">
       <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="name" />
-      <node concept="17QB3L" id="7P_FdVQ_seW" role="3clF45" />
-      <node concept="3Tm1VV" id="7P_FdVQ_scZ" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVQ_sd0" role="3clF47" />
+      <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="7P_FdVQ_sbr" role="jymVt" />
-    <node concept="3clFb_" id="7WKNeR94Np2" role="jymVt">
+    <node concept="2tJIrI" id="6OXbTD$iO0$" role="jymVt" />
+    <node concept="3clFb_" id="6OXbTD$iO0_" role="jymVt">
       <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="fqName" />
-      <node concept="17QB3L" id="7WKNeR94Np3" role="3clF45" />
-      <node concept="3Tm1VV" id="7WKNeR94Np4" role="1B3o_S" />
-      <node concept="3clFbS" id="7WKNeR94Np5" role="3clF47" />
+      <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="7WKNeR94NnR" role="jymVt" />
-    <node concept="3clFb_" id="7P_FdVQBl1a" role="jymVt">
+    <node concept="2tJIrI" id="6OXbTD$iO0D" role="jymVt" />
+    <node concept="3clFb_" id="6OXbTD$iO0E" role="jymVt">
       <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="usedHandlersFqNames" />
-      <node concept="_YKpA" id="7P_FdVQBl3q" role="3clF45">
-        <node concept="17QB3L" id="7P_FdVQBl3W" role="_ZDj9" />
+      <node concept="_YKpA" id="6OXbTD$iO0F" role="3clF45">
+        <node concept="17QB3L" id="6OXbTD$iO0G" role="_ZDj9" />
       </node>
-      <node concept="3Tm1VV" id="7P_FdVQBl1d" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVQBl1e" role="3clF47" />
+      <node concept="3Tm1VV" id="6OXbTD$iO0H" role="1B3o_S" />
+      <node concept="3clFbS" id="6OXbTD$iO0I" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="7P_FdVPsPXb" role="jymVt" />
+    <node concept="2tJIrI" id="6OXbTD$iO0j" role="jymVt" />
+    <node concept="3clFb_" id="6OXbTD$jl18" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="stageTemplates" />
+      <node concept="A3Dl8" id="6OXbTD$jl19" role="3clF45">
+        <node concept="3uibUv" id="6OXbTD$jl3W" role="A3Ik2">
+          <ref role="3uigEE" node="7P_FdVPs4aA" resolve="QueryStageTemplate" />
+          <node concept="3qTvmN" id="6OXbTD$JJM1" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6OXbTD$jl1b" role="1B3o_S" />
+      <node concept="3clFbS" id="6OXbTD$jl1c" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="6OXbTD$oHqU" role="jymVt" />
+    <node concept="3clFb_" id="6OXbTD$oET6" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="stageTemplate" />
+      <node concept="37vLTG" id="6OXbTD$oIHv" role="3clF46">
+        <property role="TrG5h" value="stage" />
+        <node concept="17QB3L" id="6OXbTD$oII$" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="6OXbTD$oIFy" role="3clF45">
+        <ref role="3uigEE" node="7P_FdVPs4aA" resolve="QueryStageTemplate" />
+      </node>
+      <node concept="3Tm1VV" id="6OXbTD$oET9" role="1B3o_S" />
+      <node concept="3clFbS" id="6OXbTD$oETa" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="6OXbTD$iO0n" role="jymVt" />
+    <node concept="3Tm1VV" id="6OXbTD$iNPQ" role="1B3o_S" />
     <node concept="3clFb_" id="7P_FdVPsDM6" role="jymVt">
       <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="newQuery" />
@@ -2045,7 +2112,7 @@
       <node concept="3Tm1VV" id="7P_FdVPsDM9" role="1B3o_S" />
       <node concept="3clFbS" id="7P_FdVPsDMa" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="7P_FdVPsDA3" role="jymVt" />
+    <node concept="2tJIrI" id="6OXbTD$reMa" role="jymVt" />
     <node concept="3HP615" id="7P_FdVPsDC0" role="jymVt">
       <property role="2bfB8j" value="true" />
       <property role="TrG5h" value="QueryConfigurable" />
@@ -2072,7 +2139,7 @@
       <node concept="2tJIrI" id="7P_FdVQ_p0D" role="jymVt" />
       <node concept="3Tm1VV" id="7P_FdVPsDC1" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="7P_FdVPs4bh" role="jymVt" />
+    <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" />
@@ -2093,7 +2160,7 @@
       <node concept="2tJIrI" id="7P_FdVQ_oC2" role="jymVt" />
       <node concept="3Tm1VV" id="7P_FdVQ_k3c" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="7P_FdVQ_k1I" role="jymVt" />
+    <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" />
@@ -2146,18 +2213,6 @@
       <node concept="2tJIrI" id="7P_FdVQ_jEt" role="jymVt" />
       <node concept="3Tm1VV" id="7P_FdVQ_jCp" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="7P_FdVQ_jBm" role="jymVt" />
-    <node concept="3Tm1VV" id="7P_FdVPs4aB" role="1B3o_S" />
-  </node>
-  <node concept="312cEu" id="7P_FdVPsPNk">
-    <property role="3GE5qa" value="ruleTemplate" />
-    <property role="TrG5h" value="AbstractQueryTemplate" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="7P_FdVPsPTr" role="jymVt" />
-    <node concept="3Tm1VV" id="7P_FdVPsPNl" role="1B3o_S" />
-    <node concept="3uibUv" id="7P_FdVPsPOy" role="EKbjA">
-      <ref role="3uigEE" node="7P_FdVPs4aA" resolve="QueryTemplate" />
-    </node>
   </node>
 </model>