From 9d3b7e1fba896f04c766fb933368fcda10e1ed4f Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Tue, 27 Oct 2020 12:15:39 +0300
Subject: [PATCH] Add program Preamble as SessionToken, use it in Queries
 strategy

Program Preamble consists of 2 parts: rules & Journal.
Preamble rules are no-input rules with rules for their required nodes.
Preamble journal is journal part with results of executing these rules.
Preamble is defined per-Query, because Journal differs for Queries.

Repository CacheHolder is used for storing them b/w sessions.
Rules are stored and  retrievied with Memoizer.
Journal is stored as SessionToken in PreambleSet (map Query->SessionToken).

Add option to IncrementalSpec -- incrementality level (Preamble or Full).
---
 .../jetbrains.mps.lang.coderules.eval.mps     |   1 +
 ...ns.mps.lang.coderules.program.analysis.mps | 112 +++
 .../jetbrains.mps.lang.coderules.program.mps  | 783 +++++++++++++++---
 ...ins.mps.coderules.typechecking.service.mps | 700 +++++++++++++---
 4 files changed, 1381 insertions(+), 215 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index cceca289..cc812b15 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -4624,6 +4624,7 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="51nMZI9$QRH" role="3cqZAp" />
         <node concept="3cpWs8" id="6tPOoeTaVAX" role="3cqZAp">
           <node concept="3cpWsn" id="6tPOoeTaVAY" role="3cpWs9">
             <property role="TrG5h" value="programBuilder" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps
index 6c7b0aa7..c96016f1 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps
@@ -263,6 +263,38 @@
         <node concept="10P_77" id="5tAk4yVVZ5z" role="1tU5fm" />
       </node>
     </node>
+    <node concept="2tJIrI" id="57Rdq$NuGTN" role="jymVt" />
+    <node concept="3clFb_" id="57Rdq$NuMzc" role="jymVt">
+      <property role="TrG5h" value="setLevel" />
+      <node concept="3clFbS" id="57Rdq$NuMzf" role="3clF47">
+        <node concept="3clFbF" id="57Rdq$NuQxx" role="3cqZAp">
+          <node concept="37vLTI" id="57Rdq$NuRkX" role="3clFbG">
+            <node concept="37vLTw" id="57Rdq$NuRta" role="37vLTx">
+              <ref role="3cqZAo" node="57Rdq$NuNW$" resolve="incrLevel" />
+            </node>
+            <node concept="2OqwBi" id="57Rdq$NuQEU" role="37vLTJ">
+              <node concept="Xjq3P" id="57Rdq$NuQxw" role="2Oq$k0" />
+              <node concept="2OwXpG" id="57Rdq$NuQPB" role="2OqNvi">
+                <ref role="2Oxat5" node="57Rdq$NuEja" resolve="incrLevel" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="57Rdq$NuRF6" role="3cqZAp">
+          <node concept="Xjq3P" id="57Rdq$NuRF4" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="57Rdq$NuJKy" role="1B3o_S" />
+      <node concept="3uibUv" id="57Rdq$NuMuS" role="3clF45">
+        <ref role="3uigEE" node="1H_6AUT30JE" resolve="IncrProgramSpecBuilder" />
+      </node>
+      <node concept="37vLTG" id="57Rdq$NuNW$" role="3clF46">
+        <property role="TrG5h" value="incrLevel" />
+        <node concept="3uibUv" id="57Rdq$NuNWz" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~IncrementalSpec$IncrLevel" resolve="IncrementalSpec.IncrLevel" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="5tAk4yW1et6" role="jymVt" />
     <node concept="3clFb_" id="5tAk4yW1cEZ" role="jymVt">
       <property role="TrG5h" value="enable" />
@@ -333,6 +365,9 @@
               <node concept="37vLTw" id="5tAk4yW2au6" role="37wK5m">
                 <ref role="3cqZAo" node="5tAk4yW1EFq" resolve="ability" />
               </node>
+              <node concept="37vLTw" id="57Rdq$NuGuI" role="37wK5m">
+                <ref role="3cqZAo" node="57Rdq$NuEja" resolve="incrLevel" />
+              </node>
               <node concept="37vLTw" id="5tAk4yW2bCB" role="37wK5m">
                 <ref role="3cqZAo" node="5tAk4yVVXPf" resolve="assertLevel" />
               </node>
@@ -456,6 +491,29 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="57Rdq$Nv5RQ" role="3cqZAp">
+          <node concept="37vLTI" id="57Rdq$Nv7Pi" role="3clFbG">
+            <node concept="2OqwBi" id="57Rdq$Nv8nO" role="37vLTx">
+              <node concept="37vLTw" id="57Rdq$Nv7Y3" role="2Oq$k0">
+                <ref role="3cqZAo" node="57Rdq$NuEja" resolve="incrLevel" />
+              </node>
+              <node concept="liA8E" id="57Rdq$Nv8Rx" role="2OqNvi">
+                <ref role="37wK5l" to="av0y:~IncrementalSpec$IncrLevel.min(jetbrains.mps.logic.reactor.program.IncrementalSpec$IncrLevel)" resolve="min" />
+                <node concept="2OqwBi" id="57Rdq$Nv95v" role="37wK5m">
+                  <node concept="37vLTw" id="57Rdq$Nv8Ui" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5tAk4yVWWQz" resolve="otherBuilder" />
+                  </node>
+                  <node concept="2OwXpG" id="57Rdq$Nv9lD" role="2OqNvi">
+                    <ref role="2Oxat5" node="57Rdq$NuEja" resolve="incrLevel" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="57Rdq$Nv5RO" role="37vLTJ">
+              <ref role="3cqZAo" node="57Rdq$NuEja" resolve="incrLevel" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="5tAk4yVXaLg" role="3cqZAp">
           <node concept="37vLTI" id="5tAk4yW1JLR" role="3clFbG">
             <node concept="37vLTw" id="5tAk4yW1JLW" role="37vLTJ">
@@ -536,6 +594,17 @@
         <ref role="1Px2BO" to="av0y:~IncrementalSpec$Enabled" resolve="IncrementalSpec.Enabled" />
       </node>
     </node>
+    <node concept="312cEg" id="57Rdq$NuEja" role="jymVt">
+      <property role="TrG5h" value="incrLevel" />
+      <node concept="3Tm6S6" id="57Rdq$NuCFz" role="1B3o_S" />
+      <node concept="3uibUv" id="57Rdq$NuEfr" role="1tU5fm">
+        <ref role="3uigEE" to="av0y:~IncrementalSpec$IncrLevel" resolve="IncrementalSpec.IncrLevel" />
+      </node>
+      <node concept="Rm8GO" id="57Rdq$NuFId" role="33vP2m">
+        <ref role="Rm8GQ" to="av0y:~IncrementalSpec$IncrLevel.Full" resolve="Full" />
+        <ref role="1Px2BO" to="av0y:~IncrementalSpec$IncrLevel" resolve="IncrementalSpec.IncrLevel" />
+      </node>
+    </node>
     <node concept="312cEg" id="5tAk4yVVXPf" role="jymVt">
       <property role="TrG5h" value="assertLevel" />
       <node concept="3Tm6S6" id="5tAk4yVVX$N" role="1B3o_S" />
@@ -561,6 +630,12 @@
           <ref role="3uigEE" to="av0y:~IncrementalSpec$Enabled" resolve="IncrementalSpec.Enabled" />
         </node>
       </node>
+      <node concept="37vLTG" id="57Rdq$Nuy3T" role="3clF46">
+        <property role="TrG5h" value="incrLevel" />
+        <node concept="3uibUv" id="57Rdq$Nuyvy" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~IncrementalSpec$IncrLevel" resolve="IncrementalSpec.IncrLevel" />
+        </node>
+      </node>
       <node concept="37vLTG" id="5tAk4yW10y3" role="3clF46">
         <property role="TrG5h" value="assertLevel" />
         <node concept="3uibUv" id="5tAk4yW10Ue" role="1tU5fm">
@@ -599,6 +674,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="57Rdq$NuyMW" role="3cqZAp">
+          <node concept="37vLTI" id="57Rdq$NuzU6" role="3clFbG">
+            <node concept="37vLTw" id="57Rdq$Nu$3B" role="37vLTx">
+              <ref role="3cqZAo" node="57Rdq$Nuy3T" resolve="incrLevel" />
+            </node>
+            <node concept="2OqwBi" id="57Rdq$NuzbM" role="37vLTJ">
+              <node concept="Xjq3P" id="57Rdq$NuyMU" role="2Oq$k0" />
+              <node concept="2OwXpG" id="57Rdq$Nuzq_" role="2OqNvi">
+                <ref role="2Oxat5" node="57Rdq$NuvYt" resolve="incrLevel" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="5tAk4yVWgfn" role="3cqZAp">
           <node concept="37vLTI" id="5tAk4yVWqKG" role="3clFbG">
             <node concept="2OqwBi" id="5tAk4yVWg$t" role="37vLTJ">
@@ -802,6 +890,23 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="3clFb_" id="57Rdq$NuwKy" role="jymVt">
+      <property role="TrG5h" value="incrLevel" />
+      <node concept="3Tm1VV" id="57Rdq$NuwKz" role="1B3o_S" />
+      <node concept="3uibUv" id="57Rdq$NuwKA" role="3clF45">
+        <ref role="3uigEE" to="av0y:~IncrementalSpec$IncrLevel" resolve="IncrementalSpec.IncrLevel" />
+      </node>
+      <node concept="3clFbS" id="57Rdq$NuwKB" role="3clF47">
+        <node concept="3clFbF" id="57Rdq$NuxPY" role="3cqZAp">
+          <node concept="37vLTw" id="57Rdq$NuxPX" role="3clFbG">
+            <ref role="3cqZAo" node="57Rdq$NuvYt" resolve="incrLevel" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="57Rdq$NuwKC" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="3clFb_" id="1JkMMuhf_MF" role="jymVt">
       <property role="TrG5h" value="assertLevel" />
       <node concept="3Tm1VV" id="1JkMMuhf_MG" role="1B3o_S" />
@@ -827,6 +932,13 @@
         <ref role="3uigEE" to="av0y:~IncrementalSpec$Enabled" resolve="IncrementalSpec.Enabled" />
       </node>
     </node>
+    <node concept="312cEg" id="57Rdq$NuvYt" role="jymVt">
+      <property role="TrG5h" value="incrLevel" />
+      <node concept="3Tm6S6" id="57Rdq$NuvDw" role="1B3o_S" />
+      <node concept="3uibUv" id="57Rdq$NuvTj" role="1tU5fm">
+        <ref role="3uigEE" to="av0y:~IncrementalSpec$IncrLevel" resolve="IncrementalSpec.IncrLevel" />
+      </node>
+    </node>
     <node concept="312cEg" id="5tAk4yW0YB3" role="jymVt">
       <property role="TrG5h" value="assertLevel" />
       <node concept="3Tm6S6" id="5tAk4yW0Yaj" role="1B3o_S" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index 2a63640c..f42c2b90 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -564,6 +564,25 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="5HxDM7DfnDi" role="3cqZAp">
+          <node concept="37vLTI" id="5HxDM7Dfofv" role="3clFbG">
+            <node concept="37vLTw" id="5HxDM7Dfoni" role="37vLTx">
+              <ref role="3cqZAo" node="5HxDM7Dfn4B" resolve="preambleInfo" />
+            </node>
+            <node concept="2OqwBi" id="5HxDM7DfnTj" role="37vLTJ">
+              <node concept="Xjq3P" id="5HxDM7DfnDg" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5HxDM7Dfo1S" role="2OqNvi">
+                <ref role="2Oxat5" node="5HxDM7DeOG2" resolve="preambleInfo" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="5HxDM7Dfn4B" role="3clF46">
+        <property role="TrG5h" value="preambleInfo" />
+        <node concept="3uibUv" id="5HxDM7DfntD" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~PreambleInfo" resolve="PreambleInfo" />
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="70Wv0dJiKOi" role="jymVt" />
@@ -596,6 +615,24 @@
       </node>
     </node>
     <node concept="2tJIrI" id="ZqZbw4QkdO" role="jymVt" />
+    <node concept="3clFb_" id="5HxDM7DePWy" role="jymVt">
+      <property role="TrG5h" value="preambleInfo" />
+      <node concept="3Tm1VV" id="5HxDM7DePWz" role="1B3o_S" />
+      <node concept="3uibUv" id="5HxDM7DePW_" role="3clF45">
+        <ref role="3uigEE" to="av0y:~PreambleInfo" resolve="PreambleInfo" />
+      </node>
+      <node concept="3clFbS" id="5HxDM7DePWA" role="3clF47">
+        <node concept="3clFbF" id="5HxDM7DePWD" role="3cqZAp">
+          <node concept="37vLTw" id="5HxDM7DeRbU" role="3clFbG">
+            <ref role="3cqZAo" node="5HxDM7DeOG2" resolve="preambleInfo" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5HxDM7DePWB" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5HxDM7DeRkk" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUKgMc" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="rulesLists" />
@@ -970,6 +1007,13 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="7nPD14O5B_4" role="1B3o_S" />
+    <node concept="312cEg" id="5HxDM7DeOG2" role="jymVt">
+      <property role="TrG5h" value="preambleInfo" />
+      <node concept="3Tm6S6" id="5HxDM7DeOG3" role="1B3o_S" />
+      <node concept="3uibUv" id="5HxDM7DeOG4" role="1tU5fm">
+        <ref role="3uigEE" to="av0y:~PreambleInfo" resolve="PreambleInfo" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="7DvO2M9Uago">
     <property role="TrG5h" value="RulesPlanHandler" />
@@ -2458,8 +2502,8 @@
           </node>
         </node>
       </node>
-      <node concept="2tJIrI" id="1LBj9wAi8_5" role="jymVt" />
       <node concept="3Tm6S6" id="2$$Q_FeUj73" role="1B3o_S" />
+      <node concept="2tJIrI" id="1LBj9wAi8_5" role="jymVt" />
       <node concept="312cEg" id="2$$Q_FeUj83" role="jymVt">
         <property role="TrG5h" value="ruleTemplateTable" />
         <node concept="3Tm6S6" id="2$$Q_FeUj84" role="1B3o_S" />
