From a58caa24ef95642f6ac66464f21d71543c32e166 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 11 Jun 2018 19:15:46 +0200
Subject: [PATCH] Drop support for HandlingStage. Stages no longer necessary in
 presence of queries.

---
 .../models/types.mps                          |    2 -
 .../jetbrains.mps.typechecking@tests.mps      |  116 +-
 .../models/ui.plugin.mps                      |  330 +--
 .../models/service.mps                        |  560 ++---
 .../generator/template/main@generator.mps     | 1549 ++++--------
 .../languageModels/editor.mps                 |   31 -
 .../languageModels/structure.mps              |   13 +-
 ...brains.mps.lang.typesystem2.evaluation.mps | 2230 ++++-------------
 .../jetbrains.mps.lang.typesystem2.rule.mps   |  163 +-
 9 files changed, 1483 insertions(+), 3511 deletions(-)

diff --git a/typechecking/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/typechecking/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index 9c703d95..e626a6af 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/typechecking/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -166,7 +166,6 @@
         <child id="6691972578451986151" name="input" index="2t_VXX" />
       </concept>
       <concept id="8335224865066015764" name="jetbrains.mps.lang.typesystem2.structure.Handler" flags="ng" index="AVZre">
-        <property id="2316688792951788157" name="stage" index="3J8TDj" />
         <child id="1980609059185345194" name="constraint" index="8PkJo" />
         <child id="3575255234175157601" name="template" index="1nK1Vg" />
       </concept>
@@ -706,7 +705,6 @@
     </node>
   </node>
   <node concept="AVZre" id="7lt0LtPOZVe">
-    <property role="3J8TDj" value="recover" />
     <property role="TrG5h" value="Recover" />
     <node concept="3AqmO8" id="7lt0LtPOZVl" role="8PkJo">
       <property role="TrG5h" value="recover" />
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 b141f29c..076cb009 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
@@ -50,15 +50,6 @@
     <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
   </imports>
   <registry>
-    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
-      <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
-        <child id="1238852204892" name="componentType" index="1Lm7xW" />
-      </concept>
-      <concept id="1238857743184" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleMemberAccessExpression" flags="nn" index="1LFfDK">
-        <child id="1238857764950" name="tuple" index="1LFl5Q" />
-        <child id="1238857834412" name="index" index="1LF_Uc" />
-      </concept>
-    </language>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
       <concept id="1211979288880" name="jetbrains.mps.lang.test.structure.AssertMatch" flags="nn" index="JA50E">
         <child id="1211979305365" name="before" index="JA92f" />
@@ -98,9 +89,6 @@
         <child id="1153952416686" name="body" index="2GV8ay" />
         <child id="1153952429843" name="finallyBody" index="2GVbov" />
       </concept>
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
-      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -135,7 +123,6 @@
       </concept>
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -190,12 +177,6 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
-      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
-        <child id="1144226360166" name="iterable" index="1DdaDG" />
-      </concept>
-      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
-        <child id="1144230900587" name="variable" index="1Duv9x" />
-      </concept>
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
       </concept>
@@ -1024,69 +1005,54 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="1DcWWT" id="1CcQBrQrTBa" role="3cqZAp">
-                    <node concept="3clFbS" id="1CcQBrQrTBd" role="2LFqv$">
-                      <node concept="3clFbF" id="1CcQBrQrYPT" role="3cqZAp">
-                        <node concept="37vLTI" id="1CcQBrQrYPV" role="3clFbG">
-                          <node concept="37vLTw" id="1CcQBrQrYPZ" role="37vLTJ">
-                            <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
-                          </node>
-                          <node concept="2OqwBi" id="1CcQBrQs3mU" role="37vLTx">
-                            <node concept="37vLTw" id="1CcQBrQs3e7" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
+                  <node concept="3cpWs8" id="6tPOoeTbYY_" role="3cqZAp">
+                    <node concept="3cpWsn" id="6tPOoeTbYYA" role="3cpWs9">
+                      <property role="TrG5h" value="program" />
+                      <node concept="3uibUv" id="6tPOoeTbYYx" role="1tU5fm">
+                        <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+                      </node>
+                      <node concept="2OqwBi" id="6tPOoeTbYYB" role="33vP2m">
+                        <node concept="37vLTw" id="6tPOoeTbYYC" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
+                        </node>
+                        <node concept="liA8E" id="6tPOoeTbYYD" role="2OqNvi">
+                          <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="1CcQBrQrYPT" role="3cqZAp">
+                    <node concept="37vLTI" id="1CcQBrQrYPV" role="3clFbG">
+                      <node concept="37vLTw" id="1CcQBrQrYPZ" role="37vLTJ">
+                        <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
+                      </node>
+                      <node concept="2OqwBi" id="1CcQBrQs3mU" role="37vLTx">
+                        <node concept="37vLTw" id="1CcQBrQs3e7" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
+                        </node>
+                        <node concept="liA8E" id="1CcQBrQs3tX" role="2OqNvi">
+                          <ref role="37wK5l" to="hano:7nkyKX7v7xb" resolve="and" />
+                          <node concept="2OqwBi" id="6QH_LDtbV6d" role="37wK5m">
+                            <node concept="37vLTw" id="6QH_LDtbV6e" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6QH_LDtbV5Q" resolve="evaluator" />
                             </node>
-                            <node concept="liA8E" id="1CcQBrQs3tX" role="2OqNvi">
-                              <ref role="37wK5l" to="hano:7nkyKX7v7xb" resolve="and" />
-                              <node concept="2OqwBi" id="6QH_LDtbV6d" role="37wK5m">
-                                <node concept="37vLTw" id="6QH_LDtbV6e" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6QH_LDtbV5Q" resolve="evaluator" />
-                                </node>
-                                <node concept="liA8E" id="6QH_LDtbV6f" role="2OqNvi">
-                                  <ref role="37wK5l" to="hano:HV6urVFrQ9" resolve="eval" />
-                                  <node concept="1LFfDK" id="7WKNeR9lNYN" role="37wK5m">
-                                    <node concept="3cmrfG" id="7WKNeR9lNYW" role="1LF_Uc">
-                                      <property role="3cmrfH" value="0" />
-                                    </node>
-                                    <node concept="37vLTw" id="7lt0LtQtMIX" role="1LFl5Q">
-                                      <ref role="3cqZAo" node="1CcQBrQrTBe" resolve="stage_program" />
-                                    </node>
-                                  </node>
-                                  <node concept="1LFfDK" id="7WKNeR9G7WA" role="37wK5m">
-                                    <node concept="3cmrfG" id="7WKNeR9G7WB" role="1LF_Uc">
-                                      <property role="3cmrfH" value="1" />
-                                    </node>
-                                    <node concept="37vLTw" id="7WKNeR9G7WC" role="1LFl5Q">
-                                      <ref role="3cqZAo" node="1CcQBrQrTBe" resolve="stage_program" />
-                                    </node>
-                                  </node>
-                                  <node concept="10M0yZ" id="6QH_LDtbV6h" role="37wK5m">
-                                    <ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                                    <ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
-                                  </node>
-                                </node>
+                            <node concept="liA8E" id="6QH_LDtbV6f" role="2OqNvi">
+                              <ref role="37wK5l" to="hano:HV6urVFrQ9" resolve="eval" />
+                              <node concept="Xl_RD" id="6tPOoeTc4db" role="37wK5m">
+                                <property role="Xl_RC" value=".initial" />
+                              </node>
+                              <node concept="37vLTw" id="6tPOoeTc7DG" role="37wK5m">
+                                <ref role="3cqZAo" node="6tPOoeTbYYA" resolve="program" />
+                              </node>
+                              <node concept="10M0yZ" id="6QH_LDtbV6h" role="37wK5m">
+                                <ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                                <ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3cpWsn" id="1CcQBrQrTBe" role="1Duv9x">
-                      <property role="TrG5h" value="stage_program" />
-                      <node concept="1LlUBW" id="7WKNeR9lHxD" role="1tU5fm">
-                        <node concept="17QB3L" id="7WKNeR9lJcK" role="1Lm7xW" />
-                        <node concept="3uibUv" id="7WKNeR9lK4q" role="1Lm7xW">
-                          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="1CcQBrQrTBj" role="1DdaDG">
-                      <node concept="37vLTw" id="1CcQBrQrTBk" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
-                      </node>
-                      <node concept="liA8E" id="1CcQBrQrTBl" role="2OqNvi">
-                        <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getPrograms" />
-                      </node>
-                    </node>
                   </node>
                   <node concept="3vwNmj" id="6$7vuu2uk9h" role="3cqZAp">
                     <node concept="2OqwBi" id="6$7vuu2uktV" role="3vwVQn">
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 8764c97a..054d92bd 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
@@ -640,14 +640,6 @@
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="6126991172893676625" name="jetbrains.mps.baseLanguage.collections.structure.ContainsAllOperation" flags="nn" index="BjQpj" />
       <concept id="3358009230509553641" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListType" flags="in" index="2BANLN" />
-      <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
-        <child id="1153944400369" name="variable" index="2Gsz3X" />
-        <child id="1153944424730" name="inputSequence" index="2GsD0m" />
-      </concept>
-      <concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
-      <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
-        <reference id="1153944258490" name="variable" index="2Gs0qQ" />
-      </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435808" name="initValue" index="HW$Y0" />
@@ -26053,13 +26045,8 @@
                   <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">
-                    <property role="3cmrfH" value="1" />
-                  </node>
-                  <node concept="37vLTw" id="1CcQBrPeqBx" role="1LFl5Q">
-                    <ref role="3cqZAo" node="3YJ7yg2N2M5" resolve="tpl" />
-                  </node>
+                <node concept="37vLTw" id="6tPOoeTdjBM" role="33vP2m">
+                  <ref role="3cqZAo" node="3YJ7yg2N2M5" resolve="tpl" />
                 </node>
               </node>
             </node>
@@ -26126,16 +26113,11 @@
           </node>
           <node concept="3cpWsn" id="3YJ7yg2N2M5" role="1Duv9x">
             <property role="TrG5h" value="tpl" />
-            <node concept="1LlUBW" id="3YJ7yg2N3dO" role="1tU5fm">
-              <node concept="3uibUv" id="1CcQBrPepNg" role="1Lm7xW">
-                <ref role="3uigEE" to="hano:1CcQBrPcZVG" resolve="HandlingStage" />
-              </node>
-              <node concept="3uibUv" id="1ffsG7c4ezn" role="1Lm7xW">
-                <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="RuleTemplateToken" />
-                  </node>
+            <node concept="3uibUv" id="1ffsG7c4ezn" role="1tU5fm">
+              <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="RuleTemplateToken" />
                 </node>
               </node>
             </node>
@@ -29220,10 +29202,8 @@
                 <node concept="3uibUv" id="Hg6EncXnsU" role="1Lm7xW">
                   <ref role="3uigEE" to="tj24:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
                 </node>
-                <node concept="_YKpA" id="4BHjwwGBkzR" role="1Lm7xW">
-                  <node concept="3uibUv" id="4BHjwwGBkzS" role="_ZDj9">
-                    <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                  </node>
+                <node concept="3uibUv" id="6tPOoeTcJfS" role="1Lm7xW">
+                  <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
                 </node>
               </node>
             </node>
@@ -29253,18 +29233,13 @@
                     <node concept="3clFbH" id="Hg6EncXnu2" role="3cqZAp" />
                     <node concept="3cpWs8" id="Hg6EncXnu7" role="3cqZAp">
                       <node concept="3cpWsn" id="Hg6EncXnu8" role="3cpWs9">
-                        <property role="TrG5h" value="stage_programs" />
-                        <node concept="_YKpA" id="Hg6EncXnu9" role="1tU5fm">
-                          <node concept="1LlUBW" id="7WKNeR9lXEL" role="_ZDj9">
-                            <node concept="17QB3L" id="7WKNeR9m1oQ" role="1Lm7xW" />
-                            <node concept="3uibUv" id="7WKNeR9m3mk" role="1Lm7xW">
-                              <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
-                            </node>
-                          </node>
+                        <property role="TrG5h" value="program" />
+                        <node concept="3uibUv" id="6tPOoeTcyRh" role="1tU5fm">
+                          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
                         </node>
                         <node concept="2OqwBi" id="Hg6EncXnub" role="33vP2m">
                           <node concept="liA8E" id="6kREIVl1TxS" role="2OqNvi">
-                            <ref role="37wK5l" to="tj24:6kREIVl0HhM" resolve="getPrograms" />
+                            <ref role="37wK5l" to="tj24:6kREIVl0HhM" resolve="getProgram" />
                           </node>
                           <node concept="37vLTw" id="Hg6EncXnud" role="2Oq$k0">
                             <ref role="3cqZAo" node="Hg6EncXntZ" resolve="prev" />
@@ -29272,23 +29247,6 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3cpWs8" id="4BHjwwG$czY" role="3cqZAp">
-                      <node concept="3cpWsn" id="4BHjwwG$c$1" role="3cpWs9">
-                        <property role="TrG5h" value="traces" />
-                        <node concept="_YKpA" id="4BHjwwG$czU" role="1tU5fm">
-                          <node concept="3uibUv" id="4BHjwwG$e8C" role="_ZDj9">
-                            <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                          </node>
-                        </node>
-                        <node concept="2ShNRf" id="4BHjwwG$hn7" role="33vP2m">
-                          <node concept="Tc6Ow" id="4BHjwwG$heA" role="2ShVmc">
-                            <node concept="3uibUv" id="4BHjwwG$heB" role="HW$YZ">
-                              <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
                     <node concept="3clFbH" id="4BHjwwGBcqL" role="3cqZAp" />
                     <node concept="3cpWs8" id="3wxtToE2Oej" role="3cqZAp">
                       <node concept="3cpWsn" id="3wxtToE2Oek" role="3cpWs9">
@@ -29299,161 +29257,131 @@
                         <node concept="10Nm6u" id="3wxtToE2ZF7" role="33vP2m" />
                       </node>
                     </node>
-                    <node concept="2Gpval" id="7WKNeR9m8wE" role="3cqZAp">
-                      <node concept="3clFbS" id="Hg6EncXnuf" role="2LFqv$">
-                        <node concept="3cpWs8" id="Hg6EncXnuj" role="3cqZAp">
-                          <node concept="3cpWsn" id="Hg6EncXnuk" role="3cpWs9">
-                            <property role="TrG5h" value="activationTrace" />
-                            <node concept="3uibUv" id="Hg6EncXnul" role="1tU5fm">
-                              <ref role="3uigEE" node="7nPD14Nbbbe" resolve="TraceComponent" />
-                            </node>
-                            <node concept="2YIFZM" id="Hg6EncXnum" role="33vP2m">
-                              <ref role="1Pybhc" node="7nPD14Nbbbe" resolve="TraceComponent" />
-                              <ref role="37wK5l" node="7nPD14Nboty" resolve="get" />
-                              <node concept="37vLTw" id="443LGHBSKBD" role="37wK5m">
-                                <ref role="3cqZAo" node="443LGHBSGGx" resolve="mpsProject" />
-                              </node>
-                            </node>
+                    <node concept="3cpWs8" id="Hg6EncXnuj" role="3cqZAp">
+                      <node concept="3cpWsn" id="Hg6EncXnuk" role="3cpWs9">
+                        <property role="TrG5h" value="activationTrace" />
+                        <node concept="3uibUv" id="Hg6EncXnul" role="1tU5fm">
+                          <ref role="3uigEE" node="7nPD14Nbbbe" resolve="TraceComponent" />
+                        </node>
+                        <node concept="2YIFZM" id="Hg6EncXnum" role="33vP2m">
+                          <ref role="1Pybhc" node="7nPD14Nbbbe" resolve="TraceComponent" />
+                          <ref role="37wK5l" node="7nPD14Nboty" resolve="get" />
+                          <node concept="37vLTw" id="443LGHBSKBD" role="37wK5m">
+                            <ref role="3cqZAo" node="443LGHBSGGx" resolve="mpsProject" />
                           </node>
                         </node>
-                        <node concept="3cpWs8" id="6IQb_Rxph$E" role="3cqZAp">
-                          <node concept="3cpWsn" id="6IQb_Rxph$F" role="3cpWs9">
-                            <property role="TrG5h" value="openedTab" />
-                            <node concept="3uibUv" id="6IQb_Rxph$B" role="1tU5fm">
-                              <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
-                            </node>
-                            <node concept="2OqwBi" id="6IQb_Rxph$G" role="33vP2m">
-                              <node concept="37vLTw" id="6IQb_Rxph$H" role="2Oq$k0">
-                                <ref role="3cqZAo" node="Hg6EncXnuk" resolve="activationTrace" />
-                              </node>
-                              <node concept="liA8E" id="6IQb_Rxph$I" role="2OqNvi">
-                                <ref role="37wK5l" node="7nPD14Nb$fz" resolve="openTab" />
-                                <node concept="2OqwBi" id="6IQb_Rxph$J" role="37wK5m">
-                                  <node concept="1LFfDK" id="7WKNeR9miXX" role="2Oq$k0">
-                                    <node concept="3cmrfG" id="7WKNeR9mkiK" role="1LF_Uc">
-                                      <property role="3cmrfH" value="1" />
-                                    </node>
-                                    <node concept="2GrUjf" id="7WKNeR9m8$s" role="1LFl5Q">
-                                      <ref role="2Gs0qQ" node="7WKNeR9m8$q" resolve="stage_program" />
-                                    </node>
-                                  </node>
-                                  <node concept="liA8E" id="6IQb_Rxph$L" role="2OqNvi">
-                                    <ref role="37wK5l" to="av0y:~Program.name():java.lang.String" resolve="name" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbJ" id="3wxtToE3355" role="3cqZAp">
-                          <node concept="3clFbS" id="3wxtToE3357" role="3clFbx">
-                            <node concept="3clFbF" id="3wxtToE38WG" role="3cqZAp">
-                              <node concept="2OqwBi" id="3wxtToE3c$I" role="3clFbG">
-                                <node concept="37vLTw" id="3wxtToE38WE" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
-                                </node>
-                                <node concept="liA8E" id="3wxtToE46Do" role="2OqNvi">
-                                  <ref role="37wK5l" node="3wxtToE3p8y" resolve="setPreviousTab" />
-                                  <node concept="37vLTw" id="3wxtToE4aLH" role="37wK5m">
-                                    <ref role="3cqZAo" node="3wxtToE2Oek" resolve="prevTab" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3y3z36" id="3wxtToE36KU" role="3clFbw">
-                            <node concept="10Nm6u" id="3wxtToE36Tu" role="3uHU7w" />
-                            <node concept="37vLTw" id="3wxtToE34Wu" role="3uHU7B">
-                              <ref role="3cqZAo" node="3wxtToE2Oek" resolve="prevTab" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="6IQb_RxS2eX" role="3cqZAp">
-                          <node concept="2OqwBi" id="6IQb_RxS6MS" role="3clFbG">
-                            <node concept="2OqwBi" id="6IQb_RxS3tz" role="2Oq$k0">
-                              <node concept="Xjq3P" id="6IQb_RxS2eV" role="2Oq$k0" />
-                              <node concept="2OwXpG" id="6IQb_RxS4TP" role="2OqNvi">
-                                <ref role="2Oxat5" node="6IQb_RxRUPR" resolve="traceTabs" />
-                              </node>
-                            </node>
-                            <node concept="TSZUe" id="6IQb_RxS8FU" role="2OqNvi">
-                              <node concept="37vLTw" id="6IQb_RxSc3P" role="25WWJ7">
-                                <ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="6IQb_RxsFCj" role="3cqZAp">
-                          <node concept="2OqwBi" id="6IQb_RxsL_H" role="3clFbG">
-                            <node concept="2OqwBi" id="6IQb_RxsHi8" role="2Oq$k0">
-                              <node concept="Xjq3P" id="6IQb_RxsFCh" role="2Oq$k0" />
-                              <node concept="2OwXpG" id="6IQb_RxsJ8V" role="2OqNvi">
-                                <ref role="2Oxat5" node="6IQb_RxsBvb" resolve="traceTabComponents" />
-                              </node>
-                            </node>
-                            <node concept="TSZUe" id="6IQb_RxsNKt" role="2OqNvi">
-                              <node concept="2OqwBi" id="6IQb_RxRYGQ" role="25WWJ7">
-                                <node concept="37vLTw" id="6IQb_RxsSZ4" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
-                                </node>
-                                <node concept="liA8E" id="6IQb_RxRZZh" role="2OqNvi">
-                                  <ref role="37wK5l" node="5X6ji59z7r_" resolve="getTabComponent" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="4BHjwwG$kvV" role="3cqZAp">
-                          <node concept="2OqwBi" id="4BHjwwG$noo" role="3clFbG">
-                            <node concept="37vLTw" id="4BHjwwG$kvT" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4BHjwwG$c$1" resolve="traces" />
-                            </node>
-                            <node concept="TSZUe" id="4BHjwwG$pAm" role="2OqNvi">
-                              <node concept="2ShNRf" id="443LGHBTehJ" role="25WWJ7">
-                                <node concept="1pGfFk" id="443LGHBTu9d" role="2ShVmc">
-                                  <ref role="37wK5l" to="tj24:7nPD14NbIzp" resolve="MultiTrace" />
-                                  <node concept="2OqwBi" id="4BHjwwG$rgu" role="37wK5m">
-                                    <node concept="37vLTw" id="4BHjwwG$rgv" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
-                                    </node>
-                                    <node concept="liA8E" id="4BHjwwG$rgw" role="2OqNvi">
-                                      <ref role="37wK5l" node="YGS68MEx_L" resolve="trace" />
-                                    </node>
-                                  </node>
-                                  <node concept="37vLTw" id="443LGHBT_F3" role="37wK5m">
-                                    <ref role="3cqZAo" node="3F6vMxqv_px" resolve="msgtrace" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbF" id="3wxtToE2UCB" role="3cqZAp">
-                          <node concept="37vLTI" id="3wxtToE2UCD" role="3clFbG">
-                            <node concept="37vLTw" id="3wxtToE2Oel" role="37vLTx">
-                              <ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
-                            </node>
-                            <node concept="37vLTw" id="3wxtToE2UCH" role="37vLTJ">
-                              <ref role="3cqZAo" node="3wxtToE2Oek" resolve="prevTab" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="Hg6EncXnuM" role="2GsD0m">
-                        <ref role="3cqZAo" node="Hg6EncXnu8" resolve="stage_programs" />
-                      </node>
-                      <node concept="2GrKxI" id="7WKNeR9m8$q" role="2Gsz3X">
-                        <property role="TrG5h" value="stage_program" />
                       </node>
                     </node>
-                    <node concept="3clFbH" id="4BHjwwGBaFZ" role="3cqZAp" />
+                    <node concept="3cpWs8" id="6IQb_Rxph$E" role="3cqZAp">
+                      <node concept="3cpWsn" id="6IQb_Rxph$F" role="3cpWs9">
+                        <property role="TrG5h" value="openedTab" />
+                        <node concept="3uibUv" id="6IQb_Rxph$B" role="1tU5fm">
+                          <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+                        </node>
+                        <node concept="2OqwBi" id="6IQb_Rxph$G" role="33vP2m">
+                          <node concept="37vLTw" id="6IQb_Rxph$H" role="2Oq$k0">
+                            <ref role="3cqZAo" node="Hg6EncXnuk" resolve="activationTrace" />
+                          </node>
+                          <node concept="liA8E" id="6IQb_Rxph$I" role="2OqNvi">
+                            <ref role="37wK5l" node="7nPD14Nb$fz" resolve="openTab" />
+                            <node concept="2OqwBi" id="6IQb_Rxph$J" role="37wK5m">
+                              <node concept="37vLTw" id="6tPOoeTcFbx" role="2Oq$k0">
+                                <ref role="3cqZAo" node="Hg6EncXnu8" resolve="program" />
+                              </node>
+                              <node concept="liA8E" id="6IQb_Rxph$L" role="2OqNvi">
+                                <ref role="37wK5l" to="av0y:~Program.name():java.lang.String" resolve="name" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbJ" id="3wxtToE3355" role="3cqZAp">
+                      <node concept="3clFbS" id="3wxtToE3357" role="3clFbx">
+                        <node concept="3clFbF" id="3wxtToE38WG" role="3cqZAp">
+                          <node concept="2OqwBi" id="3wxtToE3c$I" role="3clFbG">
+                            <node concept="37vLTw" id="3wxtToE38WE" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
+                            </node>
+                            <node concept="liA8E" id="3wxtToE46Do" role="2OqNvi">
+                              <ref role="37wK5l" node="3wxtToE3p8y" resolve="setPreviousTab" />
+                              <node concept="37vLTw" id="3wxtToE4aLH" role="37wK5m">
+                                <ref role="3cqZAo" node="3wxtToE2Oek" resolve="prevTab" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3y3z36" id="3wxtToE36KU" role="3clFbw">
+                        <node concept="10Nm6u" id="3wxtToE36Tu" role="3uHU7w" />
+                        <node concept="37vLTw" id="3wxtToE34Wu" role="3uHU7B">
+                          <ref role="3cqZAo" node="3wxtToE2Oek" resolve="prevTab" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="6IQb_RxS2eX" role="3cqZAp">
+                      <node concept="2OqwBi" id="6IQb_RxS6MS" role="3clFbG">
+                        <node concept="2OqwBi" id="6IQb_RxS3tz" role="2Oq$k0">
+                          <node concept="Xjq3P" id="6IQb_RxS2eV" role="2Oq$k0" />
+                          <node concept="2OwXpG" id="6IQb_RxS4TP" role="2OqNvi">
+                            <ref role="2Oxat5" node="6IQb_RxRUPR" resolve="traceTabs" />
+                          </node>
+                        </node>
+                        <node concept="TSZUe" id="6IQb_RxS8FU" role="2OqNvi">
+                          <node concept="37vLTw" id="6IQb_RxSc3P" role="25WWJ7">
+                            <ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="6IQb_RxsFCj" role="3cqZAp">
+                      <node concept="2OqwBi" id="6IQb_RxsL_H" role="3clFbG">
+                        <node concept="2OqwBi" id="6IQb_RxsHi8" role="2Oq$k0">
+                          <node concept="Xjq3P" id="6IQb_RxsFCh" role="2Oq$k0" />
+                          <node concept="2OwXpG" id="6IQb_RxsJ8V" role="2OqNvi">
+                            <ref role="2Oxat5" node="6IQb_RxsBvb" resolve="traceTabComponents" />
+                          </node>
+                        </node>
+                        <node concept="TSZUe" id="6IQb_RxsNKt" role="2OqNvi">
+                          <node concept="2OqwBi" id="6IQb_RxRYGQ" role="25WWJ7">
+                            <node concept="37vLTw" id="6IQb_RxsSZ4" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
+                            </node>
+                            <node concept="liA8E" id="6IQb_RxRZZh" role="2OqNvi">
+                              <ref role="37wK5l" node="5X6ji59z7r_" resolve="getTabComponent" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="6tPOoeTcNvA" role="3cqZAp" />
                     <node concept="3clFbF" id="Hg6EncXnuO" role="3cqZAp">
                       <node concept="1Ls8ON" id="Hg6EncXnuP" role="3clFbG">
                         <node concept="37vLTw" id="Hg6EncXnuQ" role="1Lso8e">
                           <ref role="3cqZAo" node="Hg6EncXntZ" resolve="prev" />
                         </node>
-                        <node concept="37vLTw" id="4BHjwwGB9H3" role="1Lso8e">
-                          <ref role="3cqZAo" node="4BHjwwG$c$1" resolve="traces" />
+                        <node concept="1eOMI4" id="6tPOoeTcTIQ" role="1Lso8e">
+                          <node concept="10QFUN" id="6tPOoeTcTIN" role="1eOMHV">
+                            <node concept="3uibUv" id="6tPOoeTcV1_" role="10QFUM">
+                              <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                            </node>
+                            <node concept="2ShNRf" id="6tPOoeTcTIS" role="10QFUP">
+                              <node concept="1pGfFk" id="6tPOoeTcTIT" role="2ShVmc">
+                                <ref role="37wK5l" to="tj24:7nPD14NbIzp" resolve="MultiTrace" />
+                                <node concept="2OqwBi" id="6tPOoeTcTIU" role="37wK5m">
+                                  <node concept="37vLTw" id="6tPOoeTcTIV" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
+                                  </node>
+                                  <node concept="liA8E" id="6tPOoeTcTIW" role="2OqNvi">
+                                    <ref role="37wK5l" node="YGS68MEx_L" resolve="trace" />
+                                  </node>
+                                </node>
+                                <node concept="37vLTw" id="6tPOoeTcTIX" role="37wK5m">
+                                  <ref role="3cqZAo" node="3F6vMxqv_px" resolve="msgtrace" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
index fdfbae2f..17a3c372 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
@@ -431,24 +431,12 @@
       <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
       <concept id="1208542034276" name="jetbrains.mps.baseLanguage.collections.structure.MapClearOperation" flags="nn" index="1yHZxX" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
-      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
-      <concept id="9042586985346099698" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachStatement" flags="nn" index="1_o_46">
-        <child id="9042586985346099734" name="forEach" index="1_o_by" />
-      </concept>
-      <concept id="9042586985346099733" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachPair" flags="ng" index="1_o_bx">
-        <child id="9042586985346099778" name="variable" index="1_o_aQ" />
-        <child id="9042586985346099735" name="input" index="1_o_bz" />
-      </concept>
-      <concept id="9042586985346099736" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariable" flags="ng" index="1_o_bG" />
       <concept id="1240824834947" name="jetbrains.mps.baseLanguage.collections.structure.ValueAccessOperation" flags="nn" index="3AV6Ez" />
       <concept id="1240825616499" name="jetbrains.mps.baseLanguage.collections.structure.KeyAccessOperation" flags="nn" index="3AY5_j" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
         <child id="1197932525128" name="key" index="3ElVtu" />
       </concept>
-      <concept id="8293956702609956630" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariableReference" flags="nn" index="3M$PaV">
-        <reference id="8293956702609966325" name="variable" index="3M$S_o" />
-      </concept>
       <concept id="1522217801069396578" name="jetbrains.mps.baseLanguage.collections.structure.FoldLeftOperation" flags="nn" index="1MD8d$">
         <child id="1522217801069421796" name="seed" index="1MDeny" />
       </concept>
@@ -2241,34 +2229,9 @@
                         <node concept="37vLTw" id="55Q$YFtJUbX" role="1Lso8e">
                           <ref role="3cqZAo" node="55Q$YFtJUbS" resolve="prev" />
                         </node>
-                        <node concept="2OqwBi" id="4BHjwwGAC8l" role="1Lso8e">
-                          <node concept="2OqwBi" id="4BHjwwGAC8m" role="2Oq$k0">
-                            <node concept="2OqwBi" id="4BHjwwGAC8n" role="2Oq$k0">
-                              <node concept="37vLTw" id="4BHjwwGAC8o" role="2Oq$k0">
-                                <ref role="3cqZAo" node="55Q$YFtJUbS" resolve="prev" />
-                              </node>
-                              <node concept="liA8E" id="4BHjwwGAC8p" role="2OqNvi">
-                                <ref role="37wK5l" node="6kREIVl0HhM" resolve="getPrograms" />
-                              </node>
-                            </node>
-                            <node concept="3$u5V9" id="4BHjwwGAC8q" role="2OqNvi">
-                              <node concept="1bVj0M" id="4BHjwwGAC8r" role="23t8la">
-                                <node concept="3clFbS" id="4BHjwwGAC8s" role="1bW5cS">
-                                  <node concept="3clFbF" id="4BHjwwGAC8t" role="3cqZAp">
-                                    <node concept="10M0yZ" id="4BHjwwGAC8u" role="3clFbG">
-                                      <ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                                      <ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="Rh6nW" id="4BHjwwGAC8v" role="1bW2Oz">
-                                  <property role="TrG5h" value="it" />
-                                  <node concept="2jxLKc" id="4BHjwwGAC8w" role="1tU5fm" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="ANE8D" id="4BHjwwGAC8x" role="2OqNvi" />
+                        <node concept="10M0yZ" id="6tPOoeTcfZY" role="1Lso8e">
+                          <ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                          <ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
                         </node>
                       </node>
                     </node>
@@ -2299,10 +2262,8 @@
             <node concept="3uibUv" id="55Q$YFtI23G" role="1Lm7xW">
               <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
             </node>
-            <node concept="_YKpA" id="4BHjwwGA78d" role="1Lm7xW">
-              <node concept="3uibUv" id="4BHjwwGA78e" role="_ZDj9">
-                <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
-              </node>
+            <node concept="3uibUv" id="6tPOoeTcgU8" role="1Lm7xW">
+              <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
             </node>
           </node>
         </node>
@@ -2357,12 +2318,7 @@
                   </node>
                   <node concept="3cpWs8" id="Hg6Enc9_Rb" role="3cqZAp">
                     <node concept="3cpWsn" id="Hg6Enc9_Rc" role="3cpWs9">
-                      <property role="TrG5h" value="traces" />
-                      <node concept="_YKpA" id="4BHjwwGAao_" role="1tU5fm">
-                        <node concept="3uibUv" id="4BHjwwGAaoA" role="_ZDj9">
-                          <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                        </node>
-                      </node>
+                      <property role="TrG5h" value="trace" />
                       <node concept="1LFfDK" id="Hg6Enc9_Rd" role="33vP2m">
                         <node concept="3cmrfG" id="Hg6Enc9_Re" role="1LF_Uc">
                           <property role="3cmrfH" value="1" />
@@ -2371,6 +2327,9 @@
                           <ref role="3cqZAo" node="Hg6Enc8tAo" resolve="prev_trace" />
                         </node>
                       </node>
+                      <node concept="3uibUv" id="6tPOoeTciTG" role="1tU5fm">
+                        <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                      </node>
                     </node>
                   </node>
                   <node concept="3clFbH" id="Hg6Enc7kMq" role="3cqZAp" />
@@ -2619,95 +2578,65 @@
                         </node>
                       </node>
                       <node concept="3clFbH" id="7WKNeR9GfTo" role="3cqZAp" />
-                      <node concept="1_o_46" id="4BHjwwGAILv" role="3cqZAp">
-                        <node concept="1_o_bx" id="4BHjwwGAILx" role="1_o_by">
-                          <node concept="1_o_bG" id="4BHjwwGAILz" role="1_o_aQ">
-                            <property role="TrG5h" value="stage_program" />
+                      <node concept="3cpWs8" id="7WKNeR9AkUc" role="3cqZAp">
+                        <node concept="3cpWsn" id="7WKNeR9AkUd" role="3cpWs9">
+                          <property role="TrG5h" value="stage" />
+                          <property role="3TUv4t" value="true" />
+                          <node concept="17QB3L" id="7WKNeR9AkTR" role="1tU5fm" />
+                          <node concept="Xl_RD" id="6tPOoeTcswg" role="33vP2m">
+                            <property role="Xl_RC" value=".initial" />
                           </node>
-                          <node concept="2OqwBi" id="4BHjwwGB8a_" role="1_o_bz">
-                            <node concept="liA8E" id="4BHjwwGB8aA" role="2OqNvi">
-                              <ref role="37wK5l" node="6kREIVl0HhM" resolve="getPrograms" />
-                            </node>
-                            <node concept="37vLTw" id="4BHjwwGB8aB" role="2Oq$k0">
+                        </node>
+                      </node>
+                      <node concept="3cpWs8" id="7WKNeR9AoxH" role="3cqZAp">
+                        <node concept="3cpWsn" id="7WKNeR9AoxI" role="3cpWs9">
+                          <property role="TrG5h" value="program" />
+                          <property role="3TUv4t" value="true" />
+                          <node concept="3uibUv" id="7WKNeR9AowU" role="1tU5fm">
+                            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+                          </node>
+                          <node concept="2OqwBi" id="6tPOoeTcqr5" role="33vP2m">
+                            <node concept="37vLTw" id="6tPOoeTcp$e" role="2Oq$k0">
                               <ref role="3cqZAo" node="Hg6Enc9a3G" resolve="prev" />
                             </node>
-                          </node>
-                        </node>
-                        <node concept="1_o_bx" id="4BHjwwGAPcU" role="1_o_by">
-                          <node concept="1_o_bG" id="4BHjwwGAPcV" role="1_o_aQ">
-                            <property role="TrG5h" value="trace" />
-                          </node>
-                          <node concept="37vLTw" id="4BHjwwGAVzF" role="1_o_bz">
-                            <ref role="3cqZAo" node="Hg6Enc9_Rc" resolve="traces" />
-                          </node>
-                        </node>
-                        <node concept="3clFbS" id="4BHjwwGAILB" role="2LFqv$">
-                          <node concept="3cpWs8" id="7WKNeR9AkUc" role="3cqZAp">
-                            <node concept="3cpWsn" id="7WKNeR9AkUd" role="3cpWs9">
-                              <property role="TrG5h" value="stage" />
-                              <property role="3TUv4t" value="true" />
-                              <node concept="17QB3L" id="7WKNeR9AkTR" role="1tU5fm" />
-                              <node concept="1LFfDK" id="7WKNeR9AkUe" role="33vP2m">
-                                <node concept="3cmrfG" id="7WKNeR9AkUf" role="1LF_Uc">
-                                  <property role="3cmrfH" value="0" />
-                                </node>
-                                <node concept="3M$PaV" id="7WKNeR9AkUg" role="1LFl5Q">
-                                  <ref role="3M$S_o" node="4BHjwwGAILz" resolve="stage_program" />
-                                </node>
-                              </node>
+                            <node concept="liA8E" id="6tPOoeTcr$$" role="2OqNvi">
+                              <ref role="37wK5l" node="6kREIVl0HhM" resolve="getProgram" />
                             </node>
                           </node>
-                          <node concept="3cpWs8" id="7WKNeR9AoxH" role="3cqZAp">
-                            <node concept="3cpWsn" id="7WKNeR9AoxI" role="3cpWs9">
-                              <property role="TrG5h" value="program" />
-                              <property role="3TUv4t" value="true" />
-                              <node concept="3uibUv" id="7WKNeR9AowU" role="1tU5fm">
-                                <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
-                              </node>
-                              <node concept="1LFfDK" id="7WKNeR9AoxJ" role="33vP2m">
-                                <node concept="3cmrfG" id="7WKNeR9AoxK" role="1LF_Uc">
-                                  <property role="3cmrfH" value="1" />
-                                </node>
-                                <node concept="3M$PaV" id="7WKNeR9AoxL" role="1LFl5Q">
-                                  <ref role="3M$S_o" node="4BHjwwGAILz" resolve="stage_program" />
-                                </node>
-                              </node>
-                            </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="7WKNeR9AmNV" role="3cqZAp" />
+                      <node concept="3clFbF" id="Hg6Enc7CQd" role="3cqZAp">
+                        <node concept="37vLTI" id="Hg6Enc7CQe" role="3clFbG">
+                          <node concept="37vLTw" id="Hg6Enc7CQf" role="37vLTJ">
+                            <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
                           </node>
-                          <node concept="3clFbH" id="7WKNeR9AmNV" role="3cqZAp" />
-                          <node concept="3clFbF" id="Hg6Enc7CQd" role="3cqZAp">
-                            <node concept="37vLTI" id="Hg6Enc7CQe" role="3clFbG">
-                              <node concept="37vLTw" id="Hg6Enc7CQf" role="37vLTJ">
-                                <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
-                              </node>
-                              <node concept="2OqwBi" id="Hg6Enc7CQg" role="37vLTx">
-                                <node concept="37vLTw" id="Hg6Enc7CQh" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
+                          <node concept="2OqwBi" id="Hg6Enc7CQg" role="37vLTx">
+                            <node concept="37vLTw" id="Hg6Enc7CQh" role="2Oq$k0">
+                              <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
+                            </node>
+                            <node concept="liA8E" id="Hg6Enc7CQi" role="2OqNvi">
+                              <ref role="37wK5l" to="hano:7nkyKX7v7xb" resolve="and" />
+                              <node concept="2OqwBi" id="Hg6Enc7CQj" role="37wK5m">
+                                <node concept="37vLTw" id="Hg6Enc7CQk" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
                                 </node>
-                                <node concept="liA8E" id="Hg6Enc7CQi" role="2OqNvi">
-                                  <ref role="37wK5l" to="hano:7nkyKX7v7xb" resolve="and" />
-                                  <node concept="2OqwBi" id="Hg6Enc7CQj" role="37wK5m">
-                                    <node concept="37vLTw" id="Hg6Enc7CQk" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
-                                    </node>
-                                    <node concept="liA8E" id="Hg6Enc7CQl" role="2OqNvi">
-                                      <ref role="37wK5l" to="hano:HV6urVFrQ9" resolve="eval" />
-                                      <node concept="37vLTw" id="7WKNeR9GipL" role="37wK5m">
-                                        <ref role="3cqZAo" node="7WKNeR9AkUd" resolve="stage" />
+                                <node concept="liA8E" id="Hg6Enc7CQl" role="2OqNvi">
+                                  <ref role="37wK5l" to="hano:HV6urVFrQ9" resolve="eval" />
+                                  <node concept="37vLTw" id="7WKNeR9GipL" role="37wK5m">
+                                    <ref role="3cqZAo" node="7WKNeR9AkUd" resolve="stage" />
+                                  </node>
+                                  <node concept="37vLTw" id="7WKNeR9AoxM" role="37wK5m">
+                                    <ref role="3cqZAo" node="7WKNeR9AoxI" resolve="program" />
+                                  </node>
+                                  <node concept="2ShNRf" id="7WKNeR9Gjbf" role="37wK5m">
+                                    <node concept="1pGfFk" id="7WKNeR9Gjbg" role="2ShVmc">
+                                      <ref role="37wK5l" node="7nPD14NbIzp" resolve="MultiTrace" />
+                                      <node concept="37vLTw" id="6tPOoeTco$P" role="37wK5m">
+                                        <ref role="3cqZAo" node="Hg6Enc9_Rc" resolve="trace" />
                                       </node>
-                                      <node concept="37vLTw" id="7WKNeR9AoxM" role="37wK5m">
-                                        <ref role="3cqZAo" node="7WKNeR9AoxI" resolve="program" />
-                                      </node>
-                                      <node concept="2ShNRf" id="7WKNeR9Gjbf" role="37wK5m">
-                                        <node concept="1pGfFk" id="7WKNeR9Gjbg" role="2ShVmc">
-                                          <ref role="37wK5l" node="7nPD14NbIzp" resolve="MultiTrace" />
-                                          <node concept="3M$PaV" id="7WKNeR9Gjbh" role="37wK5m">
-                                            <ref role="3M$S_o" node="4BHjwwGAPcV" resolve="trace" />
-                                          </node>
-                                          <node concept="1rXfSq" id="7WKNeR9Gjbi" role="37wK5m">
-                                            <ref role="37wK5l" node="6kREIVky9Kx" resolve="timeout" />
-                                          </node>
-                                        </node>
+                                      <node concept="1rXfSq" id="7WKNeR9Gjbi" role="37wK5m">
+                                        <ref role="37wK5l" node="6kREIVky9Kx" resolve="timeout" />
                                       </node>
                                     </node>
                                   </node>
@@ -2715,192 +2644,192 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="3clFbH" id="Hg6Enc7CQo" role="3cqZAp" />
-                          <node concept="3clFbJ" id="Hg6Enc7CQp" role="3cqZAp">
-                            <node concept="2OqwBi" id="Hg6Enc7CQr" role="3clFbw">
-                              <node concept="37vLTw" id="Hg6Enc7CQs" role="2Oq$k0">
-                                <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
-                              </node>
-                              <node concept="liA8E" id="Hg6Enc7CQt" role="2OqNvi">
-                                <ref role="37wK5l" to="hano:7Oc59RS_hsj" resolve="isSuccessful" />
-                              </node>
-                            </node>
-                            <node concept="3clFbS" id="7WKNeR9zVo8" role="3clFbx">
-                              <node concept="3clFbJ" id="7WKNeR9$rEF" role="3cqZAp">
-                                <node concept="3clFbS" id="7WKNeR9$rEG" role="3clFbx">
-                                  <node concept="3clFbF" id="7WKNeR9$Mkw" role="3cqZAp">
-                                    <node concept="2OqwBi" id="7WKNeR9$N7D" role="3clFbG">
-                                      <node concept="2OqwBi" id="7WKNeR9_x9U" role="2Oq$k0">
-                                        <node concept="37vLTw" id="7WKNeR9_qKx" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
-                                        </node>
-                                        <node concept="liA8E" id="7WKNeR9_ybk" role="2OqNvi">
-                                          <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
-                                        </node>
-                                      </node>
-                                      <node concept="liA8E" id="7WKNeR9$NVL" role="2OqNvi">
-                                        <ref role="37wK5l" to="i348:7P_FdVQ_jFm" resolve="onNext" />
-                                        <node concept="37vLTw" id="7WKNeR9AuTl" role="37wK5m">
-                                          <ref role="3cqZAo" node="7WKNeR9AkUd" resolve="stage" />
-                                        </node>
-                                        <node concept="2OqwBi" id="7WKNeR9$Y1M" role="37wK5m">
-                                          <node concept="37vLTw" id="7WKNeR9$Xd$" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
-                                          </node>
-                                          <node concept="liA8E" id="7WKNeR9$YSO" role="2OqNvi">
-                                            <ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3y3z36" id="7WKNeR9$rEM" role="3clFbw">
-                                  <node concept="10Nm6u" id="7WKNeR9$rEN" role="3uHU7w" />
-                                  <node concept="2OqwBi" id="7WKNeR9_vhW" role="3uHU7B">
-                                    <node concept="37vLTw" id="7WKNeR9_um5" role="2Oq$k0">
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="Hg6Enc7CQo" role="3cqZAp" />
+                      <node concept="3clFbJ" id="Hg6Enc7CQp" role="3cqZAp">
+                        <node concept="2OqwBi" id="Hg6Enc7CQr" role="3clFbw">
+                          <node concept="37vLTw" id="Hg6Enc7CQs" role="2Oq$k0">
+                            <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
+                          </node>
+                          <node concept="liA8E" id="Hg6Enc7CQt" role="2OqNvi">
+                            <ref role="37wK5l" to="hano:7Oc59RS_hsj" resolve="isSuccessful" />
+                          </node>
+                        </node>
+                        <node concept="3clFbS" id="7WKNeR9zVo8" role="3clFbx">
+                          <node concept="3clFbJ" id="7WKNeR9$rEF" role="3cqZAp">
+                            <node concept="3clFbS" id="7WKNeR9$rEG" role="3clFbx">
+                              <node concept="3clFbF" id="7WKNeR9$Mkw" role="3cqZAp">
+                                <node concept="2OqwBi" id="7WKNeR9$N7D" role="3clFbG">
+                                  <node concept="2OqwBi" id="7WKNeR9_x9U" role="2Oq$k0">
+                                    <node concept="37vLTw" id="7WKNeR9_qKx" role="2Oq$k0">
                                       <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
                                     </node>
-                                    <node concept="liA8E" id="7WKNeR9_waj" role="2OqNvi">
+                                    <node concept="liA8E" id="7WKNeR9_ybk" role="2OqNvi">
                                       <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
                                     </node>
                                   </node>
+                                  <node concept="liA8E" id="7WKNeR9$NVL" role="2OqNvi">
+                                    <ref role="37wK5l" to="i348:7P_FdVQ_jFm" resolve="onNext" />
+                                    <node concept="37vLTw" id="7WKNeR9AuTl" role="37wK5m">
+                                      <ref role="3cqZAo" node="7WKNeR9AkUd" resolve="stage" />
+                                    </node>
+                                    <node concept="2OqwBi" id="7WKNeR9$Y1M" role="37wK5m">
+                                      <node concept="37vLTw" id="7WKNeR9$Xd$" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
+                                      </node>
+                                      <node concept="liA8E" id="7WKNeR9$YSO" role="2OqNvi">
+                                        <ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
+                                      </node>
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="7WKNeR9zZA8" role="3cqZAp" />
                             </node>
-                            <node concept="9aQIb" id="7WKNeR9zW7_" role="9aQIa">
-                              <node concept="3clFbS" id="Hg6Enc7CQu" role="9aQI4">
-                                <node concept="3cpWs8" id="19wqdqOkjca" role="3cqZAp">
-                                  <node concept="3cpWsn" id="19wqdqOkjcb" role="3cpWs9">
-                                    <property role="TrG5h" value="ex" />
-                                    <node concept="3uibUv" id="19wqdqOkjc9" role="1tU5fm">
-                                      <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
-                                    </node>
-                                    <node concept="2EnYce" id="19wqdqOszQK" role="33vP2m">
-                                      <node concept="2OqwBi" id="19wqdqOkjcd" role="2Oq$k0">
-                                        <node concept="1eOMI4" id="19wqdqOkjce" role="2Oq$k0">
-                                          <node concept="10QFUN" id="19wqdqOkjcf" role="1eOMHV">
-                                            <node concept="A3Dl8" id="19wqdqOkjcg" role="10QFUM">
-                                              <node concept="3uibUv" id="19wqdqOkjch" role="A3Ik2">
-                                                <ref role="3uigEE" to="hano:6i42QSs$lgC" resolve="Result.ReportedError" />
-                                              </node>
-                                            </node>
-                                            <node concept="2OqwBi" id="19wqdqOkjci" role="10QFUP">
-                                              <node concept="37vLTw" id="19wqdqOkjcj" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
-                                              </node>
-                                              <node concept="liA8E" id="19wqdqOkjck" role="2OqNvi">
-                                                <ref role="37wK5l" to="hano:7Oc59RSEnG3" resolve="errors" />
-                                              </node>
-                                            </node>
+                            <node concept="3y3z36" id="7WKNeR9$rEM" role="3clFbw">
+                              <node concept="10Nm6u" id="7WKNeR9$rEN" role="3uHU7w" />
+                              <node concept="2OqwBi" id="7WKNeR9_vhW" role="3uHU7B">
+                                <node concept="37vLTw" id="7WKNeR9_um5" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
+                                </node>
+                                <node concept="liA8E" id="7WKNeR9_waj" role="2OqNvi">
+                                  <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbH" id="7WKNeR9zZA8" role="3cqZAp" />
+                        </node>
+                        <node concept="9aQIb" id="7WKNeR9zW7_" role="9aQIa">
+                          <node concept="3clFbS" id="Hg6Enc7CQu" role="9aQI4">
+                            <node concept="3cpWs8" id="19wqdqOkjca" role="3cqZAp">
+                              <node concept="3cpWsn" id="19wqdqOkjcb" role="3cpWs9">
+                                <property role="TrG5h" value="ex" />
+                                <node concept="3uibUv" id="19wqdqOkjc9" role="1tU5fm">
+                                  <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+                                </node>
+                                <node concept="2EnYce" id="19wqdqOszQK" role="33vP2m">
+                                  <node concept="2OqwBi" id="19wqdqOkjcd" role="2Oq$k0">
+                                    <node concept="1eOMI4" id="19wqdqOkjce" role="2Oq$k0">
+                                      <node concept="10QFUN" id="19wqdqOkjcf" role="1eOMHV">
+                                        <node concept="A3Dl8" id="19wqdqOkjcg" role="10QFUM">
+                                          <node concept="3uibUv" id="19wqdqOkjch" role="A3Ik2">
+                                            <ref role="3uigEE" to="hano:6i42QSs$lgC" resolve="Result.ReportedError" />
                                           </node>
                                         </node>