@@ -5269,6 +5313,20 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="5HxDM7Df4LE" role="3cqZAp">
+          <node concept="2OqwBi" id="5HxDM7Dfb5a" role="3clFbG">
+            <node concept="37vLTw" id="5HxDM7Df4LC" role="2Oq$k0">
+              <ref role="3cqZAo" node="1CcQBrPh8x2" resolve="programBuilder" />
+            </node>
+            <node concept="liA8E" id="5HxDM7Dfdfe" role="2OqNvi">
+              <ref role="37wK5l" node="5HxDM7DewM3" resolve="specifyPreamble" />
+              <node concept="37vLTw" id="5HxDM7DfdmP" role="37wK5m">
+                <ref role="3cqZAo" node="5HxDM7DdKeq" resolve="preambleInfo" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="5HxDM7Dferq" role="3cqZAp" />
         <node concept="3SKdUt" id="5yr01fE2ejp" role="3cqZAp">
           <node concept="1PaTwC" id="5yr01fE2ejq" role="1aUNEU">
             <node concept="3oM_SD" id="5yr01fE2ejs" role="1PaTwD">
@@ -5507,6 +5565,15 @@
           </node>
         </node>
         <node concept="3clFbH" id="4hQVL4fjaox" role="3cqZAp" />
+        <node concept="3cpWs8" id="5HxDM7D9SVX" role="3cqZAp">
+          <node concept="3cpWsn" id="5HxDM7D9SW0" role="3cpWs9">
+            <property role="TrG5h" value="isPreamble" />
+            <node concept="10P_77" id="5HxDM7D9SVV" role="1tU5fm" />
+            <node concept="3clFbT" id="5HxDM7D9TJz" role="33vP2m">
+              <property role="3clFbU" value="true" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbJ" id="4hQVL4fbhuA" role="3cqZAp">
           <node concept="3clFbS" id="4hQVL4fbhuC" role="3clFbx">
             <node concept="3SKdUt" id="6OXbTDxA$Dn" role="3cqZAp">
@@ -5558,6 +5625,9 @@
                     <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
                     <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
                   </node>
+                  <node concept="37vLTw" id="5HxDM7D9TSc" role="37wK5m">
+                    <ref role="3cqZAo" node="5HxDM7D9SW0" resolve="isPreamble" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -5623,18 +5693,99 @@
             <node concept="3oM_SD" id="589APehYxQy" role="1PaTwD">
               <property role="3oM_SC" value="all" />
             </node>
-            <node concept="3oM_SD" id="589APehYxQz" role="1PaTwD">
+            <node concept="3oM_SD" id="5HxDM7DazvJ" role="1PaTwD">
+              <property role="3oM_SC" value="initially" />
+            </node>
+            <node concept="3oM_SD" id="5HxDM7DazvW" role="1PaTwD">
               <property role="3oM_SC" value="required" />
             </node>
-            <node concept="3oM_SD" id="589APehYxQ$" role="1PaTwD">
-              <property role="3oM_SC" value="as" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="5HxDM7D5Ykm" role="3cqZAp">
+          <node concept="3cpWsn" id="5HxDM7D5Ykn" role="3cpWs9">
+            <property role="TrG5h" value="visited" />
+            <node concept="3vKaQO" id="5HxDM7D5Yko" role="1tU5fm">
+              <node concept="3Tqbb2" id="5HxDM7D5Ykp" role="3O5elw" />
             </node>
-            <node concept="3oM_SD" id="589APehYxQ_" role="1PaTwD">
-              <property role="3oM_SC" value="new" />
+            <node concept="2ShNRf" id="5HxDM7D5WHc" role="33vP2m">
+              <node concept="2i4dXS" id="5HxDM7D8SNf" role="2ShVmc">
+                <node concept="3Tqbb2" id="5HxDM7D5Xzg" role="HW$YZ" />
+              </node>
             </node>
-            <node concept="3oM_SD" id="589APehYxQA" role="1PaTwD">
+          </node>
+        </node>
+        <node concept="3clFbF" id="5HxDM7D5QJ3" role="3cqZAp">
+          <node concept="37vLTI" id="5HxDM7D5RrK" role="3clFbG">
+            <node concept="37vLTw" id="5HxDM7D5QJ1" role="37vLTJ">
+              <ref role="3cqZAo" node="4QPCta1bMCc" resolve="result" />
+            </node>
+            <node concept="2OqwBi" id="5HxDM7D5RUm" role="37vLTx">
+              <node concept="37vLTw" id="5HxDM7D5RUn" role="2Oq$k0">
+                <ref role="3cqZAo" node="4QPCta1bMCc" resolve="result" />
+              </node>
+              <node concept="liA8E" id="5HxDM7D5RUo" role="2OqNvi">
+                <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
+                <node concept="1rXfSq" id="5HxDM7D5RUp" role="37wK5m">
+                  <ref role="37wK5l" node="tIwzd1MM22" resolve="processRequired" />
+                  <node concept="37vLTw" id="5HxDM7D8W7g" role="37wK5m">
+                    <ref role="3cqZAo" node="4hQVL4fbdNS" resolve="required" />
+                  </node>
+                  <node concept="37vLTw" id="5HxDM7D5Zoq" role="37wK5m">
+                    <ref role="3cqZAo" node="5HxDM7D5Ykn" resolve="visited" />
+                  </node>
+                  <node concept="37vLTw" id="5HxDM7D9UrY" role="37wK5m">
+                    <ref role="3cqZAo" node="5HxDM7D9SW0" resolve="isPreamble" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5HxDM7De6C6" role="3cqZAp">
+          <node concept="37vLTI" id="5HxDM7De9p8" role="3clFbG">
+            <node concept="2ShNRf" id="5HxDM7DeaQc" role="37vLTx">
+              <node concept="1pGfFk" id="5HxDM7Debk9" role="2ShVmc">
+                <ref role="37wK5l" node="5HxDM7DcDpj" resolve="PreambleInfoImpl" />
+                <node concept="37vLTw" id="5HxDM7DedJD" role="37wK5m">
+                  <ref role="3cqZAo" node="5HxDM7D5Ykn" resolve="visited" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5HxDM7De7fT" role="37vLTJ">
+              <node concept="Xjq3P" id="5HxDM7De6C4" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5HxDM7De897" role="2OqNvi">
+                <ref role="2Oxat5" node="5HxDM7DdKeq" resolve="preambleInfo" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="5HxDM7D61eM" role="3cqZAp" />
+        <node concept="3SKdUt" id="5HxDM7D60NC" role="3cqZAp">
+          <node concept="1PaTwC" id="5HxDM7D60ND" role="1aUNEU">
+            <node concept="3oM_SD" id="5HxDM7D60NE" role="1PaTwD">
+              <property role="3oM_SC" value="then" />
+            </node>
+            <node concept="3oM_SD" id="5HxDM7D61dx" role="1PaTwD">
+              <property role="3oM_SC" value="process" />
+            </node>
+            <node concept="3oM_SD" id="5HxDM7D61d$" role="1PaTwD">
               <property role="3oM_SC" value="input" />
             </node>
+            <node concept="3oM_SD" id="5HxDM7Dazwa" role="1PaTwD">
+              <property role="3oM_SC" value="nodes" />
+            </node>
+            <node concept="3oM_SD" id="5HxDM7D61dK" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="5HxDM7D61dX" role="1PaTwD">
+              <property role="3oM_SC" value="its" />
+            </node>
+            <node concept="3oM_SD" id="5HxDM7D61ej" role="1PaTwD">
+              <property role="3oM_SC" value="required" />
+            </node>
+            <node concept="3oM_SD" id="5HxDM7D61eq" role="1PaTwD">
+              <property role="3oM_SC" value="nodes" />
+            </node>
           </node>
         </node>
         <node concept="3clFbF" id="4QPCta1bMCp" role="3cqZAp">
@@ -5658,6 +5809,9 @@
                     <node concept="37vLTw" id="4hQVL4fbmMe" role="37wK5m">
                       <ref role="3cqZAo" node="4hQVL4fbdNS" resolve="required" />
                     </node>
+                    <node concept="37vLTw" id="5HxDM7D7rDr" role="37wK5m">
+                      <ref role="3cqZAo" node="5HxDM7D5Ykn" resolve="visited" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -5903,14 +6057,13 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="2Qe6u2cmBeW" role="3cqZAp">
-          <node concept="3cpWsn" id="2Qe6u2cmBeX" role="3cpWs9">
-            <property role="TrG5h" value="visited" />
-            <node concept="3vKaQO" id="2Qe6u2cmBEJ" role="1tU5fm">
-              <node concept="3Tqbb2" id="2Qe6u2cmC60" role="3O5elw" />
+        <node concept="3clFbF" id="5HxDM7D76b9" role="3cqZAp">
+          <node concept="2OqwBi" id="5HxDM7D7eZN" role="3clFbG">
+            <node concept="37vLTw" id="5HxDM7D76b7" role="2Oq$k0">
+              <ref role="3cqZAo" node="5HxDM7D6$xL" resolve="collectedVisited" />
             </node>
-            <node concept="2OqwBi" id="2Qe6u2cmBeY" role="33vP2m">
-              <node concept="2OqwBi" id="2Qe6u2cmBf0" role="2Oq$k0">
+            <node concept="X8dFx" id="5HxDM7D7lgu" role="2OqNvi">
+              <node concept="2OqwBi" id="2Qe6u2cmBf0" role="25WWJ7">
                 <node concept="37vLTw" id="2Qe6u2cmBf1" role="2Oq$k0">
                   <ref role="3cqZAo" node="4QPCta1aZL_" resolve="applyingResult" />
                 </node>
@@ -5918,7 +6071,6 @@
                   <ref role="2Oxat5" node="4MqhgXU_1wg" resolve="visited" />
                 </node>
               </node>
-              <node concept="ANE8D" id="2Qe6u2cmBf5" role="2OqNvi" />
             </node>
           </node>
         </node>
@@ -5948,19 +6100,24 @@
               <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
               <node concept="1rXfSq" id="2fobfNk6_p5" role="37wK5m">
                 <ref role="37wK5l" node="tIwzd1MM22" resolve="processRequired" />
-                <node concept="1Ls8ON" id="2fobfNk6_p6" role="37wK5m">
-                  <node concept="37vLTw" id="3OUB6BBSfmo" role="1Lso8e">
-                    <ref role="3cqZAo" node="2Qe6u2ckhfY" resolve="collectedRequired" />
-                  </node>
-                  <node concept="37vLTw" id="2fobfNk6_p8" role="1Lso8e">
-                    <ref role="3cqZAo" node="2Qe6u2cmBeX" resolve="visited" />
-                  </node>
+                <node concept="37vLTw" id="5HxDM7D9cot" role="37wK5m">
+                  <ref role="3cqZAo" node="2Qe6u2ckhfY" resolve="collectedRequired" />
                 </node>
+                <node concept="37vLTw" id="5HxDM7D9sDa" role="37wK5m">
+                  <ref role="3cqZAo" node="5HxDM7D6$xL" resolve="collectedVisited" />
+                </node>
+                <node concept="3clFbT" id="5HxDM7Da4fa" role="37wK5m" />
               </node>
             </node>
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="5HxDM7D6$xL" role="3clF46">
+        <property role="TrG5h" value="collectedVisited" />
+        <node concept="3vKaQO" id="5HxDM7D6$xN" role="1tU5fm">
+          <node concept="3Tqbb2" id="5HxDM7D6$xO" role="3O5elw" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="tIwzd1LqJe" role="jymVt" />
     <node concept="3clFb_" id="tIwzd1MM22" role="jymVt">
@@ -5969,17 +6126,6 @@
       <node concept="3uibUv" id="6i42QSsq0Nv" role="3clF45">
         <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
       </node>
-      <node concept="37vLTG" id="tIwzd1MM1I" role="3clF46">
-        <property role="TrG5h" value="required_visited" />
-        <node concept="1LlUBW" id="tIwzd1MM1J" role="1tU5fm">
-          <node concept="3vKaQO" id="tIwzd1MM1K" role="1Lm7xW">
-            <node concept="3Tqbb2" id="tIwzd1MM1L" role="3O5elw" />
-          </node>
-          <node concept="3vKaQO" id="tIwzd1MM1M" role="1Lm7xW">
-            <node concept="3Tqbb2" id="tIwzd1MM1N" role="3O5elw" />
-          </node>
-        </node>
-      </node>
       <node concept="3clFbS" id="tIwzd1MM0J" role="3clF47">
         <node concept="3cpWs8" id="6i42QSsq4kW" role="3cqZAp">
           <node concept="3cpWsn" id="6i42QSsq4kX" role="3cpWs9">
@@ -5994,27 +6140,6 @@
           </node>
         </node>
         <node concept="3clFbH" id="7kTeLbQm9Tn" role="3cqZAp" />
-        <node concept="3cpWs8" id="tIwzd1MM0K" role="3cqZAp">
-          <node concept="3cpWsn" id="tIwzd1MM0L" role="3cpWs9">
-            <property role="TrG5h" value="visited" />
-            <node concept="2hMVRd" id="tIwzd1MM0M" role="1tU5fm">
-              <node concept="3Tqbb2" id="tIwzd1MM0N" role="2hN53Y" />
-            </node>
-            <node concept="2ShNRf" id="tIwzd1MM0O" role="33vP2m">
-              <node concept="2i4dXS" id="tIwzd1MM0P" role="2ShVmc">
-                <node concept="3Tqbb2" id="tIwzd1MM0Q" role="HW$YZ" />
-                <node concept="1LFfDK" id="6i42QSsvwZ4" role="I$8f6">
-                  <node concept="3cmrfG" id="6i42QSsvwZ5" role="1LF_Uc">
-                    <property role="3cmrfH" value="1" />
-                  </node>
-                  <node concept="37vLTw" id="6i42QSsvwZ6" role="1LFl5Q">
-                    <ref role="3cqZAo" node="tIwzd1MM1I" resolve="required_visited" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3cpWs8" id="tIwzd1MM0Z" role="3cqZAp">
           <node concept="3cpWsn" id="tIwzd1MM10" role="3cpWs9">
             <property role="TrG5h" value="allRequired" />
@@ -6025,19 +6150,14 @@
               <node concept="2OqwBi" id="3OUB6BBVQbf" role="2Oq$k0">
                 <node concept="2OqwBi" id="tIwzd1MM14" role="2Oq$k0">
                   <node concept="2OqwBi" id="tIwzd1MM15" role="2Oq$k0">
-                    <node concept="1LFfDK" id="tIwzd1MM16" role="2Oq$k0">
-                      <node concept="3cmrfG" id="tIwzd1MM17" role="1LF_Uc">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                      <node concept="37vLTw" id="tIwzd1MM1X" role="1LFl5Q">
-                        <ref role="3cqZAo" node="tIwzd1MM1I" resolve="required_visited" />
-                      </node>
-                    </node>
                     <node concept="1VAtEI" id="tIwzd1MM19" role="2OqNvi" />
+                    <node concept="37vLTw" id="5HxDM7D89RW" role="2Oq$k0">
+                      <ref role="3cqZAo" node="5HxDM7D7rLB" resolve="required" />
+                    </node>
                   </node>
                   <node concept="66VNe" id="tIwzd1MM1a" role="2OqNvi">
-                    <node concept="37vLTw" id="tIwzd1MM1b" role="576Qk">
-                      <ref role="3cqZAo" node="tIwzd1MM0L" resolve="visited" />
+                    <node concept="37vLTw" id="51nMZI9_aCi" role="576Qk">
+                      <ref role="3cqZAo" node="5HxDM7D8viE" resolve="visited" />
                     </node>
                   </node>
                 </node>
@@ -6068,8 +6188,11 @@
                     </node>
                     <node concept="2ShNRf" id="6nFpYltT7bd" role="37wK5m">
                       <node concept="1pGfFk" id="6nFpYltT7Nw" role="2ShVmc">
-                        <ref role="37wK5l" node="xaaVXvi$I3" resolve="ProgramFactory.TemplateApplicator" />
+                        <ref role="37wK5l" node="5HxDM7DadcM" resolve="ProgramFactory.TemplateApplicator" />
                         <node concept="3clFbT" id="6nFpYltT9q2" role="37wK5m" />
+                        <node concept="37vLTw" id="5HxDM7DaxyF" role="37wK5m">
+                          <ref role="3cqZAo" node="5HxDM7D9VFX" resolve="isPreamble" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -6102,8 +6225,8 @@
             </node>
             <node concept="3clFbF" id="tIwzd1MM1n" role="3cqZAp">
               <node concept="2OqwBi" id="tIwzd1MM1o" role="3clFbG">
-                <node concept="37vLTw" id="tIwzd1MM1p" role="2Oq$k0">
-                  <ref role="3cqZAo" node="tIwzd1MM0L" resolve="visited" />
+                <node concept="37vLTw" id="51nMZI9_bXv" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5HxDM7D8viE" resolve="visited" />
                 </node>
                 <node concept="X8dFx" id="tIwzd1MM1q" role="2OqNvi">
                   <node concept="2OqwBi" id="4MqhgXUA4gu" role="25WWJ7">
@@ -6137,8 +6260,8 @@
                         <node concept="1VAtEI" id="tIwzd1MM1B" role="2OqNvi" />
                       </node>
                       <node concept="66VNe" id="tIwzd1MM1C" role="2OqNvi">
-                        <node concept="37vLTw" id="tIwzd1MM1D" role="576Qk">
-                          <ref role="3cqZAo" node="tIwzd1MM0L" resolve="visited" />
+                        <node concept="37vLTw" id="51nMZI9_dyZ" role="576Qk">
+                          <ref role="3cqZAo" node="5HxDM7D8viE" resolve="visited" />
                         </node>
                       </node>
                     </node>
@@ -6163,6 +6286,22 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="5HxDM7D7rLB" role="3clF46">
+        <property role="TrG5h" value="required" />
+        <node concept="3vKaQO" id="tIwzd1MM1K" role="1tU5fm">
+          <node concept="3Tqbb2" id="tIwzd1MM1L" role="3O5elw" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5HxDM7D8viE" role="3clF46">
+        <property role="TrG5h" value="visited" />
+        <node concept="3vKaQO" id="tIwzd1MM1M" role="1tU5fm">
+          <node concept="3Tqbb2" id="tIwzd1MM1N" role="3O5elw" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5HxDM7D9VFX" role="3clF46">
+        <property role="TrG5h" value="isPreamble" />
+        <node concept="10P_77" id="5HxDM7D9VFZ" role="1tU5fm" />
+      </node>
     </node>
     <node concept="2tJIrI" id="5NuEpF1pMvG" role="jymVt" />
     <node concept="3clFb_" id="5ntLU8GlSnU" role="jymVt">
@@ -6836,33 +6975,16 @@
                   <ref role="3cqZAo" node="xaaVXvi$r8" resolve="skipAuxiliary" />
                 </node>
                 <node concept="2OqwBi" id="xaaVXvp6wJ" role="3uHU7w">
-                  <node concept="37vLTw" id="xaaVXvp4ng" role="2Oq$k0">
-                    <ref role="3cqZAo" node="tIwzd1I3Xj" resolve="tpl" />
-                  </node>
                   <node concept="liA8E" id="xaaVXvp77z" role="2OqNvi">
                     <ref role="37wK5l" to="i348:xaaVXv6GTE" resolve="isAuxiliary" />
                   </node>
+                  <node concept="37vLTw" id="5HxDM7D5qHb" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
+                  </node>
                 </node>
               </node>
             </node>
             <node concept="3clFbH" id="xaaVXvp7Co" role="3cqZAp" />
-            <node concept="3cpWs8" id="4MqhgXUBzFn" role="3cqZAp">
-              <node concept="3cpWsn" id="4MqhgXUBzFo" role="3cpWs9">
-                <property role="TrG5h" value="template" />
-                <node concept="3uibUv" id="4MqhgXUBzF7" role="1tU5fm">
-                  <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
-                  <node concept="3qUE_q" id="7XdbJdyRy2h" role="11_B2D">
-                    <node concept="3uibUv" id="7XdbJdyRyYU" role="3qUE_r">
-                      <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="6tPOoeTdh1V" role="33vP2m">
-                  <ref role="3cqZAo" node="tIwzd1I3Xj" resolve="tpl" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="5HVB6JRwPfT" role="3cqZAp" />
             <node concept="3cpWs8" id="5HVB6JRBxJ2" role="3cqZAp">
               <node concept="3cpWsn" id="5HVB6JRBxJ3" role="3cpWs9">
                 <property role="TrG5h" value="memoKey" />
@@ -6918,31 +7040,45 @@
                     <node concept="3Tqbb2" id="5HVB6JRQLY7" role="_ZDj9" />
                   </node>
                 </node>
-                <node concept="2OqwBi" id="5HVB6JREAyk" role="33vP2m">
-                  <node concept="37vLTw" id="5HVB6JRE_FE" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="applicationSession" />
+                <node concept="3K4zz7" id="5HxDM7D5_bc" role="33vP2m">
+                  <node concept="37vLTw" id="5HxDM7D5yup" role="3K4Cdx">
+                    <ref role="3cqZAo" node="5HxDM7D4Qx4" resolve="isPreamble" />
                   </node>
-                  <node concept="liA8E" id="5HVB6JREDA1" role="2OqNvi">
-                    <ref role="37wK5l" to="i348:5HVB6JR7NAD" resolve="memoize" />
-                    <node concept="37vLTw" id="5HVB6JREKkw" role="37wK5m">
-                      <ref role="3cqZAo" node="5HVB6JRBxJ3" resolve="memoKey" />
+                  <node concept="2OqwBi" id="5HVB6JREAyk" role="3K4E3e">
+                    <node concept="37vLTw" id="5HVB6JRE_FE" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7DvO2Mah9z5" resolve="applicationSession" />
                     </node>
-                    <node concept="1bVj0M" id="5HVB6JREGvb" role="37wK5m">
-                      <node concept="3clFbS" id="5HVB6JREGvd" role="1bW5cS">
-                        <node concept="3clFbF" id="5HVB6JREH9G" role="3cqZAp">
-                          <node concept="1rXfSq" id="5HVB6JRughd" role="3clFbG">
-                            <ref role="37wK5l" node="5ntLU8GlSnU" resolve="applyRuleTemplate" />
-                            <node concept="37vLTw" id="5HVB6JRughe" role="37wK5m">
-                              <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
-                            </node>
-                            <node concept="37vLTw" id="5HVB6JRughf" role="37wK5m">
-                              <ref role="3cqZAo" node="tIwzd1I3Xp" resolve="node" />
+                    <node concept="liA8E" id="5HVB6JREDA1" role="2OqNvi">
+                      <ref role="37wK5l" to="i348:5HVB6JR7NAD" resolve="memoize" />
+                      <node concept="37vLTw" id="5HVB6JREKkw" role="37wK5m">
+                        <ref role="3cqZAo" node="5HVB6JRBxJ3" resolve="memoKey" />
+                      </node>
+                      <node concept="1bVj0M" id="5HVB6JREGvb" role="37wK5m">
+                        <node concept="3clFbS" id="5HVB6JREGvd" role="1bW5cS">
+                          <node concept="3clFbF" id="5HVB6JREH9G" role="3cqZAp">
+                            <node concept="1rXfSq" id="5HVB6JRughd" role="3clFbG">
+                              <ref role="37wK5l" node="5ntLU8GlSnU" resolve="applyRuleTemplate" />
+                              <node concept="37vLTw" id="5HVB6JRughe" role="37wK5m">
+                                <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
+                              </node>
+                              <node concept="37vLTw" id="5HVB6JRughf" role="37wK5m">
+                                <ref role="3cqZAo" node="tIwzd1I3Xp" resolve="node" />
+                              </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1rXfSq" id="5HxDM7D5E_S" role="3K4GZi">
+                    <ref role="37wK5l" node="5ntLU8GlSnU" resolve="applyRuleTemplate" />
+                    <node concept="37vLTw" id="5HxDM7D5E_T" role="37wK5m">
+                      <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
+                    </node>
+                    <node concept="37vLTw" id="5HxDM7D5E_U" role="37wK5m">
+                      <ref role="3cqZAo" node="tIwzd1I3Xp" resolve="node" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -7581,8 +7717,8 @@
                   <node concept="37vLTw" id="4Q576RaYhA0" role="37wK5m">
                     <ref role="3cqZAo" node="tIwzd1I3Xp" resolve="node" />
                   </node>
-                  <node concept="37vLTw" id="4Q576RaYivS" role="37wK5m">
-                    <ref role="3cqZAo" node="tIwzd1I3Xj" resolve="tpl" />
+                  <node concept="37vLTw" id="5HxDM7DarT4" role="37wK5m">
+                    <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
                   </node>
                   <node concept="37vLTw" id="3YPJJpIctSQ" role="37wK5m">
                     <ref role="3cqZAo" node="2gw7OvgBDWU" resolve="apply_result" />
@@ -7625,20 +7761,20 @@
               </node>
             </node>
           </node>
-          <node concept="3cpWsn" id="tIwzd1I3Xj" role="1Duv9x">
-            <property role="TrG5h" value="tpl" />
-            <node concept="3uibUv" id="6tPOoeTdcfx" role="1tU5fm">
+          <node concept="37vLTw" id="tIwzd1I3Xs" role="1DdaDG">
+            <ref role="3cqZAo" node="tIwzd1I3Xm" resolve="tpls" />
+          </node>
+          <node concept="3cpWsn" id="4MqhgXUBzFo" role="1Duv9x">
+            <property role="TrG5h" value="template" />
+            <node concept="3uibUv" id="4MqhgXUBzF7" role="1tU5fm">
               <ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="AbstractRuleTemplate" />
-              <node concept="3qUE_q" id="6tPOoeTdcfy" role="11_B2D">
-                <node concept="3uibUv" id="6tPOoeTdcfz" role="3qUE_r">
+              <node concept="3qUE_q" id="7XdbJdyRy2h" role="11_B2D">
+                <node concept="3uibUv" id="7XdbJdyRyYU" role="3qUE_r">
                   <ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplate.Token" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="37vLTw" id="tIwzd1I3Xs" role="1DdaDG">
-            <ref role="3cqZAo" node="tIwzd1I3Xm" resolve="tpls" />
-          </node>
         </node>
         <node concept="3clFbH" id="4Q576Rb5Nds" role="3cqZAp" />
         <node concept="3clFbF" id="4Q576Rb5KTi" role="3cqZAp">
@@ -7673,6 +7809,10 @@
           <node concept="3Tqbb2" id="tIwzd1JBnF" role="3O5elw" />
         </node>
       </node>
+      <node concept="37vLTG" id="5HxDM7D4Qx4" role="3clF46">
+        <property role="TrG5h" value="isPreamble" />
+        <node concept="10P_77" id="5HxDM7D4ZC5" role="1tU5fm" />
+      </node>
     </node>
     <node concept="2tJIrI" id="6OXbTDzFf$i" role="jymVt" />
     <node concept="3clFb_" id="6OXbTDy1oEg" role="jymVt">