-                                        <node concept="1z4cxt" id="19wqdqOkjcl" role="2OqNvi">
-                                          <node concept="1bVj0M" id="19wqdqOkjcm" role="23t8la">
-                                            <node concept="3clFbS" id="19wqdqOkjcn" role="1bW5cS">
-                                              <node concept="3clFbF" id="19wqdqOkjco" role="3cqZAp">
-                                                <node concept="1Wc70l" id="19wqdqOs4QT" role="3clFbG">
-                                                  <node concept="3y3z36" id="19wqdqOs6wx" role="3uHU7B">
-                                                    <node concept="10Nm6u" id="19wqdqOs7ae" role="3uHU7w" />
-                                                    <node concept="37vLTw" id="19wqdqOs5Mh" role="3uHU7B">
-                                                      <ref role="3cqZAo" node="19wqdqOkjcu" resolve="it" />
-                                                    </node>
+                                        <node concept="2OqwBi" id="19wqdqOkjci" role="10QFUP">
+                                          <node concept="37vLTw" id="19wqdqOkjcj" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
+                                          </node>
+                                          <node concept="liA8E" id="19wqdqOkjck" role="2OqNvi">
+                                            <ref role="37wK5l" to="hano:7Oc59RSEnG3" resolve="errors" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="1z4cxt" id="19wqdqOkjcl" role="2OqNvi">
+                                      <node concept="1bVj0M" id="19wqdqOkjcm" role="23t8la">
+                                        <node concept="3clFbS" id="19wqdqOkjcn" role="1bW5cS">
+                                          <node concept="3clFbF" id="19wqdqOkjco" role="3cqZAp">
+                                            <node concept="1Wc70l" id="19wqdqOs4QT" role="3clFbG">
+                                              <node concept="3y3z36" id="19wqdqOs6wx" role="3uHU7B">
+                                                <node concept="10Nm6u" id="19wqdqOs7ae" role="3uHU7w" />
+                                                <node concept="37vLTw" id="19wqdqOs5Mh" role="3uHU7B">
+                                                  <ref role="3cqZAo" node="19wqdqOkjcu" resolve="it" />
+                                                </node>
+                                              </node>
+                                              <node concept="3y3z36" id="19wqdqOkjcp" role="3uHU7w">
+                                                <node concept="10Nm6u" id="19wqdqOkjcq" role="3uHU7w" />
+                                                <node concept="2OqwBi" id="19wqdqOkjcr" role="3uHU7B">
+                                                  <node concept="37vLTw" id="19wqdqOkjcs" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="19wqdqOkjcu" resolve="it" />
                                                   </node>
-                                                  <node concept="3y3z36" id="19wqdqOkjcp" role="3uHU7w">
-                                                    <node concept="10Nm6u" id="19wqdqOkjcq" role="3uHU7w" />
-                                                    <node concept="2OqwBi" id="19wqdqOkjcr" role="3uHU7B">
-                                                      <node concept="37vLTw" id="19wqdqOkjcs" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="19wqdqOkjcu" resolve="it" />
-                                                      </node>
-                                                      <node concept="liA8E" id="19wqdqOkjct" role="2OqNvi">
-                                                        <ref role="37wK5l" to="hano:6i42QSs$lhc" resolve="exception" />
-                                                      </node>
-                                                    </node>
+                                                  <node concept="liA8E" id="19wqdqOkjct" role="2OqNvi">
+                                                    <ref role="37wK5l" to="hano:6i42QSs$lhc" resolve="exception" />
                                                   </node>
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="Rh6nW" id="19wqdqOkjcu" role="1bW2Oz">
-                                              <property role="TrG5h" value="it" />
-                                              <node concept="2jxLKc" id="19wqdqOkjcv" role="1tU5fm" />
-                                            </node>
                                           </node>
                                         </node>
-                                      </node>
-                                      <node concept="liA8E" id="19wqdqOs$W0" role="2OqNvi">
-                                        <ref role="37wK5l" to="hano:6i42QSs$lhc" resolve="exception" />
+                                        <node concept="Rh6nW" id="19wqdqOkjcu" role="1bW2Oz">
+                                          <property role="TrG5h" value="it" />
+                                          <node concept="2jxLKc" id="19wqdqOkjcv" role="1tU5fm" />
+                                        </node>
                                       </node>
                                     </node>
                                   </node>
+                                  <node concept="liA8E" id="19wqdqOs$W0" role="2OqNvi">
+                                    <ref role="37wK5l" to="hano:6i42QSs$lhc" resolve="exception" />
+                                  </node>
                                 </node>
-                                <node concept="3clFbJ" id="7WKNeR9$11B" role="3cqZAp">
-                                  <node concept="3clFbS" id="7WKNeR9$11D" role="3clFbx">
-                                    <node concept="3clFbF" id="7WKNeR9$kQ6" role="3cqZAp">
-                                      <node concept="2OqwBi" id="7WKNeR9$lHy" role="3clFbG">
-                                        <node concept="2OqwBi" id="7WKNeR9_BAK" role="2Oq$k0">
-                                          <node concept="37vLTw" id="7WKNeR9_AAA" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
-                                          </node>
-                                          <node concept="liA8E" id="7WKNeR9_Cwm" role="2OqNvi">
-                                            <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
-                                          </node>
-                                        </node>
-                                        <node concept="liA8E" id="7WKNeR9$mx1" role="2OqNvi">
-                                          <ref role="37wK5l" to="i348:7P_FdVQ_jU$" resolve="onFailure" />
-                                          <node concept="37vLTw" id="7WKNeR9$o3_" role="37wK5m">
-                                            <ref role="3cqZAo" node="19wqdqOkjcb" resolve="ex" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3y3z36" id="7WKNeR9$jSU" role="3clFbw">
-                                    <node concept="10Nm6u" id="7WKNeR9$jXg" role="3uHU7w" />
-                                    <node concept="2OqwBi" id="7WKNeR9_$Ih" role="3uHU7B">
-                                      <node concept="37vLTw" id="7WKNeR9_zLu" role="2Oq$k0">
+                              </node>
+                            </node>
+                            <node concept="3clFbJ" id="7WKNeR9$11B" role="3cqZAp">
+                              <node concept="3clFbS" id="7WKNeR9$11D" role="3clFbx">
+                                <node concept="3clFbF" id="7WKNeR9$kQ6" role="3cqZAp">
+                                  <node concept="2OqwBi" id="7WKNeR9$lHy" role="3clFbG">
+                                    <node concept="2OqwBi" id="7WKNeR9_BAK" role="2Oq$k0">
+                                      <node concept="37vLTw" id="7WKNeR9_AAA" role="2Oq$k0">
                                         <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
                                       </node>
-                                      <node concept="liA8E" id="7WKNeR9__Ke" role="2OqNvi">
+                                      <node concept="liA8E" id="7WKNeR9_Cwm" role="2OqNvi">
                                         <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
                                       </node>
                                     </node>
+                                    <node concept="liA8E" id="7WKNeR9$mx1" role="2OqNvi">
+                                      <ref role="37wK5l" to="i348:7P_FdVQ_jU$" resolve="onFailure" />
+                                      <node concept="37vLTw" id="7WKNeR9$o3_" role="37wK5m">
+                                        <ref role="3cqZAo" node="19wqdqOkjcb" resolve="ex" />
+                                      </node>
+                                    </node>
                                   </node>
                                 </node>
-                                <node concept="3clFbH" id="7WKNeR9$0ha" role="3cqZAp" />
-                                <node concept="YS8fn" id="6kREIVkirxV" role="3cqZAp">
-                                  <node concept="2ShNRf" id="6kREIVkitlD" role="YScLw">
-                                    <node concept="1pGfFk" id="6kREIVkix5J" role="2ShVmc">
-                                      <ref role="37wK5l" node="6kREIVkwjAo" resolve="ResumeNextStepException" />
-                                      <node concept="2OqwBi" id="6kREIVkwoyV" role="37wK5m">
-                                        <node concept="37vLTw" id="6kREIVkwoyW" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
+                              </node>
+                              <node concept="3y3z36" id="7WKNeR9$jSU" role="3clFbw">
+                                <node concept="10Nm6u" id="7WKNeR9$jXg" role="3uHU7w" />
+                                <node concept="2OqwBi" id="7WKNeR9_$Ih" role="3uHU7B">
+                                  <node concept="37vLTw" id="7WKNeR9_zLu" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
+                                  </node>
+                                  <node concept="liA8E" id="7WKNeR9__Ke" role="2OqNvi">
+                                    <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbH" id="7WKNeR9$0ha" role="3cqZAp" />
+                            <node concept="YS8fn" id="6kREIVkirxV" role="3cqZAp">
+                              <node concept="2ShNRf" id="6kREIVkitlD" role="YScLw">
+                                <node concept="1pGfFk" id="6kREIVkix5J" role="2ShVmc">
+                                  <ref role="37wK5l" node="6kREIVkwjAo" resolve="ResumeNextStepException" />
+                                  <node concept="2OqwBi" id="6kREIVkwoyV" role="37wK5m">
+                                    <node concept="37vLTw" id="6kREIVkwoyW" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
+                                    </node>
+                                    <node concept="liA8E" id="6kREIVkwoyX" role="2OqNvi">
+                                      <ref role="37wK5l" to="hano:6i42QSsna8j" resolve="message" />
+                                    </node>
+                                  </node>
+                                  <node concept="Xjq3P" id="6kREIVkiCK$" role="37wK5m" />
+                                  <node concept="2ShNRf" id="4BHjwwGKNNn" role="37wK5m">
+                                    <node concept="1pGfFk" id="4BHjwwGKP9i" role="2ShVmc">
+                                      <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="RuntimeException" />
+                                      <node concept="3cpWs3" id="4BHjwwGKTpz" role="37wK5m">
+                                        <node concept="Xl_RD" id="4BHjwwGKU2M" role="3uHU7B">
+                                          <property role="Xl_RC" value="Failure evaluating rules: " />
                                         </node>
-                                        <node concept="liA8E" id="6kREIVkwoyX" role="2OqNvi">
-                                          <ref role="37wK5l" to="hano:6i42QSsna8j" resolve="message" />
+                                        <node concept="2OqwBi" id="4BHjwwGKQQi" role="3uHU7w">
+                                          <node concept="37vLTw" id="4BHjwwGKQb5" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
+                                          </node>
+                                          <node concept="liA8E" id="4BHjwwGKR$K" role="2OqNvi">
+                                            <ref role="37wK5l" to="hano:6i42QSsna8j" resolve="message" />
+                                          </node>
                                         </node>
                                       </node>
-                                      <node concept="Xjq3P" id="6kREIVkiCK$" role="37wK5m" />
-                                      <node concept="2ShNRf" id="4BHjwwGKNNn" role="37wK5m">
-                                        <node concept="1pGfFk" id="4BHjwwGKP9i" role="2ShVmc">
-                                          <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="RuntimeException" />
-                                          <node concept="3cpWs3" id="4BHjwwGKTpz" role="37wK5m">
-                                            <node concept="Xl_RD" id="4BHjwwGKU2M" role="3uHU7B">
-                                              <property role="Xl_RC" value="Failure evaluating rules: " />
-                                            </node>
-                                            <node concept="2OqwBi" id="4BHjwwGKQQi" role="3uHU7w">
-                                              <node concept="37vLTw" id="4BHjwwGKQb5" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
-                                              </node>
-                                              <node concept="liA8E" id="4BHjwwGKR$K" role="2OqNvi">
-                                                <ref role="37wK5l" to="hano:6i42QSsna8j" resolve="message" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                          <node concept="37vLTw" id="19wqdqOklYq" role="37wK5m">
-                                            <ref role="3cqZAo" node="19wqdqOkjcb" resolve="ex" />
-                                          </node>
-                                        </node>
+                                      <node concept="37vLTw" id="19wqdqOklYq" role="37wK5m">
+                                        <ref role="3cqZAo" node="19wqdqOkjcb" resolve="ex" />
                                       </node>
                                     </node>
                                   </node>
@@ -2908,28 +2837,28 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="3clFbH" id="7WKNeR9zC9b" role="3cqZAp" />
-                          <node concept="3SKdUt" id="7WKNeR9zDBE" role="3cqZAp">
-                            <node concept="3SKdUq" id="7WKNeR9zDBG" role="3SKWNk">
-                              <property role="3SKdUp" value="the store view after the last successful stage evaluation" />
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="7WKNeR9zC9b" role="3cqZAp" />
+                      <node concept="3SKdUt" id="7WKNeR9zDBE" role="3cqZAp">
+                        <node concept="3SKdUq" id="7WKNeR9zDBG" role="3SKWNk">
+                          <property role="3SKdUp" value="the store view after the last successful stage evaluation" />
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="Hg6Enc7CQZ" role="3cqZAp">
+                        <node concept="37vLTI" id="Hg6Enc7CR0" role="3clFbG">
+                          <node concept="2OqwBi" id="Hg6Enc7CR1" role="37vLTJ">
+                            <node concept="Xjq3P" id="Hg6Enc7CR2" role="2Oq$k0" />
+                            <node concept="2OwXpG" id="Hg6Enc7CR3" role="2OqNvi">
+                              <ref role="2Oxat5" node="1CcQBrQoJoP" resolve="storeView" />
                             </node>
                           </node>
-                          <node concept="3clFbF" id="Hg6Enc7CQZ" role="3cqZAp">
-                            <node concept="37vLTI" id="Hg6Enc7CR0" role="3clFbG">
-                              <node concept="2OqwBi" id="Hg6Enc7CR1" role="37vLTJ">
-                                <node concept="Xjq3P" id="Hg6Enc7CR2" role="2Oq$k0" />
-                                <node concept="2OwXpG" id="Hg6Enc7CR3" role="2OqNvi">
-                                  <ref role="2Oxat5" node="1CcQBrQoJoP" resolve="storeView" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="Hg6Enc7CR4" role="37vLTx">
-                                <node concept="37vLTw" id="Hg6Enc7CR5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
-                                </node>
-                                <node concept="liA8E" id="Hg6Enc7CR6" role="2OqNvi">
-                                  <ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
-                                </node>
-                              </node>
+                          <node concept="2OqwBi" id="Hg6Enc7CR4" role="37vLTx">
+                            <node concept="37vLTw" id="Hg6Enc7CR5" role="2Oq$k0">
+                              <ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
+                            </node>
+                            <node concept="liA8E" id="Hg6Enc7CR6" role="2OqNvi">
+                              <ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
                             </node>
                           </node>
                         </node>
@@ -2989,10 +2918,8 @@
                     <node concept="3uibUv" id="Hg6Enc8A8x" role="1Lm7xW">
                       <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
                     </node>
-                    <node concept="_YKpA" id="4BHjwwGA9fg" role="1Lm7xW">
-                      <node concept="3uibUv" id="4BHjwwGA9fh" role="_ZDj9">
-                        <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                      </node>
+                    <node concept="3uibUv" id="4BHjwwGA78e" role="1Lm7xW">
+                      <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
                     </node>
                   </node>
                 </node>
@@ -4011,14 +3938,9 @@
     </node>
     <node concept="2tJIrI" id="20Ay2VeQP0v" role="jymVt" />
     <node concept="3clFb_" id="6kREIVl0HhM" role="jymVt">
-      <property role="TrG5h" value="getPrograms" />
-      <node concept="_YKpA" id="6kREIVl0HhN" role="3clF45">
-        <node concept="1LlUBW" id="7WKNeR9lnVH" role="_ZDj9">
-          <node concept="17QB3L" id="7WKNeR9loeH" role="1Lm7xW" />
-          <node concept="3uibUv" id="7WKNeR9look" role="1Lm7xW">
-            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
-          </node>
-        </node>
+      <property role="TrG5h" value="getProgram" />
+      <node concept="3uibUv" id="6tPOoeTcatz" role="3clF45">
+        <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
       </node>
       <node concept="3Tm1VV" id="6kREIVl0HhP" role="1B3o_S" />
       <node concept="3clFbS" id="6kREIVl0HhQ" role="3clF47">
@@ -4028,7 +3950,7 @@
               <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" />
+              <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
             </node>
           </node>
         </node>
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 c005fd2c..edcaaf4a 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
@@ -583,7 +583,6 @@
         <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>
@@ -717,7 +716,6 @@
         <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" />
@@ -893,11 +891,6 @@
       <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" />
@@ -908,131 +901,6 @@
       <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" />
       <ref role="2sgKRv" node="6w6CYIRhsKS" resolve="rule_class" />
@@ -16187,54 +16055,6 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="2tJIrI" id="7P_FdVQpaC1" role="jymVt" />
-    <node concept="3clFb_" id="20Ay2Vf1jGw" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="stage" />
-      <node concept="3Tm1VV" id="20Ay2Vf1jGy" role="1B3o_S" />
-      <node concept="17QB3L" id="20Ay2Vf1jGz" role="3clF45" />
-      <node concept="3clFbS" id="20Ay2Vf1jG$" role="3clF47">
-        <node concept="3clFbF" id="20Ay2Vf1mvH" role="3cqZAp">
-          <node concept="Xl_RD" id="20Ay2Vf1mvG" role="3clFbG">
-            <property role="Xl_RC" value="" />
-            <node concept="17Uvod" id="20Ay2Vf1mw6" role="lGtFl">
-              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-              <property role="2qtEX9" value="value" />
-              <node concept="3zFVjK" id="20Ay2Vf1mw7" role="3zH0cK">
-                <node concept="3clFbS" id="20Ay2Vf1mw8" role="2VODD2">
-                  <node concept="3clFbF" id="20Ay2Vf1nBD" role="3cqZAp">
-                    <node concept="3K4zz7" id="20Ay2Vf1ph_" role="3clFbG">
-                      <node concept="2OqwBi" id="20Ay2Vf1pDn" role="3K4E3e">
-                        <node concept="30H73N" id="20Ay2Vf1pti" role="2Oq$k0" />
-                        <node concept="3TrcHB" id="20Ay2Vf1pVp" role="2OqNvi">
-                          <ref role="3TsBF5" to="wq2x:20Ay2Vf1h9X" resolve="stage" />
-                        </node>
-                      </node>
-                      <node concept="Xl_RD" id="20Ay2Vf1qb_" role="3K4GZi">
-                        <property role="Xl_RC" value=".initial" />
-                      </node>
-                      <node concept="3y3z36" id="20Ay2Vf1oUD" role="3K4Cdx">
-                        <node concept="10Nm6u" id="20Ay2Vf1p9$" role="3uHU7w" />
-                        <node concept="2OqwBi" id="20Ay2Vf1nPg" role="3uHU7B">
-                          <node concept="30H73N" id="20Ay2Vf1nBC" role="2Oq$k0" />
-                          <node concept="3TrcHB" id="20Ay2Vf1o9o" role="2OqNvi">
-                            <ref role="3TsBF5" to="wq2x:20Ay2Vf1h9X" resolve="stage" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="20Ay2Vf1jG_" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="20Ay2Vf1l6U" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUa3oY" role="jymVt">
       <property role="1EzhhJ" value="false" />
@@ -20124,697 +19944,6 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="7P_FdVPsJiz">
-    <property role="TrG5h" value="QueryStageTemplateImpl" />
-    <property role="3GE5qa" value="query" />
-    <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="6OXbTD$oTt2" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <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="6OXbTD$rl40" role="lGtFl">
-              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-              <property role="2qtEX9" value="value" />
-              <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>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="6OXbTD$oTta" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <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="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="3uibUv" id="mJ_D14GCMV" role="3clF45">
-        <ref role="3uigEE" node="mJ_D14GspB" resolve="QueryStageTemplateImpl.Token" />
-      </node>
-      <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 concept="37vLTw" id="2BZXJed3em_" role="37wK5m">
-                <ref role="3cqZAo" node="mJ_D14AmWX" resolve="parameter" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="mJ_D14AmX6" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <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" />
-      <node concept="3Tm6S6" id="7P_FdVPsY9v" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVPsY9w" role="3clF47">
-        <node concept="3clFbJ" id="7P_FdVPsY9x" role="3cqZAp">
-          <node concept="3clFbC" id="7P_FdVPsY9y" role="3clFbw">
-            <node concept="10Nm6u" id="7P_FdVPsY9z" role="3uHU7w" />
-            <node concept="37vLTw" id="7P_FdVPsY9$" role="3uHU7B">
-              <ref role="3cqZAo" node="7P_FdVPsYak" resolve="handlerFqNames" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="7P_FdVPsY9_" role="3clFbx">
-            <node concept="3cpWs8" id="7P_FdVPsY9A" role="3cqZAp">
-              <node concept="3cpWsn" id="7P_FdVPsY9B" role="3cpWs9">
-                <property role="TrG5h" value="list" />
-                <node concept="_YKpA" id="7P_FdVPsY9C" role="1tU5fm">
-                  <node concept="17QB3L" id="7P_FdVQBqB_" role="_ZDj9" />
-                </node>
-                <node concept="2ShNRf" id="7P_FdVPsY9E" role="33vP2m">
-                  <node concept="Tc6Ow" id="7P_FdVPsY9F" role="2ShVmc">
-                    <node concept="17QB3L" id="7P_FdVQBqX4" role="HW$YZ" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7P_FdVPsY9H" role="3cqZAp">
-              <node concept="2OqwBi" id="7P_FdVPsY9I" role="3clFbG">
-                <node concept="37vLTw" id="7P_FdVPsY9J" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7P_FdVPsY9B" resolve="list" />
-                </node>
-                <node concept="TSZUe" id="7P_FdVPsY9K" role="2OqNvi">
-                  <node concept="Xl_RD" id="7P_FdVQBre6" role="25WWJ7">
-                    <property role="Xl_RC" value="" />
-                    <node concept="17Uvod" id="7P_FdVQBrvJ" role="lGtFl">
-                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                      <property role="2qtEX9" value="value" />
-                      <node concept="3zFVjK" id="7P_FdVQBrvK" role="3zH0cK">
-                        <node concept="3clFbS" id="7P_FdVQBrvL" role="2VODD2">
-                          <node concept="3clFbF" id="7P_FdVQBrRo" role="3cqZAp">
-                            <node concept="2OqwBi" id="7P_FdVQBs6A" role="3clFbG">
-                              <node concept="30H73N" id="7P_FdVQBrRn" role="2Oq$k0" />
-                              <node concept="2qgKlT" id="7P_FdVQBsOI" role="2OqNvi">
-                                <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1WS0z7" id="7P_FdVPsY9V" role="lGtFl">
-                <node concept="3JmXsc" id="7P_FdVPsY9W" role="3Jn$fo">
-                  <node concept="3clFbS" id="7P_FdVPsY9X" role="2VODD2">
-                    <node concept="3clFbF" id="7P_FdVPsY9Y" role="3cqZAp">
-                      <node concept="2OqwBi" id="7P_FdVPsY9Z" role="3clFbG">
-                        <node concept="2OqwBi" id="7P_FdVPsYa0" role="2Oq$k0">
-                          <node concept="1iwH7S" id="7P_FdVPsYa1" role="2Oq$k0" />
-                          <node concept="1r8y6K" id="7P_FdVPsYa2" role="2OqNvi" />
-                        </node>
-                        <node concept="2SmgA7" id="7P_FdVPsYa3" role="2OqNvi">
-                          <node concept="chp4Y" id="7P_FdVPsYa4" role="1dBWTz">
-                            <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7P_FdVPsYa5" role="3cqZAp">
-              <node concept="37vLTI" id="7P_FdVPsYa6" role="3clFbG">
-                <node concept="2OqwBi" id="7P_FdVPsYa7" role="37vLTx">
-                  <node concept="37vLTw" id="7P_FdVPsYa8" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7P_FdVPsY9B" resolve="list" />
-                  </node>
-                  <node concept="26Dbio" id="7P_FdVPsYa9" role="2OqNvi" />
-                </node>
-                <node concept="2OqwBi" id="7P_FdVPsYaa" role="37vLTJ">
-                  <node concept="Xjq3P" id="7P_FdVPsYab" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="7P_FdVPsYac" role="2OqNvi">
-                    <ref role="2Oxat5" node="7P_FdVPsYak" resolve="handlerFqNames" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </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="1eOMI4" id="2BZXJecQvzH" role="37vLTx">
-                <node concept="10QFUN" id="2BZXJecQvzI" role="1eOMHV">
-                  <node concept="3uibUv" id="2BZXJecQvzr" role="10QFUM">
-                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                    <node concept="29HgVG" id="2BZXJecQvzs" role="lGtFl">
-                      <node concept="3NFfHV" id="2BZXJecQvzt" role="3NFExx">
-                        <node concept="3clFbS" id="2BZXJecQvzu" role="2VODD2">
-                          <node concept="3clFbF" id="2BZXJecQvzv" role="3cqZAp">
-                            <node concept="2OqwBi" id="2BZXJecQvzw" role="3clFbG">
-                              <node concept="30H73N" id="2BZXJecQvzx" role="2Oq$k0" />
-                              <node concept="3TrEf2" id="2BZXJecQvzy" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:2BZXJecQkiP" resolve="type" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="AH0OO" id="2BZXJecQvzz" role="10QFUP">
-                    <node concept="3cmrfG" id="2BZXJecQvz$" role="AHEQo">
-                      <property role="3cmrfH" value="0" />
-                      <node concept="17Uvod" id="2BZXJecQvz_" role="lGtFl">
-                        <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
-                        <property role="2qtEX9" value="value" />
-                        <node concept="3zFVjK" id="2BZXJecQvzA" role="3zH0cK">
-                          <node concept="3clFbS" id="2BZXJecQvzB" role="2VODD2">
-                            <node concept="3clFbF" id="2BZXJecQvzC" role="3cqZAp">
-                              <node concept="2OqwBi" id="2BZXJecQvzD" role="3clFbG">
-                                <node concept="1iwH7S" id="2BZXJecQvzE" role="2Oq$k0" />
-                                <node concept="1qCSth" id="2BZXJecQvzF" role="2OqNvi">
-                                  <property role="1qCSqd" value="idx" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="2BZXJecQvzG" role="AHHXb">
-                      <ref role="3cqZAo" node="6OXbTDyAyw_" resolve="parameter" />
-                    </node>
-                  </node>
-                </node>
-              </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 concept="1WS0z7" id="2BZXJecQfSI" role="lGtFl">
-              <property role="1qytDF" value="idx" />
-              <node concept="3JmXsc" id="2BZXJecQfSK" role="3Jn$fo">
-                <node concept="3clFbS" id="2BZXJecQfSM" role="2VODD2">
-                  <node concept="3clFbF" id="2BZXJecQgEE" role="3cqZAp">
-                    <node concept="2OqwBi" id="2BZXJecQidP" role="3clFbG">
-                      <node concept="2OqwBi" id="2BZXJecQgU3" role="2Oq$k0">
-                        <node concept="30H73N" id="2BZXJecQgED" role="2Oq$k0" />
-                        <node concept="2Xjw5R" id="2BZXJecQhut" role="2OqNvi">
-                          <node concept="1xMEDy" id="2BZXJecQhuv" role="1xVPHs">
-                            <node concept="chp4Y" id="2BZXJecQh_Z" role="ri$Ld">
-                              <ref role="cht4Q" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3Tsc0h" id="2BZXJecQixO" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:2BZXJecNeMM" resolve="parameter" />
-                      </node>
-                    </node>
-                  </node>
-                </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="6pyv:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-          </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="3uibUv" id="6OXbTDyAFFf" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          <node concept="29HgVG" id="2BZXJecQkM8" role="lGtFl">
-            <node concept="3NFfHV" id="2BZXJecQkX_" role="3NFExx">
-              <node concept="3clFbS" id="2BZXJecQkXA" role="2VODD2">
-                <node concept="3clFbF" id="2BZXJecQleJ" role="3cqZAp">
-                  <node concept="2OqwBi" id="2BZXJecQlzX" role="3clFbG">
-                    <node concept="30H73N" id="2BZXJecQleI" role="2Oq$k0" />
-                    <node concept="3TrEf2" id="2BZXJecQnmQ" role="2OqNvi">
-                      <ref role="3Tt5mk" to="wq2x:2BZXJecQkiP" resolve="type" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1WS0z7" id="2BZXJecQ1el" role="lGtFl">
-          <ref role="2rW$FS" node="2BZXJecSPIi" resolve="query_parameter" />
-          <node concept="3JmXsc" id="2BZXJecQ1en" role="3Jn$fo">
-            <node concept="3clFbS" id="2BZXJecQ1ep" role="2VODD2">
-              <node concept="3clFbF" id="2BZXJecQ1mB" role="3cqZAp">
-                <node concept="2OqwBi" id="2BZXJecQjwj" role="3clFbG">
-                  <node concept="2OqwBi" id="2BZXJecQ1A0" role="2Oq$k0">
-                    <node concept="30H73N" id="2BZXJecQ1mA" role="2Oq$k0" />
-                    <node concept="2Xjw5R" id="2BZXJecQj5r" role="2OqNvi">
-                      <node concept="1xMEDy" id="2BZXJecQj5t" role="1xVPHs">
-                        <node concept="chp4Y" id="2BZXJecQjfq" role="ri$Ld">
-                          <ref role="cht4Q" to="wq2x:6OXbTD$dU7b" resolve="Query" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3Tsc0h" id="2BZXJecQjXL" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:2BZXJecNeMM" resolve="parameter" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="17Uvod" id="2BZXJecV_Ka" role="lGtFl">
-          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
-          <property role="2qtEX9" value="name" />
-          <node concept="3zFVjK" id="2BZXJecV_Kb" role="3zH0cK">
-            <node concept="3clFbS" id="2BZXJecV_Kc" role="2VODD2">
-              <node concept="3clFbF" id="2BZXJecVACL" role="3cqZAp">
-                <node concept="2OqwBi" id="2BZXJecVATE" role="3clFbG">
-                  <node concept="30H73N" id="2BZXJecVACK" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="2BZXJecVF$K" role="2OqNvi">
-                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </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" />
-      <node concept="2tJIrI" id="7P_FdVPsNz5" role="jymVt" />
-      <node concept="3clFb_" id="7P_FdVQ_tvH" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="configure" />
-        <node concept="37vLTG" id="7P_FdVQ_tvI" role="3clF46">
-          <property role="TrG5h" value="stage" />
-          <node concept="17QB3L" id="7P_FdVQ_tvJ" role="1tU5fm" />
-        </node>
-        <node concept="37vLTG" id="7P_FdVQ_tvK" role="3clF46">
-          <property role="TrG5h" value="config" />
-          <node concept="3uibUv" id="7P_FdVQ_tvL" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="7P_FdVQ_tvM" role="3clF45">
-          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
-        </node>
-        <node concept="3Tm1VV" id="7P_FdVQ_tvN" role="1B3o_S" />
-        <node concept="3clFbS" id="7P_FdVQ_tvP" role="3clF47">
-          <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>
-        <node concept="2AHcQZ" id="7P_FdVQ_tvQ" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="7P_FdVQ_tI0" role="jymVt" />
-      <node concept="3Tm1VV" id="7P_FdVPsNom" role="1B3o_S" />
-      <node concept="3uibUv" id="7P_FdVPsNwi" role="EKbjA">
-        <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7P_FdVPsJvQ" role="jymVt" />
-    <node concept="312cEg" id="7P_FdVPsYak" role="jymVt">
-      <property role="TrG5h" value="handlerFqNames" />
-      <node concept="3Tm6S6" id="7P_FdVPsYal" role="1B3o_S" />
-      <node concept="_YKpA" id="7P_FdVPsYam" role="1tU5fm">
-        <node concept="17QB3L" id="7P_FdVQBpKf" role="_ZDj9" />
-      </node>
-    </node>
-    <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="QueryTemplate" />
-    </node>
-    <node concept="3uibUv" id="7P_FdVPsWWe" role="1zkMxy">
-      <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" />
     <property role="3GE5qa" value="query" />