@@ -8231,6 +8371,57 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="5HxDM7Dap4z" role="3cqZAp">
+            <node concept="37vLTI" id="5HxDM7Dap4$" role="3clFbG">
+              <node concept="3clFbT" id="5HxDM7Dapo6" role="37vLTx" />
+              <node concept="2OqwBi" id="5HxDM7Dap4A" role="37vLTJ">
+                <node concept="Xjq3P" id="5HxDM7Dap4B" role="2Oq$k0" />
+                <node concept="2OwXpG" id="5HxDM7Dap4C" role="2OqNvi">
+                  <ref role="2Oxat5" node="5HxDM7DaixD" resolve="isProgramPreamble" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbW" id="5HxDM7DadcM" role="jymVt">
+        <node concept="37vLTG" id="5HxDM7DadcN" role="3clF46">
+          <property role="TrG5h" value="includeAuxiliary" />
+          <node concept="10P_77" id="5HxDM7DadcO" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="5HxDM7DaihJ" role="3clF46">
+          <property role="TrG5h" value="isPreamble" />
+          <node concept="10P_77" id="5HxDM7DaioW" role="1tU5fm" />
+        </node>
+        <node concept="3cqZAl" id="5HxDM7DadcP" role="3clF45" />
+        <node concept="3Tm6S6" id="5HxDM7DadcQ" role="1B3o_S" />
+        <node concept="3clFbS" id="5HxDM7DadcR" role="3clF47">
+          <node concept="3clFbF" id="5HxDM7DadcS" role="3cqZAp">
+            <node concept="37vLTI" id="5HxDM7DadcT" role="3clFbG">
+              <node concept="37vLTw" id="5HxDM7DadcU" role="37vLTx">
+                <ref role="3cqZAo" node="5HxDM7DadcN" resolve="includeAuxiliary" />
+              </node>
+              <node concept="2OqwBi" id="5HxDM7DadcV" role="37vLTJ">
+                <node concept="Xjq3P" id="5HxDM7DadcW" role="2Oq$k0" />
+                <node concept="2OwXpG" id="5HxDM7DadcX" role="2OqNvi">
+                  <ref role="2Oxat5" node="42eP3wrZOvp" resolve="includeAuxiliary" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="5HxDM7DanO2" role="3cqZAp">
+            <node concept="37vLTI" id="5HxDM7DaoMf" role="3clFbG">
+              <node concept="37vLTw" id="5HxDM7Dap43" role="37vLTx">
+                <ref role="3cqZAo" node="5HxDM7DaihJ" resolve="isPreamble" />
+              </node>
+              <node concept="2OqwBi" id="5HxDM7Dao3S" role="37vLTJ">
+                <node concept="Xjq3P" id="5HxDM7DanO0" role="2Oq$k0" />
+                <node concept="2OwXpG" id="5HxDM7DaoiC" role="2OqNvi">
+                  <ref role="2Oxat5" node="5HxDM7DaixD" resolve="isProgramPreamble" />
+                </node>
+              </node>
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="6EY0p2wqgRW" role="jymVt" />
@@ -8321,6 +8512,9 @@
                 <node concept="37vLTw" id="1eEe91P0_t8" role="37wK5m">
                   <ref role="3cqZAo" node="1eEe91P0sqE" resolve="segmentPath" />
                 </node>
+                <node concept="37vLTw" id="5HxDM7DazcT" role="37wK5m">
+                  <ref role="3cqZAo" node="5HxDM7DaixD" resolve="isProgramPreamble" />
+                </node>
               </node>
             </node>
           </node>
@@ -8602,7 +8796,11 @@
         <node concept="3Tm6S6" id="42eP3wrZOvq" role="1B3o_S" />
         <node concept="10P_77" id="42eP3wrZUxy" role="1tU5fm" />
       </node>
-      <node concept="2tJIrI" id="6nFpYlukyoG" role="jymVt" />
+      <node concept="312cEg" id="5HxDM7DaixD" role="jymVt">
+        <property role="TrG5h" value="isProgramPreamble" />
+        <node concept="3Tm6S6" id="5HxDM7DaixE" role="1B3o_S" />
+        <node concept="10P_77" id="5HxDM7DaixF" role="1tU5fm" />
+      </node>
     </node>
     <node concept="2tJIrI" id="5ntLU8GlzbG" role="jymVt" />
     <node concept="312cEu" id="4MqhgXU$YdP" role="jymVt">
@@ -10116,6 +10314,17 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="4$YN6QudkOJ" role="1B3o_S" />
+    <node concept="312cEg" id="5HxDM7DdKeq" role="jymVt">
+      <property role="TrG5h" value="preambleInfo" />
+      <node concept="3Tm6S6" id="5HxDM7DdzGB" role="1B3o_S" />
+      <node concept="3uibUv" id="5HxDM7DdIdt" role="1tU5fm">
+        <ref role="3uigEE" to="av0y:~PreambleInfo" resolve="PreambleInfo" />
+      </node>
+      <node concept="10M0yZ" id="5HxDM7De3OB" role="33vP2m">
+        <ref role="3cqZAo" to="av0y:~PreambleInfo.EMPTY" resolve="EMPTY" />
+        <ref role="1PxDUh" to="av0y:~PreambleInfo" resolve="PreambleInfo" />
+      </node>
+    </node>
     <node concept="312cEg" id="4hQVL4f8WTc" role="jymVt">
       <property role="TrG5h" value="originIndex" />
       <node concept="3Tm6S6" id="4hQVL4f8WTd" role="1B3o_S" />
@@ -10799,6 +11008,9 @@
               <node concept="37vLTw" id="cmlg9OE34h" role="37wK5m">
                 <ref role="3cqZAo" node="cmlg9ODYfQ" resolve="originIndex" />
               </node>
+              <node concept="37vLTw" id="5HxDM7DeMr3" role="37wK5m">
+                <ref role="3cqZAo" node="5HxDM7DeEec" resolve="preambleInfo" />
+              </node>
             </node>
           </node>
         </node>
@@ -11040,7 +11252,35 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="2Z9ItkdaH7h" role="jymVt" />
+    <node concept="2tJIrI" id="5HxDM7DepAv" role="jymVt" />
+    <node concept="3clFb_" id="5HxDM7DewM3" role="jymVt">
+      <property role="TrG5h" value="specifyPreamble" />
+      <property role="DiZV1" value="true" />
+      <node concept="3clFbS" id="5HxDM7DewM6" role="3clF47">
+        <node concept="3clFbF" id="5HxDM7DeFZO" role="3cqZAp">
+          <node concept="37vLTI" id="5HxDM7DeHoL" role="3clFbG">
+            <node concept="37vLTw" id="5HxDM7DeHsd" role="37vLTx">
+              <ref role="3cqZAo" node="5HxDM7DeBtQ" resolve="preambleInfo" />
+            </node>
+            <node concept="2OqwBi" id="5HxDM7DeG5L" role="37vLTJ">
+              <node concept="Xjq3P" id="5HxDM7DeFZN" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5HxDM7DeHaP" role="2OqNvi">
+                <ref role="2Oxat5" node="5HxDM7DeEec" resolve="preambleInfo" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5HxDM7DeuX3" role="1B3o_S" />
+      <node concept="3cqZAl" id="5HxDM7DeyF5" role="3clF45" />
+      <node concept="37vLTG" id="5HxDM7DeBtQ" role="3clF46">
+        <property role="TrG5h" value="preambleInfo" />
+        <node concept="3uibUv" id="5HxDM7DeBtP" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~PreambleInfo" resolve="PreambleInfo" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5HxDM7De_Ra" role="jymVt" />
     <node concept="3clFb_" id="2Z9ItkdaJ0K" role="jymVt">
       <property role="TrG5h" value="introduceRule" />
       <node concept="3clFbS" id="2Z9ItkdaJ0N" role="3clF47">
@@ -11737,6 +11977,17 @@
         <ref role="3uigEE" node="70Wv0dJhQb2" resolve="OriginIndex" />
       </node>
     </node>
+    <node concept="312cEg" id="5HxDM7DeEec" role="jymVt">
+      <property role="TrG5h" value="preambleInfo" />
+      <node concept="3Tm6S6" id="5HxDM7DeEed" role="1B3o_S" />
+      <node concept="3uibUv" id="5HxDM7DeEef" role="1tU5fm">
+        <ref role="3uigEE" to="av0y:~PreambleInfo" resolve="PreambleInfo" />
+      </node>
+      <node concept="10M0yZ" id="5HxDM7Dft6c" role="33vP2m">
+        <ref role="3cqZAo" to="av0y:~PreambleInfo.EMPTY" resolve="EMPTY" />
+        <ref role="1PxDUh" to="av0y:~PreambleInfo" resolve="PreambleInfo" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="6nFpYlu02jD">
     <property role="TrG5h" value="UpdatesRecorder" />
@@ -14452,5 +14703,301 @@
     </node>
     <node concept="3Tm1VV" id="7NeFFOg4fOl" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="5HxDM7DcDjN">
+    <property role="TrG5h" value="PreambleInfoImpl" />
+    <node concept="2tJIrI" id="5HxDM7DcE6a" role="jymVt" />
+    <node concept="312cEg" id="5HxDM7DcEb5" role="jymVt">
+      <property role="TrG5h" value="originRefs" />
+      <node concept="3Tm6S6" id="5HxDM7DcE86" role="1B3o_S" />
+      <node concept="2hMVRd" id="5HxDM7DcE9K" role="1tU5fm">
+        <node concept="2sp9CU" id="5HxDM7DcEb2" role="2hN53Y" />
+      </node>
+      <node concept="2ShNRf" id="5HxDM7DcEsN" role="33vP2m">
+        <node concept="2i4dXS" id="5HxDM7DcEGR" role="2ShVmc">
+          <node concept="2sp9CU" id="5HxDM7DcEYC" role="HW$YZ" />
+          <node concept="10Nm6u" id="5HxDM7DcFhv" role="HW$Y0" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5HxDM7DcDoS" role="jymVt" />
+    <node concept="3Tm1VV" id="5HxDM7DcDjO" role="1B3o_S" />
+    <node concept="3clFbW" id="5HxDM7DcDpj" role="jymVt">
+      <node concept="37vLTG" id="5HxDM7DcDPq" role="3clF46">
+        <property role="TrG5h" value="preambleRuleOrigins" />
+        <node concept="A3Dl8" id="5HxDM7DcDVb" role="1tU5fm">
+          <node concept="3Tqbb2" id="5HxDM7DcDZM" role="A3Ik2" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="5HxDM7DcDpk" role="3clF45" />
+      <node concept="3Tm1VV" id="5HxDM7DcDpl" role="1B3o_S" />
+      <node concept="3clFbS" id="5HxDM7DcDpn" role="3clF47">
+        <node concept="3clFbF" id="5HxDM7DcLvS" role="3cqZAp">
+          <node concept="2OqwBi" id="5HxDM7DcM9e" role="3clFbG">
+            <node concept="37vLTw" id="5HxDM7DcLvR" role="2Oq$k0">
+              <ref role="3cqZAo" node="5HxDM7DcEb5" resolve="originRefs" />
+            </node>
+            <node concept="X8dFx" id="5HxDM7DcMJB" role="2OqNvi">
+              <node concept="2OqwBi" id="5HxDM7DcNVd" role="25WWJ7">
+                <node concept="37vLTw" id="5HxDM7DcMWV" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5HxDM7DcDPq" resolve="preambleRuleOrigins" />
+                </node>
+                <node concept="3$u5V9" id="5HxDM7DcOwm" role="2OqNvi">
+                  <node concept="1bVj0M" id="5HxDM7DcOwo" role="23t8la">
+                    <node concept="3clFbS" id="5HxDM7DcOwp" role="1bW5cS">
+                      <node concept="3clFbF" id="5HxDM7DcP9x" role="3cqZAp">
+                        <node concept="2OqwBi" id="5HxDM7DcPqn" role="3clFbG">
+                          <node concept="37vLTw" id="5HxDM7DcP9w" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5HxDM7DcOwq" resolve="it" />
+                          </node>
+                          <node concept="iZEcu" id="5HxDM7DcQG$" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="5HxDM7DcOwq" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="5HxDM7DcOwr" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5HxDM7DcDpJ" role="jymVt" />
+    <node concept="3uibUv" id="5HxDM7DcDuC" role="EKbjA">
+      <ref role="3uigEE" to="av0y:~PreambleInfo" resolve="PreambleInfo" />
+    </node>
+    <node concept="3clFb_" id="5HxDM7DcDz8" role="jymVt">
+      <property role="TrG5h" value="inPreamble" />
+      <node concept="3Tm1VV" id="5HxDM7DcDz9" role="1B3o_S" />
+      <node concept="10P_77" id="5HxDM7DcDzb" role="3clF45" />
+      <node concept="37vLTG" id="5HxDM7DcDzc" role="3clF46">
+        <property role="TrG5h" value="rule" />
+        <node concept="3uibUv" id="5HxDM7DcDzd" role="1tU5fm">
+          <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="5HxDM7DcDze" role="3clF47">
+        <node concept="3clFbF" id="5HxDM7DcHy$" role="3cqZAp">
+          <node concept="1Wc70l" id="5HxDM7DcI8X" role="3clFbG">
+            <node concept="2ZW3vV" id="5HxDM7DcHJ7" role="3uHU7B">
+              <node concept="3uibUv" id="5HxDM7DcHM1" role="2ZW6by">
+                <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+              </node>
+              <node concept="37vLTw" id="5HxDM7DcHyy" role="2ZW6bz">
+                <ref role="3cqZAo" node="5HxDM7DcDzc" resolve="rule" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5HxDM7DcJPm" role="3uHU7w">
+              <node concept="37vLTw" id="5HxDM7DcJ3e" role="2Oq$k0">
+                <ref role="3cqZAo" node="5HxDM7DcEb5" resolve="originRefs" />
+              </node>
+              <node concept="3JPx81" id="5HxDM7DcL6E" role="2OqNvi">
+                <node concept="2OqwBi" id="5HxDM7DcIwH" role="25WWJ7">
+                  <node concept="1eOMI4" id="5HxDM7DcIfz" role="2Oq$k0">
+                    <node concept="10QFUN" id="5HxDM7DcIfy" role="1eOMHV">
+                      <node concept="37vLTw" id="5HxDM7DcIfx" role="10QFUP">
+                        <ref role="3cqZAo" node="5HxDM7DcDzc" resolve="rule" />
+                      </node>
+                      <node concept="3uibUv" id="5HxDM7DcIkV" role="10QFUM">
+                        <ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="5HxDM7DcII1" role="2OqNvi">
+                    <ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="5HxDM7DcDzf" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="5HxDM7DfU_2">
+    <property role="TrG5h" value="PreambleSet" />
+    <node concept="2tJIrI" id="57Rdq$Nu0k7" role="jymVt" />
+    <node concept="312cEg" id="5HxDM7DfYuC" role="jymVt">
+      <property role="TrG5h" value="preambles" />
+      <node concept="3Tm6S6" id="5HxDM7DfYtm" role="1B3o_S" />
+      <node concept="2ShNRf" id="5HxDM7DfYxR" role="33vP2m">
+        <node concept="3rGOSV" id="5HxDM7DfZyI" role="2ShVmc">
+          <node concept="17QB3L" id="5HxDM7DfZFj" role="3rHrn6" />
+          <node concept="3uibUv" id="5HxDM7DfZKf" role="3rHtpV">
+            <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+          </node>
+        </node>
+      </node>
+      <node concept="3rvAFt" id="5HxDM7DfYvw" role="1tU5fm">
+        <node concept="17QB3L" id="5HxDM7DfYw2" role="3rvQeY" />
+        <node concept="3uibUv" id="5HxDM7DfYwu" role="3rvSg0">
+          <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5HxDM7DfYwS" role="jymVt" />
+    <node concept="3clFb_" id="5HxDM7DfUS_" role="jymVt">
+      <property role="TrG5h" value="getForQuery" />
+      <node concept="3clFbS" id="5HxDM7DfUSC" role="3clF47">
+        <node concept="3clFbF" id="5HxDM7Dg03t" role="3cqZAp">
+          <node concept="3EllGN" id="5HxDM7Dg0uv" role="3clFbG">
+            <node concept="2OqwBi" id="57Rdq$NtPQa" role="3ElVtu">
+              <node concept="37vLTw" id="57Rdq$NtPGo" role="2Oq$k0">
+                <ref role="3cqZAo" node="57Rdq$NtOgg" resolve="query" />
+              </node>
+              <node concept="liA8E" id="57Rdq$NtPYc" role="2OqNvi">
+                <ref role="37wK5l" to="i348:5EDW3XDYeXO" resolve="fqName" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5HxDM7Dg03s" role="3ElQJh">
+              <ref role="3cqZAo" node="5HxDM7DfYuC" resolve="preambles" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5HxDM7DfUSi" role="1B3o_S" />
+      <node concept="3uibUv" id="5HxDM7DfVby" role="3clF45">
+        <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+      </node>
+      <node concept="37vLTG" id="57Rdq$NtOgg" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="3uibUv" id="57Rdq$NtOgf" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5HxDM7DfZLe" role="jymVt" />
+    <node concept="3clFb_" id="5HxDM7DfZRo" role="jymVt">
+      <property role="TrG5h" value="putForQuery" />
+      <node concept="3clFbS" id="5HxDM7DfZRr" role="3clF47">
+        <node concept="3clFbF" id="5HxDM7Dg0_n" role="3cqZAp">
+          <node concept="37vLTI" id="5HxDM7Dg1pD" role="3clFbG">
+            <node concept="37vLTw" id="5HxDM7Dg1rD" role="37vLTx">
+              <ref role="3cqZAo" node="5HxDM7DfZWs" resolve="preamble" />
+            </node>
+            <node concept="3EllGN" id="5HxDM7Dg0Vw" role="37vLTJ">
+              <node concept="2OqwBi" id="57Rdq$NtVFa" role="3ElVtu">
+                <node concept="37vLTw" id="57Rdq$NtVz_" role="2Oq$k0">
+                  <ref role="3cqZAo" node="57Rdq$NtUbp" resolve="query" />
+                </node>
+                <node concept="liA8E" id="57Rdq$NtVMx" role="2OqNvi">
+                  <ref role="37wK5l" to="i348:5EDW3XDYeXO" resolve="fqName" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="5HxDM7Dg0_m" role="3ElQJh">
+                <ref role="3cqZAo" node="5HxDM7DfYuC" resolve="preambles" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5HxDM7DfZOj" role="1B3o_S" />
+      <node concept="3cqZAl" id="5HxDM7DfZR9" role="3clF45" />
+      <node concept="37vLTG" id="57Rdq$NtUbp" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="3uibUv" id="57Rdq$NtUg$" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5HxDM7DfZWs" role="3clF46">
+        <property role="TrG5h" value="preamble" />
+        <node concept="3uibUv" id="5HxDM7DfZYW" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="57Rdq$NsSkM" role="jymVt" />
+    <node concept="3clFb_" id="57Rdq$NsSlX" role="jymVt">
+      <property role="TrG5h" value="getOrPutForQuery" />
+      <node concept="3clFbS" id="57Rdq$NsSlY" role="3clF47">
+        <node concept="3cpWs8" id="57Rdq$NtT$r" role="3cqZAp">
+          <node concept="3cpWsn" id="57Rdq$NtT$u" role="3cpWs9">
+            <property role="TrG5h" value="queryKey" />
+            <node concept="17QB3L" id="57Rdq$NsSm8" role="1tU5fm" />
+            <node concept="2OqwBi" id="57Rdq$NtXYW" role="33vP2m">
+              <node concept="37vLTw" id="57Rdq$NtXRe" role="2Oq$k0">
+                <ref role="3cqZAo" node="57Rdq$NtVPU" resolve="query" />
+              </node>
+              <node concept="liA8E" id="57Rdq$NtY7m" role="2OqNvi">
+                <ref role="37wK5l" to="i348:5EDW3XDYeXO" resolve="fqName" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="57Rdq$NsVr9" role="3cqZAp">
+          <node concept="3clFbS" id="57Rdq$NsVrb" role="3clFbx">
+            <node concept="3cpWs6" id="57Rdq$NsWt8" role="3cqZAp">
+              <node concept="3EllGN" id="57Rdq$NsWQR" role="3cqZAk">
+                <node concept="37vLTw" id="57Rdq$NsWXq" role="3ElVtu">
+                  <ref role="3cqZAo" node="57Rdq$NtT$u" resolve="queryKey" />
+                </node>
+                <node concept="37vLTw" id="57Rdq$NsWu1" role="3ElQJh">
+                  <ref role="3cqZAo" node="5HxDM7DfYuC" resolve="preambles" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="57Rdq$NsVWK" role="3clFbw">
+            <node concept="37vLTw" id="57Rdq$NsVz9" role="2Oq$k0">
+              <ref role="3cqZAo" node="5HxDM7DfYuC" resolve="preambles" />
+            </node>
+            <node concept="2Nt0df" id="57Rdq$NsWon" role="2OqNvi">
+              <node concept="37vLTw" id="57Rdq$NtXNy" role="38cxEo">
+                <ref role="3cqZAo" node="57Rdq$NtT$u" resolve="queryKey" />
+              </node>
+            </node>
+          </node>
+          <node concept="9aQIb" id="57Rdq$NsX9C" role="9aQIa">
+            <node concept="3clFbS" id="57Rdq$NsX9D" role="9aQI4">
+              <node concept="3clFbF" id="57Rdq$NsSlZ" role="3cqZAp">
+                <node concept="37vLTI" id="57Rdq$NsSm0" role="3clFbG">
+                  <node concept="37vLTw" id="57Rdq$NsSm1" role="37vLTx">
+                    <ref role="3cqZAo" node="57Rdq$NsSm9" resolve="preamble" />
+                  </node>
+                  <node concept="3EllGN" id="57Rdq$NsSm2" role="37vLTJ">
+                    <node concept="37vLTw" id="57Rdq$NsSm3" role="3ElVtu">
+                      <ref role="3cqZAo" node="57Rdq$NtT$u" resolve="queryKey" />
+                    </node>
+                    <node concept="37vLTw" id="57Rdq$NsSm4" role="3ElQJh">
+                      <ref role="3cqZAo" node="5HxDM7DfYuC" resolve="preambles" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs6" id="57Rdq$NsXqz" role="3cqZAp">
+                <node concept="37vLTw" id="57Rdq$NsXy7" role="3cqZAk">
+                  <ref role="3cqZAo" node="57Rdq$NsSm9" resolve="preamble" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="57Rdq$NsSm5" role="1B3o_S" />
+      <node concept="3uibUv" id="57Rdq$NsXB8" role="3clF45">
+        <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+      </node>
+      <node concept="37vLTG" id="57Rdq$NtVPU" role="3clF46">
+        <property role="TrG5h" value="query" />
+        <node concept="3uibUv" id="57Rdq$NtVPV" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="57Rdq$NsSm9" role="3clF46">
+        <property role="TrG5h" value="preamble" />
+        <node concept="3uibUv" id="57Rdq$NsSma" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="57Rdq$NsSln" role="jymVt" />
+    <node concept="3Tm1VV" id="5HxDM7DfU_3" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index dbfc29d8..40839fe9 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -5967,6 +5967,33 @@
       </node>
       <node concept="3Tmbuc" id="61G6TdCrlVr" role="1B3o_S" />
     </node>
+    <node concept="2tJIrI" id="5HxDM7Dg432" role="jymVt" />
+    <node concept="Wx3nA" id="628mNaME76w" role="jymVt">
+      <property role="TrG5h" value="PREAMBLES" />
+      <node concept="3Tmbuc" id="628mNaMDY7D" role="1B3o_S" />
+      <node concept="3uibUv" id="628mNaME5fn" role="1tU5fm">
+        <ref role="3uigEE" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
+        <node concept="3uibUv" id="628mNaME76j" role="11_B2D">
+          <ref role="3uigEE" to="ksgm:5HxDM7DfU_2" resolve="PreambleSet" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="628mNaMEcyK" role="33vP2m">
+        <node concept="1pGfFk" id="628mNaMEcyM" role="2ShVmc">
+          <ref role="37wK5l" node="7i3KM7g1T3X" resolve="CachedData.DataFlavour" />
+          <node concept="3uibUv" id="628mNaMEeyd" role="1pMfVU">
+            <ref role="3uigEE" to="ksgm:5HxDM7DfU_2" resolve="PreambleSet" />
+          </node>
+          <node concept="2OqwBi" id="628mNaMEcyO" role="37wK5m">
+            <node concept="3VsKOn" id="628mNaMEcyP" role="2Oq$k0">
+              <ref role="3VsUkX" to="ksgm:5HxDM7DfU_2" resolve="PreambleSet" />
+            </node>
+            <node concept="liA8E" id="628mNaMEcyQ" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~Class.getName()" resolve="getName" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="6PWFJfG5oiW" role="jymVt" />
     <node concept="Wx3nA" id="7i3KM7gAW2Y" role="jymVt">
       <property role="TrG5h" value="ORIGINS" />
@@ -8183,6 +8210,46 @@
       </node>
       <node concept="3Tm6S6" id="7yzrjo0Jum$" role="1B3o_S" />
       <node concept="3clFbS" id="7yzrjo0JotY" role="3clF47">
+        <node concept="3cpWs8" id="57Rdq$Ntnql" role="3cqZAp">
+          <node concept="3cpWsn" id="57Rdq$Ntnqm" role="3cpWs9">
+            <property role="TrG5h" value="query" />
+            <node concept="3uibUv" id="57Rdq$Ntnqn" role="1tU5fm">
+              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            </node>
+            <node concept="2YIFZM" id="5EDW3XEtyNU" role="33vP2m">
+              <ref role="37wK5l" node="5EDW3XDYgsl" resolve="convert" />
+              <ref role="1Pybhc" node="5EDW3XDYg8Y" resolve="TypecheckingQueries" />
+              <node concept="37vLTw" id="5EDW3XEtyNV" role="37wK5m">
+                <ref role="3cqZAo" node="7yzrjo0K2me" resolve="source" />
+              </node>
+              <node concept="37vLTw" id="5EDW3XEtyNW" role="37wK5m">
+                <ref role="3cqZAo" node="7yzrjo0K2mg" resolve="target" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="5BSy9OjwBsK" role="3cqZAp">
+          <node concept="3cpWsn" id="5BSy9OjwBsL" role="3cpWs9">
+            <property role="TrG5h" value="stepsFactory" />
+            <node concept="3uibUv" id="5BSy9OjwBsM" role="1tU5fm">
+              <ref role="3uigEE" node="7i3KM7gIg9K" resolve="TypecheckingStrategy.Default" />
+            </node>
+            <node concept="2ShNRf" id="5BSy9OjwHVo" role="33vP2m">
+              <node concept="1pGfFk" id="5BSy9OjwHVm" role="2ShVmc">
+                <ref role="37wK5l" node="3OUB6BASVwU" resolve="TypecheckingStrategy.Queries" />
+                <node concept="37vLTw" id="5BSy9OjwHVq" role="37wK5m">
+                  <ref role="3cqZAo" node="57Rdq$Ntnqm" resolve="query" />
+                </node>
+                <node concept="37vLTw" id="5BSy9OjwHVu" role="37wK5m">
+                  <ref role="3cqZAo" node="1z4$59j0rVE" resolve="request" />
+                </node>
+                <node concept="37vLTw" id="5BSy9OjwHVs" role="37wK5m">
+                  <ref role="3cqZAo" node="1z4$59jFJQa" resolve="updatable" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="3IIf9OAgvDK" role="3cqZAp">
           <node concept="3cpWsn" id="3IIf9OAgvDL" role="3cpWs9">
             <property role="TrG5h" value="helpers" />
@@ -8207,15 +8274,11 @@
                   </node>
                 </node>
               </node>
-              <node concept="2YIFZM" id="5EDW3XEtyNU" role="37wK5m">
-                <ref role="37wK5l" node="5EDW3XDYgsl" resolve="convert" />
-                <ref role="1Pybhc" node="5EDW3XDYg8Y" resolve="TypecheckingQueries" />
-                <node concept="37vLTw" id="5EDW3XEtyNV" role="37wK5m">
-                  <ref role="3cqZAo" node="7yzrjo0K2me" resolve="source" />
-                </node>
-                <node concept="37vLTw" id="5EDW3XEtyNW" role="37wK5m">
-                  <ref role="3cqZAo" node="7yzrjo0K2mg" resolve="target" />
-                </node>
+              <node concept="37vLTw" id="5BSy9OjwFCM" role="37wK5m">
+                <ref role="3cqZAo" node="5BSy9OjwBsL" resolve="stepsFactory" />
+              </node>
+              <node concept="37vLTw" id="57Rdq$NtvoA" role="37wK5m">
+                <ref role="3cqZAo" node="57Rdq$Ntnqm" resolve="query" />
               </node>
             </node>
           </node>