@@ -20949,78 +20078,6 @@
       </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" />
@@ -21054,60 +20111,131 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="6tPOoeT46g4" role="jymVt" />
+    <node concept="3clFb_" id="6tPOoeT44hu" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="newToken" />
+      <node concept="37vLTG" id="6tPOoeT44hv" role="3clF46">
+        <property role="TrG5h" value="parameter" />
+        <node concept="8X2XB" id="6tPOoeT44hw" role="1tU5fm">
+          <node concept="3uibUv" id="6tPOoeT44hx" role="8Xvag">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="6tPOoeT44hy" role="3clF45">
+        <ref role="3uigEE" node="6tPOoeT3Z1_" resolve="QueryTemplateImpl.Token" />
+      </node>
+      <node concept="3Tm1VV" id="6tPOoeT44hz" role="1B3o_S" />
+      <node concept="3clFbS" id="6tPOoeT44h$" role="3clF47">
+        <node concept="3clFbF" id="6tPOoeT44h_" role="3cqZAp">
+          <node concept="2ShNRf" id="6tPOoeT44hA" role="3clFbG">
+            <node concept="1pGfFk" id="6tPOoeT44hB" role="2ShVmc">
+              <ref role="37wK5l" node="6tPOoeT3Z1B" resolve="QueryTemplateImpl.Token" />
+              <node concept="1rXfSq" id="6tPOoeT44hC" role="37wK5m">
+                <ref role="37wK5l" node="6OXbTDz054k" resolve="templateRef" />
+              </node>
+              <node concept="37vLTw" id="6tPOoeT44hD" role="37wK5m">
+                <ref role="3cqZAo" node="6tPOoeT44hv" resolve="parameter" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6tPOoeT44hE" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="6OXbTD$joUc" role="jymVt" />
     <node concept="3clFb_" id="6OXbTD$jtv1" role="jymVt">
       <property role="TrG5h" value="init" />
       <node concept="3cqZAl" id="6OXbTD$jtv3" role="3clF45" />
       <node concept="3Tm1VV" id="6OXbTD$jtv4" role="1B3o_S" />
       <node concept="3clFbS" id="6OXbTD$jtv5" role="3clF47">
-        <node concept="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 concept="3clFbF" id="6tPOoeT3RHA" role="3cqZAp">
+          <node concept="37vLTI" id="6tPOoeT3SNV" role="3clFbG">
+            <node concept="2OqwBi" id="6tPOoeT3S2K" role="37vLTJ">
+              <node concept="Xjq3P" id="6tPOoeT3RH$" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6tPOoeT3Som" role="2OqNvi">
+                <ref role="2Oxat5" node="6OXbTDz03H0" resolve="templateRef" />
+              </node>
             </node>
-          </node>
-          <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 concept="2YIFZM" id="6tPOoeT3TgF" role="37vLTx">
+              <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+              <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="deserialize" />
+              <node concept="Xl_RD" id="6tPOoeT3TgG" role="37wK5m">
+                <property role="Xl_RC" value="" />
+                <node concept="17Uvod" id="6tPOoeT3TgH" role="lGtFl">
+                  <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                  <property role="2qtEX9" value="value" />
+                  <node concept="3zFVjK" id="6tPOoeT3TgI" role="3zH0cK">
+                    <node concept="3clFbS" id="6tPOoeT3TgJ" role="2VODD2">
+                      <node concept="3clFbF" id="6tPOoeT3TgK" role="3cqZAp">
+                        <node concept="2OqwBi" id="6tPOoeT3TgL" role="3clFbG">
+                          <node concept="2OqwBi" id="6tPOoeT3TgM" role="2Oq$k0">
+                            <node concept="2JrnkZ" id="6tPOoeT3TgN" role="2Oq$k0">
+                              <node concept="2OqwBi" id="6tPOoeT3TgO" role="2JrQYb">
+                                <node concept="1iwH7S" id="6tPOoeT3TgP" role="2Oq$k0" />
+                                <node concept="12$id9" id="6tPOoeT3TgQ" role="2OqNvi">
+                                  <node concept="30H73N" id="6tPOoeT3TgR" role="12$y8L" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="6tPOoeT3TgS" role="2OqNvi">
+                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="6tPOoeT3TgT" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                          </node>
+                        </node>
+                      </node>
                     </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>
+        <node concept="3clFbJ" id="6tPOoeT43El" role="3cqZAp">
+          <node concept="3clFbC" id="6tPOoeT43Em" role="3clFbw">
+            <node concept="10Nm6u" id="6tPOoeT43En" role="3uHU7w" />
+            <node concept="37vLTw" id="6tPOoeT43Eo" role="3uHU7B">
+              <ref role="3cqZAo" node="6tPOoeT428u" resolve="handlerFqNames" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="6tPOoeT43Ep" role="3clFbx">
+            <node concept="3cpWs8" id="6tPOoeT43Eq" role="3cqZAp">
+              <node concept="3cpWsn" id="6tPOoeT43Er" role="3cpWs9">
+                <property role="TrG5h" value="list" />
+                <node concept="_YKpA" id="6tPOoeT43Es" role="1tU5fm">
+                  <node concept="17QB3L" id="6tPOoeT43Et" role="_ZDj9" />
                 </node>
-                <node concept="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 concept="2ShNRf" id="6tPOoeT43Eu" role="33vP2m">
+                  <node concept="Tc6Ow" id="6tPOoeT43Ev" role="2ShVmc">
+                    <node concept="17QB3L" id="6tPOoeT43Ew" role="HW$YZ" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="6tPOoeT43Ex" role="3cqZAp">
+              <node concept="2OqwBi" id="6tPOoeT43Ey" role="3clFbG">
+                <node concept="37vLTw" id="6tPOoeT43Ez" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6tPOoeT43Er" resolve="list" />
+                </node>
+                <node concept="TSZUe" id="6tPOoeT43E$" role="2OqNvi">
+                  <node concept="Xl_RD" id="6tPOoeT43E_" role="25WWJ7">
+                    <property role="Xl_RC" value="" />
+                    <node concept="17Uvod" id="6tPOoeT43EA" role="lGtFl">
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <property role="2qtEX9" value="value" />
+                      <node concept="3zFVjK" id="6tPOoeT43EB" role="3zH0cK">
+                        <node concept="3clFbS" id="6tPOoeT43EC" role="2VODD2">
+                          <node concept="3clFbF" id="6tPOoeT43ED" role="3cqZAp">
+                            <node concept="2OqwBi" id="6tPOoeT43EE" role="3clFbG">
+                              <node concept="30H73N" id="6tPOoeT43EF" role="2Oq$k0" />
+                              <node concept="2qgKlT" id="6tPOoeT43EG" role="2OqNvi">
+                                <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                               </node>
                             </node>
                           </node>
@@ -21117,14 +20245,19 @@
                   </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 concept="1WS0z7" id="6tPOoeT43EH" role="lGtFl">
+                <node concept="3JmXsc" id="6tPOoeT43EI" role="3Jn$fo">
+                  <node concept="3clFbS" id="6tPOoeT43EJ" role="2VODD2">
+                    <node concept="3clFbF" id="6tPOoeT43EK" role="3cqZAp">
+                      <node concept="2OqwBi" id="6tPOoeT43EL" role="3clFbG">
+                        <node concept="2OqwBi" id="6tPOoeT43EM" role="2Oq$k0">
+                          <node concept="1iwH7S" id="6tPOoeT43EN" role="2Oq$k0" />
+                          <node concept="1r8y6K" id="6tPOoeT43EO" role="2OqNvi" />
+                        </node>
+                        <node concept="2SmgA7" id="6tPOoeT43EP" role="2OqNvi">
+                          <node concept="chp4Y" id="6tPOoeT43EQ" role="1dBWTz">
+                            <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -21132,15 +20265,18 @@
                 </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 concept="3clFbF" id="6tPOoeT43ER" role="3cqZAp">
+              <node concept="37vLTI" id="6tPOoeT43ES" role="3clFbG">
+                <node concept="2OqwBi" id="6tPOoeT43ET" role="37vLTx">
+                  <node concept="37vLTw" id="6tPOoeT43EU" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6tPOoeT43Er" resolve="list" />
+                  </node>
+                  <node concept="26Dbio" id="6tPOoeT43EV" role="2OqNvi" />
                 </node>
-                <node concept="2OqwBi" id="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 concept="2OqwBi" id="6tPOoeT43EW" role="37vLTJ">
+                  <node concept="Xjq3P" id="6tPOoeT43EX" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="6tPOoeT43EY" role="2OqNvi">
+                    <ref role="2Oxat5" node="6tPOoeT428u" resolve="handlerFqNames" />
                   </node>
                 </node>
               </node>
@@ -21149,6 +20285,21 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="6tPOoeT3NWW" role="jymVt" />
+    <node concept="3clFb_" id="6OXbTDz054k" role="jymVt">
+      <property role="TrG5h" value="templateRef" />
+      <node concept="3uibUv" id="6OXbTDz05bG" role="3clF45">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+      <node concept="3Tm1VV" id="6OXbTDz054n" role="1B3o_S" />
+      <node concept="3clFbS" id="6OXbTDz054o" role="3clF47">
+        <node concept="3clFbF" id="6OXbTDz05BR" role="3cqZAp">
+          <node concept="37vLTw" id="6OXbTDz05BQ" role="3clFbG">
+            <ref role="3cqZAo" node="6OXbTDz03H0" resolve="templateRef" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="6OXbTD$jt5T" role="jymVt" />
     <node concept="312cEu" id="6OXbTD$r8hA" role="jymVt">
       <property role="2bfB8j" value="false" />
@@ -21188,15 +20339,394 @@
         <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 concept="2tJIrI" id="6tPOoeT40WY" role="jymVt" />
+    <node concept="312cEu" id="6tPOoeT3Z1_" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="Token" />
+      <node concept="2tJIrI" id="6tPOoeT3Z1A" role="jymVt" />
+      <node concept="3clFbW" id="6tPOoeT3Z1B" role="jymVt">
+        <node concept="37vLTG" id="6tPOoeT3Z1C" role="3clF46">
+          <property role="TrG5h" value="templateRef" />
+          <node concept="3uibUv" id="6tPOoeT3Z1D" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+          </node>
         </node>
+        <node concept="37vLTG" id="6tPOoeT3Z1E" role="3clF46">
+          <property role="TrG5h" value="parameter" />
+          <node concept="8X2XB" id="6tPOoeT3Z1F" role="1tU5fm">
+            <node concept="3uibUv" id="6tPOoeT3Z1G" role="8Xvag">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="6tPOoeT3Z1H" role="3clF45" />
+        <node concept="3Tmbuc" id="6tPOoeT3Z1I" role="1B3o_S" />
+        <node concept="3clFbS" id="6tPOoeT3Z1J" role="3clF47">
+          <node concept="3clFbF" id="6tPOoeT3Z1K" role="3cqZAp">
+            <node concept="37vLTI" id="6tPOoeT3Z1L" role="3clFbG">
+              <node concept="37vLTw" id="6tPOoeT3Z1M" role="37vLTx">
+                <ref role="3cqZAo" node="6tPOoeT3Z1C" resolve="templateRef" />
+              </node>
+              <node concept="2OqwBi" id="6tPOoeT3Z1N" role="37vLTJ">
+                <node concept="Xjq3P" id="6tPOoeT3Z1O" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6tPOoeT3Z1P" role="2OqNvi">
+                  <ref role="2Oxat5" node="6tPOoeT3Z45" resolve="templateRef" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6tPOoeT3Z1Q" role="3cqZAp">
+            <node concept="37vLTI" id="6tPOoeT3Z1R" role="3clFbG">
+              <node concept="1eOMI4" id="6tPOoeT3Z1S" role="37vLTx">
+                <node concept="10QFUN" id="6tPOoeT3Z1T" role="1eOMHV">
+                  <node concept="3uibUv" id="6tPOoeT3Z1U" role="10QFUM">
+                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                    <node concept="29HgVG" id="6tPOoeT3Z1V" role="lGtFl">
+                      <node concept="3NFfHV" id="6tPOoeT3Z1W" role="3NFExx">
+                        <node concept="3clFbS" id="6tPOoeT3Z1X" role="2VODD2">
+                          <node concept="3clFbF" id="6tPOoeT3Z1Y" role="3cqZAp">
+                            <node concept="2OqwBi" id="6tPOoeT3Z1Z" role="3clFbG">
+                              <node concept="30H73N" id="6tPOoeT3Z20" role="2Oq$k0" />
+                              <node concept="3TrEf2" id="6tPOoeT3Z21" role="2OqNvi">
+                                <ref role="3Tt5mk" to="wq2x:2BZXJecQkiP" resolve="type" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="AH0OO" id="6tPOoeT3Z22" role="10QFUP">
+                    <node concept="3cmrfG" id="6tPOoeT3Z23" role="AHEQo">
+                      <property role="3cmrfH" value="0" />
+                      <node concept="17Uvod" id="6tPOoeT3Z24" role="lGtFl">
+                        <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
+                        <property role="2qtEX9" value="value" />
+                        <node concept="3zFVjK" id="6tPOoeT3Z25" role="3zH0cK">
+                          <node concept="3clFbS" id="6tPOoeT3Z26" role="2VODD2">
+                            <node concept="3clFbF" id="6tPOoeT3Z27" role="3cqZAp">
+                              <node concept="2OqwBi" id="6tPOoeT3Z28" role="3clFbG">
+                                <node concept="1iwH7S" id="6tPOoeT3Z29" role="2Oq$k0" />
+                                <node concept="1qCSth" id="6tPOoeT3Z2a" role="2OqNvi">
+                                  <property role="1qCSqd" value="idx" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="6tPOoeT3Z2b" role="AHHXb">
+                      <ref role="3cqZAo" node="6tPOoeT3Z1E" resolve="parameter" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6tPOoeT3Z2c" role="37vLTJ">
+                <node concept="Xjq3P" id="6tPOoeT3Z2d" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6tPOoeT3Z2e" role="2OqNvi">
+                  <ref role="2Oxat5" node="6tPOoeT3Z3q" resolve="parameter" />
+                </node>
+              </node>
+            </node>
+            <node concept="1WS0z7" id="6tPOoeT3Z2f" role="lGtFl">
+              <property role="1qytDF" value="idx" />
+              <node concept="3JmXsc" id="6tPOoeT3Z2g" role="3Jn$fo">
+                <node concept="3clFbS" id="6tPOoeT3Z2h" role="2VODD2">
+                  <node concept="3clFbF" id="6tPOoeT3Z2i" role="3cqZAp">
+                    <node concept="2OqwBi" id="6tPOoeT3Z2j" role="3clFbG">
+                      <node concept="2OqwBi" id="6tPOoeT3Z2k" role="2Oq$k0">
+                        <node concept="30H73N" id="6tPOoeT3Z2l" role="2Oq$k0" />
+                        <node concept="2Xjw5R" id="6tPOoeT3Z2m" role="2OqNvi">
+                          <node concept="1xMEDy" id="6tPOoeT3Z2n" role="1xVPHs">
+                            <node concept="chp4Y" id="6tPOoeT3Z2o" role="ri$Ld">
+                              <ref role="cht4Q" to="wq2x:6OXbTD$dU7b" resolve="Query" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3Tsc0h" id="6tPOoeT3Z2p" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:2BZXJecNeMM" resolve="parameter" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6tPOoeT3Z2q" role="3cqZAp">
+            <node concept="37vLTI" id="6tPOoeT3Z2r" role="3clFbG">
+              <node concept="10Nm6u" id="6tPOoeT3Z2s" role="37vLTx" />
+              <node concept="37vLTw" id="6tPOoeT3Z2t" role="37vLTJ">
+                <ref role="3cqZAo" node="6tPOoeT3Z3Q" resolve="logical" />
+              </node>
+            </node>
+            <node concept="1WS0z7" id="6tPOoeT3Z2u" role="lGtFl">
+              <node concept="3JmXsc" id="6tPOoeT3Z2v" role="3Jn$fo">
+                <node concept="3clFbS" id="6tPOoeT3Z2w" role="2VODD2">
+                  <node concept="3clFbF" id="6tPOoeT3Z2x" role="3cqZAp">
+                    <node concept="2OqwBi" id="6tPOoeT3Z2y" role="3clFbG">
+                      <node concept="30H73N" id="6tPOoeT3Z2z" role="2Oq$k0" />
+                      <node concept="2qgKlT" id="6tPOoeT3Z2$" role="2OqNvi">
+                        <ref role="37wK5l" to="x5bw:6OXbTDz3CDo" resolve="localContextNames" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1sPUBX" id="6tPOoeT3Z2_" role="lGtFl">
+              <ref role="v9R2y" node="4KRwoemr_Es" resolve="contextName_variable_init" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="6tPOoeT3Z2A" role="3cqZAp">
+            <node concept="37vLTI" id="6tPOoeT3Z2B" role="3clFbG">
+              <node concept="2ShNRf" id="6tPOoeT3Z2C" role="37vLTx">
+                <node concept="Tc6Ow" id="6tPOoeT3Z2D" role="2ShVmc">
+                  <node concept="3uibUv" id="6tPOoeT3Z2E" role="HW$YZ">
+                    <ref role="3uigEE" to="6pyv:7eGEHDlc$ap" resolve="RuleBuilder" />
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6tPOoeT3Z2F" role="37vLTJ">
+                <node concept="Xjq3P" id="6tPOoeT3Z2G" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6tPOoeT3Z2H" role="2OqNvi">
+                  <ref role="2Oxat5" node="6tPOoeT3Z41" resolve="ruleBuilder" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6tPOoeT3Z2I" role="jymVt" />
+      <node concept="3clFb_" id="6tPOoeT3Z2J" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="apply" />
+        <node concept="A3Dl8" id="6tPOoeT3Z2K" role="3clF45">
+          <node concept="3uibUv" id="6tPOoeT3Z2L" role="A3Ik2">
+            <ref role="3uigEE" to="6pyv:7eGEHDlc$ap" resolve="RuleBuilder" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="6tPOoeT3Z2M" role="3clF46">
+          <property role="TrG5h" value="session" />
+          <node concept="3uibUv" id="6tPOoeT3Z2N" role="1tU5fm">
+            <ref role="3uigEE" to="6pyv:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+          </node>
+          <node concept="2ZBi8u" id="6tPOoeT3Z2O" role="lGtFl">
+            <ref role="2rW$FS" node="429xoypVg6q" resolve="apply_session_parameter" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="6tPOoeT3Z2P" role="1B3o_S" />
+        <node concept="3clFbS" id="6tPOoeT3Z2Q" role="3clF47">
+          <node concept="3clFbF" id="6tPOoeT3Z2R" role="3cqZAp">
+            <node concept="2OqwBi" id="6tPOoeT3Z2S" role="3clFbG">
+              <node concept="37vLTw" id="6tPOoeT3Z2T" role="2Oq$k0">
+                <ref role="3cqZAo" node="6tPOoeT3Z41" resolve="ruleBuilder" />
+              </node>
+              <node concept="TSZUe" id="6tPOoeT3Z2U" role="2OqNvi">
+                <node concept="10Nm6u" id="6tPOoeT3Z2V" role="25WWJ7" />
+              </node>
+            </node>
+            <node concept="2b32R4" id="6tPOoeT3Z2W" role="lGtFl">
+              <node concept="3JmXsc" id="6tPOoeT3Z2X" role="2P8S$">
+                <node concept="3clFbS" id="6tPOoeT3Z2Y" role="2VODD2">
+                  <node concept="3clFbF" id="6tPOoeT3Z2Z" role="3cqZAp">
+                    <node concept="2OqwBi" id="6tPOoeT3Z30" role="3clFbG">
+                      <node concept="2OqwBi" id="6tPOoeT3Z31" role="2Oq$k0">
+                        <node concept="30H73N" id="6tPOoeT3Z32" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="6tPOoeT3Z33" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:6OXbTDyyU9U" resolve="code" />
+                        </node>
+                      </node>
+                      <node concept="3Tsc0h" id="6tPOoeT3Z34" role="2OqNvi">
+                        <ref role="3TtcxE" to="tpee:fzcqZ_x" resolve="statement" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6tPOoeT3Z35" role="3cqZAp">
+            <node concept="37vLTw" id="6tPOoeT3Z36" role="3clFbG">
+              <ref role="3cqZAo" node="6tPOoeT3Z41" resolve="ruleBuilder" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="6tPOoeT3Z37" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6tPOoeT3Z38" role="jymVt" />
+      <node concept="3clFb_" id="6tPOoeT3Z39" role="jymVt">
+        <property role="TrG5h" value="token" />
+        <node concept="3uibUv" id="6tPOoeT3Z3a" role="3clF45">
+          <ref role="3uigEE" node="6tPOoeT3Z1_" resolve="QueryTemplateImpl.Token" />
+        </node>
+        <node concept="3Tmbuc" id="6tPOoeT3Z3b" role="1B3o_S" />
+        <node concept="3clFbS" id="6tPOoeT3Z3c" role="3clF47">
+          <node concept="3clFbF" id="6tPOoeT3Z3d" role="3cqZAp">
+            <node concept="Xjq3P" id="6tPOoeT3Z3e" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="2ZBi8u" id="6tPOoeT3Z3f" role="lGtFl">
+          <ref role="2rW$FS" node="36tQV5AugIl" resolve="template_token_this" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6tPOoeT3Z3g" role="jymVt" />
+      <node concept="3clFb_" id="6tPOoeT3Z3h" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="templateRef" />
+        <node concept="3uibUv" id="6tPOoeT3Z3i" role="3clF45">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+        <node concept="3Tm1VV" id="6tPOoeT3Z3j" role="1B3o_S" />
+        <node concept="3clFbS" id="6tPOoeT3Z3k" role="3clF47">
+          <node concept="3clFbF" id="6tPOoeT3Z3l" role="3cqZAp">
+            <node concept="37vLTw" id="6tPOoeT3Z3m" role="3clFbG">
+              <ref role="3cqZAo" node="6tPOoeT3Z45" resolve="templateRef" />
+            </node>
+          </node>
+        </node>
+        <node concept="2ZBi8u" id="6tPOoeT3Z3n" role="lGtFl">
+          <ref role="2rW$FS" node="6OXbTDyZfMT" resolve="template_ref" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6tPOoeT3Z3o" role="jymVt" />
+      <node concept="2tJIrI" id="6tPOoeT3Z3p" role="jymVt" />
+      <node concept="312cEg" id="6tPOoeT3Z3q" role="jymVt">
+        <property role="TrG5h" value="parameter" />
+        <node concept="3Tmbuc" id="6tPOoeT3Z3r" role="1B3o_S" />
+        <node concept="3uibUv" id="6tPOoeT3Z3s" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          <node concept="29HgVG" id="6tPOoeT3Z3t" role="lGtFl">
+            <node concept="3NFfHV" id="6tPOoeT3Z3u" role="3NFExx">
+              <node concept="3clFbS" id="6tPOoeT3Z3v" role="2VODD2">
+                <node concept="3clFbF" id="6tPOoeT3Z3w" role="3cqZAp">
+                  <node concept="2OqwBi" id="6tPOoeT3Z3x" role="3clFbG">
+                    <node concept="30H73N" id="6tPOoeT3Z3y" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="6tPOoeT3Z3z" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:2BZXJecQkiP" resolve="type" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1WS0z7" id="6tPOoeT3Z3$" role="lGtFl">
+          <ref role="2rW$FS" node="2BZXJecSPIi" resolve="query_parameter" />
+          <node concept="3JmXsc" id="6tPOoeT3Z3_" role="3Jn$fo">
+            <node concept="3clFbS" id="6tPOoeT3Z3A" role="2VODD2">
+              <node concept="3clFbF" id="6tPOoeT3Z3B" role="3cqZAp">
+                <node concept="2OqwBi" id="6tPOoeT3Z3C" role="3clFbG">
+                  <node concept="2OqwBi" id="6tPOoeT3Z3D" role="2Oq$k0">
+                    <node concept="30H73N" id="6tPOoeT3Z3E" role="2Oq$k0" />
+                    <node concept="2Xjw5R" id="6tPOoeT3Z3F" role="2OqNvi">
+                      <node concept="1xMEDy" id="6tPOoeT3Z3G" role="1xVPHs">
+                        <node concept="chp4Y" id="6tPOoeT3Z3H" role="ri$Ld">
+                          <ref role="cht4Q" to="wq2x:6OXbTD$dU7b" resolve="Query" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3Tsc0h" id="6tPOoeT3Z3I" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:2BZXJecNeMM" resolve="parameter" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="17Uvod" id="6tPOoeT3Z3J" role="lGtFl">
+          <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+          <property role="2qtEX9" value="name" />
+          <node concept="3zFVjK" id="6tPOoeT3Z3K" role="3zH0cK">
+            <node concept="3clFbS" id="6tPOoeT3Z3L" role="2VODD2">
+              <node concept="3clFbF" id="6tPOoeT3Z3M" role="3cqZAp">
+                <node concept="2OqwBi" id="6tPOoeT3Z3N" role="3clFbG">
+                  <node concept="30H73N" id="6tPOoeT3Z3O" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="6tPOoeT3Z3P" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="312cEg" id="6tPOoeT3Z3Q" role="jymVt">
+        <property role="TrG5h" value="logical" />
+        <node concept="3uibUv" id="6tPOoeT3Z3R" role="1tU5fm">
+          <ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
+        </node>
+        <node concept="3Tm1VV" id="6tPOoeT3Z3S" role="1B3o_S" />
+        <node concept="1WS0z7" id="6tPOoeT3Z3T" role="lGtFl">
+          <node concept="3JmXsc" id="6tPOoeT3Z3U" role="3Jn$fo">
+            <node concept="3clFbS" id="6tPOoeT3Z3V" role="2VODD2">
+              <node concept="3clFbF" id="6tPOoeT3Z3W" role="3cqZAp">
+                <node concept="2OqwBi" id="6tPOoeT3Z3X" role="3clFbG">
+                  <node concept="30H73N" id="6tPOoeT3Z3Y" role="2Oq$k0" />
+                  <node concept="2qgKlT" id="6tPOoeT3Z3Z" role="2OqNvi">
+                    <ref role="37wK5l" to="x5bw:6OXbTDz3CDo" resolve="localContextNames" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1sPUBX" id="6tPOoeT3Z40" role="lGtFl">
+          <ref role="v9R2y" node="452KZTbxEFE" resolve="contextName_field_declaration" />
+        </node>
+      </node>
+      <node concept="312cEg" id="6tPOoeT3Z41" role="jymVt">
+        <property role="TrG5h" value="ruleBuilder" />
+        <node concept="3Tmbuc" id="6tPOoeT3Z42" role="1B3o_S" />
+        <node concept="_YKpA" id="6tPOoeT3Z43" role="1tU5fm">
+          <node concept="3uibUv" id="6tPOoeT3Z44" role="_ZDj9">
+            <ref role="3uigEE" to="6pyv:7eGEHDlc$ap" resolve="RuleBuilder" />
+          </node>
+        </node>
+      </node>
+      <node concept="312cEg" id="6tPOoeT3Z45" role="jymVt">
+        <property role="TrG5h" value="templateRef" />
+        <node concept="3Tmbuc" id="6tPOoeT3Z46" role="1B3o_S" />
+        <node concept="3uibUv" id="6tPOoeT3Z47" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6tPOoeT3Z48" role="1B3o_S" />
+      <node concept="3uibUv" id="6tPOoeT3Z49" role="EKbjA">
+        <ref role="3uigEE" to="i348:mJ_D14woL$" resolve="TemplateToken" />
+      </node>
+      <node concept="1WS0z7" id="6tPOoeT5Mwz" role="lGtFl">
+        <node concept="3JmXsc" id="6tPOoeT5Mw_" role="3Jn$fo">
+          <node concept="3clFbS" id="6tPOoeT5MwB" role="2VODD2">
+            <node concept="3clFbF" id="6tPOoeT5NTy" role="3cqZAp">
+              <node concept="2OqwBi" id="6tPOoeT5ON8" role="3clFbG">
+                <node concept="30H73N" id="6tPOoeT5NTx" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="6tPOoeT5Rsl" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:6OXbTD$dU7c" resolve="queryStage" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6tPOoeT3Vi7" role="jymVt" />
+    <node concept="312cEg" id="6OXbTDz03H0" role="jymVt">
+      <property role="TrG5h" value="templateRef" />
+      <node concept="3Tm6S6" id="6OXbTDz03H1" role="1B3o_S" />
+      <node concept="3uibUv" id="6OXbTDz03H2" role="1tU5fm">
+        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+      </node>
+    </node>
+    <node concept="312cEg" id="6tPOoeT428u" role="jymVt">
+      <property role="TrG5h" value="handlerFqNames" />
+      <node concept="3Tm6S6" id="6tPOoeT428v" role="1B3o_S" />
+      <node concept="_YKpA" id="6tPOoeT428w" role="1tU5fm">
+        <node concept="17QB3L" id="6tPOoeT428x" role="_ZDj9" />
       </node>
     </node>
     <node concept="2tJIrI" id="6OXbTD$joxi" role="jymVt" />