@@ -8238,16 +8301,8 @@
                   <node concept="37vLTw" id="1z4$59jFU6d" role="37wK5m">
                     <ref role="3cqZAo" node="3IIf9OAgvDL" resolve="helpers" />
                   </node>
-                  <node concept="2ShNRf" id="1z4$59jFU6e" role="37wK5m">
-                    <node concept="1pGfFk" id="1z4$59jFU6f" role="2ShVmc">
-                      <ref role="37wK5l" node="3OUB6BASVwU" resolve="TypecheckingStrategy.Queries" />
-                      <node concept="37vLTw" id="1z4$59jFU6g" role="37wK5m">
-                        <ref role="3cqZAo" node="1z4$59j0rVE" resolve="request" />
-                      </node>
-                      <node concept="37vLTw" id="5ZJzlPmsyt7" role="37wK5m">
-                        <ref role="3cqZAo" node="1z4$59jFJQa" resolve="updatable" />
-                      </node>
-                    </node>
+                  <node concept="37vLTw" id="5BSy9OjwK7N" role="37wK5m">
+                    <ref role="3cqZAo" node="5BSy9OjwBsL" resolve="stepsFactory" />
                   </node>
                 </node>
               </node>
@@ -8344,6 +8399,49 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="57Rdq$NtwaZ" role="3cqZAp">
+          <node concept="3cpWsn" id="57Rdq$Ntwb0" role="3cpWs9">
+            <property role="TrG5h" value="query" />
+            <node concept="3uibUv" id="57Rdq$Ntwb1" role="1tU5fm">
+              <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+            </node>
+            <node concept="2YIFZM" id="5EDW3XEt3e$" role="33vP2m">
+              <ref role="1Pybhc" node="5EDW3XDYg8Y" resolve="TypecheckingQueries" />
+              <ref role="37wK5l" node="5EDW3XEtfON" resolve="coerce" />
+              <node concept="37vLTw" id="7yzrjo0PbTC" role="37wK5m">
+                <ref role="3cqZAo" node="7yzrjo0OFdd" resolve="source" />
+              </node>
+              <node concept="37vLTw" id="7yzrjo0Pe24" role="37wK5m">
+                <ref role="3cqZAo" node="7yzrjo0ONqZ" resolve="target" />
+              </node>
+              <node concept="37vLTw" id="4pwDyRBsoUq" role="37wK5m">
+                <ref role="3cqZAo" node="4pwDyRBsdy7" resolve="lresult" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="5BSy9OjwKeY" role="3cqZAp">
+          <node concept="3cpWsn" id="5BSy9OjwKeZ" role="3cpWs9">
+            <property role="TrG5h" value="stepsFactory" />
+            <node concept="3uibUv" id="5BSy9OjwKf0" role="1tU5fm">
+              <ref role="3uigEE" node="7i3KM7gIg9K" resolve="TypecheckingStrategy.Default" />
+            </node>
+            <node concept="2ShNRf" id="5BSy9OjwKf1" role="33vP2m">
+              <node concept="1pGfFk" id="5BSy9OjwKf2" role="2ShVmc">
+                <ref role="37wK5l" node="3OUB6BASVwU" resolve="TypecheckingStrategy.Queries" />
+                <node concept="37vLTw" id="5BSy9OjwKf3" role="37wK5m">
+                  <ref role="3cqZAo" node="57Rdq$Ntwb0" resolve="query" />
+                </node>
+                <node concept="37vLTw" id="5BSy9OjwKf4" role="37wK5m">
+                  <ref role="3cqZAo" node="1z4$59j0Jzo" resolve="request" />
+                </node>
+                <node concept="37vLTw" id="5BSy9OjwKf5" role="37wK5m">
+                  <ref role="3cqZAo" node="1z4$59jF78T" resolve="updatable" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="7Bx7XgEiqaQ" role="3cqZAp">
           <node concept="3cpWsn" id="7Bx7XgEiqaR" role="3cpWs9">
             <property role="TrG5h" value="helpers" />
@@ -8373,18 +8471,11 @@
                   </node>
                 </node>
               </node>
-              <node concept="2YIFZM" id="5EDW3XEt3e$" role="37wK5m">
-                <ref role="1Pybhc" node="5EDW3XDYg8Y" resolve="TypecheckingQueries" />
-                <ref role="37wK5l" node="5EDW3XEtfON" resolve="coerce" />
-                <node concept="37vLTw" id="7yzrjo0PbTC" role="37wK5m">
-                  <ref role="3cqZAo" node="7yzrjo0OFdd" resolve="source" />
-                </node>
-                <node concept="37vLTw" id="7yzrjo0Pe24" role="37wK5m">
-                  <ref role="3cqZAo" node="7yzrjo0ONqZ" resolve="target" />
-                </node>
-                <node concept="37vLTw" id="4pwDyRBsoUq" role="37wK5m">
-                  <ref role="3cqZAo" node="4pwDyRBsdy7" resolve="lresult" />
-                </node>
+              <node concept="37vLTw" id="5BSy9OjwMh6" role="37wK5m">
+                <ref role="3cqZAo" node="5BSy9OjwKeZ" resolve="stepsFactory" />
+              </node>
+              <node concept="37vLTw" id="57Rdq$Nt$GN" role="37wK5m">
+                <ref role="3cqZAo" node="57Rdq$Ntwb0" resolve="query" />
               </node>
             </node>
           </node>
@@ -8422,16 +8513,8 @@
                   <node concept="37vLTw" id="6nFpYluJIah" role="37wK5m">
                     <ref role="3cqZAo" node="7Bx7XgEiqaR" resolve="helpers" />
                   </node>
-                  <node concept="2ShNRf" id="3OUB6BATIUw" role="37wK5m">
-                    <node concept="1pGfFk" id="3OUB6BATIUy" role="2ShVmc">
-                      <ref role="37wK5l" node="3OUB6BASVwU" resolve="TypecheckingStrategy.Queries" />
-                      <node concept="37vLTw" id="1z4$59j0Q$b" role="37wK5m">
-                        <ref role="3cqZAo" node="1z4$59j0Jzo" resolve="request" />
-                      </node>
-                      <node concept="37vLTw" id="5ZJzlPmsx9D" role="37wK5m">
-                        <ref role="3cqZAo" node="1z4$59jF78T" resolve="updatable" />
-                      </node>
-                    </node>
+                  <node concept="37vLTw" id="5BSy9OjwOP_" role="37wK5m">
+                    <ref role="3cqZAo" node="5BSy9OjwKeZ" resolve="stepsFactory" />
                   </node>
                 </node>
               </node>
@@ -8935,6 +9018,12 @@
           <node concept="3bZ5Sz" id="156bt08RivT" role="A3Ik2" />
         </node>
       </node>
+      <node concept="37vLTG" id="5BSy9Ojw9ha" role="3clF46">
+        <property role="TrG5h" value="stepsFactory" />
+        <node concept="3uibUv" id="5BSy9Ojw9hb" role="1tU5fm">
+          <ref role="3uigEE" node="7i3KM7gIg9K" resolve="TypecheckingStrategy.Default" />
+        </node>
+      </node>
       <node concept="37vLTG" id="5EDW3XEqiiP" role="3clF46">
         <property role="TrG5h" value="query" />
         <node concept="3uibUv" id="5EDW3XEqiiQ" role="1tU5fm">
@@ -9013,13 +9102,8 @@
             <node concept="37vLTw" id="156bt08TbiS" role="37wK5m">
               <ref role="3cqZAo" node="156bt08TbiF" resolve="acs" />
             </node>
-            <node concept="2ShNRf" id="156bt08TbiT" role="37wK5m">
-              <node concept="1pGfFk" id="61G6TdCi_Oq" role="2ShVmc">
-                <ref role="37wK5l" node="61G6TdCiqDU" resolve="TypecheckingStrategy.Default" />
-                <node concept="37vLTw" id="1z4$59j1vPr" role="37wK5m">
-                  <ref role="3cqZAo" node="1z4$59j1qMf" resolve="request" />
-                </node>
-              </node>
+            <node concept="37vLTw" id="5BSy9Ojxch7" role="37wK5m">
+              <ref role="3cqZAo" node="5BSy9Ojw9ha" resolve="stepsFactory" />
             </node>
             <node concept="37vLTw" id="5EDW3XEs$xW" role="37wK5m">
               <ref role="3cqZAo" node="5EDW3XEqiiP" resolve="query" />
@@ -9048,6 +9132,12 @@
         <property role="TrG5h" value="nodes" />
         <node concept="2I9FWS" id="3KN3A4vEXnn" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="5BSy9Ojwe1n" role="3clF46">
+        <property role="TrG5h" value="stepsFactory" />
+        <node concept="3uibUv" id="5BSy9Ojwe1o" role="1tU5fm">
+          <ref role="3uigEE" node="7i3KM7gIg9K" resolve="TypecheckingStrategy.Default" />
+        </node>
+      </node>
       <node concept="37vLTG" id="5EDW3XEqzhD" role="3clF46">
         <property role="TrG5h" value="query" />
         <node concept="3uibUv" id="5EDW3XEqzhE" role="1tU5fm">
@@ -9099,13 +9189,8 @@
             <node concept="37vLTw" id="7i3KM7gvtwb" role="37wK5m">
               <ref role="3cqZAo" node="7i3KM7gvgrZ" resolve="acs" />
             </node>
-            <node concept="2ShNRf" id="7i3KM7gLUrB" role="37wK5m">
-              <node concept="1pGfFk" id="61G6TdCi_Oo" role="2ShVmc">
-                <ref role="37wK5l" node="61G6TdCiqDU" resolve="TypecheckingStrategy.Default" />
-                <node concept="37vLTw" id="1z4$59j20p8" role="37wK5m">
-                  <ref role="3cqZAo" node="1z4$59j1Pox" resolve="request" />
-                </node>
-              </node>
+            <node concept="37vLTw" id="5BSy9OjwZWV" role="37wK5m">
+              <ref role="3cqZAo" node="5BSy9Ojwe1n" resolve="stepsFactory" />
             </node>
             <node concept="37vLTw" id="5EDW3XEsits" role="37wK5m">
               <ref role="3cqZAo" node="5EDW3XEqzhD" resolve="query" />
@@ -15466,6 +15551,12 @@
       <property role="TrG5h" value="Queries" />
       <node concept="2tJIrI" id="3OUB6BASVwT" role="jymVt" />
       <node concept="3clFbW" id="3OUB6BASVwU" role="jymVt">
+        <node concept="37vLTG" id="57Rdq$NtcsV" role="3clF46">
+          <property role="TrG5h" value="query" />
+          <node concept="3uibUv" id="57Rdq$Ntd9Y" role="1tU5fm">
+            <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+          </node>
+        </node>
         <node concept="37vLTG" id="3OUB6BASVwV" role="3clF46">
           <property role="TrG5h" value="request" />
           <node concept="3uibUv" id="1z4$59iAdWr" role="1tU5fm">
@@ -15488,6 +15579,19 @@
               <ref role="3cqZAo" node="3OUB6BASVwV" resolve="request" />
             </node>
           </node>
+          <node concept="3clFbF" id="57Rdq$NtkEp" role="3cqZAp">
+            <node concept="37vLTI" id="57Rdq$Ntlco" role="3clFbG">
+              <node concept="37vLTw" id="57Rdq$Ntlen" role="37vLTx">
+                <ref role="3cqZAo" node="57Rdq$NtcsV" resolve="query" />
+              </node>
+              <node concept="2OqwBi" id="57Rdq$NtkNY" role="37vLTJ">
+                <node concept="Xjq3P" id="57Rdq$NtkEn" role="2Oq$k0" />
+                <node concept="2OwXpG" id="57Rdq$NtkWu" role="2OqNvi">
+                  <ref role="2Oxat5" node="57Rdq$Ntiuo" resolve="query" />
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbF" id="5ZJzlPmstig" role="3cqZAp">
             <node concept="37vLTI" id="5ZJzlPmstii" role="3clFbG">
               <node concept="2OqwBi" id="5ZJzlPmsvhF" role="37vLTJ">
@@ -15606,7 +15710,363 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
-      <node concept="2tJIrI" id="3OUB6BASVxN" role="jymVt" />
+      <node concept="2tJIrI" id="57Rdq$NtCKz" role="jymVt" />
+      <node concept="3clFb_" id="57Rdq$NtDNa" role="jymVt">
+        <property role="TrG5h" value="typecheckingStep" />
+        <node concept="37vLTG" id="57Rdq$NtDNb" role="3clF46">
+          <property role="TrG5h" value="aspectClique" />
+          <node concept="3uibUv" id="57Rdq$NtDNc" role="1tU5fm">
+            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <node concept="3qTvmN" id="57Rdq$NtDNd" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="57Rdq$NtDNe" role="3clF45">
+          <ref role="3uigEE" node="NKt6yn81z$" resolve="TypecheckingStep" />
+        </node>
+        <node concept="3Tmbuc" id="57Rdq$NtDNf" role="1B3o_S" />
+        <node concept="3clFbS" id="57Rdq$NtDNg" role="3clF47">
+          <node concept="3SKdUt" id="57Rdq$Nvx7E" role="3cqZAp">
+            <node concept="1PaTwC" id="57Rdq$Nvx7F" role="1aUNEU">
+              <node concept="3oM_SD" id="57Rdq$Nvx7G" role="1PaTwD">
+                <property role="3oM_SC" value="todo:" />
+              </node>
+              <node concept="3oM_SD" id="57Rdq$NvxfI" role="1PaTwD">
+                <property role="3oM_SC" value="make" />
+              </node>
+              <node concept="3oM_SD" id="57Rdq$NvxfL" role="1PaTwD">
+                <property role="3oM_SC" value="separate" />
+              </node>
+              <node concept="3oM_SD" id="57Rdq$NvxfP" role="1PaTwD">
+                <property role="3oM_SC" value="option:" />
+              </node>
+              <node concept="3oM_SD" id="57Rdq$Nvxga" role="1PaTwD">
+                <property role="3oM_SC" value="only" />
+              </node>
+              <node concept="3oM_SD" id="57Rdq$Nvxh8" role="1PaTwD">
+                <property role="3oM_SC" value="preamble?" />
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="57Rdq$NvvzU" role="3cqZAp">
+            <node concept="3cpWsn" id="57Rdq$NvvzV" role="3cpWs9">
+              <property role="TrG5h" value="withPreamble" />
+              <node concept="3uibUv" id="57Rdq$NvvzW" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+              </node>
+              <node concept="2OqwBi" id="57Rdq$Nvw0b" role="33vP2m">
+                <node concept="10M0yZ" id="57Rdq$NvvNA" role="2Oq$k0">
+                  <ref role="3cqZAo" to="qox2:7iCybvT_b52" resolve="TYPECHECKING_INCREMENTAL" />
+                  <ref role="1PxDUh" to="qox2:7iCybvTy_Mb" resolve="TypecheckingOptions" />
+                </node>
+                <node concept="liA8E" id="57Rdq$Nvwap" role="2OqNvi">
+                  <ref role="37wK5l" to="31yc:7iCybvT$ANq" resolve="get" />
+                  <node concept="2YIFZM" id="57Rdq$NvwHI" role="37wK5m">
+                    <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+                    <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="57Rdq$NvxhB" role="3cqZAp" />
+          <node concept="3cpWs8" id="57Rdq$NtDNh" role="3cqZAp">
+            <node concept="3cpWsn" id="57Rdq$NtDNi" role="3cpWs9">
+              <property role="TrG5h" value="sessionToken" />
+              <node concept="3uibUv" id="57Rdq$NtDNj" role="1tU5fm">
+                <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+              </node>
+              <node concept="10Nm6u" id="5JGToLARb1L" role="33vP2m" />
+            </node>
+          </node>
+          <node concept="3cpWs8" id="57Rdq$NvSQO" role="3cqZAp">
+            <node concept="3cpWsn" id="57Rdq$NvSQP" role="3cpWs9">
+              <property role="TrG5h" value="incrSpec" />
+              <node concept="3uibUv" id="57Rdq$NvSQQ" role="1tU5fm">
+                <ref role="3uigEE" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
+              </node>
+              <node concept="10Nm6u" id="5JGToLARbiU" role="33vP2m" />
+            </node>
+          </node>
+          <node concept="3clFbJ" id="57Rdq$NvAI5" role="3cqZAp">
+            <node concept="3clFbS" id="57Rdq$NvAI7" role="3clFbx">
+              <node concept="3clFbF" id="57Rdq$NvFXT" role="3cqZAp">
+                <node concept="37vLTI" id="57Rdq$NvGbh" role="3clFbG">
+                  <node concept="37vLTw" id="57Rdq$NvFXR" role="37vLTJ">
+                    <ref role="3cqZAo" node="57Rdq$NtDNi" resolve="sessionToken" />
+                  </node>
+                  <node concept="2OqwBi" id="57Rdq$NtKoo" role="37vLTx">
+                    <node concept="2OqwBi" id="57Rdq$NtDNk" role="2Oq$k0">
+                      <node concept="1rXfSq" id="57Rdq$NtDNl" role="2Oq$k0">
+                        <ref role="37wK5l" node="3OUB6BBwqkM" resolve="getCachedData" />
+                        <node concept="37vLTw" id="57Rdq$NtDNm" role="37wK5m">
+                          <ref role="3cqZAo" node="57Rdq$NtDNb" resolve="aspectClique" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="57Rdq$NtDNn" role="2OqNvi">
+                        <ref role="37wK5l" node="6nFpYlveRCO" resolve="getOrDefault" />
+                        <node concept="10M0yZ" id="57Rdq$NtIj6" role="37wK5m">
+                          <ref role="3cqZAo" node="628mNaME76w" resolve="PREAMBLES" />
+                          <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                        </node>
+                        <node concept="1bVj0M" id="57Rdq$Nu3TB" role="37wK5m">
+                          <node concept="3clFbS" id="57Rdq$Nu3TD" role="1bW5cS">
+                            <node concept="3clFbF" id="57Rdq$Nu4b5" role="3cqZAp">
+                              <node concept="2ShNRf" id="57Rdq$Nu4b3" role="3clFbG">
+                                <node concept="HV5vD" id="57Rdq$Nu6Kl" role="2ShVmc">
+                                  <ref role="HV5vE" to="ksgm:5HxDM7DfU_2" resolve="PreambleSet" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="57Rdq$NtME0" role="2OqNvi">
+                      <ref role="37wK5l" to="ksgm:5HxDM7DfUS_" resolve="getForQuery" />
+                      <node concept="37vLTw" id="57Rdq$NtMN1" role="37wK5m">
+                        <ref role="3cqZAo" node="57Rdq$Ntiuo" resolve="query" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="57Rdq$NvAXp" role="3cqZAp">
+                <node concept="3cpWsn" id="57Rdq$NvAXq" role="3cpWs9">
+                  <property role="TrG5h" value="ruleProcessingSession" />
+                  <node concept="3uibUv" id="57Rdq$NvAXr" role="1tU5fm">
+                    <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+                  </node>
+                  <node concept="2OqwBi" id="57Rdq$NvAXs" role="33vP2m">
+                    <node concept="1rXfSq" id="57Rdq$NvAXt" role="2Oq$k0">
+                      <ref role="37wK5l" node="3OUB6BBwqkM" resolve="getCachedData" />
+                      <node concept="37vLTw" id="57Rdq$NvAXu" role="37wK5m">
+                        <ref role="3cqZAo" node="57Rdq$NtDNb" resolve="aspectClique" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="51nMZI9Bthi" role="2OqNvi">
+                      <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                      <node concept="10M0yZ" id="51nMZI9Bthj" role="37wK5m">
+                        <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                        <ref role="3cqZAo" node="6$F3Z5zitgp" resolve="RULES_SESSION" />
+                      </node>
+                      <node concept="1bVj0M" id="51nMZI9Bthk" role="37wK5m">
+                        <node concept="3clFbS" id="51nMZI9Bthl" role="1bW5cS">
+                          <node concept="3clFbF" id="51nMZI9Bthm" role="3cqZAp">
+                            <node concept="1rXfSq" id="51nMZI9Bthn" role="3clFbG">
+                              <ref role="37wK5l" node="3OUB6BBxkCB" resolve="createRuleProcessingSession" />
+                              <node concept="37vLTw" id="51nMZI9BBQP" role="37wK5m">
+                                <ref role="3cqZAo" node="57Rdq$NtDNb" resolve="aspectClique" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="57Rdq$NvU9R" role="3cqZAp">
+                <node concept="37vLTI" id="57Rdq$NvV6w" role="3clFbG">
+                  <node concept="37vLTw" id="57Rdq$NvU9P" role="37vLTJ">
+                    <ref role="3cqZAo" node="57Rdq$NvSQP" resolve="incrSpec" />
+                  </node>
+                  <node concept="2OqwBi" id="57Rdq$NvAXJ" role="37vLTx">
+                    <node concept="2OqwBi" id="57Rdq$NvAXK" role="2Oq$k0">
+                      <node concept="2OqwBi" id="57Rdq$NvAXL" role="2Oq$k0">
+                        <node concept="37vLTw" id="57Rdq$NvAXM" role="2Oq$k0">
+                          <ref role="3cqZAo" node="57Rdq$NvAXq" resolve="ruleProcessingSession" />
+                        </node>
+                        <node concept="liA8E" id="57Rdq$NvAXN" role="2OqNvi">
+                          <ref role="37wK5l" to="hano:5tAk4yW01VJ" resolve="programSpecBuilder" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="57Rdq$NvAXO" role="2OqNvi">
+                        <ref role="37wK5l" to="xnrr:57Rdq$NuMzc" resolve="setLevel" />
+                        <node concept="Rm8GO" id="57Rdq$NvVWN" role="37wK5m">
+                          <ref role="Rm8GQ" to="av0y:~IncrementalSpec$IncrLevel.Preamble" resolve="Preamble" />
+                          <ref role="1Px2BO" to="av0y:~IncrementalSpec$IncrLevel" resolve="IncrementalSpec.IncrLevel" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="57Rdq$NvAXQ" role="2OqNvi">
+                      <ref role="37wK5l" to="xnrr:5tAk4yVVZZP" resolve="toSpec" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="57Rdq$NvAPD" role="3clFbw">
+              <ref role="3cqZAo" node="57Rdq$NvvzV" resolve="withPreamble" />
+            </node>
+          </node>
+          <node concept="3clFbH" id="57Rdq$NtDNp" role="3cqZAp" />
+          <node concept="3clFbF" id="57Rdq$NtDNq" role="3cqZAp">
+            <node concept="2OqwBi" id="57Rdq$NvWgI" role="3clFbG">
+              <node concept="2ShNRf" id="57Rdq$NtDNr" role="2Oq$k0">
+                <node concept="1pGfFk" id="57Rdq$NtDNs" role="2ShVmc">
+                  <ref role="37wK5l" node="3KN3A4vHiEF" resolve="TypecheckingStep" />
+                  <node concept="2OqwBi" id="57Rdq$NtDNt" role="37wK5m">
+                    <node concept="2OqwBi" id="57Rdq$NtDNu" role="2Oq$k0">
+                      <node concept="37vLTw" id="57Rdq$NtDNv" role="2Oq$k0">
+                        <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
+                      </node>
+                      <node concept="liA8E" id="57Rdq$NtDNw" role="2OqNvi">
+                        <ref role="37wK5l" node="1z4$59iwuVK" resolve="typecheckingService" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="57Rdq$NtDNx" role="2OqNvi">
+                      <ref role="37wK5l" node="61G6TdCmasW" resolve="getRepository" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="57Rdq$NtDNy" role="37wK5m">
+                    <ref role="3cqZAo" node="57Rdq$NtDNi" resolve="sessionToken" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="57Rdq$NvYsc" role="2OqNvi">
+                <ref role="37wK5l" node="5tAk4yVSZ1V" resolve="withProgramSpec" />
+                <node concept="37vLTw" id="57Rdq$NvYU8" role="37wK5m">
+                  <ref role="3cqZAo" node="57Rdq$NvSQP" resolve="incrSpec" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="57Rdq$NtDNz" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="57Rdq$NtCMH" role="jymVt" />
+      <node concept="3clFb_" id="628mNaMEudC" role="jymVt">
+        <property role="TrG5h" value="processEffect" />
+        <node concept="37vLTG" id="628mNaMEudD" role="3clF46">
+          <property role="TrG5h" value="aspectClique" />
+          <node concept="3uibUv" id="628mNaMEudE" role="1tU5fm">
+            <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
+            <node concept="3qTvmN" id="628mNaMEudF" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="628mNaMEudG" role="3clF46">
+          <property role="TrG5h" value="effect" />
+          <node concept="3uibUv" id="628mNaMEudH" role="1tU5fm">
+            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="628mNaMEudI" role="3clF45" />
+        <node concept="3Tmbuc" id="628mNaMEudJ" role="1B3o_S" />
+        <node concept="3clFbS" id="628mNaMEudK" role="3clF47">
+          <node concept="3clFbF" id="628mNaMEudL" role="3cqZAp">
+            <node concept="2OqwBi" id="628mNaMEudM" role="3clFbG">
+              <node concept="37vLTw" id="628mNaMEudN" role="2Oq$k0">
+                <ref role="3cqZAo" node="628mNaMEudG" resolve="effect" />
+              </node>
+              <node concept="liA8E" id="628mNaMEudO" role="2OqNvi">
+                <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="applyIfHasValue" />
+                <node concept="10M0yZ" id="628mNaMEudP" role="37wK5m">
+                  <ref role="1PxDUh" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+                  <ref role="3cqZAo" to="1yqb:2daneBP_Jiy" resolve="SESSION_TOKEN" />
+                </node>
+                <node concept="1bVj0M" id="628mNaMEudQ" role="37wK5m">
+                  <node concept="3clFbS" id="628mNaMEudR" role="1bW5cS">
+                    <node concept="3clFbJ" id="628mNaMEudS" role="3cqZAp">
+                      <node concept="3clFbS" id="628mNaMEudT" role="3clFbx">
+                        <node concept="3clFbF" id="628mNaME$20" role="3cqZAp">
+                          <node concept="2OqwBi" id="628mNaMEIxM" role="3clFbG">
+                            <node concept="2OqwBi" id="628mNaME$_v" role="2Oq$k0">
+                              <node concept="1rXfSq" id="628mNaME$1Y" role="2Oq$k0">
+                                <ref role="37wK5l" node="3OUB6BBwqkM" resolve="getCachedData" />
+                                <node concept="37vLTw" id="628mNaME$hG" role="37wK5m">
+                                  <ref role="3cqZAo" node="628mNaMEudD" resolve="aspectClique" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="628mNaME$UG" role="2OqNvi">
+                                <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                                <node concept="10M0yZ" id="628mNaMEDbD" role="37wK5m">
+                                  <ref role="3cqZAo" node="628mNaME76w" resolve="PREAMBLES" />
+                                  <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                                </node>
+                                <node concept="1bVj0M" id="628mNaMEFmf" role="37wK5m">
+                                  <node concept="3clFbS" id="628mNaMEFmh" role="1bW5cS">
+                                    <node concept="3clFbF" id="628mNaMEFBN" role="3cqZAp">
+                                      <node concept="2ShNRf" id="628mNaMEFBL" role="3clFbG">
+                                        <node concept="HV5vD" id="628mNaMEIl3" role="2ShVmc">
+                                          <ref role="HV5vE" to="ksgm:5HxDM7DfU_2" resolve="PreambleSet" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="628mNaMEKQU" role="2OqNvi">
+                              <ref role="37wK5l" to="ksgm:57Rdq$NsSlX" resolve="getOrPutForQuery" />
+                              <node concept="37vLTw" id="57Rdq$NtBGl" role="37wK5m">
+                                <ref role="3cqZAo" node="57Rdq$Ntiuo" resolve="query" />
+                              </node>
+                              <node concept="37vLTw" id="628mNaMELlF" role="37wK5m">
+                                <ref role="3cqZAo" node="628mNaMEuec" resolve="sessionToken" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3y3z36" id="628mNaMEue1" role="3clFbw">
+                        <node concept="10Nm6u" id="628mNaMEue2" role="3uHU7w" />
+                        <node concept="37vLTw" id="628mNaMEue3" role="3uHU7B">
+                          <ref role="3cqZAo" node="628mNaMEuec" resolve="sessionToken" />
+                        </node>
+                      </node>
+                      <node concept="9aQIb" id="628mNaMEue4" role="9aQIa">
+                        <node concept="3clFbS" id="628mNaMEue5" role="9aQI4">
+                          <node concept="3clFbF" id="628mNaMEue6" role="3cqZAp">
+                            <node concept="2OqwBi" id="628mNaMEue7" role="3clFbG">
+                              <node concept="1rXfSq" id="628mNaMEue8" role="2Oq$k0">
+                                <ref role="37wK5l" node="3OUB6BBwqkM" resolve="getCachedData" />
+                                <node concept="37vLTw" id="628mNaMEue9" role="37wK5m">
+                                  <ref role="3cqZAo" node="628mNaMEudD" resolve="aspectClique" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="628mNaMEuea" role="2OqNvi">
+                                <ref role="37wK5l" node="7i3KM7g2ZSX" resolve="clear" />
+                                <node concept="10M0yZ" id="628mNaMEueb" role="37wK5m">
+                                  <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                                  <ref role="3cqZAo" node="7i3KM7g3FBB" resolve="SESSION_TOKEN" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTG" id="628mNaMEuec" role="1bW2Oz">
+                    <property role="TrG5h" value="sessionToken" />
+                    <node concept="3uibUv" id="628mNaMEued" role="1tU5fm">
+                      <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="628mNaMEuee" role="3cqZAp" />
+          <node concept="3clFbF" id="628mNaMEuef" role="3cqZAp">
+            <node concept="3nyPlj" id="628mNaMEueg" role="3clFbG">
+              <ref role="37wK5l" node="5Qx6_65qdzK" resolve="processEffect" />
+              <node concept="37vLTw" id="628mNaMEueh" role="37wK5m">
+                <ref role="3cqZAo" node="628mNaMEudD" resolve="aspectClique" />
+              </node>
+              <node concept="37vLTw" id="628mNaMEuei" role="37wK5m">
+                <ref role="3cqZAo" node="628mNaMEudG" resolve="effect" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="628mNaMEuej" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="628mNaMEr3k" role="jymVt" />
       <node concept="3clFb_" id="3OUB6BASVxO" role="jymVt">
         <property role="TrG5h" value="finish" />
         <node concept="3cqZAl" id="3OUB6BASVxP" role="3clF45" />