@@ -21206,6 +20736,9 @@
     </node>
     <node concept="3uibUv" id="6OXbTD$iV$$" role="EKbjA">
       <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+      <node concept="3uibUv" id="6tPOoeT6cJK" role="11_B2D">
+        <ref role="3uigEE" node="6tPOoeT3Z1_" resolve="QueryTemplateImpl.Token" />
+      </node>
     </node>
     <node concept="17Uvod" id="6OXbTD$iVUX" role="lGtFl">
       <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 570cb4a9..1f243a3c 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -232,7 +232,6 @@
         <property id="1214560368769" name="emptyNoTargetText" index="39s7Ar" />
         <property id="1139852716018" name="noTargetText" index="1$x2rV" />
         <property id="1140017977771" name="readOnly" index="1Intyy" />
-        <property id="1140114345053" name="allowEmptyText" index="1O74Pk" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
       <concept id="7667708318090725848" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentAnchorStyleClassItem" flags="ln" index="1Bsynf" />
@@ -1123,19 +1122,6 @@
   <node concept="24kQdi" id="6p0DfM0dr8L">
     <ref role="1XX52x" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
     <node concept="3EZMnI" id="6p0DfM0drav" role="2wV5jI">
-      <node concept="3F0ifn" id="1HWyn8jLJSL" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <ref role="1k5W1q" to="tpen:hFCSAw$" resolve="LeftParen" />
-      </node>
-      <node concept="3F0A7n" id="20Ay2Vf2Tqw" role="3EZMnx">
-        <property role="1$x2rV" value="initial" />
-        <property role="1O74Pk" value="true" />
-        <ref role="1NtTu8" to="wq2x:20Ay2Vf1h9X" resolve="stage" />
-      </node>
-      <node concept="3F0ifn" id="1HWyn8jLK3W" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
-      </node>
       <node concept="PMmxH" id="6p0DfM0drif" role="3EZMnx">
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
         <ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
@@ -6785,23 +6771,6 @@
     <property role="3GE5qa" value="query" />
     <ref role="1XX52x" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
     <node concept="3EZMnI" id="7P_FdVQ_S6R" role="2wV5jI">
-      <node concept="3F0ifn" id="2BZXJecJG8q" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <node concept="11LMrY" id="2BZXJecKocH" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </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>
-      <node concept="3F0ifn" id="2BZXJecJG9E" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <node concept="11L4FC" id="2BZXJecKocJ" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
       <node concept="3F0A7n" id="7P_FdVQ_S77" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         <node concept="ljvvj" id="2BZXJecJGb_" role="3F10Kt">
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index 89dc0cb2..bfee4baf 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -89,12 +89,6 @@
       <property role="20kJfa" value="extends" />
       <ref role="20lvS9" node="7eGEHDlgPKk" resolve="Handler" />
     </node>
-    <node concept="1TJgyi" id="20Ay2Vf1h9X" role="1TKVEl">
-      <property role="IQ2nx" value="2316688792951788157" />
-      <property role="TrG5h" value="stage" />
-      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
-      <node concept="asaX9" id="6tPOoeT2Eq$" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="6p0DfM0bRQj" role="1TKVEi">
       <property role="20lmBu" value="aggregation" />
       <property role="20kJfa" value="rule" />
@@ -1612,12 +1606,6 @@
     <property role="TrG5h" value="QueryTemplate" />
     <property role="3GE5qa" value="query" />
     <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 concept="asaX9" id="6tPOoeT2O6f" role="lGtFl" />
-    </node>
     <node concept="1TJgyj" id="6OXbTDyyU9U" role="1TKVEi">
       <property role="IQ2ns" value="7871500063838282362" />
       <property role="20lmBu" value="aggregation" />
@@ -1665,6 +1653,7 @@
       <property role="20kJfa" value="queryStage" />
       <property role="20lbJX" value="0..n" />
       <ref role="20lvS9" node="7P_FdVQ_S6B" resolve="QueryTemplate" />
+      <node concept="asaX9" id="6tPOoeT5KFi" role="lGtFl" />
     </node>
     <node concept="1TJgyj" id="2BZXJecNeMM" role="1TKVEi">
       <property role="IQ2ns" value="3026409000515988658" />
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 d8cd9b34..caf19e7d 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
@@ -469,8 +469,6 @@
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1240216724530" name="jetbrains.mps.baseLanguage.collections.structure.LinkedHashMapCreator" flags="nn" index="32Fmki" />
-      <concept id="1240239337991" name="jetbrains.mps.baseLanguage.collections.structure.SortedMapType" flags="in" index="341BcB" />
-      <concept id="1240239494010" name="jetbrains.mps.baseLanguage.collections.structure.TreeMapCreator" flags="nn" index="342d9q" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -3044,20 +3042,20 @@
     </node>
     <node concept="2tJIrI" id="7P_FdVPH0_B" role="jymVt" />
     <node concept="3clFb_" id="4QPCta1zKCT" role="jymVt">
-      <property role="TrG5h" value="stages" />
+      <property role="TrG5h" value="handlerTemplates" />
       <node concept="A3Dl8" id="4QPCta1zMzv" role="3clF45">
-        <node concept="3uibUv" id="4QPCta1zOh1" role="A3Ik2">
-          <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+        <node concept="3uibUv" id="6tPOoeTaqNv" role="A3Ik2">
+          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
         </node>
       </node>
       <node concept="3Tm1VV" id="4QPCta1zKCW" role="1B3o_S" />
       <node concept="3clFbS" id="4QPCta1zKCX" role="3clF47">
-        <node concept="3clFbF" id="4QPCta1zRNF" role="3cqZAp">
-          <node concept="2OqwBi" id="6UWSvq586$t" role="3clFbG">
-            <node concept="37vLTw" id="4QPCta1zRNE" role="2Oq$k0">
-              <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
+        <node concept="3clFbF" id="6tPOoeTaBiE" role="3cqZAp">
+          <node concept="2OqwBi" id="6tPOoeTaBIp" role="3clFbG">
+            <node concept="37vLTw" id="6tPOoeTaBiD" role="2Oq$k0">
+              <ref role="3cqZAo" node="7P_FdVQplXd" resolve="fqName2handlerTemplate" />
             </node>
-            <node concept="T8wYR" id="6UWSvq587p_" role="2OqNvi" />
+            <node concept="T8wYR" id="6tPOoeTaC0s" role="2OqNvi" />
           </node>
         </node>
       </node>
@@ -3070,16 +3068,11 @@
         <node concept="3Tqbb2" id="12yN8Dyv_JV" role="1tU5fm" />
       </node>
       <node concept="A3Dl8" id="6fdr4UgfxqC" role="3clF45">
-        <node concept="1LlUBW" id="7t5VLKHa5QV" role="A3Ik2">
-          <node concept="3uibUv" id="1CcQBrPdyGK" role="1Lm7xW">
-            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-          </node>
-          <node concept="3uibUv" id="1ffsG7c4ezn" role="1Lm7xW">
-            <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="RuleTemplateToken" />
-              </node>
+        <node concept="3uibUv" id="1ffsG7c4ezn" role="A3Ik2">
+          <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="RuleTemplateToken" />
             </node>
           </node>
         </node>
@@ -3090,32 +3083,22 @@
           <node concept="3cpWsn" id="12yN8DyvAUk" role="3cpWs9">
             <property role="TrG5h" value="result" />
             <node concept="_YKpA" id="12yN8DyvAUd" role="1tU5fm">
-              <node concept="1LlUBW" id="7t5VLKHacJO" role="_ZDj9">
-                <node concept="3uibUv" id="1CcQBrPd_Sl" role="1Lm7xW">
-                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                </node>
-                <node concept="3uibUv" id="7XdbJdyRODp" role="1Lm7xW">
-                  <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="RuleTemplateToken" />
-                    </node>
+              <node concept="3uibUv" id="6tPOoeTaEit" role="_ZDj9">
+                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                <node concept="3qUE_q" id="6tPOoeTaEiu" role="11_B2D">
+                  <node concept="3uibUv" id="6tPOoeTaEiv" role="3qUE_r">
+                    <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                   </node>
                 </node>
               </node>
             </node>
             <node concept="2ShNRf" id="12yN8DyvD8g" role="33vP2m">
               <node concept="Tc6Ow" id="12yN8DyvD72" role="2ShVmc">
-                <node concept="1LlUBW" id="7t5VLKHa9fr" role="HW$YZ">
-                  <node concept="3uibUv" id="1CcQBrPdCZx" role="1Lm7xW">
-                    <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                  </node>
-                  <node concept="3uibUv" id="7XdbJdyRQxJ" role="1Lm7xW">
-                    <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="RuleTemplateToken" />
-                      </node>
+                <node concept="3uibUv" id="6tPOoeTaGDL" role="HW$YZ">
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                  <node concept="3qUE_q" id="6tPOoeTaGDM" role="11_B2D">
+                    <node concept="3uibUv" id="6tPOoeTaGDN" role="3qUE_r">
+                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                     </node>
                   </node>
                 </node>
@@ -3200,16 +3183,11 @@
                   <node concept="3cpWsn" id="12yN8DywoJ9" role="3cpWs9">
                     <property role="TrG5h" value="matching" />
                     <node concept="3vKaQO" id="12yN8DyD$_b" role="1tU5fm">
-                      <node concept="1LlUBW" id="1CcQBrPdqZp" role="3O5elw">
-                        <node concept="3uibUv" id="1CcQBrPdqZq" role="1Lm7xW">
-                          <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                        </node>
-                        <node concept="3uibUv" id="7XdbJdyRSmQ" role="1Lm7xW">
-                          <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="RuleTemplateToken" />
-                            </node>
+                      <node concept="3uibUv" id="7XdbJdyRSmQ" role="3O5elw">
+                        <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="RuleTemplateToken" />
                           </node>
                         </node>
                       </node>
@@ -3253,17 +3231,12 @@
                         </node>
                         <node concept="3fqX7Q" id="7XdbJdyJLha" role="3uHU7w">
                           <node concept="2OqwBi" id="7XdbJdyJLhc" role="3fr31v">
-                            <node concept="1LFfDK" id="7XdbJdyJNzj" role="2Oq$k0">
-                              <node concept="3cmrfG" id="7XdbJdyJNzk" role="1LF_Uc">
-                                <property role="3cmrfH" value="1" />
-                              </node>
-                              <node concept="37vLTw" id="7XdbJdyJNzl" role="1LFl5Q">
-                                <ref role="3cqZAo" node="12yN8DyDOdM" resolve="tpl" />
-                              </node>
-                            </node>
                             <node concept="liA8E" id="7XdbJdyJLhe" role="2OqNvi">
                               <ref role="37wK5l" to="i348:7XdbJdz3PF6" resolve="isExactMatch" />
                             </node>
+                            <node concept="37vLTw" id="6tPOoeTaKuA" role="2Oq$k0">
+                              <ref role="3cqZAo" node="12yN8DyDOdM" resolve="tpl" />
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -3271,16 +3244,11 @@
                   </node>
                   <node concept="3cpWsn" id="12yN8DyDOdM" role="1Duv9x">
                     <property role="TrG5h" value="tpl" />
-                    <node concept="1LlUBW" id="1CcQBrPdrx8" role="1tU5fm">
-                      <node concept="3uibUv" id="1CcQBrPdrx9" role="1Lm7xW">
-                        <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                      </node>
-                      <node concept="3uibUv" id="7XdbJdySrgC" role="1Lm7xW">
-                        <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="RuleTemplateToken" />
-                          </node>
+                    <node concept="3uibUv" id="6tPOoeTaJl8" role="1tU5fm">
+                      <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                      <node concept="3qUE_q" id="6tPOoeTaJl9" role="11_B2D">
+                        <node concept="3uibUv" id="6tPOoeTaJla" role="3qUE_r">
+                          <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                         </node>
                       </node>
                     </node>
@@ -3331,16 +3299,11 @@
     <node concept="3clFb_" id="5NuEpF1qn9x" role="jymVt">
       <property role="TrG5h" value="allRuleTemplatesWithNoInput" />
       <node concept="A3Dl8" id="5NuEpF1qn9B" role="3clF45">
-        <node concept="1LlUBW" id="23ITgZhhKsi" role="A3Ik2">
-          <node concept="3uibUv" id="1CcQBrPdHb$" role="1Lm7xW">
-            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-          </node>
-          <node concept="3uibUv" id="7XdbJdyRWsv" role="1Lm7xW">
-            <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="RuleTemplateToken" />
-              </node>
+        <node concept="3uibUv" id="7XdbJdyRWsv" role="A3Ik2">
+          <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="RuleTemplateToken" />
             </node>
           </node>
         </node>
@@ -3351,32 +3314,22 @@
           <node concept="3cpWsn" id="5NuEpF1qn9G" role="3cpWs9">
             <property role="TrG5h" value="result" />
             <node concept="_YKpA" id="5NuEpF1qn9H" role="1tU5fm">
-              <node concept="1LlUBW" id="7t5VLKHb0SG" role="_ZDj9">
-                <node concept="3uibUv" id="1CcQBrPdKr0" role="1Lm7xW">
-                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                </node>
-                <node concept="3uibUv" id="7XdbJdyS2mz" role="1Lm7xW">
-                  <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="RuleTemplateToken" />
-                    </node>
+              <node concept="3uibUv" id="6tPOoeTaMF9" role="_ZDj9">
+                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                <node concept="3qUE_q" id="6tPOoeTaMFa" role="11_B2D">
+                  <node concept="3uibUv" id="6tPOoeTaMFb" role="3qUE_r">
+                    <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                   </node>
                 </node>
               </node>
             </node>
             <node concept="2ShNRf" id="5NuEpF1qn9J" role="33vP2m">
               <node concept="Tc6Ow" id="5NuEpF1qn9K" role="2ShVmc">
-                <node concept="1LlUBW" id="7t5VLKHb1Xg" role="HW$YZ">
-                  <node concept="3uibUv" id="1CcQBrPdQJh" role="1Lm7xW">
-                    <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                  </node>
-                  <node concept="3uibUv" id="7XdbJdyS4j5" role="1Lm7xW">
-                    <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="RuleTemplateToken" />
-                      </node>
+                <node concept="3uibUv" id="6tPOoeTaOFc" role="HW$YZ">
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                  <node concept="3qUE_q" id="6tPOoeTaOFd" role="11_B2D">
+                    <node concept="3uibUv" id="6tPOoeTaOFe" role="3qUE_r">
+                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                     </node>
                   </node>
                 </node>
@@ -3391,16 +3344,11 @@
               <node concept="3cpWsn" id="5NuEpF1qnam" role="3cpWs9">
                 <property role="TrG5h" value="matching" />
                 <node concept="3vKaQO" id="5NuEpF1qnan" role="1tU5fm">
-                  <node concept="1LlUBW" id="1CcQBrPdScq" role="3O5elw">
-                    <node concept="3uibUv" id="1CcQBrPdT5w" role="1Lm7xW">
-                      <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                    </node>
-                    <node concept="3uibUv" id="7XdbJdyS6dB" role="1Lm7xW">
-                      <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="RuleTemplateToken" />
-                        </node>
+                  <node concept="3uibUv" id="6tPOoeTaQxm" role="3O5elw">
+                    <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                    <node concept="3qUE_q" id="6tPOoeTaQxn" role="11_B2D">
+                      <node concept="3uibUv" id="6tPOoeTaQxo" role="3qUE_r">
+                        <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                       </node>
                     </node>
                   </node>
@@ -3431,16 +3379,11 @@
               </node>
               <node concept="3cpWsn" id="5NuEpF1qnaO" role="1Duv9x">
                 <property role="TrG5h" value="tpl" />
-                <node concept="1LlUBW" id="1CcQBrPdV7J" role="1tU5fm">
-                  <node concept="3uibUv" id="1CcQBrPdV7K" role="1Lm7xW">
-                    <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                  </node>
-                  <node concept="3uibUv" id="7XdbJdySs6B" role="1Lm7xW">
-                    <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="RuleTemplateToken" />
-                      </node>
+                <node concept="3uibUv" id="6tPOoeTaR5p" role="1tU5fm">
+                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                  <node concept="3qUE_q" id="6tPOoeTaR5q" role="11_B2D">
+                    <node concept="3uibUv" id="6tPOoeTaR5r" role="3qUE_r">
+                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                     </node>
                   </node>
                 </node>
@@ -3535,7 +3478,7 @@
       <node concept="3clFbS" id="7DvO2Mandqk" role="3clF47">
         <node concept="3clFbF" id="7P_FdVPIgWH" role="3cqZAp">
           <node concept="1rXfSq" id="7P_FdVPIgWF" role="3clFbG">
-            <ref role="37wK5l" node="7P_FdVPHmHU" resolve="initWithStages" />
+            <ref role="37wK5l" node="7P_FdVPHmHU" resolve="initWithTemplates" />
             <node concept="2OqwBi" id="7P_FdVPIiZ_" role="37wK5m">
               <node concept="37vLTw" id="7P_FdVPIiMF" role="2Oq$k0">
                 <ref role="3cqZAo" node="7P_FdVPGxfv" resolve="ruleTemplateManifests" />
@@ -3544,9 +3487,8 @@
                 <node concept="1bVj0M" id="7P_FdVPIjy2" role="23t8la">
                   <node concept="3clFbS" id="7P_FdVPIjy3" role="1bW5cS">
                     <node concept="3clFbF" id="7P_FdVPIjDk" role="3cqZAp">
-                      <node concept="1rXfSq" id="7P_FdVPPstQ" role="3clFbG">
-                        <ref role="37wK5l" node="7P_FdVPsPOY" resolve="handlingStages" />
-                        <node concept="2OqwBi" id="7WKNeR97qwC" role="37wK5m">
+                      <node concept="2OqwBi" id="6tPOoeT9Tkv" role="3clFbG">
+                        <node concept="2OqwBi" id="7WKNeR97qwC" role="2Oq$k0">
                           <node concept="2OqwBi" id="7P_FdVPPsJB" role="2Oq$k0">
                             <node concept="37vLTw" id="7P_FdVPPs$d" role="2Oq$k0">
                               <ref role="3cqZAo" node="7P_FdVPIjy4" resolve="it" />
@@ -3574,6 +3516,7 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="ANE8D" id="6tPOoeT9TPZ" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
@@ -3590,187 +3533,23 @@
     </node>
     <node concept="2tJIrI" id="7P_FdVPI535" role="jymVt" />
     <node concept="3clFb_" id="7P_FdVPHmHU" role="jymVt">
-      <property role="TrG5h" value="initWithStages" />
+      <property role="TrG5h" value="initWithTemplates" />
       <node concept="37vLTG" id="7P_FdVPHmOS" role="3clF46">
-        <property role="TrG5h" value="handlingStages" />
+        <property role="TrG5h" value="handlingTemplates" />
         <node concept="A3Dl8" id="7P_FdVPHCUR" role="1tU5fm">
-          <node concept="3uibUv" id="7P_FdVPHCVT" role="A3Ik2">
-            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+          <node concept="3uibUv" id="6tPOoeT9Wkd" role="A3Ik2">
+            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
           </node>
         </node>
       </node>
       <node concept="3cqZAl" id="7P_FdVPHmHW" role="3clF45" />
       <node concept="3Tm6S6" id="7WKNeR94dbG" role="1B3o_S" />
       <node concept="3clFbS" id="7P_FdVPHmHY" role="3clF47">
-        <node concept="2Gpval" id="7P_FdVPHCXG" role="3cqZAp">
-          <node concept="3clFbS" id="7P_FdVPHCXH" role="2LFqv$">
-            <node concept="3clFbJ" id="7P_FdVPHCXI" role="3cqZAp">
-              <node concept="3clFbS" id="7P_FdVPHCXJ" role="3clFbx">
-                <node concept="3cpWs8" id="7P_FdVPHCXK" role="3cqZAp">
-                  <node concept="3cpWsn" id="7P_FdVPHCXL" role="3cpWs9">
-                    <property role="TrG5h" value="existing" />
-                    <node concept="3uibUv" id="7P_FdVPHCXM" role="1tU5fm">
-                      <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                    </node>
-                    <node concept="3EllGN" id="7P_FdVPHCXN" role="33vP2m">
-                      <node concept="2OqwBi" id="7P_FdVPHCXO" role="3ElVtu">
-                        <node concept="2GrUjf" id="7P_FdVPHCXP" role="2Oq$k0">
-                          <ref role="2Gs0qQ" node="7P_FdVPHCYE" resolve="stage" />
-                        </node>
-                        <node concept="liA8E" id="7P_FdVPHCXQ" role="2OqNvi">
-                          <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="7P_FdVPHCXR" role="3ElQJh">
-                        <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="7P_FdVPHCXS" role="3cqZAp">
-                  <node concept="3cpWsn" id="7P_FdVPHCXT" role="3cpWs9">
-                    <property role="TrG5h" value="templates" />
-                    <node concept="_YKpA" id="7P_FdVPHCXU" role="1tU5fm">
-                      <node concept="3uibUv" id="7P_FdVPHCXV" role="_ZDj9">
-                        <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-                      </node>
-                    </node>
-                    <node concept="2ShNRf" id="7P_FdVPHCXW" role="33vP2m">
-                      <node concept="Tc6Ow" id="7P_FdVPHCXX" role="2ShVmc">
-                        <node concept="3uibUv" id="7P_FdVPHCXY" role="HW$YZ">
-                          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-                        </node>
-                        <node concept="2OqwBi" id="7P_FdVPHCXZ" role="I$8f6">
-                          <node concept="37vLTw" id="7P_FdVPHCY0" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7P_FdVPHCXL" resolve="existing" />
-                          </node>
-                          <node concept="liA8E" id="7P_FdVPHCY1" role="2OqNvi">
-                            <ref role="37wK5l" node="1CcQBrPd1dz" resolve="handlerTemplates" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="7P_FdVPHCY2" role="3cqZAp">
-                  <node concept="2OqwBi" id="7P_FdVPHCY3" role="3clFbG">
-                    <node concept="37vLTw" id="7P_FdVPHCY4" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7P_FdVPHCXT" resolve="templates" />
-                    </node>
-                    <node concept="X8dFx" id="7P_FdVPHCY5" role="2OqNvi">
-                      <node concept="2OqwBi" id="7P_FdVPHCY6" role="25WWJ7">
-                        <node concept="2GrUjf" id="7P_FdVPHCY7" role="2Oq$k0">
-                          <ref role="2Gs0qQ" node="7P_FdVPHCYE" resolve="stage" />
-                        </node>
-                        <node concept="liA8E" id="7P_FdVPHCY8" role="2OqNvi">
-                          <ref role="37wK5l" node="1CcQBrPd1dz" resolve="handlerTemplates" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="7P_FdVPHCY9" role="3cqZAp">
-                  <node concept="37vLTI" id="7P_FdVPHCYa" role="3clFbG">
-                    <node concept="3EllGN" id="7P_FdVPHCYb" role="37vLTJ">
-                      <node concept="2OqwBi" id="7P_FdVPHCYc" role="3ElVtu">
-                        <node concept="2GrUjf" id="7P_FdVPHCYd" role="2Oq$k0">
-                          <ref role="2Gs0qQ" node="7P_FdVPHCYE" resolve="stage" />
-                        </node>
-                        <node concept="liA8E" id="7P_FdVPHCYe" role="2OqNvi">
-                          <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
-                        </node>
-                      </node>
-                      <node concept="37vLTw" id="7P_FdVPHCYf" role="3ElQJh">
-                        <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
-                      </node>
-                    </node>
-                    <node concept="2ShNRf" id="7P_FdVPHCYg" role="37vLTx">
-                      <node concept="1pGfFk" id="7P_FdVPHCYh" role="2ShVmc">
-                        <ref role="37wK5l" node="1CcQBrPd004" resolve="HandlingStage" />
-                        <node concept="2OqwBi" id="7P_FdVPHCYi" role="37wK5m">
-                          <node concept="37vLTw" id="7P_FdVPHCYj" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7P_FdVPHCXL" resolve="existing" />
-                          </node>
-                          <node concept="liA8E" id="7P_FdVPHCYk" role="2OqNvi">
-                            <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="7P_FdVPHCYl" role="37wK5m">
-                          <ref role="3cqZAo" node="7P_FdVPHCXT" resolve="templates" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="7P_FdVPHCYm" role="3cqZAp" />
-              </node>
-              <node concept="2OqwBi" id="7P_FdVPHCYn" role="3clFbw">
-                <node concept="37vLTw" id="7P_FdVPHCYo" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
-                </node>
-                <node concept="2Nt0df" id="7P_FdVPHCYp" role="2OqNvi">
-                  <node concept="2OqwBi" id="7P_FdVPHCYq" role="38cxEo">
-                    <node concept="2GrUjf" id="7P_FdVPHCYr" role="2Oq$k0">
-                      <ref role="2Gs0qQ" node="7P_FdVPHCYE" resolve="stage" />
-                    </node>
-                    <node concept="liA8E" id="7P_FdVPHCYs" role="2OqNvi">
-                      <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="9aQIb" id="7P_FdVPHCYt" role="9aQIa">
-                <node concept="3clFbS" id="7P_FdVPHCYu" role="9aQI4">
-                  <node concept="3clFbF" id="7P_FdVPHCYv" role="3cqZAp">
-                    <node concept="37vLTI" id="7P_FdVPHCYw" role="3clFbG">
-                      <node concept="2GrUjf" id="7P_FdVPHCYx" role="37vLTx">
-                        <ref role="2Gs0qQ" node="7P_FdVPHCYE" resolve="stage" />
-                      </node>
-                      <node concept="3EllGN" id="7P_FdVPHCYy" role="37vLTJ">
-                        <node concept="2OqwBi" id="7P_FdVPHCYz" role="3ElVtu">
-                          <node concept="2GrUjf" id="7P_FdVPHCY$" role="2Oq$k0">
-                            <ref role="2Gs0qQ" node="7P_FdVPHCYE" resolve="stage" />
-                          </node>
-                          <node concept="liA8E" id="7P_FdVPHCY_" role="2OqNvi">
-                            <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="7P_FdVPHCYA" role="3ElQJh">
-                          <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="7P_FdVPHTJn" role="2GsD0m">
-            <ref role="3cqZAo" node="7P_FdVPHmOS" resolve="handlingStages" />
-          </node>
-          <node concept="2GrKxI" id="7P_FdVPHCYE" role="2Gsz3X">
-            <property role="TrG5h" value="stage" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="7P_FdVPIdck" role="3cqZAp" />
-        <node concept="2Gpval" id="6UWSvq4KuKV" role="3cqZAp">
-          <node concept="2GrKxI" id="6UWSvq4KuKX" role="2Gsz3X">
-            <property role="TrG5h" value="stage" />
-          </node>
-          <node concept="2OqwBi" id="6UWSvq58403" role="2GsD0m">
-            <node concept="37vLTw" id="6UWSvq4Kyx5" role="2Oq$k0">
-              <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
-            </node>
-            <node concept="T8wYR" id="6UWSvq585$D" role="2OqNvi" />
-          </node>
-          <node concept="3clFbS" id="6UWSvq4KuL1" role="2LFqv$">
-            <node concept="3clFbF" id="7DvO2MaBQGN" role="3cqZAp">
-              <node concept="1rXfSq" id="7DvO2MaBQGO" role="3clFbG">
-                <ref role="37wK5l" node="12yN8Dyvyy6" resolve="collectTemplates" />
-                <node concept="2GrUjf" id="6UWSvq4K$GP" role="37wK5m">
-                  <ref role="2Gs0qQ" node="6UWSvq4KuKX" resolve="stage" />
-                </node>
-              </node>
+        <node concept="3clFbF" id="7DvO2MaBQGN" role="3cqZAp">
+          <node concept="1rXfSq" id="7DvO2MaBQGO" role="3clFbG">
+            <ref role="37wK5l" node="12yN8Dyvyy6" resolve="collectTemplates" />
+            <node concept="37vLTw" id="6tPOoeTaawu" role="37wK5m">
+              <ref role="3cqZAo" node="7P_FdVPHmOS" resolve="handlingTemplates" />
             </node>
           </node>
         </node>
@@ -3798,10 +3577,12 @@
     <node concept="2tJIrI" id="7DvO2Manhxe" role="jymVt" />
     <node concept="3clFb_" id="12yN8Dyvyy6" role="jymVt">
       <property role="TrG5h" value="collectTemplates" />
-      <node concept="37vLTG" id="4MqhgXU9tzq" role="3clF46">
-        <property role="TrG5h" value="stage" />
-        <node concept="3uibUv" id="1CcQBrPdcWm" role="1tU5fm">
-          <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+      <node concept="37vLTG" id="6tPOoeTa2e3" role="3clF46">
+        <property role="TrG5h" value="handlerTemplates" />
+        <node concept="A3Dl8" id="6tPOoeTa566" role="1tU5fm">
+          <node concept="3uibUv" id="6tPOoeTa5$s" role="A3Ik2">
+            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+          </node>
         </node>
       </node>
       <node concept="3cqZAl" id="12yN8Dyvyy8" role="3clF45" />
@@ -3842,16 +3623,11 @@
                   <node concept="3cpWsn" id="4MqhgXUaPfV" role="3cpWs9">
                     <property role="TrG5h" value="stageTemplate" />
                     <node concept="3vKaQO" id="4MqhgXUaPfW" role="1tU5fm">
-                      <node concept="1LlUBW" id="1CcQBrPdYFV" role="3O5elw">
-                        <node concept="3uibUv" id="1CcQBrPdZmb" role="1Lm7xW">
-                          <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                        </node>
-                        <node concept="3uibUv" id="7XdbJdySsFg" role="1Lm7xW">
-                          <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="RuleTemplateToken" />
-                            </node>
+                      <node concept="3uibUv" id="7XdbJdySsFg" role="3O5elw">
+                        <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="RuleTemplateToken" />
                           </node>
                         </node>
                       </node>
@@ -3879,16 +3655,11 @@
                           <node concept="37vLTI" id="4MqhgXUaPg8" role="1eOMHV">
                             <node concept="2ShNRf" id="4MqhgXUaPg9" role="37vLTx">
                               <node concept="Tc6Ow" id="4MqhgXUaPga" role="2ShVmc">
-                                <node concept="1LlUBW" id="1CcQBrPe1i5" role="HW$YZ">
-                                  <node concept="3uibUv" id="1CcQBrPe1i6" role="1Lm7xW">
-                                    <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                                  </node>
-                                  <node concept="3uibUv" id="7XdbJdySth5" role="1Lm7xW">
-                                    <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="RuleTemplateToken" />
-                                      </node>
+                                <node concept="3uibUv" id="6tPOoeTaAOM" role="HW$YZ">
+                                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                                  <node concept="3qUE_q" id="6tPOoeTaAON" role="11_B2D">
+                                    <node concept="3uibUv" id="6tPOoeTaAOO" role="3qUE_r">
+                                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                                     </node>
                                   </node>
                                 </node>
@@ -3934,21 +3705,16 @@
                       <ref role="3cqZAo" node="4MqhgXUaPfV" resolve="stageTemplate" />
                     </node>
                     <node concept="TSZUe" id="4MqhgXUaPgo" role="2OqNvi">
-                      <node concept="1Ls8ON" id="1CcQBrPe4xt" role="25WWJ7">
-                        <node concept="37vLTw" id="1CcQBrPe4Ac" role="1Lso8e">
-                          <ref role="3cqZAo" node="4MqhgXU9tzq" resolve="stage" />
-                        </node>
-                        <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 concept="1eOMI4" id="3IIf9OAyh5v" role="25WWJ7">
+                        <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>
@@ -3985,13 +3751,8 @@
               <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
             </node>
           </node>
-          <node concept="2OqwBi" id="1CcQBrPddeo" role="1DdaDG">
-            <node concept="37vLTw" id="4MqhgXUaOd_" role="2Oq$k0">
-              <ref role="3cqZAo" node="4MqhgXU9tzq" resolve="stage" />
-            </node>
-            <node concept="liA8E" id="1CcQBrPddMT" role="2OqNvi">
-              <ref role="37wK5l" node="1CcQBrPd1dz" resolve="handlerTemplates" />
-            </node>
+          <node concept="37vLTw" id="6tPOoeTa7ji" role="1DdaDG">
+            <ref role="3cqZAo" node="6tPOoeTa2e3" resolve="handlerTemplates" />
           </node>
         </node>
       </node>
@@ -4009,198 +3770,35 @@
         </node>
       </node>
       <node concept="_YKpA" id="7P_FdVPsPOZ" role="3clF45">
-        <node concept="3uibUv" id="7P_FdVPsPP0" role="_ZDj9">
-          <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+        <node concept="3uibUv" id="6tPOoeT9Sxd" role="_ZDj9">
+          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
         </node>
       </node>
       <node concept="3Tmbuc" id="7WKNeR9475y" role="1B3o_S" />
       <node concept="3clFbS" id="7P_FdVPsPP3" role="3clF47">
-        <node concept="3cpWs8" id="7P_FdVPsQ4_" role="3cqZAp">
-          <node concept="3cpWsn" id="7P_FdVPsQ4A" role="3cpWs9">
-            <property role="TrG5h" value="stagesMap" />
-            <node concept="3uibUv" id="7P_FdVPsQ4B" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~TreeMap" resolve="TreeMap" />
-              <node concept="17QB3L" id="7P_FdVPsQ4C" role="11_B2D" />
-              <node concept="_YKpA" id="7P_FdVPsQ4D" role="11_B2D">
-                <node concept="3uibUv" id="7P_FdVPsQ4E" role="_ZDj9">
+        <node concept="3cpWs8" id="6tPOoeT9Rh$" role="3cqZAp">
+          <node concept="3cpWsn" id="6tPOoeT9Rh_" role="3cpWs9">
+            <property role="TrG5h" value="tpls" />
+            <node concept="_YKpA" id="6tPOoeT9Rhs" role="1tU5fm">
+              <node concept="3uibUv" id="6tPOoeT9Rhv" role="_ZDj9">
+                <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="6tPOoeT9RhA" role="33vP2m">
+              <node concept="Tc6Ow" id="6tPOoeT9RhB" role="2ShVmc">
+                <node concept="3uibUv" id="6tPOoeT9RhC" role="HW$YZ">
                   <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
                 </node>
-              </node>
-            </node>
-            <node concept="2ShNRf" id="7P_FdVPsQ4F" role="33vP2m">
-              <node concept="1pGfFk" id="7P_FdVPsQ4G" role="2ShVmc">
-                <ref role="37wK5l" to="33ny:~TreeMap.&lt;init&gt;()" resolve="TreeMap" />
-                <node concept="17QB3L" id="7P_FdVPsQ4H" role="1pMfVU" />
-                <node concept="_YKpA" id="7P_FdVPsQ4I" role="1pMfVU">
-                  <node concept="3uibUv" id="7P_FdVPsQ4J" role="_ZDj9">
-                    <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-                  </node>
+                <node concept="37vLTw" id="6tPOoeT9Sef" role="I$8f6">
+                  <ref role="3cqZAo" node="7P_FdVPPiuI" resolve="handlerTemplates" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="1DcWWT" id="7P_FdVPsQ4K" role="3cqZAp">
-          <node concept="3clFbS" id="7P_FdVPsQ4L" role="2LFqv$">
-            <node concept="3clFbJ" id="7P_FdVPsQ4M" role="3cqZAp">
-              <node concept="3clFbS" id="7P_FdVPsQ4N" role="3clFbx">
-                <node concept="3clFbF" id="7P_FdVPsQ4O" role="3cqZAp">
-                  <node concept="2OqwBi" id="7P_FdVPsQ4P" role="3clFbG">
-                    <node concept="37vLTw" id="7P_FdVPsQ4Q" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7P_FdVPsQ4A" resolve="stagesMap" />
-                    </node>
-                    <node concept="liA8E" id="7P_FdVPsQ4R" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~TreeMap.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
-                      <node concept="2OqwBi" id="7P_FdVPsQ4S" role="37wK5m">
-                        <node concept="37vLTw" id="7P_FdVPsQ4T" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7P_FdVPsQ5f" resolve="htpl" />
-                        </node>
-                        <node concept="liA8E" id="7P_FdVPsQ4U" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:20Ay2Vf1i5R" resolve="stage" />
-                        </node>
-                      </node>
-                      <node concept="2ShNRf" id="7P_FdVPsQ4V" role="37wK5m">
-                        <node concept="Tc6Ow" id="7P_FdVPsQ4W" role="2ShVmc">
-                          <node concept="3uibUv" id="7P_FdVPsQ4X" role="HW$YZ">
-                            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3fqX7Q" id="7P_FdVPsQ4Y" role="3clFbw">
-                <node concept="2OqwBi" id="7P_FdVPsQ4Z" role="3fr31v">
-                  <node concept="37vLTw" id="7P_FdVPsQ50" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7P_FdVPsQ4A" resolve="stagesMap" />
-                  </node>
-                  <node concept="liA8E" id="7P_FdVPsQ51" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~TreeMap.containsKey(java.lang.Object):boolean" resolve="containsKey" />
-                    <node concept="2OqwBi" id="7P_FdVPsQ52" role="37wK5m">
-                      <node concept="37vLTw" id="7P_FdVPsQ53" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7P_FdVPsQ5f" resolve="htpl" />
-                      </node>
-                      <node concept="liA8E" id="7P_FdVPsQ54" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:20Ay2Vf1i5R" resolve="stage" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7P_FdVPsQ55" role="3cqZAp">
-              <node concept="2OqwBi" id="7P_FdVPsQ56" role="3clFbG">
-                <node concept="2OqwBi" id="7P_FdVPsQ57" role="2Oq$k0">
-                  <node concept="37vLTw" id="7P_FdVPsQ58" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7P_FdVPsQ4A" resolve="stagesMap" />
-                  </node>
-                  <node concept="liA8E" id="7P_FdVPsQ59" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~TreeMap.get(java.lang.Object):java.lang.Object" resolve="get" />
-                    <node concept="2OqwBi" id="7P_FdVPsQ5a" role="37wK5m">
-                      <node concept="37vLTw" id="7P_FdVPsQ5b" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7P_FdVPsQ5f" resolve="htpl" />
-                      </node>
-                      <node concept="liA8E" id="7P_FdVPsQ5c" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:20Ay2Vf1i5R" resolve="stage" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="TSZUe" id="7P_FdVPsQ5d" role="2OqNvi">
-                  <node concept="37vLTw" id="7P_FdVPsQ5e" role="25WWJ7">
-                    <ref role="3cqZAo" node="7P_FdVPsQ5f" resolve="htpl" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="7P_FdVPsQ5f" role="1Duv9x">
-            <property role="TrG5h" value="htpl" />
-            <node concept="3uibUv" id="7P_FdVPsQ5g" role="1tU5fm">
-              <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="7P_FdVPPo9F" role="1DdaDG">
-            <ref role="3cqZAo" node="7P_FdVPPiuI" resolve="handlerTemplates" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="7P_FdVPsQ5i" role="3cqZAp" />
-        <node concept="3cpWs8" id="7P_FdVPsQ5j" role="3cqZAp">
-          <node concept="3cpWsn" id="7P_FdVPsQ5k" role="3cpWs9">
-            <property role="TrG5h" value="stages" />
-            <node concept="_YKpA" id="7P_FdVPsQ5l" role="1tU5fm">
-              <node concept="3uibUv" id="7P_FdVPsQ5m" role="_ZDj9">
-                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="7P_FdVPsQ5n" role="33vP2m">
-              <node concept="Tc6Ow" id="7P_FdVPsQ5o" role="2ShVmc">
-                <node concept="3uibUv" id="7P_FdVPsQ5p" role="HW$YZ">
-                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="7P_FdVPsQ5q" role="3cqZAp">
-          <node concept="3clFbS" id="7P_FdVPsQ5r" role="2LFqv$">
-            <node concept="3clFbF" id="7P_FdVPsQ5s" role="3cqZAp">
-              <node concept="2OqwBi" id="7P_FdVPsQ5t" role="3clFbG">
-                <node concept="37vLTw" id="7P_FdVPsQ5u" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7P_FdVPsQ5k" resolve="stages" />
-                </node>
-                <node concept="TSZUe" id="7P_FdVPsQ5v" role="2OqNvi">
-                  <node concept="2ShNRf" id="7P_FdVPsQ5w" role="25WWJ7">
-                    <node concept="1pGfFk" id="7P_FdVPsQ5x" role="2ShVmc">
-                      <ref role="37wK5l" node="1CcQBrPd004" resolve="HandlingStage" />
-                      <node concept="2OqwBi" id="7P_FdVPsQ5y" role="37wK5m">
-                        <node concept="37vLTw" id="7P_FdVPsQ5z" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7P_FdVPsQ5C" resolve="e" />
-                        </node>
-                        <node concept="liA8E" id="7P_FdVPsQ5$" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~Map$Entry.getKey():java.lang.Object" resolve="getKey" />
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="7P_FdVPsQ5_" role="37wK5m">
-                        <node concept="37vLTw" id="7P_FdVPsQ5A" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7P_FdVPsQ5C" resolve="e" />
-                        </node>
-                        <node concept="liA8E" id="7P_FdVPsQ5B" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~Map$Entry.getValue():java.lang.Object" resolve="getValue" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="7P_FdVPsQ5C" role="1Duv9x">
-            <property role="TrG5h" value="e" />
-            <node concept="3uibUv" id="7P_FdVPsQ5D" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~Map$Entry" resolve="Map.Entry" />
-              <node concept="17QB3L" id="7P_FdVPsQ5E" role="11_B2D" />
-              <node concept="_YKpA" id="7P_FdVPsQ5F" role="11_B2D">
-                <node concept="3uibUv" id="7P_FdVPsQ5G" role="_ZDj9">
-                  <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="7P_FdVPsQ5H" role="1DdaDG">
-            <node concept="37vLTw" id="7P_FdVPsQ5I" role="2Oq$k0">
-              <ref role="3cqZAo" node="7P_FdVPsQ4A" resolve="stagesMap" />
-            </node>
-            <node concept="liA8E" id="7P_FdVPsQ5J" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~TreeMap.entrySet():java.util.Set" resolve="entrySet" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7P_FdVPsQ5K" role="3cqZAp" />
-        <node concept="3clFbF" id="7P_FdVPsQ5L" role="3cqZAp">
-          <node concept="37vLTw" id="7P_FdVPsQ5M" role="3clFbG">
-            <ref role="3cqZAo" node="7P_FdVPsQ5k" resolve="stages" />
+        <node concept="3clFbF" id="6tPOoeT9STY" role="3cqZAp">
+          <node concept="37vLTw" id="6tPOoeT9STW" role="3clFbG">
+            <ref role="3cqZAo" node="6tPOoeT9Rh_" resolve="tpls" />
           </node>
         </node>
       </node>
@@ -4212,16 +3810,11 @@
       <node concept="3rvAFt" id="12yN8Dyw7uY" role="1tU5fm">
         <node concept="3bZ5Sz" id="YGS68MZPLr" role="3rvQeY" />
         <node concept="3vKaQO" id="12yN8DyDzne" role="3rvSg0">
-          <node concept="1LlUBW" id="1CcQBrPdpQH" role="3O5elw">
-            <node concept="3uibUv" id="1CcQBrPdpQI" role="1Lm7xW">
-              <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-            </node>
-            <node concept="3uibUv" id="7XdbJdyRSXd" role="1Lm7xW">
-              <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="RuleTemplateToken" />
-                </node>
+          <node concept="3uibUv" id="7XdbJdyRSXd" role="3O5elw">
+            <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="RuleTemplateToken" />
               </node>
             </node>
           </node>
@@ -4231,16 +3824,11 @@
         <node concept="3rGOSV" id="429xoypKEon" role="2ShVmc">
           <node concept="3bZ5Sz" id="YGS68MZQMl" role="3rHrn6" />
           <node concept="3vKaQO" id="429xoypKEop" role="3rHtpV">