@@ -15628,6 +16088,13 @@
           <ref role="3uigEE" node="4Dkptq1Qcxp" resolve="CacheUpdatable" />
         </node>
       </node>
+      <node concept="312cEg" id="57Rdq$Ntiuo" role="jymVt">
+        <property role="TrG5h" value="query" />
+        <node concept="3Tm6S6" id="57Rdq$Ntg7S" role="1B3o_S" />
+        <node concept="3uibUv" id="57Rdq$NtgM1" role="1tU5fm">
+          <ref role="3uigEE" to="i348:5EDW3XDYeWv" resolve="Query" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="61G6TdCr3Dx" role="jymVt" />
     <node concept="312cEu" id="5Qx6_65Eucp" role="jymVt">
@@ -16363,25 +16830,48 @@
               </node>
             </node>
           </node>
+          <node concept="3cpWs8" id="51nMZI9Bb2D" role="3cqZAp">
+            <node concept="3cpWsn" id="51nMZI9Bb2E" role="3cpWs9">
+              <property role="TrG5h" value="cachedSessionData" />
+              <node concept="3uibUv" id="51nMZI9Bb2F" role="1tU5fm">
+                <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
+              </node>
+              <node concept="1rXfSq" id="3OUB6BByjf3" role="33vP2m">
+                <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getCachedData" />
+                <node concept="37vLTw" id="51nMZI9B7hv" role="37wK5m">
+                  <ref role="3cqZAo" node="3OUB6BBoFGU" resolve="aspectClique" />
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbH" id="3OUB6BBvFoO" role="3cqZAp" />
-          <node concept="3cpWs8" id="3OUB6BBvFLc" role="3cqZAp">
-            <node concept="3cpWsn" id="3OUB6BBvFLd" role="3cpWs9">
+          <node concept="3cpWs8" id="51nMZI9APMV" role="3cqZAp">
+            <node concept="3cpWsn" id="51nMZI9APMW" role="3cpWs9">
               <property role="TrG5h" value="ruleProcessingSession" />
-              <node concept="3uibUv" id="3OUB6BBvFyn" role="1tU5fm">
+              <node concept="3uibUv" id="51nMZI9APMX" role="1tU5fm">
                 <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
               </node>
-              <node concept="2OqwBi" id="3OUB6BBvFLe" role="33vP2m">
-                <node concept="1rXfSq" id="3OUB6BByjf1" role="2Oq$k0">
-                  <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getCachedData" />
-                  <node concept="37vLTw" id="3OUB6BByjf2" role="37wK5m">
-                    <ref role="3cqZAo" node="3OUB6BBoFGU" resolve="aspectClique" />
-                  </node>
+              <node concept="2OqwBi" id="51nMZI9APMY" role="33vP2m">
+                <node concept="37vLTw" id="51nMZI9APMZ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="51nMZI9Bb2E" resolve="cachedSessionData" />
                 </node>
-                <node concept="liA8E" id="3OUB6BBvFLg" role="2OqNvi">
-                  <ref role="37wK5l" node="7i3KM7g1KV4" resolve="get" />
-                  <node concept="10M0yZ" id="3OUB6BBvFLh" role="37wK5m">
-                    <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                <node concept="liA8E" id="51nMZI9APN0" role="2OqNvi">
+                  <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                  <node concept="10M0yZ" id="51nMZI9APN1" role="37wK5m">
                     <ref role="3cqZAo" node="6$F3Z5zitgp" resolve="RULES_SESSION" />
+                    <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                  </node>
+                  <node concept="1bVj0M" id="51nMZI9APN2" role="37wK5m">
+                    <node concept="3clFbS" id="51nMZI9APN3" role="1bW5cS">
+                      <node concept="3clFbF" id="51nMZI9APN4" role="3cqZAp">
+                        <node concept="1rXfSq" id="51nMZI9APN5" role="3clFbG">
+                          <ref role="37wK5l" node="3OUB6BBxkCB" resolve="createRuleProcessingSession" />
+                          <node concept="37vLTw" id="51nMZI9AZkI" role="37wK5m">
+                            <ref role="3cqZAo" node="3OUB6BBoFGU" resolve="aspectClique" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
@@ -16398,7 +16888,7 @@
                 <node concept="2OqwBi" id="3OUB6BBoFHj" role="2Oq$k0">
                   <node concept="2OqwBi" id="3OUB6BBoFHk" role="2Oq$k0">
                     <node concept="37vLTw" id="3OUB6BBvFLi" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3OUB6BBvFLd" resolve="ruleProcessingSession" />
+                      <ref role="3cqZAo" node="51nMZI9APMW" resolve="ruleProcessingSession" />
                     </node>
                     <node concept="liA8E" id="3OUB6BBoFHp" role="2OqNvi">
                       <ref role="37wK5l" to="hano:5tAk4yW01VJ" resolve="programSpecBuilder" />
@@ -16452,11 +16942,8 @@
                 <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
               </node>
               <node concept="2OqwBi" id="3OUB6BBygOn" role="33vP2m">
-                <node concept="1rXfSq" id="3OUB6BByjf3" role="2Oq$k0">
-                  <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getCachedData" />
-                  <node concept="37vLTw" id="3OUB6BByjf4" role="37wK5m">
-                    <ref role="3cqZAo" node="3OUB6BBoFGU" resolve="aspectClique" />
-                  </node>
+                <node concept="37vLTw" id="51nMZI9Bd60" role="2Oq$k0">
+                  <ref role="3cqZAo" node="51nMZI9Bb2E" resolve="cachedSessionData" />
                 </node>
                 <node concept="liA8E" id="3OUB6BBygOp" role="2OqNvi">
                   <ref role="37wK5l" node="7i3KM7g1KV4" resolve="get" />
@@ -16658,7 +17145,6 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbH" id="3OUB6BBywEY" role="3cqZAp" />
                     </node>
                   </node>
                 </node>
@@ -17009,25 +17495,48 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="3OUB6BByLCe" role="3cqZAp" />
-          <node concept="3cpWs8" id="3OUB6BBvN9_" role="3cqZAp">
-            <node concept="3cpWsn" id="3OUB6BBvN9A" role="3cpWs9">
+          <node concept="3cpWs8" id="51nMZI9BiEN" role="3cqZAp">
+            <node concept="3cpWsn" id="51nMZI9BiEO" role="3cpWs9">
+              <property role="TrG5h" value="cachedSessionData" />
+              <node concept="3uibUv" id="51nMZI9BiEP" role="1tU5fm">
+                <ref role="3uigEE" node="7i3KM7g1Hnp" resolve="CachedData" />
+              </node>
+              <node concept="1rXfSq" id="51nMZI9BiEQ" role="33vP2m">
+                <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getCachedData" />
+                <node concept="37vLTw" id="51nMZI9BsSG" role="37wK5m">
+                  <ref role="3cqZAo" node="7i3KM7gOQSR" resolve="aspectClique" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="51nMZI9BiES" role="3cqZAp" />
+          <node concept="3cpWs8" id="51nMZI9BiET" role="3cqZAp">
+            <node concept="3cpWsn" id="51nMZI9BiEU" role="3cpWs9">
               <property role="TrG5h" value="ruleProcessingSession" />
-              <node concept="3uibUv" id="3OUB6BBvMPu" role="1tU5fm">
+              <node concept="3uibUv" id="51nMZI9BiEV" role="1tU5fm">
                 <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
               </node>
-              <node concept="2OqwBi" id="3OUB6BBvN9B" role="33vP2m">
-                <node concept="1rXfSq" id="3OUB6BByGvw" role="2Oq$k0">
-                  <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getCachedData" />
-                  <node concept="37vLTw" id="3OUB6BByGvx" role="37wK5m">
-                    <ref role="3cqZAo" node="7i3KM7gOQSR" resolve="aspectClique" />
-                  </node>
+              <node concept="2OqwBi" id="51nMZI9BiEW" role="33vP2m">
+                <node concept="37vLTw" id="51nMZI9BiEX" role="2Oq$k0">
+                  <ref role="3cqZAo" node="51nMZI9BiEO" resolve="cachedSessionData" />
                 </node>
-                <node concept="liA8E" id="3OUB6BBvN9D" role="2OqNvi">
-                  <ref role="37wK5l" node="7i3KM7g1KV4" resolve="get" />
-                  <node concept="10M0yZ" id="3OUB6BBvN9E" role="37wK5m">
-                    <ref role="3cqZAo" node="6$F3Z5zitgp" resolve="RULES_SESSION" />
+                <node concept="liA8E" id="51nMZI9BiEY" role="2OqNvi">
+                  <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                  <node concept="10M0yZ" id="51nMZI9BiEZ" role="37wK5m">
                     <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                    <ref role="3cqZAo" node="6$F3Z5zitgp" resolve="RULES_SESSION" />
+                  </node>
+                  <node concept="1bVj0M" id="51nMZI9BiF0" role="37wK5m">
+                    <node concept="3clFbS" id="51nMZI9BiF1" role="1bW5cS">
+                      <node concept="3clFbF" id="51nMZI9BiF2" role="3cqZAp">
+                        <node concept="1rXfSq" id="51nMZI9BiF3" role="3clFbG">
+                          <ref role="37wK5l" node="3OUB6BBxkCB" resolve="createRuleProcessingSession" />
+                          <node concept="37vLTw" id="51nMZI9BiF4" role="37wK5m">
+                            <ref role="3cqZAo" node="7i3KM7gOQSR" resolve="aspectClique" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
@@ -17042,8 +17551,8 @@
               <node concept="2OqwBi" id="5tAk4yW0hlg" role="33vP2m">
                 <node concept="2OqwBi" id="5tAk4yW0fLR" role="2Oq$k0">
                   <node concept="2OqwBi" id="5tAk4yVTktT" role="2Oq$k0">
-                    <node concept="37vLTw" id="3OUB6BBvN9F" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3OUB6BBvN9A" resolve="ruleProcessingSession" />
+                    <node concept="37vLTw" id="51nMZI9BlXd" role="2Oq$k0">
+                      <ref role="3cqZAo" node="51nMZI9BiEU" resolve="ruleProcessingSession" />
                     </node>
                     <node concept="liA8E" id="5tAk4yW08No" role="2OqNvi">
                       <ref role="37wK5l" to="hano:5tAk4yW01VJ" resolve="programSpecBuilder" />
@@ -17097,11 +17606,8 @@
                 <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
               </node>
               <node concept="2OqwBi" id="3OUB6BByIE2" role="33vP2m">
-                <node concept="1rXfSq" id="3OUB6BByKh6" role="2Oq$k0">
-                  <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getCachedData" />
-                  <node concept="37vLTw" id="3OUB6BByKh7" role="37wK5m">
-                    <ref role="3cqZAo" node="7i3KM7gOQSR" resolve="aspectClique" />
-                  </node>
+                <node concept="37vLTw" id="51nMZI9Bm_R" role="2Oq$k0">
+                  <ref role="3cqZAo" node="51nMZI9BiEO" resolve="cachedSessionData" />
                 </node>
                 <node concept="liA8E" id="3OUB6BByIE4" role="2OqNvi">
                   <ref role="37wK5l" node="7i3KM7g1KV4" resolve="get" />