-            <node concept="1LlUBW" id="1CcQBrPdeWw" role="3O5elw">
-              <node concept="3uibUv" id="1CcQBrPdhbo" role="1Lm7xW">
-                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-              </node>
-              <node concept="3uibUv" id="7XdbJdyRULm" role="1Lm7xW">
-                <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="RuleTemplateToken" />
-                  </node>
+            <node concept="3uibUv" id="6tPOoeTa_2l" role="3O5elw">
+              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+              <node concept="3qUE_q" id="6tPOoeTa_2m" role="11_B2D">
+                <node concept="3uibUv" id="6tPOoeTa_2n" role="3qUE_r">
+                  <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                 </node>
               </node>
             </node>
@@ -4248,25 +3836,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7P_FdVPGV6W" role="jymVt" />
-    <node concept="312cEg" id="4QPCta1zvN6" role="jymVt">
-      <property role="TrG5h" value="stages" />
-      <node concept="3Tm6S6" id="4QPCta1zvN7" role="1B3o_S" />
-      <node concept="341BcB" id="6UWSvq547Qk" role="1tU5fm">
-        <node concept="17QB3L" id="6UWSvq54aOg" role="3rvQeY" />
-        <node concept="3uibUv" id="6UWSvq54dNz" role="3rvSg0">
-          <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="4QPCta1zxHP" role="33vP2m">
-        <node concept="342d9q" id="6UWSvq54jYn" role="2ShVmc">
-          <node concept="17QB3L" id="6UWSvq54pYp" role="3rHrn6" />
-          <node concept="3uibUv" id="6UWSvq54sUa" role="3rHtpV">
-            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="7P_FdVPGY2g" role="jymVt" />
     <node concept="312cEg" id="7P_FdVQplXd" role="jymVt">
       <property role="TrG5h" value="fqName2handlerTemplate" />
@@ -5774,20 +5343,15 @@
     </node>
     <node concept="2tJIrI" id="7kTeLbPorJ7" role="jymVt" />
     <node concept="3clFb_" id="3GlpCDSyO$P" role="jymVt">
-      <property role="TrG5h" value="getPrograms" />
-      <node concept="_YKpA" id="20Ay2VeYwM6" role="3clF45">
-        <node concept="1LlUBW" id="7WKNeR9luDN" role="_ZDj9">
-          <node concept="17QB3L" id="7WKNeR9lv4Z" role="1Lm7xW" />
-          <node concept="3uibUv" id="7WKNeR9lvwj" role="1Lm7xW">
-            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
-          </node>
-        </node>
+      <property role="TrG5h" value="getProgram" />
+      <node concept="3uibUv" id="6tPOoeTbPNO" role="3clF45">
+        <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
       </node>
       <node concept="3Tm1VV" id="3GlpCDSyO$S" role="1B3o_S" />
       <node concept="3clFbS" id="3GlpCDSyO$T" role="3clF47">
         <node concept="3clFbF" id="3GlpCDSyQWA" role="3cqZAp">
           <node concept="37vLTw" id="3GlpCDSyQW_" role="3clFbG">
-            <ref role="3cqZAo" node="1pPth$lE8Xs" resolve="stage_programs" />
+            <ref role="3cqZAo" node="1pPth$lE8Xs" resolve="program" />
           </node>
         </node>
       </node>
@@ -5892,53 +5456,16 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="4vBwiiVefTj" role="3cqZAp">
-          <node concept="3cpWsn" id="4vBwiiVefTk" role="3cpWs9">
-            <property role="TrG5h" value="stage_builders" />
-            <node concept="_YKpA" id="4vBwiiVefSq" role="1tU5fm">
-              <node concept="1LlUBW" id="4vBwiiVefSz" role="_ZDj9">
-                <node concept="3uibUv" id="4vBwiiVefS$" role="1Lm7xW">
-                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                </node>
-                <node concept="3uibUv" id="4vBwiiVefS_" role="1Lm7xW">
-                  <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
-                </node>
-              </node>
+        <node concept="3cpWs8" id="6tPOoeTaVAX" role="3cqZAp">
+          <node concept="3cpWsn" id="6tPOoeTaVAY" role="3cpWs9">
+            <property role="TrG5h" value="programBuilder" />
+            <node concept="3uibUv" id="6tPOoeTaVAW" role="1tU5fm">
+              <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
             </node>
-            <node concept="2OqwBi" id="4vBwiiVefTl" role="33vP2m">
-              <node concept="2OqwBi" id="4vBwiiVefTm" role="2Oq$k0">
-                <node concept="2OqwBi" id="4vBwiiVefTn" role="2Oq$k0">
-                  <node concept="1rXfSq" id="7WKNeR9dMsA" role="2Oq$k0">
-                    <ref role="37wK5l" node="7WKNeR9c0Kn" resolve="ruleTemplates" />
-                  </node>
-                  <node concept="liA8E" id="4vBwiiVefTr" role="2OqNvi">
-                    <ref role="37wK5l" node="4QPCta1zKCT" resolve="stages" />
-                  </node>
-                </node>
-                <node concept="3$u5V9" id="4vBwiiVefTs" role="2OqNvi">
-                  <node concept="1bVj0M" id="4vBwiiVefTt" role="23t8la">
-                    <node concept="3clFbS" id="4vBwiiVefTu" role="1bW5cS">
-                      <node concept="3clFbF" id="4vBwiiVefTv" role="3cqZAp">
-                        <node concept="1Ls8ON" id="4vBwiiVefTw" role="3clFbG">
-                          <node concept="37vLTw" id="4vBwiiVefTx" role="1Lso8e">
-                            <ref role="3cqZAo" node="4vBwiiVefT$" resolve="it" />
-                          </node>
-                          <node concept="2ShNRf" id="4vBwiiVefTy" role="1Lso8e">
-                            <node concept="1pGfFk" id="4vBwiiVefTz" role="2ShVmc">
-                              <ref role="37wK5l" to="7n8k:5rhZO$TZ9Ji" resolve="LogicProgramBuilder" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="4vBwiiVefT$" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="4vBwiiVefT_" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
+            <node concept="2ShNRf" id="6tPOoeTaVAZ" role="33vP2m">
+              <node concept="1pGfFk" id="6tPOoeTaVB0" role="2ShVmc">
+                <ref role="37wK5l" to="7n8k:5rhZO$TZ9Ji" resolve="LogicProgramBuilder" />
               </node>
-              <node concept="ANE8D" id="4vBwiiVefTA" role="2OqNvi" />
             </node>
           </node>
         </node>
@@ -5967,8 +5494,8 @@
                 <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 concept="37vLTw" id="6tPOoeTaVB1" role="37wK5m">
+                  <ref role="3cqZAo" node="6tPOoeTaVAY" resolve="programBuilder" />
                 </node>
               </node>
             </node>
@@ -6003,89 +5530,26 @@
         <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">
-              <node concept="3cpWsn" id="7kTeLbPnP2F" role="3cpWs9">
-                <property role="TrG5h" value="stageIdx" />
-                <node concept="10Oyi0" id="7kTeLbPnP2G" role="1tU5fm" />
-                <node concept="3cmrfG" id="7kTeLbPnP2H" role="33vP2m">
-                  <property role="3cmrfH" value="1" />
-                </node>
-              </node>
-            </node>
-            <node concept="1DcWWT" id="4vBwiiVep0Q" role="3cqZAp">
-              <node concept="3clFbS" id="4vBwiiVep0T" role="2LFqv$">
-                <node concept="3clFbF" id="4vBwiiVen0L" role="3cqZAp">
-                  <node concept="2OqwBi" id="4vBwiiVen0M" role="3clFbG">
-                    <node concept="2OqwBi" id="4vBwiiVen0N" role="2Oq$k0">
-                      <node concept="Xjq3P" id="4vBwiiVen0O" role="2Oq$k0" />
-                      <node concept="2OwXpG" id="4vBwiiVen0P" role="2OqNvi">
-                        <ref role="2Oxat5" node="1pPth$lE8Xs" resolve="stage_programs" />
-                      </node>
-                    </node>
-                    <node concept="TSZUe" id="4vBwiiVen0Q" role="2OqNvi">
-                      <node concept="1Ls8ON" id="7WKNeR9lAVH" role="25WWJ7">
-                        <node concept="2OqwBi" id="7WKNeR9lDcf" role="1Lso8e">
-                          <node concept="1LFfDK" id="7WKNeR9lCuA" role="2Oq$k0">
-                            <node concept="3cmrfG" id="7WKNeR9lCMP" role="1LF_Uc">
-                              <property role="3cmrfH" value="0" />
-                            </node>
-                            <node concept="37vLTw" id="7WKNeR9lBQn" role="1LFl5Q">
-                              <ref role="3cqZAo" node="4vBwiiVep0U" resolve="stage_builder" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="7WKNeR9lDAB" role="2OqNvi">
-                            <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="4vBwiiVen0R" role="1Lso8e">
-                          <node concept="1LFfDK" id="4vBwiiVexUs" role="2Oq$k0">
-                            <node concept="3cmrfG" id="4vBwiiVeyfV" role="1LF_Uc">
-                              <property role="3cmrfH" value="1" />
-                            </node>
-                            <node concept="37vLTw" id="4vBwiiVexk7" role="1LFl5Q">
-                              <ref role="3cqZAo" node="4vBwiiVep0U" resolve="stage_builder" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="4vBwiiVen0T" role="2OqNvi">
-                            <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="6OXbTDxuHpv" role="3uHU7B">
-                                  <ref role="3cqZAo" node="6OXbTDxtYkB" resolve="name" />
-                                </node>
-                                <node concept="Xl_RD" id="4vBwiiVen0X" role="3uHU7w">
-                                  <property role="Xl_RC" value="-" />
-                                </node>
-                              </node>
-                              <node concept="1eOMI4" id="4vBwiiVen0Y" role="3uHU7w">
-                                <node concept="3uNrnE" id="4vBwiiVen0Z" role="1eOMHV">
-                                  <node concept="37vLTw" id="4vBwiiVen10" role="2$L3a6">
-                                    <ref role="3cqZAo" node="7kTeLbPnP2F" resolve="stageIdx" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
+            <node concept="3clFbF" id="6tPOoeTb3FO" role="3cqZAp">
+              <node concept="37vLTI" id="6tPOoeTb4EN" role="3clFbG">
+                <node concept="2OqwBi" id="6tPOoeTb4Rp" role="37vLTx">
+                  <node concept="37vLTw" id="6tPOoeTb4Ki" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6tPOoeTaVAY" resolve="programBuilder" />
+                  </node>
+                  <node concept="liA8E" id="6tPOoeTb4ZE" role="2OqNvi">
+                    <ref role="37wK5l" to="7n8k:5rhZO$TZiL1" resolve="toProgram" />
+                    <node concept="37vLTw" id="6tPOoeTb8N4" role="37wK5m">
+                      <ref role="3cqZAo" node="6OXbTDxtYkB" resolve="name" />
                     </node>
                   </node>
                 </node>
-              </node>
-              <node concept="3cpWsn" id="4vBwiiVep0U" role="1Duv9x">
-                <property role="TrG5h" value="stage_builder" />
-                <node concept="1LlUBW" id="4vBwiiVep0Y" role="1tU5fm">
-                  <node concept="3uibUv" id="4vBwiiVep0Z" role="1Lm7xW">
-                    <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                  </node>
-                  <node concept="3uibUv" id="4vBwiiVep10" role="1Lm7xW">
-                    <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
+                <node concept="2OqwBi" id="6tPOoeTb47l" role="37vLTJ">
+                  <node concept="Xjq3P" id="6tPOoeTb3FM" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="6tPOoeTb4lL" role="2OqNvi">
+                    <ref role="2Oxat5" node="1pPth$lE8Xs" resolve="program" />
                   </node>
                 </node>
               </node>
-              <node concept="37vLTw" id="4vBwiiVep11" role="1DdaDG">
-                <ref role="3cqZAo" node="4vBwiiVefTk" resolve="stage_builders" />
-              </node>
             </node>
           </node>
           <node concept="2OqwBi" id="4vBwiiVen12" role="3clFbw">
@@ -6188,11 +5652,11 @@
               <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" />
+                  <ref role="2Oxat5" node="6OXbTDxv6BA" resolve="programBuilder" />
                 </node>
               </node>
               <node concept="37vLTw" id="6OXbTDxv6BN" role="37vLTx">
-                <ref role="3cqZAo" node="6OXbTDxv1Kn" resolve="stage_builders" />
+                <ref role="3cqZAo" node="6OXbTDxv1Kn" resolve="programBuilder" />
               </node>
             </node>
           </node>
@@ -6223,16 +5687,9 @@
           </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>
+          <property role="TrG5h" value="programBuilder" />
+          <node concept="3uibUv" id="6OXbTDxv2zJ" role="1tU5fm">
+            <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
           </node>
         </node>
       </node>
@@ -6401,21 +5858,8 @@
                       <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 concept="37vLTw" id="6tPOoeT4ylm" role="37wK5m">
+                          <ref role="3cqZAo" node="7WKNeR9b_iR" resolve="queryTemplate" />
                         </node>
                         <node concept="37vLTw" id="6OXbTDyhxR8" role="37wK5m">
                           <ref role="3cqZAo" node="6OXbTDxP7qn" resolve="parameter" />
@@ -6464,60 +5908,29 @@
             </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 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="37vLTw" id="6tPOoeTbwGr" role="37wK5m">
+                        <ref role="3cqZAo" node="6OXbTDxv6BA" resolve="programBuilder" />
                       </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 concept="37vLTw" id="6OXbTDzSgG1" role="37vLTJ">
+                <ref role="3cqZAo" node="6OXbTDzSgzu" resolve="result" />
               </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">
@@ -6530,12 +5943,6 @@
       <node concept="2tJIrI" id="6OXbTDzRXc5" role="jymVt" />
       <node concept="3clFb_" id="7nkyKX7ncaN" role="jymVt">
         <property role="TrG5h" value="buildProgramStage" />
-        <node concept="37vLTG" id="4vBwiiVccBe" role="3clF46">
-          <property role="TrG5h" value="stage" />
-          <node concept="3uibUv" id="4vBwiiVcgAO" role="1tU5fm">
-            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-          </node>
-        </node>
         <node concept="37vLTG" id="1CcQBrPh8x2" role="3clF46">
           <property role="TrG5h" value="programBuilder" />
           <node concept="3uibUv" id="1CcQBrPhbzq" role="1tU5fm">
@@ -6549,53 +5956,34 @@
         <node concept="3clFbS" id="7nkyKX7ncaR" role="3clF47">
           <node concept="SfApY" id="7nkyKX7nl0O" role="3cqZAp">
             <node concept="3clFbS" id="7nkyKX7nl0Q" role="SfCbr">
-              <node concept="3clFbJ" id="23c4kVtlhxX" role="3cqZAp">
-                <node concept="3clFbS" id="23c4kVtlhxZ" role="3clFbx">
-                  <node concept="1DcWWT" id="4MqhgXUSKVL" role="3cqZAp">
-                    <node concept="3clFbS" id="4MqhgXUSKVO" role="2LFqv$">
-                      <node concept="3clFbF" id="4MqhgXUSLTN" role="3cqZAp">
-                        <node concept="2OqwBi" id="4MqhgXUSMc_" role="3clFbG">
-                          <node concept="37vLTw" id="4MqhgXUSLTM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="1CcQBrPh8x2" resolve="programBuilder" />
-                          </node>
-                          <node concept="liA8E" id="4MqhgXUSMpw" role="2OqNvi">
-                            <ref role="37wK5l" to="7n8k:4MqhgXUQoOL" resolve="addHandler" />
-                            <node concept="37vLTw" id="4MqhgXUSMIv" role="37wK5m">
-                              <ref role="3cqZAo" node="4MqhgXUSKVP" resolve="handler" />
-                            </node>
-                          </node>
-                        </node>
+              <node concept="1DcWWT" id="4MqhgXUSKVL" role="3cqZAp">
+                <node concept="3clFbS" id="4MqhgXUSKVO" role="2LFqv$">
+                  <node concept="3clFbF" id="4MqhgXUSLTN" role="3cqZAp">
+                    <node concept="2OqwBi" id="4MqhgXUSMc_" role="3clFbG">
+                      <node concept="37vLTw" id="4MqhgXUSLTM" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1CcQBrPh8x2" resolve="programBuilder" />
                       </node>
-                    </node>
-                    <node concept="3cpWsn" id="4MqhgXUSKVP" role="1Duv9x">
-                      <property role="TrG5h" value="handler" />
-                      <node concept="3uibUv" id="4MqhgXUSKVT" role="1tU5fm">
-                        <ref role="3uigEE" to="av0y:~Handler" resolve="Handler" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="4MqhgXUSKVU" role="1DdaDG">
-                      <node concept="3EllGN" id="1CcQBrPhjgf" role="2Oq$k0">
-                        <node concept="37vLTw" id="1CcQBrPhjkX" role="3ElVtu">
-                          <ref role="3cqZAo" node="4vBwiiVccBe" resolve="stage" />
+                      <node concept="liA8E" id="4MqhgXUSMpw" role="2OqNvi">
+                        <ref role="37wK5l" to="7n8k:4MqhgXUQoOL" resolve="addHandler" />
+                        <node concept="37vLTw" id="6tPOoeTbvfq" role="37wK5m">
+                          <ref role="3cqZAo" node="4MqhgXUSKVP" resolve="handler" />
                         </node>
-                        <node concept="37vLTw" id="4MqhgXUSKVV" role="3ElQJh">
-                          <ref role="3cqZAo" node="4MqhgXUBtmF" resolve="ruleTables" />
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="4MqhgXUSKVW" role="2OqNvi">
-                        <ref role="37wK5l" node="7DvO2M9UagU" resolve="allHandlers" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="2OqwBi" id="23c4kVtlmDH" role="3clFbw">
-                  <node concept="37vLTw" id="23c4kVtlm0W" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4MqhgXUBtmF" resolve="ruleTables" />
+                <node concept="3cpWsn" id="4MqhgXUSKVP" role="1Duv9x">
+                  <property role="TrG5h" value="handler" />
+                  <node concept="3uibUv" id="4MqhgXUSKVT" role="1tU5fm">
+                    <ref role="3uigEE" to="av0y:~Handler" resolve="Handler" />
                   </node>
-                  <node concept="2Nt0df" id="23c4kVtlnXF" role="2OqNvi">
-                    <node concept="37vLTw" id="23c4kVtlodi" role="38cxEo">
-                      <ref role="3cqZAo" node="4vBwiiVccBe" resolve="stage" />
-                    </node>
+                </node>
+                <node concept="2OqwBi" id="6tPOoeTbtQC" role="1DdaDG">
+                  <node concept="37vLTw" id="6tPOoeTbtQD" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6tPOoeT4XhE" resolve="ruleTable" />
+                  </node>
+                  <node concept="liA8E" id="6tPOoeTbtQE" role="2OqNvi">
+                    <ref role="37wK5l" node="7DvO2M9UagU" resolve="allHandlers" />
                   </node>
                 </node>
               </node>
@@ -7446,14 +6834,10 @@
       <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" />
+            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
             <node concept="16syzq" id="6OXbTDybqOL" role="11_B2D">
               <ref role="16sUi3" node="6OXbTDyaL_y" resolve="Token" />
             </node>
@@ -7481,7 +6865,7 @@
                       <ref role="3cqZAo" node="6OXbTDyaLzX" resolve="tpl" />
                     </node>
                     <node concept="liA8E" id="6OXbTDycgwH" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:mJ_D14Alpb" resolve="newToken" />
+                      <ref role="37wK5l" to="i348:6tPOoeT3pU7" resolve="newToken" />
                       <node concept="37vLTw" id="6OXbTDycgwJ" role="37wK5m">
                         <ref role="3cqZAo" node="6OXbTDycbjU" resolve="parameter" />
                       </node>
@@ -7903,18 +7287,13 @@
         <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" />
+          <property role="TrG5h" value="tpls" />
           <node concept="A3Dl8" id="tIwzd1I3Xn" role="1tU5fm">
-            <node concept="1LlUBW" id="7t5VLKHawYT" role="A3Ik2">
-              <node concept="3uibUv" id="1CcQBrPeaZd" role="1Lm7xW">
-                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-              </node>
-              <node concept="3uibUv" id="1ffsG7c4WJ7" role="1Lm7xW">
-                <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="RuleTemplateToken" />
-                  </node>
+            <node concept="3uibUv" id="6tPOoeTdbj8" role="A3Ik2">
+              <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+              <node concept="3qUE_q" id="6tPOoeTdbj9" role="11_B2D">
+                <node concept="3uibUv" id="6tPOoeTdbja" role="3qUE_r">
+                  <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                 </node>
               </node>
             </node>
@@ -8037,22 +7416,6 @@
               </node>
               <node concept="2GUZhq" id="4vBwiiV7qJC" role="3cqZAp">
                 <node concept="3clFbS" id="4vBwiiV7qJE" role="2GV8ay">
-                  <node concept="3cpWs8" id="1CcQBrPen4r" role="3cqZAp">
-                    <node concept="3cpWsn" id="1CcQBrPen4s" role="3cpWs9">
-                      <property role="TrG5h" value="stage" />
-                      <node concept="3uibUv" id="1CcQBrPen46" role="1tU5fm">
-                        <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                      </node>
-                      <node concept="1LFfDK" id="1CcQBrPen4t" role="33vP2m">
-                        <node concept="3cmrfG" id="1CcQBrPen4u" role="1LF_Uc">
-                          <property role="3cmrfH" value="0" />
-                        </node>
-                        <node concept="37vLTw" id="1CcQBrPen4v" role="1LFl5Q">
-                          <ref role="3cqZAo" node="tIwzd1I3Xj" resolve="stage_tpl" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3cpWs8" id="4MqhgXUBzFn" role="3cqZAp">
                     <node concept="3cpWsn" id="4MqhgXUBzFo" role="3cpWs9">
                       <property role="TrG5h" value="template" />
@@ -8064,13 +7427,8 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="1LFfDK" id="4MqhgXUBzFp" role="33vP2m">
-                        <node concept="3cmrfG" id="4MqhgXUBzFq" role="1LF_Uc">
-                          <property role="3cmrfH" value="1" />
-                        </node>
-                        <node concept="37vLTw" id="4MqhgXUBzFr" role="1LFl5Q">
-                          <ref role="3cqZAo" node="tIwzd1I3Xj" resolve="stage_tpl" />
-                        </node>
+                      <node concept="37vLTw" id="6tPOoeTdh1V" role="33vP2m">
+                        <ref role="3cqZAo" node="tIwzd1I3Xj" resolve="tpl" />
                       </node>
                     </node>
                   </node>
@@ -8219,16 +7577,15 @@
                               <property role="TrG5h" value="builder" />
                             </node>
                           </node>
-                          <node concept="3clFbH" id="4MqhgXUBpUs" role="3cqZAp" />
-                          <node concept="3clFbF" id="4MqhgXUByvU" role="3cqZAp">
-                            <node concept="2OqwBi" id="4MqhgXUBz8e" role="3clFbG">
-                              <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 concept="3clFbF" id="6tPOoeT5wvK" role="3cqZAp">
+                            <node concept="2OqwBi" id="6tPOoeT5xBh" role="3clFbG">
+                              <node concept="2OqwBi" id="6tPOoeT5wQk" role="2Oq$k0">
+                                <node concept="Xjq3P" id="6tPOoeT5wvI" role="2Oq$k0" />
+                                <node concept="2OwXpG" id="6tPOoeT5xh1" role="2OqNvi">
+                                  <ref role="2Oxat5" node="6tPOoeT4XhE" resolve="ruleTable" />
                                 </node>
                               </node>
-                              <node concept="liA8E" id="4MqhgXUBzq2" role="2OqNvi">
+                              <node concept="liA8E" id="6tPOoeT5xYf" role="2OqNvi">
                                 <ref role="37wK5l" node="7DvO2M9Uagq" resolve="update" />
                                 <node concept="37vLTw" id="4MqhgXUBBcH" role="37wK5m">
                                   <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
@@ -8437,23 +7794,18 @@
               <node concept="3clFbH" id="4vBwiiV8iBJ" role="3cqZAp" />
             </node>
             <node concept="3cpWsn" id="tIwzd1I3Xj" role="1Duv9x">
-              <property role="TrG5h" value="stage_tpl" />
-              <node concept="1LlUBW" id="7t5VLKHazo3" role="1tU5fm">
-                <node concept="3uibUv" id="1CcQBrPeewI" role="1Lm7xW">
-                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                </node>
-                <node concept="3uibUv" id="1ffsG7c4Zfy" role="1Lm7xW">
-                  <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="RuleTemplateToken" />
-                    </node>
+              <property role="TrG5h" value="tpl" />
+              <node concept="3uibUv" id="6tPOoeTdcfx" role="1tU5fm">
+                <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
+                <node concept="3qUE_q" id="6tPOoeTdcfy" role="11_B2D">
+                  <node concept="3uibUv" id="6tPOoeTdcfz" role="3qUE_r">
+                    <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
                   </node>
                 </node>
               </node>
             </node>
             <node concept="37vLTw" id="tIwzd1I3Xs" role="1DdaDG">
-              <ref role="3cqZAo" node="tIwzd1I3Xm" resolve="stage_tpls" />
+              <ref role="3cqZAo" node="tIwzd1I3Xm" resolve="tpls" />
             </node>
           </node>
           <node concept="3clFbH" id="6i42QSssfmM" role="3cqZAp" />
@@ -8500,315 +7852,252 @@
           <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 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="37vLTw" id="6tPOoeT4SaD" role="37wK5m">
+                      <ref role="3cqZAo" node="6OXbTDydhIZ" resolve="queryTemplate" />
+                    </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="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 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="6OXbTD$lB7G" role="2Oq$k0">
-                            <node concept="3cmrfG" id="6OXbTD$lBeM" role="1LF_Uc">
-                              <property role="3cmrfH" value="0" />
+                          <node concept="1LFfDK" id="6OXbTDzFnYP" role="I$8f6">
+                            <node concept="3cmrfG" id="6OXbTDzFnYQ" role="1LF_Uc">
+                              <property role="3cmrfH" value="1" />
                             </node>
-                            <node concept="2GrUjf" id="6OXbTDygBSH" role="1LFl5Q">
-                              <ref role="2Gs0qQ" node="6OXbTDydnjC" resolve="stage_tpl" />
+                            <node concept="37vLTw" id="6OXbTDzFoOp" role="1LFl5Q">
+                              <ref role="3cqZAo" node="6OXbTDydyNS" resolve="result_builders" />
                             </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 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="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 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 concept="37vLTw" id="6OXbTDzFoOp" role="1LFl5Q">
-                                  <ref role="3cqZAo" node="6OXbTDydyNS" resolve="result_builders" />
+                              </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="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 concept="3clFbJ" id="6tPOoeT54Pn" role="3cqZAp">
+                        <node concept="3clFbS" id="6tPOoeT54Pp" role="3clFbx">
+                          <node concept="3clFbH" id="6tPOoeT54Po" role="3cqZAp" />
+                        </node>
+                        <node concept="3clFbC" id="6tPOoeT55Q3" role="3clFbw">
+                          <node concept="10Nm6u" id="6tPOoeT55Wy" role="3uHU7w" />
+                          <node concept="37vLTw" id="6tPOoeT55_U" role="3uHU7B">
+                            <ref role="3cqZAo" node="6tPOoeT4XhE" resolve="ruleTable" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="6tPOoeT524D" role="3cqZAp">
+                        <node concept="2OqwBi" id="6tPOoeT53LW" role="3clFbG">
+                          <node concept="2OqwBi" id="6tPOoeT52Fu" role="2Oq$k0">
+                            <node concept="Xjq3P" id="6tPOoeT524B" role="2Oq$k0" />
+                            <node concept="2OwXpG" id="6tPOoeT538g" role="2OqNvi">
+                              <ref role="2Oxat5" node="6tPOoeT4XhE" resolve="ruleTable" />
                             </node>
-                            <node concept="37vLTw" id="6OXbTDzFwae" role="2GsD0m">
+                          </node>
+                          <node concept="liA8E" id="6tPOoeT544o" role="2OqNvi">
+                            <ref role="37wK5l" node="6OXbTDy0Er4" resolve="update" />
+                            <node concept="37vLTw" id="6tPOoeT5urx" role="37wK5m">
+                              <ref role="3cqZAo" node="6OXbTDydhIZ" resolve="queryTemplate" />
+                            </node>
+                            <node concept="37vLTw" id="6tPOoeT5v0Z" role="37wK5m">
                               <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 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 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>
+                        <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="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 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="6OXbTDydY2D" role="3uHU7w">
-                                            <property role="Xl_RC" value=")" />
+                                          <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="6tPOoeTbwWq" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="6OXbTDydhIZ" resolve="queryTemplate" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="Xl_RD" id="6OXbTDydY2D" role="3uHU7w">
+                                        <property role="Xl_RC" value=")" />
                                       </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 concept="3clFbH" id="2BZXJed1UUQ" role="3cqZAp" />
-                    </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 concept="9aQIb" id="2BZXJed1UiI" role="9aQIa">
-                      <node concept="3clFbS" id="2BZXJed1UiJ" role="9aQI4">
-                        <node concept="3clFbF" id="2BZXJed1VFt" role="3cqZAp">
-                          <node concept="37vLTI" id="2BZXJed1VPh" role="3clFbG">
-                            <node concept="2OqwBi" id="2BZXJed1W6q" role="37vLTx">
-                              <node concept="37vLTw" id="2BZXJed1W0J" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6OXbTDyef8r" resolve="result" />
-                              </node>
-                              <node concept="liA8E" id="2BZXJed1We4" role="2OqNvi">
-                                <ref role="37wK5l" node="7nkyKX7v7xb" resolve="and" />
-                                <node concept="1LFfDK" id="2BZXJed1X2p" role="37wK5m">
-                                  <node concept="3cmrfG" id="2BZXJed1Xfp" role="1LF_Uc">
-                                    <property role="3cmrfH" value="0" />
-                                  </node>
-                                  <node concept="37vLTw" id="2BZXJed1W$4" role="1LFl5Q">
-                                    <ref role="3cqZAo" node="6OXbTDydyNS" resolve="result_builders" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="2BZXJed1VFs" role="37vLTJ">
+                            <node concept="37vLTw" id="6OXbTDyefYD" role="37vLTJ">
                               <ref role="3cqZAo" node="6OXbTDyef8r" resolve="result" />
                             </node>
                           </node>
@@ -8816,12 +8105,47 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFbH" id="2BZXJed1UUQ" role="3cqZAp" />
                 </node>
-                <node concept="37vLTw" id="6OXbTDydn2q" role="2GsD0m">
-                  <ref role="3cqZAo" node="6OXbTDydhIZ" resolve="stage_tpls" />
+                <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 concept="2GrKxI" id="6OXbTDydnjC" role="2Gsz3X">
-                  <property role="TrG5h" value="stage_tpl" />
+                <node concept="9aQIb" id="2BZXJed1UiI" role="9aQIa">
+                  <node concept="3clFbS" id="2BZXJed1UiJ" role="9aQI4">
+                    <node concept="3clFbF" id="2BZXJed1VFt" role="3cqZAp">
+                      <node concept="37vLTI" id="2BZXJed1VPh" role="3clFbG">
+                        <node concept="2OqwBi" id="2BZXJed1W6q" role="37vLTx">
+                          <node concept="37vLTw" id="2BZXJed1W0J" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6OXbTDyef8r" resolve="result" />
+                          </node>
+                          <node concept="liA8E" id="2BZXJed1We4" role="2OqNvi">
+                            <ref role="37wK5l" node="7nkyKX7v7xb" resolve="and" />
+                            <node concept="1LFfDK" id="2BZXJed1X2p" role="37wK5m">
+                              <node concept="3cmrfG" id="2BZXJed1Xfp" role="1LF_Uc">
+                                <property role="3cmrfH" value="0" />
+                              </node>
+                              <node concept="37vLTw" id="2BZXJed1W$4" role="1LFl5Q">
+                                <ref role="3cqZAo" node="6OXbTDydyNS" resolve="result_builders" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="2BZXJed1VFs" role="37vLTJ">
+                          <ref role="3cqZAo" node="6OXbTDyef8r" resolve="result" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
               </node>
               <node concept="3clFbH" id="6OXbTDydmGN" role="3cqZAp" />
@@ -8836,21 +8160,9 @@
           </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>
+          <property role="TrG5h" value="queryTemplate" />
+          <node concept="3uibUv" id="6tPOoeT4z8$" role="1tU5fm">
+            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
           </node>
         </node>
         <node concept="37vLTG" id="6OXbTDyaDvN" role="3clF46">
@@ -8863,76 +8175,6 @@
         </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" />
@@ -8951,16 +8193,11 @@
               <node concept="3cpWsn" id="5ntLU8GlzSJ" role="3cpWs9">
                 <property role="TrG5h" value="tpls" />
                 <node concept="A3Dl8" id="5ntLU8GlzSt" role="1tU5fm">
-                  <node concept="1LlUBW" id="7t5VLKHavfN" role="A3Ik2">
-                    <node concept="3uibUv" id="1CcQBrPe8g0" role="1Lm7xW">
-                      <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                    </node>
-                    <node concept="3uibUv" id="1ffsG7c5hrm" role="1Lm7xW">
-                      <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="RuleTemplateToken" />
-                        </node>
+                  <node concept="3uibUv" id="1ffsG7c5hrm" role="A3Ik2">
+                    <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="RuleTemplateToken" />
                       </node>
                     </node>
                   </node>
@@ -9339,40 +8576,23 @@
           <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
         </node>
       </node>
-      <node concept="312cEg" id="4MqhgXUBtmF" role="jymVt">
-        <property role="TrG5h" value="ruleTables" />
-        <node concept="3Tm6S6" id="4MqhgXUBtmG" role="1B3o_S" />
-        <node concept="3rvAFt" id="1CcQBrPgZ71" role="1tU5fm">
-          <node concept="3uibUv" id="1CcQBrPgZto" role="3rvQeY">
-            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-          </node>
-          <node concept="3uibUv" id="1CcQBrPgZJH" role="3rvSg0">
-            <ref role="3uigEE" node="7DvO2M9Uago" resolve="ProgramProducer.RuleTable" />
-          </node>
+      <node concept="312cEg" id="6tPOoeT4XhE" role="jymVt">
+        <property role="TrG5h" value="ruleTable" />
+        <node concept="3Tm6S6" id="6tPOoeT4XhF" role="1B3o_S" />
+        <node concept="3uibUv" id="6tPOoeT51Qn" role="1tU5fm">
+          <ref role="3uigEE" node="7DvO2M9Uago" resolve="ProgramProducer.RuleTable" />
         </node>
-        <node concept="2ShNRf" id="1CcQBrPh0w5" role="33vP2m">
-          <node concept="3rGOSV" id="1CcQBrPh0ro" role="2ShVmc">
-            <node concept="3uibUv" id="1CcQBrPh0rp" role="3rHrn6">
-              <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-            </node>
-            <node concept="3uibUv" id="1CcQBrPh0rq" role="3rHtpV">
-              <ref role="3uigEE" node="7DvO2M9Uago" resolve="ProgramProducer.RuleTable" />
-            </node>
+        <node concept="2ShNRf" id="6tPOoeT5rTq" role="33vP2m">
+          <node concept="HV5vD" id="6tPOoeT5tv5" role="2ShVmc">
+            <ref role="HV5vE" node="7DvO2M9Uago" resolve="ProgramProducer.RuleTable" />
           </node>
         </node>
       </node>
       <node concept="312cEg" id="6OXbTDxv6BA" role="jymVt">
-        <property role="TrG5h" value="stage_builders" />
+        <property role="TrG5h" value="programBuilder" />
         <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 concept="3uibUv" id="6tPOoeTaVdp" role="1tU5fm">
+          <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="LogicProgramBuilder" />
         </node>
       </node>
       <node concept="3Tm6S6" id="7DvO2M9BJbW" role="1B3o_S" />
@@ -10266,7 +9486,7 @@
         <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="3clFbH" id="6tPOoeT5u8K" role="3cqZAp" />
           <node concept="2Gpval" id="6OXbTDyyjVd" role="3cqZAp">
             <node concept="3clFbS" id="6OXbTDy10Jh" role="2LFqv$">
               <node concept="3clFbF" id="6OXbTDy1aOX" role="3cqZAp">
@@ -10274,13 +9494,13 @@
                   <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" />
+                      <ref role="3cqZAo" node="6OXbTDy0I1M" resolve="queryTemplate" />
                     </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" />
+                      <ref role="3cqZAo" node="6OXbTDy0I1M" resolve="queryTemplate" />
                     </node>
                     <node concept="2OqwBi" id="6OXbTDy1d8D" role="37wK5m">
                       <node concept="2GrUjf" id="6OXbTDyyjW7" role="2Oq$k0">
@@ -10304,9 +9524,9 @@
           <node concept="3clFbH" id="6OXbTDy0KT9" role="3cqZAp" />
         </node>
         <node concept="37vLTG" id="6OXbTDy0I1M" role="3clF46">
-          <property role="TrG5h" value="queryStageTemplate" />
+          <property role="TrG5h" value="queryTemplate" />
           <node concept="3uibUv" id="6OXbTD$xzi7" role="1tU5fm">
-            <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryStageTemplate" />
+            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
             <node concept="3qTvmN" id="6OXbTD$xEq3" role="11_B2D" />
           </node>
         </node>
@@ -10571,9 +9791,9 @@
       <node concept="3clFb_" id="6OXbTDy166r" role="jymVt">
         <property role="TrG5h" value="queryHandlerBuilder" />
         <node concept="37vLTG" id="6OXbTDy166s" role="3clF46">
-          <property role="TrG5h" value="queryStageTemplate" />
+          <property role="TrG5h" value="queryTemplate" />
           <node concept="3uibUv" id="6OXbTD$xHlq" role="1tU5fm">
-            <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryStageTemplate" />
+            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
             <node concept="3qTvmN" id="6OXbTD$xHAd" role="11_B2D" />
           </node>
         </node>
@@ -10590,7 +9810,7 @@
               </node>
               <node concept="3EllGN" id="6OXbTDy166$" role="33vP2m">
                 <node concept="37vLTw" id="6OXbTDy166_" role="3ElVtu">
-                  <ref role="3cqZAo" node="6OXbTDy166s" resolve="queryStageTemplate" />
+                  <ref role="3cqZAo" node="6OXbTDy166s" resolve="queryTemplate" />
                 </node>
                 <node concept="37vLTw" id="6OXbTDy19TR" role="3ElQJh">
                   <ref role="3cqZAo" node="6OXbTDy15hb" resolve="queryHandlerBuilders" />
@@ -10607,10 +9827,10 @@
                       <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" />
+                          <ref role="3cqZAo" node="6OXbTDy166s" resolve="queryTemplate" />
                         </node>
                         <node concept="liA8E" id="6OXbTDzvnFT" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:6OXbTD$oRWJ" resolve="stageName" />
+                          <ref role="37wK5l" to="i348:6OXbTD$iO0w" resolve="name" />
                         </node>
                       </node>
                       <node concept="2ShNRf" id="6OXbTDzvnFU" role="37wK5m">
@@ -10626,7 +9846,7 @@
                             <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                           </node>
                           <node concept="37vLTw" id="6OXbTDzvnG0" role="2HTEbv">
-                            <ref role="3cqZAo" node="6OXbTDy166s" resolve="queryStageTemplate" />
+                            <ref role="3cqZAo" node="6OXbTDy166s" resolve="queryTemplate" />
                           </node>
                         </node>
                       </node>
@@ -10644,7 +9864,7 @@
                   </node>
                   <node concept="3EllGN" id="6OXbTDy1679" role="37vLTJ">
                     <node concept="37vLTw" id="6OXbTDy167a" role="3ElVtu">
-                      <ref role="3cqZAo" node="6OXbTDy166s" resolve="queryStageTemplate" />
+                      <ref role="3cqZAo" node="6OXbTDy166s" resolve="queryTemplate" />
                     </node>
                     <node concept="37vLTw" id="6OXbTDy1aJG" role="3ElQJh">
                       <ref role="3cqZAo" node="6OXbTDy15hb" resolve="queryHandlerBuilders" />
@@ -10695,7 +9915,7 @@
         <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" />
+            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
             <node concept="3qTvmN" id="6OXbTD$xIpJ" role="11_B2D" />
           </node>
           <node concept="3uibUv" id="6OXbTDzvogx" role="3rvSg0">
@@ -10705,7 +9925,7 @@
         <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" />
+              <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
               <node concept="3qTvmN" id="6OXbTD$xJlQ" role="11_B2D" />
             </node>
             <node concept="3uibUv" id="6OXbTDzvor7" role="3rHtpV">
@@ -10721,27 +9941,12 @@
     <node concept="312cEg" id="1pPth$lE8Xs" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
-      <property role="TrG5h" value="stage_programs" />
+      <property role="TrG5h" value="program" />
       <property role="3TUv4t" value="false" />
-      <node concept="_YKpA" id="20Ay2VeYy5g" role="1tU5fm">
-        <node concept="1LlUBW" id="7WKNeR9lvI2" role="_ZDj9">
-          <node concept="17QB3L" id="7WKNeR9lwOJ" role="1Lm7xW" />
-          <node concept="3uibUv" id="7WKNeR9lxqX" role="1Lm7xW">
-            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
-          </node>
-        </node>
+      <node concept="3uibUv" id="6tPOoeTaWdU" role="1tU5fm">
+        <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
       </node>
       <node concept="3Tm6S6" id="3GlpCDSyB5g" role="1B3o_S" />
-      <node concept="2ShNRf" id="20Ay2VeYyxo" role="33vP2m">
-        <node concept="Tc6Ow" id="20Ay2VeYywP" role="2ShVmc">
-          <node concept="1LlUBW" id="7WKNeR9l$pX" role="HW$YZ">
-            <node concept="17QB3L" id="7WKNeR9l_jJ" role="1Lm7xW" />
-            <node concept="3uibUv" id="7WKNeR9l_Mu" role="1Lm7xW">
-              <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="3Tm1VV" id="3GlpCDSxTG8" role="1B3o_S" />
     <node concept="312cEg" id="7WKNeR9bpBf" role="jymVt">
@@ -11912,111 +11117,6 @@
       <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
     </node>
   </node>
-  <node concept="312cEu" id="1CcQBrPcZVG">
-    <property role="TrG5h" value="HandlingStage" />
-    <node concept="2tJIrI" id="1CcQBrPcZWg" role="jymVt" />
-    <node concept="3clFbW" id="1CcQBrPd004" role="jymVt">
-      <node concept="37vLTG" id="7DvO2MaziaI" role="3clF46">
-        <property role="TrG5h" value="name" />
-        <node concept="17QB3L" id="7DvO2Mazihr" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1CcQBrPd00y" role="3clF46">
-        <property role="TrG5h" value="handlerTemplates" />
-        <node concept="_YKpA" id="1CcQBrPd00Q" role="1tU5fm">
-          <node concept="3uibUv" id="1CcQBrPd01d" role="_ZDj9">
-            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1CcQBrPd006" role="3clF45" />
-      <node concept="3Tm1VV" id="1CcQBrPd007" role="1B3o_S" />
-      <node concept="3clFbS" id="1CcQBrPd008" role="3clF47">
-        <node concept="3clFbF" id="1CcQBrPd029" role="3cqZAp">
-          <node concept="37vLTI" id="1CcQBrPd0UF" role="3clFbG">
-            <node concept="37vLTw" id="1CcQBrPd11p" role="37vLTx">
-              <ref role="3cqZAo" node="1CcQBrPd00y" resolve="handlerTemplates" />
-            </node>
-            <node concept="2OqwBi" id="1CcQBrPd06n" role="37vLTJ">
-              <node concept="Xjq3P" id="1CcQBrPd028" role="2Oq$k0" />
-              <node concept="2OwXpG" id="1CcQBrPd0gK" role="2OqNvi">
-                <ref role="2Oxat5" node="1CcQBrPcZWy" resolve="handlerTemplates" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7DvO2MazihR" role="3cqZAp">
-          <node concept="37vLTI" id="7DvO2MazihT" role="3clFbG">
-            <node concept="2OqwBi" id="7DvO2Maziva" role="37vLTJ">
-              <node concept="Xjq3P" id="7DvO2MazivM" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7DvO2Mazivd" role="2OqNvi">
-                <ref role="2Oxat5" node="7DvO2MazihN" resolve="name" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="7DvO2MazihX" role="37vLTx">
-              <ref role="3cqZAo" node="7DvO2MaziaI" resolve="name" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1CcQBrPcZZC" role="jymVt" />
-    <node concept="3clFb_" id="1CcQBrPd1dz" role="jymVt">
-      <property role="TrG5h" value="handlerTemplates" />
-      <node concept="_YKpA" id="1CcQBrPd1k7" role="3clF45">
-        <node concept="3uibUv" id="1CcQBrPd1qg" role="_ZDj9">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1CcQBrPd1dA" role="1B3o_S" />
-      <node concept="3clFbS" id="1CcQBrPd1dB" role="3clF47">
-        <node concept="3clFbF" id="1CcQBrPd1$F" role="3cqZAp">
-          <node concept="2OqwBi" id="6UWSvq4JGuP" role="3clFbG">
-            <node concept="37vLTw" id="1CcQBrPd1$E" role="2Oq$k0">
-              <ref role="3cqZAo" node="1CcQBrPcZWy" resolve="handlerTemplates" />
-            </node>
-            <node concept="26Dbio" id="6UWSvq4JHBk" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7DvO2Maz94F" role="jymVt" />
-    <node concept="3clFb_" id="7DvO2Maz9cH" role="jymVt">
-      <property role="TrG5h" value="name" />
-      <node concept="17QB3L" id="7DvO2Maz9kE" role="3clF45" />
-      <node concept="3Tm1VV" id="7DvO2Maz9cK" role="1B3o_S" />
-      <node concept="3clFbS" id="7DvO2Maz9cL" role="3clF47">
-        <node concept="3clFbF" id="7DvO2MaziJG" role="3cqZAp">
-          <node concept="37vLTw" id="7DvO2MaziJF" role="3clFbG">
-            <ref role="3cqZAo" node="7DvO2MazihN" resolve="name" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1CcQBrPcZZL" role="jymVt" />
-    <node concept="312cEg" id="7DvO2MazihN" role="jymVt">
-      <property role="TrG5h" value="name" />
-      <node concept="3Tm6S6" id="7DvO2MazihO" role="1B3o_S" />
-      <node concept="17QB3L" id="7DvO2MazihQ" role="1tU5fm" />
-    </node>
-    <node concept="312cEg" id="1CcQBrPcZWy" role="jymVt">
-      <property role="TrG5h" value="handlerTemplates" />
-      <node concept="3Tm6S6" id="1CcQBrPcZWz" role="1B3o_S" />
-      <node concept="_YKpA" id="1CcQBrPcZWR" role="1tU5fm">
-        <node concept="3uibUv" id="1CcQBrPcZZ7" role="_ZDj9">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1CcQBrPcZWl" role="jymVt" />
-    <node concept="3Tm1VV" id="1CcQBrPcZVH" role="1B3o_S" />
-    <node concept="3UR2Jj" id="7P_FdVPH8tE" role="lGtFl">
-      <node concept="TZ5HA" id="7P_FdVPH8tF" role="TZ5H$">
-        <node concept="1dT_AC" id="7P_FdVPH8tG" role="1dT_Ay">
-          <property role="1dT_AB" value="A view on collection of handler templates." />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="312cEu" id="7WKNeR93NDF">
     <property role="TrG5h" value="QueryTemplateIndex" />
     <node concept="2tJIrI" id="7WKNeR93NF5" role="jymVt" />
@@ -12150,141 +11250,6 @@
       </node>
     </node>
     <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">
@@ -12497,135 +11462,6 @@
                 </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="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="6OXbTD$pwIU" role="3ElQJh">
-                    <ref role="3cqZAo" node="6OXbTD$nH5r" resolve="queryTemplate2stage_templates" />
-                  </node>
-                </node>
-              </node>
-            </node>
           </node>
           <node concept="37vLTw" id="7WKNeR97wtS" role="2GsD0m">
             <ref role="3cqZAo" node="7WKNeR97vRN" resolve="queryTemplates" />
@@ -12677,52 +11513,6 @@
         </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="312cEg" id="7WKNeR97s2V" role="jymVt">
       <property role="TrG5h" value="queryTemplateFqname2index" />
       <node concept="3Tm6S6" id="7WKNeR97s2W" role="1B3o_S" />
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 14f9e95a..5942236c 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
@@ -1690,18 +1690,6 @@
       <node concept="3clFbS" id="7P_FdVQoGPx" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="7P_FdVQoNeh" role="jymVt" />
-    <node concept="3clFb_" id="20Ay2Vf1i5R" role="jymVt">
-      <property role="1EzhhJ" value="true" />
-      <property role="2aFKle" value="false" />
-      <property role="TrG5h" value="stage" />
-      <node concept="3clFbS" id="20Ay2Vf1i5U" role="3clF47" />
-      <node concept="3Tm1VV" id="20Ay2Vf1i5V" role="1B3o_S" />
-      <node concept="17QB3L" id="20Ay2Vf1hOi" role="3clF45" />
-      <node concept="2AHcQZ" id="6tPOoeT2Lyf" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="20Ay2Vf1hyH" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXU9lmo" role="jymVt">
       <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="primarySymbols" />
@@ -1930,114 +1918,6 @@
     <node concept="2tJIrI" id="36tQV5AIeEy" role="jymVt" />
     <node concept="3Tm1VV" id="36tQV5AurZX" role="1B3o_S" />
   </node>
-  <node concept="3HP615" id="7P_FdVPs4aA">
-    <property role="TrG5h" value="QueryStageTemplate" />
-    <node concept="2tJIrI" id="7P_FdVPs4b8" 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 concept="2AHcQZ" id="6tPOoeT2QhK" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </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" />
@@ -2102,34 +1982,25 @@
       <node concept="3Tm1VV" id="6OXbTD$iO0H" role="1B3o_S" />
       <node concept="3clFbS" id="6OXbTD$iO0I" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="6OXbTD$iO0j" role="jymVt" />
-    <node concept="3clFb_" id="6OXbTD$jl18" role="jymVt">
+    <node concept="2tJIrI" id="6OXbTD$iO0n" role="jymVt" />
+    <node concept="3clFb_" id="6tPOoeT3pU7" 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" />
+      <property role="TrG5h" value="newToken" />
+      <node concept="37vLTG" id="6tPOoeT3pU8" role="3clF46">
+        <property role="TrG5h" value="parameter" />
+        <node concept="8X2XB" id="6tPOoeT3pU9" role="1tU5fm">
+          <node concept="3uibUv" id="6tPOoeT3pUa" role="8Xvag">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
         </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 concept="16syzq" id="6tPOoeT3qes" role="3clF45">
+        <ref role="16sUi3" node="6tPOoeT3qak" resolve="Token" />
       </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 concept="3Tm1VV" id="6tPOoeT3pUc" role="1B3o_S" />
+      <node concept="3clFbS" id="6tPOoeT3pUd" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="6OXbTD$iO0n" role="jymVt" />
+    <node concept="2tJIrI" id="6tPOoeT3pQI" role="jymVt" />
     <node concept="3Tm1VV" id="6OXbTD$iNPQ" role="1B3o_S" />
     <node concept="3clFb_" id="7P_FdVPsDM6" role="jymVt">
       <property role="1EzhhJ" value="true" />
@@ -2254,6 +2125,12 @@
       <node concept="2tJIrI" id="7P_FdVQ_jEt" role="jymVt" />
       <node concept="3Tm1VV" id="7P_FdVQ_jCp" role="1B3o_S" />
     </node>
+    <node concept="16euLQ" id="6tPOoeT3qak" role="16eVyc">
+      <property role="TrG5h" value="Token" />
+      <node concept="3uibUv" id="6tPOoeT3qal" role="3ztrMU">
+        <ref role="3uigEE" node="mJ_D14woL$" resolve="TemplateToken" />
+      </node>
+    </node>
   </node>
   <node concept="3HP615" id="4t7Xo7inshN">
     <property role="TrG5h" value="QueryKind" />