diff --git a/build.xml b/build.xml
index da86bbe2..c1a8e6f9 100644
--- a/build.xml
+++ b/build.xml
@@ -616,6 +616,7 @@
           <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
           <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
           <module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
           <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
@@ -1713,11 +1714,11 @@
         <module file="${basedir}/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" />
         <module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" />
         <module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd" />
-        <module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" />
       </chunk>
       <chunk>
         <module file="${basedir}/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" />
         <module file="${basedir}/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" />
+        <module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" />
       </chunk>
       <chunk>
         <module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd" />
@@ -2639,7 +2640,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.typechecking.ui" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.typechecking.ui" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2652,21 +2653,22 @@
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
@@ -2685,9 +2687,12 @@
         <fileset file="${artifacts.mps}/lib/trove4j.jar" />
         <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
         <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       </classpath>
     </javac>
   </target>
@@ -3098,10 +3103,10 @@
     <delete dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.reporting/source_gen" />
-    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
     <delete dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.smodel.types/generator/source_gen" />
+    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index b5e7baa9..68e2f8a2 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -1088,18 +1088,18 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="7DvO2M9pVyQ" role="3bR37C">
-          <node concept="3bR9La" id="7DvO2M9pVyR" role="1SiIV1">
-            <property role="3bR36h" value="false" />
-            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="oI9YrJ93V" role="3bR37C">
           <node concept="3bR9La" id="oI9YrJ93W" role="1SiIV1">
             <property role="3bR36h" value="false" />
             <ref role="3bR37D" node="oI9YrJ7Rx" resolve="jetbrains.mps.typechecking.reporting" />
           </node>
         </node>
+        <node concept="1SiIV0" id="7WKNeR92MhD" role="3bR37C">
+          <node concept="3bR9La" id="7WKNeR92MhE" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUx9d" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1680,6 +1680,12 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="7WKNeR9rwdk" role="3bR37C">
+          <node concept="3bR9La" id="7WKNeR9rwdl" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7Ant4WkHLsF" resolve="jetbrains.mps.baseLanguageExt" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="46o4wsH5PJF" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd b/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
index 4c700ef6..37f1d5d9 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
+++ b/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
@@ -27,6 +27,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
     <language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.baseLanguageExt" version="0" />
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
index 8d714bc5..f8e1a3f6 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
@@ -16,6 +16,7 @@
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
+    <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -46,6 +47,15 @@
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
   </imports>
   <registry>
+    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
+      <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
+        <child id="1238852204892" name="componentType" index="1Lm7xW" />
+      </concept>
+      <concept id="1238857743184" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleMemberAccessExpression" flags="nn" index="1LFfDK">
+        <child id="1238857764950" name="tuple" index="1LFl5Q" />
+        <child id="1238857834412" name="index" index="1LF_Uc" />
+      </concept>
+    </language>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
       <concept id="1211979288880" name="jetbrains.mps.lang.test.structure.AssertMatch" flags="nn" index="JA50E">
         <child id="1211979305365" name="before" index="JA92f" />
@@ -122,6 +132,7 @@
       </concept>
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -966,21 +977,6 @@
                   </node>
                   <node concept="1DcWWT" id="1CcQBrQrTBa" role="3cqZAp">
                     <node concept="3clFbS" id="1CcQBrQrTBd" role="2LFqv$">
-                      <node concept="3cpWs8" id="6QH_LDtbV5I" role="3cqZAp">
-                        <node concept="3cpWsn" id="6QH_LDtbV5J" role="3cpWs9">
-                          <property role="TrG5h" value="config" />
-                          <node concept="3uibUv" id="6QH_LDtbV5K" role="1tU5fm">
-                            <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
-                          </node>
-                          <node concept="2YIFZM" id="6QH_LDtbV5L" role="33vP2m">
-                            <ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="newSession" />
-                            <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                            <node concept="37vLTw" id="1CcQBrQrWi4" role="37wK5m">
-                              <ref role="3cqZAo" node="1CcQBrQrTBe" resolve="program" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
                       <node concept="3clFbF" id="1CcQBrQrYPT" role="3cqZAp">
                         <node concept="37vLTI" id="1CcQBrQrYPV" role="3clFbG">
                           <node concept="37vLTw" id="1CcQBrQrYPZ" role="37vLTJ">
@@ -998,11 +994,21 @@
                                 </node>
                                 <node concept="liA8E" id="6QH_LDtbV6f" role="2OqNvi">
                                   <ref role="37wK5l" to="hano:HV6urVFrQ9" resolve="eval" />
-                                  <node concept="37vLTw" id="7lt0LtQtMIX" role="37wK5m">
-                                    <ref role="3cqZAo" node="1CcQBrQrTBe" resolve="program" />
+                                  <node concept="1LFfDK" id="7WKNeR9lNYN" role="37wK5m">
+                                    <node concept="3cmrfG" id="7WKNeR9lNYW" role="1LF_Uc">
+                                      <property role="3cmrfH" value="0" />
+                                    </node>
+                                    <node concept="37vLTw" id="7lt0LtQtMIX" role="1LFl5Q">
+                                      <ref role="3cqZAo" node="1CcQBrQrTBe" resolve="stage_program" />
+                                    </node>
                                   </node>
-                                  <node concept="37vLTw" id="6QH_LDtbV6g" role="37wK5m">
-                                    <ref role="3cqZAo" node="6QH_LDtbV5J" resolve="config" />
+                                  <node concept="1LFfDK" id="7WKNeR9G7WA" role="37wK5m">
+                                    <node concept="3cmrfG" id="7WKNeR9G7WB" role="1LF_Uc">
+                                      <property role="3cmrfH" value="1" />
+                                    </node>
+                                    <node concept="37vLTw" id="7WKNeR9G7WC" role="1LFl5Q">
+                                      <ref role="3cqZAo" node="1CcQBrQrTBe" resolve="stage_program" />
+                                    </node>
                                   </node>
                                   <node concept="10M0yZ" id="6QH_LDtbV6h" role="37wK5m">
                                     <ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
@@ -1016,9 +1022,12 @@
                       </node>
                     </node>
                     <node concept="3cpWsn" id="1CcQBrQrTBe" role="1Duv9x">
-                      <property role="TrG5h" value="program" />
-                      <node concept="3uibUv" id="1CcQBrQrTBi" role="1tU5fm">
-                        <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+                      <property role="TrG5h" value="stage_program" />
+                      <node concept="1LlUBW" id="7WKNeR9lHxD" role="1tU5fm">
+                        <node concept="17QB3L" id="7WKNeR9lJcK" role="1Lm7xW" />
+                        <node concept="3uibUv" id="7WKNeR9lK4q" role="1Lm7xW">
+                          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+                        </node>
                       </node>
                     </node>
                     <node concept="2OqwBi" id="1CcQBrQrTBj" role="1DdaDG">
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd b/typechecking/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd
index d674962f..3191fa83 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd
+++ b/typechecking/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd
@@ -21,6 +21,7 @@
     <dependency reexport="true">bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)</dependency>
     <dependency reexport="true">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+    <dependency reexport="false">0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -48,9 +49,14 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps b/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
index 6883bd79..a0da2a8b 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
@@ -101,6 +101,8 @@
     <import index="6rp1" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:com.github.andrewoma.dexx.collection(jetbrains.mps.logic.reactor/)" />
     <import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
     <import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" />
+    <import index="kqnc" ref="r:92b96158-68e6-4f53-a32b-36e2b456fe01(jetbrains.mps.baseLanguageExt.types)" />
+    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -568,6 +570,11 @@
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
     </language>
+    <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
+      <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
+        <reference id="7256306938026143658" name="target" index="2aWVGs" />
+      </concept>
+    </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
         <property id="1167228628751" name="hasException" index="34fQS0" />
@@ -580,12 +587,20 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
+        <child id="7400021826774799510" name="ref" index="2tJFKM" />
+      </concept>
+      <concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
+        <child id="3648723375513868575" name="repositoryArg" index="Vysub" />
+      </concept>
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
+      <concept id="3648723375513868532" name="jetbrains.mps.lang.smodel.structure.NodePointer_ResolveOperation" flags="ng" index="Vyspw" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
@@ -639,6 +654,14 @@
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="6126991172893676625" name="jetbrains.mps.baseLanguage.collections.structure.ContainsAllOperation" flags="nn" index="BjQpj" />
       <concept id="3358009230509553641" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListType" flags="in" index="2BANLN" />
+      <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
+        <child id="1153944400369" name="variable" index="2Gsz3X" />
+        <child id="1153944424730" name="inputSequence" index="2GsD0m" />
+      </concept>
+      <concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
+      <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
+        <reference id="1153944258490" name="variable" index="2Gs0qQ" />
+      </concept>
       <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435808" name="initValue" index="HW$Y0" />
@@ -796,14 +819,14 @@
                 </node>
               </node>
               <node concept="liA8E" id="6hqFpWnjL1T" role="2OqNvi">
-                <ref role="37wK5l" node="6hqFpWnimEi" resolve="forRoot" />
+                <ref role="37wK5l" node="6hqFpWnimEi" resolve="forNode" />
                 <node concept="37vLTw" id="6hqFpWnjL1U" role="37wK5m">
                   <ref role="3cqZAo" node="6hqFpWnjL1o" resolve="root" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="6hqFpWnjL1W" role="2OqNvi">
-              <ref role="37wK5l" node="6hqFpWnfk$G" resolve="execute" />
+              <ref role="37wK5l" node="7WKNeR8RsrK" resolve="execute" />
             </node>
           </node>
         </node>
@@ -869,6 +892,9 @@
       <node concept="tCFHf" id="5lxnBcU5Oew" role="ftvYc">
         <ref role="tCJdB" node="7f1nCjLFveK" resolve="MarkAllTypesTrace" />
       </node>
+      <node concept="tCFHf" id="7WKNeR8U80T" role="ftvYc">
+        <ref role="tCJdB" node="7WKNeR8Q7e5" resolve="LaunchQuery" />
+      </node>
       <node concept="10WQ6h" id="1isQzelDXbq" role="ftvYc">
         <property role="TrG5h" value="markTypes" />
       </node>
@@ -25849,18 +25875,18 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="6hqFpWnj$mr" role="2OqNvi">
-                  <ref role="37wK5l" node="6hqFpWnimEi" resolve="forRoot" />
+                  <ref role="37wK5l" node="6hqFpWnimEi" resolve="forNode" />
                   <node concept="37vLTw" id="6hqFpWnj_$m" role="37wK5m">
                     <ref role="3cqZAo" node="6kREIVkStvs" resolve="root" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="6hqFpWnjB2l" role="2OqNvi">
-                <ref role="37wK5l" node="6hqFpWnj7B_" resolve="withTrace" />
+                <ref role="37wK5l" node="7WKNeR8RobH" resolve="withTrace" />
               </node>
             </node>
             <node concept="liA8E" id="6hqFpWnjCxN" role="2OqNvi">
-              <ref role="37wK5l" node="6hqFpWnfk$G" resolve="execute" />
+              <ref role="37wK5l" node="7WKNeR8RsrK" resolve="execute" />
             </node>
           </node>
         </node>
@@ -29565,10 +29591,13 @@
                     <node concept="3clFbH" id="Hg6EncXnu2" role="3cqZAp" />
                     <node concept="3cpWs8" id="Hg6EncXnu7" role="3cqZAp">
                       <node concept="3cpWsn" id="Hg6EncXnu8" role="3cpWs9">
-                        <property role="TrG5h" value="programs" />
+                        <property role="TrG5h" value="stage_programs" />
                         <node concept="_YKpA" id="Hg6EncXnu9" role="1tU5fm">
-                          <node concept="3uibUv" id="Hg6EncXnua" role="_ZDj9">
-                            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+                          <node concept="1LlUBW" id="7WKNeR9lXEL" role="_ZDj9">
+                            <node concept="17QB3L" id="7WKNeR9m1oQ" role="1Lm7xW" />
+                            <node concept="3uibUv" id="7WKNeR9m3mk" role="1Lm7xW">
+                              <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+                            </node>
                           </node>
                         </node>
                         <node concept="2OqwBi" id="Hg6EncXnub" role="33vP2m">
@@ -29608,7 +29637,7 @@
                         <node concept="10Nm6u" id="3wxtToE2ZF7" role="33vP2m" />
                       </node>
                     </node>
-                    <node concept="1DcWWT" id="Hg6EncXnue" role="3cqZAp">
+                    <node concept="2Gpval" id="7WKNeR9m8wE" role="3cqZAp">
                       <node concept="3clFbS" id="Hg6EncXnuf" role="2LFqv$">
                         <node concept="3cpWs8" id="Hg6EncXnuj" role="3cqZAp">
                           <node concept="3cpWsn" id="Hg6EncXnuk" role="3cpWs9">
@@ -29638,8 +29667,13 @@
                               <node concept="liA8E" id="6IQb_Rxph$I" role="2OqNvi">
                                 <ref role="37wK5l" node="7nPD14Nb$fz" resolve="openTab" />
                                 <node concept="2OqwBi" id="6IQb_Rxph$J" role="37wK5m">
-                                  <node concept="37vLTw" id="6IQb_Rxph$K" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="Hg6EncXnuK" resolve="program" />
+                                  <node concept="1LFfDK" id="7WKNeR9miXX" role="2Oq$k0">
+                                    <node concept="3cmrfG" id="7WKNeR9mkiK" role="1LF_Uc">
+                                      <property role="3cmrfH" value="1" />
+                                    </node>
+                                    <node concept="2GrUjf" id="7WKNeR9m8$s" role="1LFl5Q">
+                                      <ref role="2Gs0qQ" node="7WKNeR9m8$q" resolve="stage_program" />
+                                    </node>
                                   </node>
                                   <node concept="liA8E" id="6IQb_Rxph$L" role="2OqNvi">
                                     <ref role="37wK5l" to="av0y:~Program.name():java.lang.String" resolve="name" />
@@ -29743,14 +29777,11 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3cpWsn" id="Hg6EncXnuK" role="1Duv9x">
-                        <property role="TrG5h" value="program" />
-                        <node concept="3uibUv" id="Hg6EncXnuL" role="1tU5fm">
-                          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
-                        </node>
+                      <node concept="37vLTw" id="Hg6EncXnuM" role="2GsD0m">
+                        <ref role="3cqZAo" node="Hg6EncXnu8" resolve="stage_programs" />
                       </node>
-                      <node concept="37vLTw" id="Hg6EncXnuM" role="1DdaDG">
-                        <ref role="3cqZAo" node="Hg6EncXnu8" resolve="programs" />
+                      <node concept="2GrKxI" id="7WKNeR9m8$q" role="2Gsz3X">
+                        <property role="TrG5h" value="stage_program" />
                       </node>
                     </node>
                     <node concept="3clFbH" id="4BHjwwGBaFZ" role="3cqZAp" />
@@ -30602,23 +30633,30 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="6hqFpWnfbDD" role="3cqZAp" />
-        <node concept="3cpWs8" id="6hqFpWnfbDE" role="3cqZAp">
-          <node concept="3cpWsn" id="6hqFpWnfbDF" role="3cpWs9">
-            <property role="TrG5h" value="allLanguageImports" />
-            <node concept="A3Dl8" id="6hqFpWnfbDG" role="1tU5fm">
-              <node concept="3uibUv" id="6hqFpWnfbDH" role="A3Ik2">
-                <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+        <node concept="3cpWs8" id="7WKNeR8ULi0" role="3cqZAp">
+          <node concept="3cpWsn" id="7WKNeR8ULi1" role="3cpWs9">
+            <property role="TrG5h" value="aspects" />
+            <node concept="3vKaQO" id="7WKNeR8ULhW" role="1tU5fm">
+              <node concept="3uibUv" id="7WKNeR8ULhZ" role="3O5elw">
+                <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
               </node>
             </node>
-            <node concept="2YIFZM" id="6hqFpWnfbDI" role="33vP2m">
-              <ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel):java.util.Set" resolve="getAllLanguageImports" />
-              <ref role="1Pybhc" to="w1kc:~SModelOperations" resolve="SModelOperations" />
-              <node concept="2OqwBi" id="6hqFpWnfbDJ" role="37wK5m">
-                <node concept="37vLTw" id="6hqFpWnfbDK" role="2Oq$k0">
+            <node concept="2YIFZM" id="7WKNeR8ULi2" role="33vP2m">
+              <ref role="37wK5l" to="fqlx:7P_FdVPW9uU" resolve="allForModel" />
+              <ref role="1Pybhc" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+              <node concept="2OqwBi" id="7WKNeR8ULi3" role="37wK5m">
+                <node concept="37vLTw" id="7WKNeR8ULi4" role="2Oq$k0">
                   <ref role="3cqZAo" node="6hqFpWnfbDy" resolve="containingRoot" />
                 </node>
-                <node concept="I4A8Y" id="6hqFpWnfbDL" role="2OqNvi" />
+                <node concept="I4A8Y" id="7WKNeR8ULi5" role="2OqNvi" />
+              </node>
+              <node concept="2OqwBi" id="7WKNeR8ULi6" role="37wK5m">
+                <node concept="37vLTw" id="7WKNeR8ULi7" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
+                </node>
+                <node concept="liA8E" id="7WKNeR8ULi8" role="2OqNvi">
+                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                </node>
               </node>
             </node>
           </node>
@@ -30627,44 +30665,14 @@
           <node concept="3cpWsn" id="6hqFpWnfbDN" role="3cpWs9">
             <property role="TrG5h" value="hasTypeAspect" />
             <node concept="10P_77" id="6hqFpWnfbDO" role="1tU5fm" />
-            <node concept="2OqwBi" id="6hqFpWnfbDP" role="33vP2m">
-              <node concept="37vLTw" id="6hqFpWnfbDQ" role="2Oq$k0">
-                <ref role="3cqZAo" node="6hqFpWnfbDF" resolve="allLanguageImports" />
-              </node>
-              <node concept="2HwmR7" id="6hqFpWnfbDR" role="2OqNvi">
-                <node concept="1bVj0M" id="6hqFpWnfbDS" role="23t8la">
-                  <node concept="3clFbS" id="6hqFpWnfbDT" role="1bW5cS">
-                    <node concept="3clFbF" id="6hqFpWnfbDU" role="3cqZAp">
-                      <node concept="3y3z36" id="6hqFpWnfbDV" role="3clFbG">
-                        <node concept="10Nm6u" id="6hqFpWnfbDW" role="3uHU7w" />
-                        <node concept="2YIFZM" id="6hqFpWnfbDX" role="3uHU7B">
-                          <ref role="37wK5l" to="fqlx:2hteS6Cndm6" resolve="forLanguage" />
-                          <ref role="1Pybhc" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
-                          <node concept="37vLTw" id="6hqFpWnfbDY" role="37wK5m">
-                            <ref role="3cqZAo" node="6hqFpWnfbE4" resolve="it" />
-                          </node>
-                          <node concept="2OqwBi" id="6hqFpWnfbDZ" role="37wK5m">
-                            <node concept="37vLTw" id="6hqFpWnfiis" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
-                            </node>
-                            <node concept="liA8E" id="6hqFpWnfbE3" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="Rh6nW" id="6hqFpWnfbE4" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6hqFpWnfbE5" role="1tU5fm" />
-                  </node>
-                </node>
+            <node concept="2OqwBi" id="7WKNeR8UNGb" role="33vP2m">
+              <node concept="37vLTw" id="7WKNeR8UN2f" role="2Oq$k0">
+                <ref role="3cqZAo" node="7WKNeR8ULi1" resolve="aspects" />
               </node>
+              <node concept="3GX2aA" id="7WKNeR8UOJy" role="2OqNvi" />
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="6hqFpWnfbE6" role="3cqZAp" />
         <node concept="3clFbF" id="6hqFpWnfbE7" role="3cqZAp">
           <node concept="1Wc70l" id="6hqFpWnfbE8" role="3clFbG">
             <node concept="1Wc70l" id="6hqFpWnfbE9" role="3uHU7B">
@@ -30797,6 +30805,263 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="7WKNeR8RgMN" role="jymVt" />
+    <node concept="2YIFZL" id="7WKNeR8SP2E" role="jymVt">
+      <property role="TrG5h" value="launchQuery" />
+      <node concept="37vLTG" id="7WKNeR9gygX" role="3clF46">
+        <property role="TrG5h" value="queryFqName" />
+        <node concept="17QB3L" id="7WKNeR9gy_k" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7WKNeR8SP2H" role="3clF46">
+        <property role="TrG5h" value="editorComponent" />
+        <node concept="3uibUv" id="7WKNeR8SP2I" role="1tU5fm">
+          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7WKNeR8SP2J" role="3clF46">
+        <property role="TrG5h" value="mpsProject" />
+        <node concept="3uibUv" id="7WKNeR8SP2K" role="1tU5fm">
+          <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7WKNeR8SP2L" role="3clF46">
+        <property role="TrG5h" value="ideaProject" />
+        <node concept="3uibUv" id="7WKNeR8SP2M" role="1tU5fm">
+          <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="7WKNeR8T4zY" role="3clF45">
+        <ref role="3uigEE" node="7WKNeR8SQxg" resolve="TypecheckingActions.LaunchQuery" />
+      </node>
+      <node concept="3Tm1VV" id="7WKNeR8SP2O" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR8SP2P" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR8SP2Q" role="3cqZAp">
+          <node concept="2ShNRf" id="7WKNeR8SP2R" role="3clFbG">
+            <node concept="1pGfFk" id="7WKNeR8SP2S" role="2ShVmc">
+              <ref role="37wK5l" node="7WKNeR8SQxi" resolve="TypecheckingActions.LaunchQuery" />
+              <node concept="37vLTw" id="7WKNeR9gzZ3" role="37wK5m">
+                <ref role="3cqZAo" node="7WKNeR9gygX" resolve="queryFqName" />
+              </node>
+              <node concept="37vLTw" id="7WKNeR8SP2U" role="37wK5m">
+                <ref role="3cqZAo" node="7WKNeR8SP2H" resolve="editorComponent" />
+              </node>
+              <node concept="37vLTw" id="7WKNeR8SP2V" role="37wK5m">
+                <ref role="3cqZAo" node="7WKNeR8SP2J" resolve="mpsProject" />
+              </node>
+              <node concept="37vLTw" id="7WKNeR8SP2W" role="37wK5m">
+                <ref role="3cqZAo" node="7WKNeR8SP2L" resolve="ideaProject" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR8SP2D" role="jymVt" />
+    <node concept="312cEu" id="7WKNeR8RiDf" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="AbstractAction" />
+      <property role="1sVAO0" value="true" />
+      <node concept="2tJIrI" id="7WKNeR8Rk5Y" role="jymVt" />
+      <node concept="3clFbW" id="7WKNeR8SByE" role="jymVt">
+        <node concept="37vLTG" id="7WKNeR8SEgi" role="3clF46">
+          <property role="TrG5h" value="editorComponent" />
+          <node concept="3uibUv" id="7WKNeR8SEgj" role="1tU5fm">
+            <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="7WKNeR8SEgk" role="3clF46">
+          <property role="TrG5h" value="mpsProject" />
+          <node concept="3uibUv" id="7WKNeR8SEgl" role="1tU5fm">
+            <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="7WKNeR8SEgm" role="3clF46">
+          <property role="TrG5h" value="ideaProject" />
+          <node concept="3uibUv" id="7WKNeR8SEgn" role="1tU5fm">
+            <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="7WKNeR8SByG" role="3clF45" />
+        <node concept="3Tmbuc" id="7WKNeR8SCRm" role="1B3o_S" />
+        <node concept="3clFbS" id="7WKNeR8SByI" role="3clF47">
+          <node concept="3clFbF" id="7WKNeR8SEkn" role="3cqZAp">
+            <node concept="37vLTI" id="7WKNeR8SEko" role="3clFbG">
+              <node concept="37vLTw" id="7WKNeR8SEkp" role="37vLTx">
+                <ref role="3cqZAo" node="7WKNeR8SEgi" resolve="editorComponent" />
+              </node>
+              <node concept="2OqwBi" id="7WKNeR8SEkq" role="37vLTJ">
+                <node concept="Xjq3P" id="7WKNeR8SEkr" role="2Oq$k0" />
+                <node concept="2OwXpG" id="7WKNeR8SEks" role="2OqNvi">
+                  <ref role="2Oxat5" node="6hqFpWnfwwm" resolve="editorComponent" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7WKNeR8SEkA" role="3cqZAp">
+            <node concept="37vLTI" id="7WKNeR8SEkB" role="3clFbG">
+              <node concept="37vLTw" id="7WKNeR8SEkC" role="37vLTx">
+                <ref role="3cqZAo" node="7WKNeR8SEgk" resolve="mpsProject" />
+              </node>
+              <node concept="2OqwBi" id="7WKNeR8SEkD" role="37vLTJ">
+                <node concept="Xjq3P" id="7WKNeR8SEkE" role="2Oq$k0" />
+                <node concept="2OwXpG" id="7WKNeR8SEkF" role="2OqNvi">
+                  <ref role="2Oxat5" node="6hqFpWnfkNg" resolve="mpsProject" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7WKNeR8SEkP" role="3cqZAp">
+            <node concept="37vLTI" id="7WKNeR8SEkQ" role="3clFbG">
+              <node concept="37vLTw" id="7WKNeR8SEkR" role="37vLTx">
+                <ref role="3cqZAo" node="7WKNeR8SEgm" resolve="ideaProject" />
+              </node>
+              <node concept="2OqwBi" id="7WKNeR8SEkS" role="37vLTJ">
+                <node concept="Xjq3P" id="7WKNeR8SEkT" role="2Oq$k0" />
+                <node concept="2OwXpG" id="7WKNeR8SEkU" role="2OqNvi">
+                  <ref role="2Oxat5" node="6hqFpWnfoA9" resolve="ideaProject" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7WKNeR8SCTJ" role="jymVt" />
+      <node concept="3clFb_" id="7WKNeR8RobH" role="jymVt">
+        <property role="TrG5h" value="withTrace" />
+        <node concept="3uibUv" id="7WKNeR8RprK" role="3clF45">
+          <ref role="3uigEE" node="7WKNeR8RiDf" resolve="TypecheckingActions.AbstractAction" />
+        </node>
+        <node concept="3Tm1VV" id="7WKNeR8RobJ" role="1B3o_S" />
+        <node concept="3clFbS" id="7WKNeR8RobK" role="3clF47">
+          <node concept="3clFbF" id="7WKNeR8RobL" role="3cqZAp">
+            <node concept="37vLTI" id="7WKNeR8RobM" role="3clFbG">
+              <node concept="3clFbT" id="7WKNeR8RobN" role="37vLTx">
+                <property role="3clFbU" value="true" />
+              </node>
+              <node concept="2OqwBi" id="7WKNeR8RobO" role="37vLTJ">
+                <node concept="Xjq3P" id="7WKNeR8RobP" role="2Oq$k0" />
+                <node concept="2OwXpG" id="7WKNeR8RobQ" role="2OqNvi">
+                  <ref role="2Oxat5" node="6hqFpWnjd0A" resolve="trace" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7WKNeR8RobR" role="3cqZAp">
+            <node concept="Xjq3P" id="7WKNeR8RobS" role="3clFbG" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7WKNeR8RY$m" role="jymVt" />
+      <node concept="3clFb_" id="6hqFpWniBeE" role="jymVt">
+        <property role="TrG5h" value="forNodes" />
+        <node concept="37vLTG" id="6hqFpWniEgR" role="3clF46">
+          <property role="TrG5h" value="nodes" />
+          <node concept="2I9FWS" id="6hqFpWniZ5l" role="1tU5fm" />
+        </node>
+        <node concept="3uibUv" id="7WKNeR8S032" role="3clF45">
+          <ref role="3uigEE" node="7WKNeR8RiDf" resolve="TypecheckingActions.AbstractAction" />
+        </node>
+        <node concept="3Tm1VV" id="6hqFpWniBeH" role="1B3o_S" />
+        <node concept="3clFbS" id="6hqFpWniBeI" role="3clF47">
+          <node concept="3clFbF" id="6hqFpWniFVp" role="3cqZAp">
+            <node concept="37vLTI" id="6hqFpWniIps" role="3clFbG">
+              <node concept="37vLTw" id="6hqFpWniIHR" role="37vLTx">
+                <ref role="3cqZAo" node="6hqFpWniEgR" resolve="nodes" />
+              </node>
+              <node concept="2OqwBi" id="6hqFpWniGgy" role="37vLTJ">
+                <node concept="Xjq3P" id="6hqFpWniFVo" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6hqFpWniI3i" role="2OqNvi">
+                  <ref role="2Oxat5" node="6hqFpWnfpcc" resolve="nodes" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6hqFpWniJaS" role="3cqZAp">
+            <node concept="Xjq3P" id="6hqFpWniJaQ" role="3clFbG" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7WKNeR8SaXX" role="jymVt" />
+      <node concept="3clFb_" id="6hqFpWnimEi" role="jymVt">
+        <property role="TrG5h" value="forNode" />
+        <node concept="37vLTG" id="6hqFpWnirzt" role="3clF46">
+          <property role="TrG5h" value="root" />
+          <node concept="3Tqbb2" id="6hqFpWnisvm" role="1tU5fm" />
+        </node>
+        <node concept="3uibUv" id="7WKNeR8ScAf" role="3clF45">
+          <ref role="3uigEE" node="7WKNeR8RiDf" resolve="TypecheckingActions.AbstractAction" />
+        </node>
+        <node concept="3Tm1VV" id="6hqFpWnimEl" role="1B3o_S" />
+        <node concept="3clFbS" id="6hqFpWnimEm" role="3clF47">
+          <node concept="3clFbF" id="6hqFpWniswU" role="3cqZAp">
+            <node concept="37vLTI" id="6hqFpWniswW" role="3clFbG">
+              <node concept="2OqwBi" id="6hqFpWnity6" role="37vLTJ">
+                <node concept="Xjq3P" id="6hqFpWnitLS" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6hqFpWnity9" role="2OqNvi">
+                  <ref role="2Oxat5" node="6hqFpWniswQ" resolve="node" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="6hqFpWnisx0" role="37vLTx">
+                <ref role="3cqZAo" node="6hqFpWnirzt" resolve="root" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6hqFpWniAci" role="3cqZAp">
+            <node concept="Xjq3P" id="6hqFpWniAcg" role="3clFbG" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7WKNeR8Rk61" role="jymVt" />
+      <node concept="3clFb_" id="7WKNeR8RsrK" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <property role="1EzhhJ" value="true" />
+        <node concept="3cqZAl" id="7WKNeR8RsrM" role="3clF45" />
+        <node concept="3Tm1VV" id="7WKNeR8RsrN" role="1B3o_S" />
+        <node concept="3clFbS" id="7WKNeR8RsrO" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="7WKNeR8RiMd" role="jymVt" />
+      <node concept="3Tm1VV" id="7WKNeR8RiDg" role="1B3o_S" />
+      <node concept="312cEg" id="6hqFpWnjd0A" role="jymVt">
+        <property role="TrG5h" value="trace" />
+        <node concept="3Tmbuc" id="7WKNeR8Ro7Y" role="1B3o_S" />
+        <node concept="10P_77" id="6hqFpWnjeks" role="1tU5fm" />
+        <node concept="3clFbT" id="6hqFpWnjeCv" role="33vP2m">
+          <property role="3clFbU" value="false" />
+        </node>
+      </node>
+      <node concept="312cEg" id="6hqFpWnfpcc" role="jymVt">
+        <property role="TrG5h" value="nodes" />
+        <node concept="3Tmbuc" id="7WKNeR8RUdJ" role="1B3o_S" />
+        <node concept="2I9FWS" id="6hqFpWniSgs" role="1tU5fm" />
+      </node>
+      <node concept="312cEg" id="6hqFpWniswQ" role="jymVt">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tmbuc" id="7WKNeR8S6E1" role="1B3o_S" />
+        <node concept="3Tqbb2" id="6hqFpWniswT" role="1tU5fm" />
+      </node>
+      <node concept="2tJIrI" id="7WKNeR8Syrl" role="jymVt" />
+      <node concept="312cEg" id="6hqFpWnfwwm" role="jymVt">
+        <property role="TrG5h" value="editorComponent" />
+        <node concept="3Tmbuc" id="7WKNeR8Sxpp" role="1B3o_S" />
+        <node concept="3uibUv" id="6hqFpWnfKMX" role="1tU5fm">
+          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+        </node>
+      </node>
+      <node concept="312cEg" id="6hqFpWnfkNg" role="jymVt">
+        <property role="TrG5h" value="mpsProject" />
+        <node concept="3Tmbuc" id="7WKNeR8SxI_" role="1B3o_S" />
+        <node concept="3uibUv" id="6hqFpWnflog" role="1tU5fm">
+          <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+        </node>
+      </node>
+      <node concept="312cEg" id="6hqFpWnfoA9" role="jymVt">
+        <property role="TrG5h" value="ideaProject" />
+        <node concept="3Tmbuc" id="7WKNeR8SyiE" role="1B3o_S" />
+        <node concept="3uibUv" id="6hqFpWnfoT0" role="1tU5fm">
+          <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="6hqFpWni6$M" role="jymVt" />
     <node concept="312cEu" id="6hqFpWnfk0_" role="jymVt">
       <property role="2bfB8j" value="false" />
@@ -30824,134 +31089,21 @@
         <node concept="3cqZAl" id="6hqFpWnfQyn" role="3clF45" />
         <node concept="3Tm1VV" id="6hqFpWnfQyo" role="1B3o_S" />
         <node concept="3clFbS" id="6hqFpWnfQyp" role="3clF47">
-          <node concept="3clFbF" id="6hqFpWnfTu3" role="3cqZAp">
-            <node concept="37vLTI" id="6hqFpWnfVjx" role="3clFbG">
-              <node concept="37vLTw" id="6hqFpWnfW3h" role="37vLTx">
-                <ref role="3cqZAo" node="6hqFpWnfRdo" resolve="editorComponent" />
-              </node>
-              <node concept="2OqwBi" id="6hqFpWnfT$r" role="37vLTJ">
-                <node concept="Xjq3P" id="6hqFpWnfTu1" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6hqFpWnfTLY" role="2OqNvi">
-                  <ref role="2Oxat5" node="6hqFpWnfwwm" resolve="editorComponent" />
-                </node>
-              </node>
+          <node concept="XkiVB" id="7WKNeR8SFHd" role="3cqZAp">
+            <ref role="37wK5l" node="7WKNeR8SByE" resolve="TypecheckingActions.AbstractAction" />
+            <node concept="37vLTw" id="7WKNeR8SGu9" role="37wK5m">
+              <ref role="3cqZAo" node="6hqFpWnfRdo" resolve="editorComponent" />
             </node>
-          </node>
-          <node concept="3clFbF" id="6hqFpWnfWEZ" role="3cqZAp">
-            <node concept="37vLTI" id="6hqFpWnfXIh" role="3clFbG">
-              <node concept="37vLTw" id="6hqFpWnfYoE" role="37vLTx">
-                <ref role="3cqZAo" node="6hqFpWnfRdq" resolve="mpsProject" />
-              </node>
-              <node concept="2OqwBi" id="6hqFpWnfWSc" role="37vLTJ">
-                <node concept="Xjq3P" id="6hqFpWnfWEX" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6hqFpWnfX67" role="2OqNvi">
-                  <ref role="2Oxat5" node="6hqFpWnfkNg" resolve="mpsProject" />
-                </node>
-              </node>
+            <node concept="37vLTw" id="7WKNeR8SH0j" role="37wK5m">
+              <ref role="3cqZAo" node="6hqFpWnfRdq" resolve="mpsProject" />
             </node>
-          </node>
-          <node concept="3clFbF" id="6hqFpWnfZ13" role="3cqZAp">
-            <node concept="37vLTI" id="6hqFpWnfZUG" role="3clFbG">
-              <node concept="37vLTw" id="6hqFpWng3d7" role="37vLTx">
-                <ref role="3cqZAo" node="6hqFpWnfRf1" resolve="ideaProject" />
-              </node>
-              <node concept="2OqwBi" id="6hqFpWnfZhP" role="37vLTJ">
-                <node concept="Xjq3P" id="6hqFpWnfZ11" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6hqFpWnfZvQ" role="2OqNvi">
-                  <ref role="2Oxat5" node="6hqFpWnfoA9" resolve="ideaProject" />
-                </node>
-              </node>
+            <node concept="37vLTw" id="7WKNeR8SHyB" role="37wK5m">
+              <ref role="3cqZAo" node="6hqFpWnfRf1" resolve="ideaProject" />
             </node>
           </node>
         </node>
       </node>
       <node concept="2tJIrI" id="6hqFpWnfP_s" role="jymVt" />
-      <node concept="3clFb_" id="6hqFpWnimEi" role="jymVt">
-        <property role="TrG5h" value="forRoot" />
-        <node concept="37vLTG" id="6hqFpWnirzt" role="3clF46">
-          <property role="TrG5h" value="root" />
-          <node concept="3Tqbb2" id="6hqFpWnisvm" role="1tU5fm" />
-        </node>
-        <node concept="3uibUv" id="6hqFpWninEi" role="3clF45">
-          <ref role="3uigEE" node="6hqFpWnfk0_" resolve="TypecheckingActions.MarkTypes" />
-        </node>
-        <node concept="3Tm1VV" id="6hqFpWnimEl" role="1B3o_S" />
-        <node concept="3clFbS" id="6hqFpWnimEm" role="3clF47">
-          <node concept="3clFbF" id="6hqFpWniswU" role="3cqZAp">
-            <node concept="37vLTI" id="6hqFpWniswW" role="3clFbG">
-              <node concept="2OqwBi" id="6hqFpWnity6" role="37vLTJ">
-                <node concept="Xjq3P" id="6hqFpWnitLS" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6hqFpWnity9" role="2OqNvi">
-                  <ref role="2Oxat5" node="6hqFpWniswQ" resolve="root" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="6hqFpWnisx0" role="37vLTx">
-                <ref role="3cqZAo" node="6hqFpWnirzt" resolve="root" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="6hqFpWniAci" role="3cqZAp">
-            <node concept="Xjq3P" id="6hqFpWniAcg" role="3clFbG" />
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6hqFpWnilCe" role="jymVt" />
-      <node concept="3clFb_" id="6hqFpWniBeE" role="jymVt">
-        <property role="TrG5h" value="forNodes" />
-        <node concept="37vLTG" id="6hqFpWniEgR" role="3clF46">
-          <property role="TrG5h" value="nodes" />
-          <node concept="2I9FWS" id="6hqFpWniZ5l" role="1tU5fm" />
-        </node>
-        <node concept="3uibUv" id="6hqFpWniCgm" role="3clF45">
-          <ref role="3uigEE" node="6hqFpWnfk0_" resolve="TypecheckingActions.MarkTypes" />
-        </node>
-        <node concept="3Tm1VV" id="6hqFpWniBeH" role="1B3o_S" />
-        <node concept="3clFbS" id="6hqFpWniBeI" role="3clF47">
-          <node concept="3clFbF" id="6hqFpWniFVp" role="3cqZAp">
-            <node concept="37vLTI" id="6hqFpWniIps" role="3clFbG">
-              <node concept="37vLTw" id="6hqFpWniIHR" role="37vLTx">
-                <ref role="3cqZAo" node="6hqFpWniEgR" resolve="nodes" />
-              </node>
-              <node concept="2OqwBi" id="6hqFpWniGgy" role="37vLTJ">
-                <node concept="Xjq3P" id="6hqFpWniFVo" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6hqFpWniI3i" role="2OqNvi">
-                  <ref role="2Oxat5" node="6hqFpWnfpcc" resolve="nodes" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="6hqFpWniJaS" role="3cqZAp">
-            <node concept="Xjq3P" id="6hqFpWniJaQ" role="3clFbG" />
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6hqFpWnj6tM" role="jymVt" />
-      <node concept="3clFb_" id="6hqFpWnj7B_" role="jymVt">
-        <property role="TrG5h" value="withTrace" />
-        <node concept="3uibUv" id="6hqFpWnj8Je" role="3clF45">
-          <ref role="3uigEE" node="6hqFpWnfk0_" resolve="TypecheckingActions.MarkTypes" />
-        </node>
-        <node concept="3Tm1VV" id="6hqFpWnj7BC" role="1B3o_S" />
-        <node concept="3clFbS" id="6hqFpWnj7BD" role="3clF47">
-          <node concept="3clFbF" id="6hqFpWnjqv5" role="3cqZAp">
-            <node concept="37vLTI" id="6hqFpWnjroM" role="3clFbG">
-              <node concept="3clFbT" id="6hqFpWnjrHa" role="37vLTx">
-                <property role="3clFbU" value="true" />
-              </node>
-              <node concept="2OqwBi" id="6hqFpWnjqOk" role="37vLTJ">
-                <node concept="Xjq3P" id="6hqFpWnjqv4" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6hqFpWnjqVv" role="2OqNvi">
-                  <ref role="2Oxat5" node="6hqFpWnjd0A" resolve="trace" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="6hqFpWnjsgb" role="3cqZAp">
-            <node concept="Xjq3P" id="6hqFpWnjsg9" role="3clFbG" />
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6hqFpWnilFe" role="jymVt" />
       <node concept="3clFb_" id="6hqFpWnfk$G" role="jymVt">
         <property role="TrG5h" value="execute" />
         <node concept="3cqZAl" id="6hqFpWnfk$I" role="3clF45" />
@@ -31040,7 +31192,7 @@
                       <node concept="2OqwBi" id="HOeeeUdyYE" role="37wK5m">
                         <node concept="Xjq3P" id="HOeeeUdyYF" role="2Oq$k0" />
                         <node concept="2OwXpG" id="HOeeeUdyYG" role="2OqNvi">
-                          <ref role="2Oxat5" node="6hqFpWniswQ" resolve="root" />
+                          <ref role="2Oxat5" node="6hqFpWniswQ" resolve="node" />
                         </node>
                       </node>
                       <node concept="37vLTw" id="HOeeeUdyYH" role="37wK5m">
@@ -31153,7 +31305,7 @@
                           <ref role="3cqZAo" node="6hqFpWnfpwq" resolve="repository" />
                         </node>
                         <node concept="37vLTw" id="HOeeeUdTOb" role="37wK5m">
-                          <ref role="3cqZAo" node="6hqFpWniswQ" resolve="root" />
+                          <ref role="3cqZAo" node="6hqFpWniswQ" resolve="node" />
                         </node>
                       </node>
                     </node>
@@ -31164,7 +31316,7 @@
             <node concept="3y3z36" id="HOeeeUcZrB" role="3clFbw">
               <node concept="10Nm6u" id="HOeeeUcZFj" role="3uHU7w" />
               <node concept="37vLTw" id="HOeeeUcYGY" role="3uHU7B">
-                <ref role="3cqZAo" node="6hqFpWniswQ" resolve="root" />
+                <ref role="3cqZAo" node="6hqFpWniswQ" resolve="node" />
               </node>
             </node>
           </node>
@@ -31302,46 +31454,10 @@
         </node>
       </node>
       <node concept="2tJIrI" id="6hqFpWnfk8d" role="jymVt" />
-      <node concept="312cEg" id="6hqFpWnfpcc" role="jymVt">
-        <property role="TrG5h" value="nodes" />
-        <node concept="3Tm6S6" id="6hqFpWnfpcd" role="1B3o_S" />
-        <node concept="2I9FWS" id="6hqFpWniSgs" role="1tU5fm" />
-      </node>
-      <node concept="312cEg" id="6hqFpWniswQ" role="jymVt">
-        <property role="TrG5h" value="root" />
-        <node concept="3Tm6S6" id="6hqFpWniswR" role="1B3o_S" />
-        <node concept="3Tqbb2" id="6hqFpWniswT" role="1tU5fm" />
-      </node>
-      <node concept="312cEg" id="6hqFpWnfwwm" role="jymVt">
-        <property role="TrG5h" value="editorComponent" />
-        <node concept="3Tm6S6" id="6hqFpWnfwwn" role="1B3o_S" />
-        <node concept="3uibUv" id="6hqFpWnfKMX" role="1tU5fm">
-          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-        </node>
-      </node>
-      <node concept="312cEg" id="6hqFpWnfkNg" role="jymVt">
-        <property role="TrG5h" value="mpsProject" />
-        <node concept="3Tm6S6" id="6hqFpWnfkNh" role="1B3o_S" />
-        <node concept="3uibUv" id="6hqFpWnflog" role="1tU5fm">
-          <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-        </node>
-      </node>
-      <node concept="312cEg" id="6hqFpWnfoA9" role="jymVt">
-        <property role="TrG5h" value="ideaProject" />
-        <node concept="3Tm6S6" id="6hqFpWnfoAa" role="1B3o_S" />
-        <node concept="3uibUv" id="6hqFpWnfoT0" role="1tU5fm">
-          <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="312cEg" id="6hqFpWnjd0A" role="jymVt">
-        <property role="TrG5h" value="trace" />
-        <node concept="3Tm6S6" id="6hqFpWnjd0B" role="1B3o_S" />
-        <node concept="10P_77" id="6hqFpWnjeks" role="1tU5fm" />
-        <node concept="3clFbT" id="6hqFpWnjeCv" role="33vP2m">
-          <property role="3clFbU" value="false" />
-        </node>
-      </node>
       <node concept="3Tm1VV" id="6hqFpWnfk0A" role="1B3o_S" />
+      <node concept="3uibUv" id="7WKNeR8RmeF" role="1zkMxy">
+        <ref role="3uigEE" node="7WKNeR8RiDf" resolve="TypecheckingActions.AbstractAction" />
+      </node>
     </node>
     <node concept="2tJIrI" id="4vBwiiVApeL" role="jymVt" />
     <node concept="312cEu" id="4vBwiiVz_UL" role="jymVt">
@@ -31376,6 +31492,18 @@
         <node concept="3cqZAl" id="4vBwiiVz_UU" role="3clF45" />
         <node concept="3Tm1VV" id="4vBwiiVz_UV" role="1B3o_S" />
         <node concept="3clFbS" id="4vBwiiVz_UW" role="3clF47">
+          <node concept="XkiVB" id="7WKNeR8SHAV" role="3cqZAp">
+            <ref role="37wK5l" node="7WKNeR8SByE" resolve="TypecheckingActions.AbstractAction" />
+            <node concept="37vLTw" id="7WKNeR8SHAW" role="37wK5m">
+              <ref role="3cqZAo" node="4vBwiiVz_UO" resolve="editorComponent" />
+            </node>
+            <node concept="37vLTw" id="7WKNeR8SHAX" role="37wK5m">
+              <ref role="3cqZAo" node="4vBwiiVz_UQ" resolve="mpsProject" />
+            </node>
+            <node concept="37vLTw" id="7WKNeR8SHAY" role="37wK5m">
+              <ref role="3cqZAo" node="4vBwiiVz_US" resolve="ideaProject" />
+            </node>
+          </node>
           <node concept="3clFbF" id="4vBwiiV$3BJ" role="3cqZAp">
             <node concept="37vLTI" id="4vBwiiV$3BL" role="3clFbG">
               <node concept="2OqwBi" id="4vBwiiV$4A1" role="37vLTJ">
@@ -31389,104 +31517,9 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="4vBwiiVz_UX" role="3cqZAp">
-            <node concept="37vLTI" id="4vBwiiVz_UY" role="3clFbG">
-              <node concept="37vLTw" id="4vBwiiVz_UZ" role="37vLTx">
-                <ref role="3cqZAo" node="4vBwiiVz_UO" resolve="editorComponent" />
-              </node>
-              <node concept="2OqwBi" id="4vBwiiVz_V0" role="37vLTJ">
-                <node concept="Xjq3P" id="4vBwiiVz_V1" role="2Oq$k0" />
-                <node concept="2OwXpG" id="4vBwiiVz_V2" role="2OqNvi">
-                  <ref role="2Oxat5" node="4vBwiiVz_XY" resolve="editorComponent" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="4vBwiiVz_V3" role="3cqZAp">
-            <node concept="37vLTI" id="4vBwiiVz_V4" role="3clFbG">
-              <node concept="37vLTw" id="4vBwiiVz_V5" role="37vLTx">
-                <ref role="3cqZAo" node="4vBwiiVz_UQ" resolve="mpsProject" />
-              </node>
-              <node concept="2OqwBi" id="4vBwiiVz_V6" role="37vLTJ">
-                <node concept="Xjq3P" id="4vBwiiVz_V7" role="2Oq$k0" />
-                <node concept="2OwXpG" id="4vBwiiVz_V8" role="2OqNvi">
-                  <ref role="2Oxat5" node="4vBwiiVz_Y1" resolve="mpsProject" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="4vBwiiVz_V9" role="3cqZAp">
-            <node concept="37vLTI" id="4vBwiiVz_Va" role="3clFbG">
-              <node concept="37vLTw" id="4vBwiiVz_Vb" role="37vLTx">
-                <ref role="3cqZAo" node="4vBwiiVz_US" resolve="ideaProject" />
-              </node>
-              <node concept="2OqwBi" id="4vBwiiVz_Vc" role="37vLTJ">
-                <node concept="Xjq3P" id="4vBwiiVz_Vd" role="2Oq$k0" />
-                <node concept="2OwXpG" id="4vBwiiVz_Ve" role="2OqNvi">
-                  <ref role="2Oxat5" node="4vBwiiVz_Y4" resolve="ideaProject" />
-                </node>
-              </node>
-            </node>
-          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="4vBwiiVz_Vf" role="jymVt" />
-      <node concept="3clFb_" id="4vBwiiVz_Vg" role="jymVt">
-        <property role="TrG5h" value="forNode" />
-        <node concept="37vLTG" id="4vBwiiVz_Vh" role="3clF46">
-          <property role="TrG5h" value="node" />
-          <node concept="3Tqbb2" id="4vBwiiVz_Vi" role="1tU5fm" />
-        </node>
-        <node concept="3uibUv" id="4vBwiiVz_Vj" role="3clF45">
-          <ref role="3uigEE" node="4vBwiiVz_UL" resolve="TypecheckingActions.ShowType" />
-        </node>
-        <node concept="3Tm1VV" id="4vBwiiVz_Vk" role="1B3o_S" />
-        <node concept="3clFbS" id="4vBwiiVz_Vl" role="3clF47">
-          <node concept="3clFbF" id="4vBwiiVz_Vm" role="3cqZAp">
-            <node concept="37vLTI" id="4vBwiiVz_Vn" role="3clFbG">
-              <node concept="2OqwBi" id="4vBwiiVz_Vo" role="37vLTJ">
-                <node concept="Xjq3P" id="4vBwiiVz_Vp" role="2Oq$k0" />
-                <node concept="2OwXpG" id="4vBwiiVz_Vq" role="2OqNvi">
-                  <ref role="2Oxat5" node="4vBwiiVz_XV" resolve="node" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="4vBwiiVz_Vr" role="37vLTx">
-                <ref role="3cqZAo" node="4vBwiiVz_Vh" resolve="node" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="4vBwiiVz_Vs" role="3cqZAp">
-            <node concept="Xjq3P" id="4vBwiiVz_Vt" role="3clFbG" />
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="4vBwiiVz_VH" role="jymVt" />
-      <node concept="3clFb_" id="4vBwiiVz_VI" role="jymVt">
-        <property role="TrG5h" value="withTrace" />
-        <node concept="3uibUv" id="4vBwiiVz_VJ" role="3clF45">
-          <ref role="3uigEE" node="4vBwiiVz_UL" resolve="TypecheckingActions.ShowType" />
-        </node>
-        <node concept="3Tm1VV" id="4vBwiiVz_VK" role="1B3o_S" />
-        <node concept="3clFbS" id="4vBwiiVz_VL" role="3clF47">
-          <node concept="3clFbF" id="4vBwiiVz_VM" role="3cqZAp">
-            <node concept="37vLTI" id="4vBwiiVz_VN" role="3clFbG">
-              <node concept="3clFbT" id="4vBwiiVz_VO" role="37vLTx">
-                <property role="3clFbU" value="true" />
-              </node>
-              <node concept="2OqwBi" id="4vBwiiVz_VP" role="37vLTJ">
-                <node concept="Xjq3P" id="4vBwiiVz_VQ" role="2Oq$k0" />
-                <node concept="2OwXpG" id="4vBwiiVz_VR" role="2OqNvi">
-                  <ref role="2Oxat5" node="4vBwiiVz_Y7" resolve="trace" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="4vBwiiVz_VS" role="3cqZAp">
-            <node concept="Xjq3P" id="4vBwiiVz_VT" role="3clFbG" />
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="4vBwiiVz_VU" role="jymVt" />
       <node concept="3clFb_" id="4vBwiiVz_VV" role="jymVt">
         <property role="TrG5h" value="execute" />
         <node concept="3cqZAl" id="4vBwiiVz_VW" role="3clF45" />
@@ -31502,7 +31535,7 @@
                 <node concept="2OqwBi" id="4vBwiiVz_W9" role="2Oq$k0">
                   <node concept="Xjq3P" id="4vBwiiVz_Wa" role="2Oq$k0" />
                   <node concept="2OwXpG" id="4vBwiiVz_Wb" role="2OqNvi">
-                    <ref role="2Oxat5" node="4vBwiiVz_Y1" resolve="mpsProject" />
+                    <ref role="2Oxat5" node="6hqFpWnfkNg" resolve="mpsProject" />
                   </node>
                 </node>
                 <node concept="liA8E" id="4vBwiiVz_Wc" role="2OqNvi">
@@ -31524,7 +31557,7 @@
                     <node concept="Tc6Ow" id="4vBwiiVzQtY" role="2ShVmc">
                       <node concept="3Tqbb2" id="4vBwiiVzSVd" role="HW$YZ" />
                       <node concept="37vLTw" id="4vBwiiVzXGc" role="HW$Y0">
-                        <ref role="3cqZAo" node="4vBwiiVz_XV" resolve="node" />
+                        <ref role="3cqZAo" node="6hqFpWniswQ" resolve="node" />
                       </node>
                     </node>
                   </node>
@@ -31543,7 +31576,7 @@
               </node>
               <node concept="3K4zz7" id="4vBwiiVz_Wz" role="33vP2m">
                 <node concept="37vLTw" id="4vBwiiVz_W$" role="3K4Cdx">
-                  <ref role="3cqZAo" node="4vBwiiVz_Y7" resolve="trace" />
+                  <ref role="3cqZAo" node="6hqFpWnjd0A" resolve="trace" />
                 </node>
                 <node concept="2ShNRf" id="4vBwiiVz_W_" role="3K4GZi">
                   <node concept="1pGfFk" id="4vBwiiVz_WA" role="2ShVmc">
@@ -31557,10 +31590,10 @@
                   <node concept="1pGfFk" id="4vBwiiVz_WD" role="2ShVmc">
                     <ref role="37wK5l" node="55Q$YFtIVZ9" resolve="EvaluateRulesWithTraceStep" />
                     <node concept="37vLTw" id="4vBwiiVz_WE" role="37wK5m">
-                      <ref role="3cqZAo" node="4vBwiiVz_XY" resolve="editorComponent" />
+                      <ref role="3cqZAo" node="6hqFpWnfwwm" resolve="editorComponent" />
                     </node>
                     <node concept="37vLTw" id="4vBwiiVz_WF" role="37wK5m">
-                      <ref role="3cqZAo" node="4vBwiiVz_Y1" resolve="mpsProject" />
+                      <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
                     </node>
                   </node>
                 </node>
@@ -31575,7 +31608,7 @@
               </node>
               <node concept="3K4zz7" id="4vBwiiVz_WJ" role="33vP2m">
                 <node concept="37vLTw" id="4vBwiiVz_WK" role="3K4Cdx">
-                  <ref role="3cqZAo" node="4vBwiiVz_Y7" resolve="trace" />
+                  <ref role="3cqZAo" node="6hqFpWnjd0A" resolve="trace" />
                 </node>
                 <node concept="2ShNRf" id="4vBwiiVz_WL" role="3K4GZi">
                   <node concept="1pGfFk" id="4vBwiiVz_WM" role="2ShVmc">
@@ -31589,7 +31622,7 @@
                   <node concept="1pGfFk" id="4vBwiiVz_WP" role="2ShVmc">
                     <ref role="37wK5l" node="6IQb_RxxY2V" resolve="CollectTypesWithTraceStep" />
                     <node concept="37vLTw" id="4vBwiiVz_WQ" role="37wK5m">
-                      <ref role="3cqZAo" node="4vBwiiVz_Y1" resolve="mpsProject" />
+                      <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
                     </node>
                   </node>
                 </node>
@@ -31608,7 +31641,7 @@
                   <node concept="2OqwBi" id="6kEuCh$5KrI" role="37wK5m">
                     <node concept="2JrnkZ" id="6kEuCh$5JKG" role="2Oq$k0">
                       <node concept="37vLTw" id="6kEuCh$5I1F" role="2JrQYb">
-                        <ref role="3cqZAo" node="4vBwiiVz_XV" resolve="node" />
+                        <ref role="3cqZAo" node="6hqFpWniswQ" resolve="node" />
                       </node>
                     </node>
                     <node concept="liA8E" id="6kEuCh$5LeT" role="2OqNvi">
@@ -31619,13 +31652,13 @@
                     <ref role="3cqZAo" node="4vBwiiV$3BF" resolve="cell" />
                   </node>
                   <node concept="37vLTw" id="4vBwiiVAn8k" role="37wK5m">
-                    <ref role="3cqZAo" node="4vBwiiVz_XY" resolve="editorComponent" />
+                    <ref role="3cqZAo" node="6hqFpWnfwwm" resolve="editorComponent" />
                   </node>
                   <node concept="37vLTw" id="4vBwiiVAn8m" role="37wK5m">
-                    <ref role="3cqZAo" node="4vBwiiVz_Y1" resolve="mpsProject" />
+                    <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
                   </node>
                   <node concept="37vLTw" id="4vBwiiVAsUJ" role="37wK5m">
-                    <ref role="3cqZAo" node="4vBwiiVz_Y4" resolve="ideaProject" />
+                    <ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
                   </node>
                 </node>
               </node>
@@ -31664,7 +31697,7 @@
                                         <ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
                                         <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
                                         <node concept="37vLTw" id="4vBwiiVz_Xl" role="37wK5m">
-                                          <ref role="3cqZAo" node="4vBwiiVz_Y4" resolve="ideaProject" />
+                                          <ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="4vBwiiVz_Xm" role="2OqNvi">
@@ -31686,7 +31719,7 @@
                               </node>
                               <node concept="2OqwBi" id="4vBwiiVz_Xq" role="ukAjM">
                                 <node concept="37vLTw" id="4vBwiiVz_Xr" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4vBwiiVz_Y1" resolve="mpsProject" />
+                                  <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
                                 </node>
                                 <node concept="liA8E" id="4vBwiiVz_Xs" role="2OqNvi">
                                   <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
@@ -31714,7 +31747,7 @@
                                         <ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
                                         <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
                                         <node concept="37vLTw" id="4vBwiiVz_XD" role="37wK5m">
-                                          <ref role="3cqZAo" node="4vBwiiVz_Y4" resolve="ideaProject" />
+                                          <ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="4vBwiiVz_XE" role="2OqNvi">
@@ -31736,7 +31769,7 @@
                               </node>
                               <node concept="2OqwBi" id="4vBwiiVz_XI" role="ukAjM">
                                 <node concept="37vLTw" id="4vBwiiVz_XJ" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4vBwiiVz_Y1" resolve="mpsProject" />
+                                  <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
                                 </node>
                                 <node concept="liA8E" id="4vBwiiVz_XK" role="2OqNvi">
                                   <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
@@ -31771,18 +31804,6 @@
         </node>
       </node>
       <node concept="2tJIrI" id="4vBwiiVz_XR" role="jymVt" />
-      <node concept="312cEg" id="4vBwiiVz_XV" role="jymVt">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tm6S6" id="4vBwiiVz_XW" role="1B3o_S" />
-        <node concept="3Tqbb2" id="4vBwiiVz_XX" role="1tU5fm" />
-      </node>
-      <node concept="312cEg" id="4vBwiiVz_XY" role="jymVt">
-        <property role="TrG5h" value="editorComponent" />
-        <node concept="3Tm6S6" id="4vBwiiVz_XZ" role="1B3o_S" />
-        <node concept="3uibUv" id="4vBwiiVz_Y0" role="1tU5fm">
-          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-        </node>
-      </node>
       <node concept="312cEg" id="4vBwiiV$3BF" role="jymVt">
         <property role="TrG5h" value="cell" />
         <node concept="3Tm6S6" id="4vBwiiV$3BG" role="1B3o_S" />
@@ -31790,29 +31811,391 @@
           <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
         </node>
       </node>
-      <node concept="312cEg" id="4vBwiiVz_Y1" role="jymVt">
-        <property role="TrG5h" value="mpsProject" />
-        <node concept="3Tm6S6" id="4vBwiiVz_Y2" role="1B3o_S" />
-        <node concept="3uibUv" id="4vBwiiVz_Y3" role="1tU5fm">
-          <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-        </node>
-      </node>
-      <node concept="312cEg" id="4vBwiiVz_Y4" role="jymVt">
-        <property role="TrG5h" value="ideaProject" />
-        <node concept="3Tm6S6" id="4vBwiiVz_Y5" role="1B3o_S" />
-        <node concept="3uibUv" id="4vBwiiVz_Y6" role="1tU5fm">
-          <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="312cEg" id="4vBwiiVz_Y7" role="jymVt">
-        <property role="TrG5h" value="trace" />
-        <node concept="3Tm6S6" id="4vBwiiVz_Y8" role="1B3o_S" />
-        <node concept="10P_77" id="4vBwiiVz_Y9" role="1tU5fm" />
-        <node concept="3clFbT" id="4vBwiiVz_Ya" role="33vP2m">
-          <property role="3clFbU" value="false" />
-        </node>
-      </node>
       <node concept="3Tm1VV" id="4vBwiiVz_Yb" role="1B3o_S" />
+      <node concept="3uibUv" id="7WKNeR8RCvp" role="1zkMxy">
+        <ref role="3uigEE" node="7WKNeR8RiDf" resolve="TypecheckingActions.AbstractAction" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR8SUdS" role="jymVt" />
+    <node concept="312cEu" id="7WKNeR8SQxg" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="LaunchQuery" />
+      <node concept="2tJIrI" id="7WKNeR8SQxh" role="jymVt" />
+      <node concept="3clFbW" id="7WKNeR8SQxi" role="jymVt">
+        <node concept="37vLTG" id="7WKNeR9ahrT" role="3clF46">
+          <property role="TrG5h" value="queryFqName" />
+          <node concept="17QB3L" id="7WKNeR9ahN6" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="7WKNeR8SQxl" role="3clF46">
+          <property role="TrG5h" value="editorComponent" />
+          <node concept="3uibUv" id="7WKNeR8SQxm" role="1tU5fm">
+            <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="7WKNeR8SQxn" role="3clF46">
+          <property role="TrG5h" value="mpsProject" />
+          <node concept="3uibUv" id="7WKNeR8SQxo" role="1tU5fm">
+            <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="7WKNeR8SQxp" role="3clF46">
+          <property role="TrG5h" value="ideaProject" />
+          <node concept="3uibUv" id="7WKNeR8SQxq" role="1tU5fm">
+            <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="7WKNeR8SQxr" role="3clF45" />
+        <node concept="3Tm1VV" id="7WKNeR8SQxs" role="1B3o_S" />
+        <node concept="3clFbS" id="7WKNeR8SQxt" role="3clF47">
+          <node concept="XkiVB" id="7WKNeR8SQxu" role="3cqZAp">
+            <ref role="37wK5l" node="7WKNeR8SByE" resolve="TypecheckingActions.AbstractAction" />
+            <node concept="37vLTw" id="7WKNeR8SQxv" role="37wK5m">
+              <ref role="3cqZAo" node="7WKNeR8SQxl" resolve="editorComponent" />
+            </node>
+            <node concept="37vLTw" id="7WKNeR8SQxw" role="37wK5m">
+              <ref role="3cqZAo" node="7WKNeR8SQxn" resolve="mpsProject" />
+            </node>
+            <node concept="37vLTw" id="7WKNeR8SQxx" role="37wK5m">
+              <ref role="3cqZAo" node="7WKNeR8SQxp" resolve="ideaProject" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="7WKNeR9fm7f" role="3cqZAp">
+            <node concept="37vLTI" id="7WKNeR9fm7h" role="3clFbG">
+              <node concept="2OqwBi" id="7WKNeR9fnha" role="37vLTJ">
+                <node concept="Xjq3P" id="7WKNeR9fnxk" role="2Oq$k0" />
+                <node concept="2OwXpG" id="7WKNeR9fnhd" role="2OqNvi">
+                  <ref role="2Oxat5" node="7WKNeR9fm7b" resolve="queryFqName" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="7WKNeR9fm7l" role="37vLTx">
+                <ref role="3cqZAo" node="7WKNeR9ahrT" resolve="queryFqName" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7WKNeR8SQxC" role="jymVt" />
+      <node concept="3clFb_" id="7WKNeR8SQxD" role="jymVt">
+        <property role="TrG5h" value="execute" />
+        <node concept="3cqZAl" id="7WKNeR8SQxE" role="3clF45" />
+        <node concept="3Tm1VV" id="7WKNeR8SQxF" role="1B3o_S" />
+        <node concept="3clFbS" id="7WKNeR8SQxG" role="3clF47">
+          <node concept="3cpWs8" id="7WKNeR8SQxH" role="3cqZAp">
+            <node concept="3cpWsn" id="7WKNeR8SQxI" role="3cpWs9">
+              <property role="TrG5h" value="repository" />
+              <node concept="3uibUv" id="7WKNeR8SQxJ" role="1tU5fm">
+                <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+              </node>
+              <node concept="2OqwBi" id="7WKNeR8SQxK" role="33vP2m">
+                <node concept="2OqwBi" id="7WKNeR8SQxL" role="2Oq$k0">
+                  <node concept="Xjq3P" id="7WKNeR8SQxM" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="7WKNeR8SQxN" role="2OqNvi">
+                    <ref role="2Oxat5" node="6hqFpWnfkNg" resolve="mpsProject" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="7WKNeR8SQxO" role="2OqNvi">
+                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="7WKNeR8TcXr" role="3cqZAp">
+            <node concept="3cpWsn" id="7WKNeR8TcXs" role="3cpWs9">
+              <property role="TrG5h" value="steps" />
+              <node concept="_YKpA" id="7WKNeR8TcXt" role="1tU5fm">
+                <node concept="3uibUv" id="7WKNeR8TcXu" role="_ZDj9">
+                  <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
+                </node>
+              </node>
+              <node concept="2ShNRf" id="7WKNeR8TcXv" role="33vP2m">
+                <node concept="Tc6Ow" id="7WKNeR8TcXw" role="2ShVmc">
+                  <node concept="3uibUv" id="7WKNeR8TcXx" role="HW$YZ">
+                    <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7WKNeR8TcXy" role="3cqZAp">
+            <node concept="2OqwBi" id="7WKNeR8TcXz" role="3clFbG">
+              <node concept="37vLTw" id="7WKNeR8TcX$" role="2Oq$k0">
+                <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
+              </node>
+              <node concept="TSZUe" id="7WKNeR8TcX_" role="2OqNvi">
+                <node concept="3K4zz7" id="7WKNeR8TcXA" role="25WWJ7">
+                  <node concept="3y3z36" id="7WKNeR8TcXB" role="3K4Cdx">
+                    <node concept="10Nm6u" id="7WKNeR8TcXC" role="3uHU7w" />
+                    <node concept="37vLTw" id="7WKNeR8TcXD" role="3uHU7B">
+                      <ref role="3cqZAo" node="6hqFpWnfpcc" resolve="nodes" />
+                    </node>
+                  </node>
+                  <node concept="2ShNRf" id="7WKNeR8TcXE" role="3K4E3e">
+                    <node concept="1pGfFk" id="7WKNeR8TcXF" role="2ShVmc">
+                      <ref role="37wK5l" to="tj24:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
+                      <node concept="37vLTw" id="7WKNeR9foS9" role="37wK5m">
+                        <ref role="3cqZAo" node="7WKNeR9fm7b" resolve="queryFqName" />
+                      </node>
+                      <node concept="2OqwBi" id="7WKNeR8TcXG" role="37wK5m">
+                        <node concept="Xjq3P" id="7WKNeR8TcXH" role="2Oq$k0" />
+                        <node concept="2OwXpG" id="7WKNeR8TcXI" role="2OqNvi">
+                          <ref role="2Oxat5" node="6hqFpWnfpcc" resolve="nodes" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="7WKNeR8ThOi" role="37wK5m">
+                        <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2ShNRf" id="7WKNeR8TcXK" role="3K4GZi">
+                    <node concept="1pGfFk" id="7WKNeR8TcXL" role="2ShVmc">
+                      <ref role="37wK5l" to="tj24:7WKNeR9fh8C" resolve="ApplyTemplatesStep" />
+                      <node concept="37vLTw" id="7WKNeR9fpTe" role="37wK5m">
+                        <ref role="3cqZAo" node="7WKNeR9fm7b" resolve="queryFqName" />
+                      </node>
+                      <node concept="2OqwBi" id="7WKNeR8TcXM" role="37wK5m">
+                        <node concept="Xjq3P" id="7WKNeR8TcXN" role="2Oq$k0" />
+                        <node concept="2OwXpG" id="7WKNeR8TcXO" role="2OqNvi">
+                          <ref role="2Oxat5" node="6hqFpWniswQ" resolve="node" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="7WKNeR8Ti4j" role="37wK5m">
+                        <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7WKNeR8TcY8" role="3cqZAp">
+            <node concept="2OqwBi" id="7WKNeR8TcY9" role="3clFbG">
+              <node concept="37vLTw" id="7WKNeR8TcYa" role="2Oq$k0">
+                <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
+              </node>
+              <node concept="TSZUe" id="7WKNeR8TcYb" role="2OqNvi">
+                <node concept="3K4zz7" id="7WKNeR8TcYc" role="25WWJ7">
+                  <node concept="37vLTw" id="7WKNeR8TcYd" role="3K4Cdx">
+                    <ref role="3cqZAo" node="6hqFpWnjd0A" resolve="trace" />
+                  </node>
+                  <node concept="2ShNRf" id="7WKNeR8TcYe" role="3K4GZi">
+                    <node concept="1pGfFk" id="7WKNeR8TcYf" role="2ShVmc">
+                      <ref role="37wK5l" to="tj24:1pPth$lHpLU" resolve="EvaluateRulesStep" />
+                      <node concept="37vLTw" id="7WKNeR8TiOp" role="37wK5m">
+                        <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2ShNRf" id="7WKNeR8TcYh" role="3K4E3e">
+                    <node concept="1pGfFk" id="7WKNeR8TcYi" role="2ShVmc">
+                      <ref role="37wK5l" node="55Q$YFtIVZ9" resolve="EvaluateRulesWithTraceStep" />
+                      <node concept="37vLTw" id="7WKNeR8Ti$q" role="37wK5m">
+                        <ref role="3cqZAo" node="6hqFpWnfwwm" resolve="editorComponent" />
+                      </node>
+                      <node concept="37vLTw" id="7WKNeR8TcYk" role="37wK5m">
+                        <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7WKNeR8TcYl" role="3cqZAp">
+            <node concept="2OqwBi" id="7WKNeR8TcYm" role="3clFbG">
+              <node concept="37vLTw" id="7WKNeR8TcYn" role="2Oq$k0">
+                <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
+              </node>
+              <node concept="TSZUe" id="7WKNeR8TcYo" role="2OqNvi">
+                <node concept="3K4zz7" id="7WKNeR8TcYp" role="25WWJ7">
+                  <node concept="37vLTw" id="7WKNeR8TcYq" role="3K4Cdx">
+                    <ref role="3cqZAo" node="6hqFpWnjd0A" resolve="trace" />
+                  </node>
+                  <node concept="2ShNRf" id="7WKNeR8TcYr" role="3K4GZi">
+                    <node concept="1pGfFk" id="7WKNeR8TcYs" role="2ShVmc">
+                      <ref role="37wK5l" to="tj24:6IQb_RxlCdT" resolve="CollectTypesStep" />
+                      <node concept="37vLTw" id="7WKNeR8TjnO" role="37wK5m">
+                        <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2ShNRf" id="7WKNeR8TcYu" role="3K4E3e">
+                    <node concept="1pGfFk" id="7WKNeR8TcYv" role="2ShVmc">
+                      <ref role="37wK5l" node="6IQb_RxxY2V" resolve="CollectTypesWithTraceStep" />
+                      <node concept="37vLTw" id="7WKNeR8TcYw" role="37wK5m">
+                        <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7WKNeR8TcYx" role="3cqZAp">
+            <node concept="2OqwBi" id="7WKNeR8TcYy" role="3clFbG">
+              <node concept="37vLTw" id="7WKNeR8TcYz" role="2Oq$k0">
+                <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
+              </node>
+              <node concept="TSZUe" id="7WKNeR8TcY$" role="2OqNvi">
+                <node concept="2ShNRf" id="7WKNeR8TcY_" role="25WWJ7">
+                  <node concept="1pGfFk" id="7WKNeR8TcYA" role="2ShVmc">
+                    <ref role="37wK5l" node="1pPth$lGTrm" resolve="HighlightingStep" />
+                    <node concept="37vLTw" id="7WKNeR8TjKr" role="37wK5m">
+                      <ref role="3cqZAo" node="6hqFpWnfwwm" resolve="editorComponent" />
+                    </node>
+                    <node concept="2OqwBi" id="7WKNeR8TcYC" role="37wK5m">
+                      <node concept="Xjq3P" id="7WKNeR8TcYD" role="2Oq$k0" />
+                      <node concept="2OwXpG" id="7WKNeR8TcYE" role="2OqNvi">
+                        <ref role="2Oxat5" node="6hqFpWnfkNg" resolve="mpsProject" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="7WKNeR8SQyz" role="3cqZAp" />
+          <node concept="3clFbF" id="7WKNeR8SQy$" role="3cqZAp">
+            <node concept="2OqwBi" id="7WKNeR8SQy_" role="3clFbG">
+              <node concept="2ShNRf" id="7WKNeR8SQyA" role="2Oq$k0">
+                <node concept="1pGfFk" id="7WKNeR8SQyB" role="2ShVmc">
+                  <ref role="37wK5l" to="tj24:1pPth$lK1ZL" resolve="TypecheckingHelper" />
+                  <node concept="2ShNRf" id="7WKNeR8SQyC" role="37wK5m">
+                    <node concept="YeOm9" id="7WKNeR8SQyD" role="2ShVmc">
+                      <node concept="1Y3b0j" id="7WKNeR8SQyE" role="YeSDq">
+                        <property role="2bfB8j" value="true" />
+                        <ref role="1Y3XeK" to="tj24:3F6vMxqaxpm" resolve="TypecheckingHelper.ProgressCallback" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                        <node concept="3Tm1VV" id="7WKNeR8SQyF" role="1B3o_S" />
+                        <node concept="3clFb_" id="7WKNeR8SQyG" role="jymVt">
+                          <property role="TrG5h" value="ok" />
+                          <property role="1EzhhJ" value="false" />
+                          <property role="IEkAT" value="false" />
+                          <node concept="37vLTG" id="7WKNeR8SQyH" role="3clF46">
+                            <property role="TrG5h" value="message" />
+                            <node concept="17QB3L" id="7WKNeR8SQyI" role="1tU5fm" />
+                          </node>
+                          <node concept="3cqZAl" id="7WKNeR8SQyJ" role="3clF45" />
+                          <node concept="3Tm1VV" id="7WKNeR8SQyK" role="1B3o_S" />
+                          <node concept="3clFbS" id="7WKNeR8SQyL" role="3clF47">
+                            <node concept="1QHqEQ" id="7WKNeR8SQyM" role="3cqZAp">
+                              <node concept="1QHqEC" id="7WKNeR8SQyN" role="1QHqEI">
+                                <node concept="3clFbS" id="7WKNeR8SQyO" role="1bW5cS">
+                                  <node concept="3clFbF" id="7WKNeR8SQyP" role="3cqZAp">
+                                    <node concept="2OqwBi" id="7WKNeR8SQyQ" role="3clFbG">
+                                      <node concept="2YIFZM" id="7WKNeR8SQyR" role="2Oq$k0">
+                                        <ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
+                                        <node concept="37vLTw" id="7WKNeR8SQyS" role="37wK5m">
+                                          <ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="7WKNeR8SQyT" role="2OqNvi">
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
+                                        <node concept="Xl_RD" id="7WKNeR8SQyU" role="37wK5m">
+                                          <property role="Xl_RC" value="Activation Trace" />
+                                        </node>
+                                        <node concept="10M0yZ" id="7WKNeR8SQyV" role="37wK5m">
+                                          <ref role="3cqZAo" to="jkm4:~MessageType.INFO" resolve="INFO" />
+                                          <ref role="1PxDUh" to="jkm4:~MessageType" resolve="MessageType" />
+                                        </node>
+                                        <node concept="37vLTw" id="7WKNeR8SQyW" role="37wK5m">
+                                          <ref role="3cqZAo" node="7WKNeR8SQyH" resolve="message" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="2OqwBi" id="7WKNeR8SQyX" role="ukAjM">
+                                <node concept="37vLTw" id="7WKNeR8SQyY" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
+                                </node>
+                                <node concept="liA8E" id="7WKNeR8SQyZ" role="2OqNvi">
+                                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFb_" id="7WKNeR8SQz0" role="jymVt">
+                          <property role="TrG5h" value="failed" />
+                          <property role="1EzhhJ" value="false" />
+                          <node concept="37vLTG" id="7WKNeR8SQz1" role="3clF46">
+                            <property role="TrG5h" value="message" />
+                            <node concept="17QB3L" id="7WKNeR8SQz2" role="1tU5fm" />
+                          </node>
+                          <node concept="3cqZAl" id="7WKNeR8SQz3" role="3clF45" />
+                          <node concept="3Tm1VV" id="7WKNeR8SQz4" role="1B3o_S" />
+                          <node concept="3clFbS" id="7WKNeR8SQz5" role="3clF47">
+                            <node concept="1QHqEQ" id="7WKNeR8SQz6" role="3cqZAp">
+                              <node concept="1QHqEC" id="7WKNeR8SQz7" role="1QHqEI">
+                                <node concept="3clFbS" id="7WKNeR8SQz8" role="1bW5cS">
+                                  <node concept="3clFbF" id="7WKNeR8SQz9" role="3cqZAp">
+                                    <node concept="2OqwBi" id="7WKNeR8SQza" role="3clFbG">
+                                      <node concept="2YIFZM" id="7WKNeR8SQzb" role="2Oq$k0">
+                                        <ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
+                                        <node concept="37vLTw" id="7WKNeR8SQzc" role="37wK5m">
+                                          <ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="7WKNeR8SQzd" role="2OqNvi">
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
+                                        <node concept="Xl_RD" id="7WKNeR8SQze" role="37wK5m">
+                                          <property role="Xl_RC" value="Activation Trace" />
+                                        </node>
+                                        <node concept="10M0yZ" id="7WKNeR8SQzf" role="37wK5m">
+                                          <ref role="1PxDUh" to="jkm4:~MessageType" resolve="MessageType" />
+                                          <ref role="3cqZAo" to="jkm4:~MessageType.ERROR" resolve="ERROR" />
+                                        </node>
+                                        <node concept="37vLTw" id="7WKNeR8SQzg" role="37wK5m">
+                                          <ref role="3cqZAo" node="7WKNeR8SQz1" resolve="message" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="2OqwBi" id="7WKNeR8SQzh" role="ukAjM">
+                                <node concept="37vLTw" id="7WKNeR8SQzi" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
+                                </node>
+                                <node concept="liA8E" id="7WKNeR8SQzj" role="2OqNvi">
+                                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="7WKNeR8Tofu" role="37wK5m">
+                    <node concept="37vLTw" id="7WKNeR8Tofv" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
+                    </node>
+                    <node concept="3_kTaI" id="7WKNeR8Tofw" role="2OqNvi" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="7WKNeR8SQzo" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:1pPth$lNVW2" resolve="executeAsync" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="7WKNeR8SQzp" role="3cqZAp" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7WKNeR8T3De" role="jymVt" />
+      <node concept="3Tm1VV" id="7WKNeR8SQzu" role="1B3o_S" />
+      <node concept="3uibUv" id="7WKNeR8SQzv" role="1zkMxy">
+        <ref role="3uigEE" node="7WKNeR8RiDf" resolve="TypecheckingActions.AbstractAction" />
+      </node>
+      <node concept="312cEg" id="7WKNeR9fm7b" role="jymVt">
+        <property role="TrG5h" value="queryFqName" />
+        <node concept="3Tm6S6" id="7WKNeR9fm7c" role="1B3o_S" />
+        <node concept="17QB3L" id="7WKNeR9fm7e" role="1tU5fm" />
+      </node>
     </node>
     <node concept="2tJIrI" id="6hqFpWnfjsp" role="jymVt" />
     <node concept="3Tm1VV" id="6hqFpWnf9Mv" role="1B3o_S" />
@@ -31884,11 +32267,11 @@
                 </node>
               </node>
               <node concept="liA8E" id="6hqFpWnsKee" role="2OqNvi">
-                <ref role="37wK5l" node="6hqFpWnj7B_" resolve="withTrace" />
+                <ref role="37wK5l" node="7WKNeR8RobH" resolve="withTrace" />
               </node>
             </node>
             <node concept="liA8E" id="6hqFpWnsaiT" role="2OqNvi">
-              <ref role="37wK5l" node="6hqFpWnfk$G" resolve="execute" />
+              <ref role="37wK5l" node="7WKNeR8RsrK" resolve="execute" />
             </node>
           </node>
         </node>
@@ -32004,7 +32387,7 @@
               </node>
             </node>
             <node concept="liA8E" id="6hqFpWnsI$p" role="2OqNvi">
-              <ref role="37wK5l" node="6hqFpWnfk$G" resolve="execute" />
+              <ref role="37wK5l" node="7WKNeR8RsrK" resolve="execute" />
             </node>
           </node>
         </node>
@@ -32265,7 +32648,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6kEuChzZO9y" role="2OqNvi">
-                <ref role="37wK5l" node="4vBwiiVz_Vg" resolve="forNode" />
+                <ref role="37wK5l" node="6hqFpWnimEi" resolve="forNode" />
                 <node concept="2OqwBi" id="6kEuChzZOhj" role="37wK5m">
                   <node concept="2WthIp" id="6kEuChzZOhm" role="2Oq$k0" />
                   <node concept="1DTwFV" id="6kEuChzZOho" role="2OqNvi">
@@ -32275,7 +32658,7 @@
               </node>
             </node>
             <node concept="liA8E" id="6kEuChzZPaJ" role="2OqNvi">
-              <ref role="37wK5l" node="4vBwiiVz_VV" resolve="execute" />
+              <ref role="37wK5l" node="7WKNeR8RsrK" resolve="execute" />
             </node>
           </node>
         </node>
@@ -33880,5 +34263,195 @@
       </node>
     </node>
   </node>
+  <node concept="sE7Ow" id="7WKNeR8Q7e5">
+    <property role="3GE5qa" value="action" />
+    <property role="TrG5h" value="LaunchQuery" />
+    <property role="2uzpH1" value="Launch Query" />
+    <node concept="1DS2jV" id="7WKNeR8Ragq" role="1NuT2Z">
+      <property role="TrG5h" value="ideaProject" />
+      <ref role="1DUlNI" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
+      <node concept="1oajcY" id="7WKNeR8Ragr" role="1oa70y" />
+    </node>
+    <node concept="1DS2jV" id="7WKNeR8Rags" role="1NuT2Z">
+      <property role="TrG5h" value="mpsProject" />
+      <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
+      <node concept="1oajcY" id="7WKNeR8Ragt" role="1oa70y" />
+    </node>
+    <node concept="1DS2jV" id="7WKNeR8Ragu" role="1NuT2Z">
+      <property role="TrG5h" value="node" />
+      <ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.NODE" resolve="NODE" />
+      <node concept="1oajcY" id="7WKNeR8Ragv" role="1oa70y" />
+    </node>
+    <node concept="1DS2jV" id="7WKNeR8Ragw" role="1NuT2Z">
+      <property role="TrG5h" value="editorComponent" />
+      <ref role="1DUlNI" to="k3nr:~MPSEditorDataKeys.EDITOR_COMPONENT" resolve="EDITOR_COMPONENT" />
+      <node concept="1oajcY" id="7WKNeR8Ragx" role="1oa70y" />
+    </node>
+    <node concept="tnohg" id="7WKNeR8Q7e6" role="tncku">
+      <node concept="3clFbS" id="7WKNeR8Q7e7" role="2VODD2">
+        <node concept="3clFbF" id="7WKNeR8RdQp" role="3cqZAp">
+          <node concept="2YIFZM" id="7WKNeR8RdQq" role="3clFbG">
+            <ref role="1Pybhc" node="41ox5VnpFrR" resolve="MarkPlugin" />
+            <ref role="37wK5l" node="3WU9yfAbTWe" resolve="clearAll" />
+            <node concept="2OqwBi" id="7WKNeR8RdQr" role="37wK5m">
+              <node concept="2WthIp" id="7WKNeR8RdQs" role="2Oq$k0" />
+              <node concept="1DTwFV" id="7WKNeR8RdQt" role="2OqNvi">
+                <ref role="2WH_rO" node="7WKNeR8Rags" resolve="mpsProject" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7WKNeR8RdQu" role="3cqZAp" />
+        <node concept="3cpWs8" id="7WKNeR8RdQv" role="3cqZAp">
+          <node concept="3cpWsn" id="7WKNeR8RdQw" role="3cpWs9">
+            <property role="TrG5h" value="root" />
+            <node concept="3Tqbb2" id="7WKNeR8RdQx" role="1tU5fm" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7WKNeR9hhkg" role="3cqZAp">
+          <node concept="3cpWsn" id="7WKNeR9hhkh" role="3cpWs9">
+            <property role="TrG5h" value="fqueryFqName" />
+            <node concept="17QB3L" id="7WKNeR9hhkf" role="1tU5fm" />
+          </node>
+        </node>
+        <node concept="1QHqEK" id="7WKNeR8RdQy" role="3cqZAp">
+          <node concept="1QHqEC" id="7WKNeR8RdQz" role="1QHqEI">
+            <node concept="3clFbS" id="7WKNeR8RdQ$" role="1bW5cS">
+              <node concept="3clFbF" id="7WKNeR8RdQ_" role="3cqZAp">
+                <node concept="37vLTI" id="7WKNeR8RdQA" role="3clFbG">
+                  <node concept="2OqwBi" id="7WKNeR8RdQB" role="37vLTx">
+                    <node concept="2OqwBi" id="7WKNeR8RdQC" role="2Oq$k0">
+                      <node concept="2WthIp" id="7WKNeR8RdQD" role="2Oq$k0" />
+                      <node concept="1DTwFV" id="7WKNeR8RdQE" role="2OqNvi">
+                        <ref role="2WH_rO" node="7WKNeR8Ragu" resolve="node" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="7WKNeR8RdQF" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="7WKNeR8RdQG" role="37vLTJ">
+                    <ref role="3cqZAo" node="7WKNeR8RdQw" resolve="root" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="7WKNeR9hhDS" role="3cqZAp">
+                <node concept="37vLTI" id="7WKNeR9hhDU" role="3clFbG">
+                  <node concept="2OqwBi" id="7WKNeR9hhki" role="37vLTx">
+                    <node concept="2OqwBi" id="7WKNeR9hhkj" role="2Oq$k0">
+                      <node concept="2tJFMh" id="7WKNeR9hhkk" role="2Oq$k0">
+                        <node concept="ZC_QK" id="7WKNeR9hhkl" role="2tJFKM">
+                          <ref role="2aWVGs" to="kqnc:7WKNeR9hdZc" resolve="main" />
+                        </node>
+                      </node>
+                      <node concept="Vyspw" id="7WKNeR9hhkm" role="2OqNvi">
+                        <node concept="2OqwBi" id="7WKNeR9hhkn" role="Vysub">
+                          <node concept="2OqwBi" id="7WKNeR9hhko" role="2Oq$k0">
+                            <node concept="2WthIp" id="7WKNeR9hhkp" role="2Oq$k0" />
+                            <node concept="1DTwFV" id="7WKNeR9hhkq" role="2OqNvi">
+                              <ref role="2WH_rO" node="7WKNeR8Rags" resolve="mpsProject" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="7WKNeR9hhkr" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2qgKlT" id="7WKNeR9hhks" role="2OqNvi">
+                      <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="7WKNeR9hhDY" role="37vLTJ">
+                    <ref role="3cqZAo" node="7WKNeR9hhkh" resolve="fqueryFqName" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="7WKNeR8RdQH" role="ukAjM">
+            <node concept="2OqwBi" id="7WKNeR8RdQI" role="2Oq$k0">
+              <node concept="2WthIp" id="7WKNeR8RdQJ" role="2Oq$k0" />
+              <node concept="1DTwFV" id="7WKNeR8RdQK" role="2OqNvi">
+                <ref role="2WH_rO" node="7WKNeR8Rags" resolve="mpsProject" />
+              </node>
+            </node>
+            <node concept="liA8E" id="7WKNeR8RdQL" role="2OqNvi">
+              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7WKNeR8RdQM" role="3cqZAp" />
+        <node concept="3clFbF" id="7WKNeR8RdQN" role="3cqZAp">
+          <node concept="2OqwBi" id="7WKNeR8RdQO" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR8RdQP" role="2Oq$k0">
+              <node concept="2YIFZM" id="7WKNeR8TaPY" role="2Oq$k0">
+                <ref role="37wK5l" node="7WKNeR8SP2E" resolve="launchQuery" />
+                <ref role="1Pybhc" node="6hqFpWnf9Mu" resolve="TypecheckingActions" />
+                <node concept="37vLTw" id="7WKNeR9hhkt" role="37wK5m">
+                  <ref role="3cqZAo" node="7WKNeR9hhkh" resolve="fqueryFqName" />
+                </node>
+                <node concept="2OqwBi" id="7WKNeR8TaPZ" role="37wK5m">
+                  <node concept="2WthIp" id="7WKNeR8TaQ0" role="2Oq$k0" />
+                  <node concept="1DTwFV" id="7WKNeR8TaQ1" role="2OqNvi">
+                    <ref role="2WH_rO" node="7WKNeR8Ragw" resolve="editorComponent" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="7WKNeR8TaQ2" role="37wK5m">
+                  <node concept="2WthIp" id="7WKNeR8TaQ3" role="2Oq$k0" />
+                  <node concept="1DTwFV" id="7WKNeR8TaQ4" role="2OqNvi">
+                    <ref role="2WH_rO" node="7WKNeR8Rags" resolve="mpsProject" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="7WKNeR8TaQ5" role="37wK5m">
+                  <node concept="2WthIp" id="7WKNeR8TaQ6" role="2Oq$k0" />
+                  <node concept="1DTwFV" id="7WKNeR8TaQ7" role="2OqNvi">
+                    <ref role="2WH_rO" node="7WKNeR8Ragq" resolve="ideaProject" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="7WKNeR8RdR0" role="2OqNvi">
+                <ref role="37wK5l" node="6hqFpWnimEi" resolve="forNode" />
+                <node concept="37vLTw" id="7WKNeR8RdR1" role="37wK5m">
+                  <ref role="3cqZAo" node="7WKNeR8RdQw" resolve="root" />
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="7WKNeR8RdR2" role="2OqNvi">
+              <ref role="37wK5l" node="7WKNeR8RsrK" resolve="execute" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2ScWuX" id="7WKNeR8R9wl" role="tmbBb">
+      <node concept="3clFbS" id="7WKNeR8R9wm" role="2VODD2">
+        <node concept="3clFbF" id="7WKNeR8RdaM" role="3cqZAp">
+          <node concept="2YIFZM" id="7WKNeR8RdaN" role="3clFbG">
+            <ref role="37wK5l" node="6hqFpWnfbeu" resolve="isTypecheckingAvailable" />
+            <ref role="1Pybhc" node="6hqFpWnf9Mu" resolve="TypecheckingActions" />
+            <node concept="2OqwBi" id="7WKNeR8RdaO" role="37wK5m">
+              <node concept="2WthIp" id="7WKNeR8RdaP" role="2Oq$k0" />
+              <node concept="1DTwFV" id="7WKNeR8RdaQ" role="2OqNvi">
+                <ref role="2WH_rO" node="7WKNeR8Ragu" resolve="node" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7WKNeR8RdaR" role="37wK5m">
+              <node concept="2WthIp" id="7WKNeR8RdaS" role="2Oq$k0" />
+              <node concept="1DTwFV" id="7WKNeR8RdaT" role="2OqNvi">
+                <ref role="2WH_rO" node="7WKNeR8Ragw" resolve="editorComponent" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7WKNeR8RdaU" role="37wK5m">
+              <node concept="2WthIp" id="7WKNeR8RdaV" role="2Oq$k0" />
+              <node concept="1DTwFV" id="7WKNeR8RdaW" role="2OqNvi">
+                <ref role="2WH_rO" node="7WKNeR8Rags" resolve="mpsProject" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/typechecking/solutions/jetbrains.mps.typechecking/models/plugin.mps b/typechecking/solutions/jetbrains.mps.typechecking/models/plugin.mps
index 80a3ece5..ef862dfa 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking/models/plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking/models/plugin.mps
@@ -27,6 +27,7 @@
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
+    <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.evaluation)" />
   </imports>
   <registry>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -87,6 +88,9 @@
       <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
         <child id="1164991057263" name="throwable" index="YScLw" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
@@ -2864,5 +2868,339 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="7WKNeR8VLpH">
+    <property role="TrG5h" value="CodeRulesManager" />
+    <node concept="2tJIrI" id="7WKNeR8VM1Q" role="jymVt" />
+    <node concept="2YIFZL" id="7WKNeR8VMwW" role="jymVt">
+      <property role="TrG5h" value="get" />
+      <node concept="37vLTG" id="7WKNeR8VOgK" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="7WKNeR8VOgL" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="7WKNeR8Wxm0" role="3clF45">
+        <ref role="3uigEE" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+      </node>
+      <node concept="3Tm1VV" id="7WKNeR8VMwZ" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR8VMx0" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR8VNq$" role="3cqZAp">
+          <node concept="2OqwBi" id="7WKNeR8VNq_" role="3clFbG">
+            <node concept="10M0yZ" id="7WKNeR8VPqA" role="2Oq$k0">
+              <ref role="3cqZAo" node="7WKNeR8VMzY" resolve="ourInstances" />
+              <ref role="1PxDUh" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+            </node>
+            <node concept="liA8E" id="7WKNeR8VNqA" role="2OqNvi">
+              <ref role="37wK5l" to="5zyv:~ConcurrentMap.computeIfAbsent(java.lang.Object,java.util.function.Function):java.lang.Object" resolve="computeIfAbsent" />
+              <node concept="37vLTw" id="7WKNeR8VNqB" role="37wK5m">
+                <ref role="3cqZAo" node="7WKNeR8VOgK" resolve="repository" />
+              </node>
+              <node concept="1bVj0M" id="7WKNeR8VNqC" role="37wK5m">
+                <node concept="37vLTG" id="7WKNeR8VNqD" role="1bW2Oz">
+                  <property role="TrG5h" value="repo" />
+                  <node concept="3uibUv" id="7WKNeR8VNqE" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="7WKNeR8VNqF" role="1bW5cS">
+                  <node concept="3clFbF" id="7WKNeR8VNqG" role="3cqZAp">
+                    <node concept="2ShNRf" id="7WKNeR8VNqH" role="3clFbG">
+                      <node concept="1pGfFk" id="7WKNeR8W2EB" role="2ShVmc">
+                        <ref role="37wK5l" node="7WKNeR8VU5d" resolve="CodeRulesManager" />
+                        <node concept="37vLTw" id="7WKNeR8W2Lr" role="37wK5m">
+                          <ref role="3cqZAo" node="7WKNeR8VNqD" resolve="repo" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR8VM1S" role="jymVt" />
+    <node concept="2YIFZL" id="7WKNeR8VPWJ" role="jymVt">
+      <property role="TrG5h" value="dispose" />
+      <node concept="37vLTG" id="7WKNeR8VQgj" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="7WKNeR8VQgk" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7WKNeR8VPWL" role="3clF45" />
+      <node concept="3Tm1VV" id="7WKNeR8VPWM" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR8VPWN" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR8VQAZ" role="3cqZAp">
+          <node concept="2OqwBi" id="7WKNeR8VQB0" role="3clFbG">
+            <node concept="10M0yZ" id="7WKNeR8VTEZ" role="2Oq$k0">
+              <ref role="3cqZAo" node="7WKNeR8VMzY" resolve="ourInstances" />
+              <ref role="1PxDUh" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+            </node>
+            <node concept="liA8E" id="7WKNeR8VQB1" role="2OqNvi">
+              <ref role="37wK5l" to="5zyv:~ConcurrentMap.computeIfPresent(java.lang.Object,java.util.function.BiFunction):java.lang.Object" resolve="computeIfPresent" />
+              <node concept="37vLTw" id="7WKNeR8VQB2" role="37wK5m">
+                <ref role="3cqZAo" node="7WKNeR8VQgj" resolve="repository" />
+              </node>
+              <node concept="1bVj0M" id="7WKNeR8VQB3" role="37wK5m">
+                <node concept="3clFbS" id="7WKNeR8VQB4" role="1bW5cS">
+                  <node concept="3clFbF" id="7WKNeR8VQB5" role="3cqZAp">
+                    <node concept="2OqwBi" id="7WKNeR8VQB6" role="3clFbG">
+                      <node concept="37vLTw" id="7WKNeR8VQB7" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7WKNeR8VQBf" resolve="instance" />
+                      </node>
+                      <node concept="liA8E" id="7WKNeR8VQB8" role="2OqNvi">
+                        <ref role="37wK5l" node="7WKNeR8VSa4" resolve="dispose" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3SKdUt" id="7WKNeR8VQB9" role="3cqZAp">
+                    <node concept="3SKdUq" id="7WKNeR8VQBa" role="3SKWNk">
+                      <property role="3SKdUp" value="remove the mapping" />
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7WKNeR8VQBb" role="3cqZAp">
+                    <node concept="10Nm6u" id="7WKNeR8VQBc" role="3clFbG" />
+                  </node>
+                </node>
+                <node concept="37vLTG" id="7WKNeR8VQBd" role="1bW2Oz">
+                  <property role="TrG5h" value="repos" />
+                  <node concept="3uibUv" id="7WKNeR8VQBe" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
+                </node>
+                <node concept="37vLTG" id="7WKNeR8VQBf" role="1bW2Oz">
+                  <property role="TrG5h" value="instance" />
+                  <node concept="3uibUv" id="7WKNeR8VR_j" role="1tU5fm">
+                    <ref role="3uigEE" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR8VROu" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR8W8qn" role="jymVt">
+      <property role="TrG5h" value="getSession" />
+      <node concept="37vLTG" id="7WKNeR8W9Me" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="H_c77" id="7WKNeR8Wa8g" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="7WKNeR8W8ON" role="3clF45">
+        <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+      </node>
+      <node concept="3Tm1VV" id="7WKNeR8W8qq" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR8W8qr" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR8Wiyc" role="3cqZAp">
+          <node concept="2OqwBi" id="7WKNeR8WmN6" role="3clFbG">
+            <node concept="37vLTw" id="7WKNeR8Wiya" role="2Oq$k0">
+              <ref role="3cqZAo" node="7WKNeR8Wgb9" resolve="sessionCache" />
+            </node>
+            <node concept="liA8E" id="7WKNeR8Wnrs" role="2OqNvi">
+              <ref role="37wK5l" to="5zyv:~ConcurrentMap.putIfAbsent(java.lang.Object,java.lang.Object):java.lang.Object" resolve="putIfAbsent" />
+              <node concept="2OqwBi" id="7WKNeR8Wqkq" role="37wK5m">
+                <node concept="2JrnkZ" id="7WKNeR8Wqkr" role="2Oq$k0">
+                  <node concept="37vLTw" id="7WKNeR8Wqks" role="2JrQYb">
+                    <ref role="3cqZAo" node="7WKNeR8W9Me" resolve="model" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="7WKNeR8Wqkt" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SModel.getReference():org.jetbrains.mps.openapi.model.SModelReference" resolve="getReference" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="7WKNeR8Wpbu" role="37wK5m">
+                <ref role="1Pybhc" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+                <ref role="37wK5l" to="hano:7DvO2M9p276" resolve="newSession" />
+                <node concept="37vLTw" id="7WKNeR8Wpbv" role="37wK5m">
+                  <ref role="3cqZAo" node="7WKNeR8W19_" resolve="repository" />
+                </node>
+                <node concept="37vLTw" id="7WKNeR8Wpbw" role="37wK5m">
+                  <ref role="3cqZAo" node="7WKNeR8W9Me" resolve="model" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7WKNeR93utq" role="3cqZAp">
+          <node concept="2OqwBi" id="7WKNeR93uOU" role="3clFbG">
+            <node concept="37vLTw" id="7WKNeR93uto" role="2Oq$k0">
+              <ref role="3cqZAo" node="7WKNeR8Wgb9" resolve="sessionCache" />
+            </node>
+            <node concept="liA8E" id="7WKNeR93w2g" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
+              <node concept="2OqwBi" id="7WKNeR93wkI" role="37wK5m">
+                <node concept="2JrnkZ" id="7WKNeR93wkJ" role="2Oq$k0">
+                  <node concept="37vLTw" id="7WKNeR93wkK" role="2JrQYb">
+                    <ref role="3cqZAo" node="7WKNeR8W9Me" resolve="model" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="7WKNeR93wkL" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SModel.getReference():org.jetbrains.mps.openapi.model.SModelReference" resolve="getReference" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR8WcYf" role="jymVt" />
+    <node concept="3clFbW" id="7WKNeR8VU5d" role="jymVt">
+      <node concept="37vLTG" id="7WKNeR8W0I5" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="7WKNeR8W0QJ" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7WKNeR8VU5f" role="3clF45" />
+      <node concept="3Tm6S6" id="7WKNeR8VUhp" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR8VU5h" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR8W19D" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR8W19F" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR8W1Cb" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR8W1Dm" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR8W1OT" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR8W19_" resolve="repository" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7WKNeR8W19J" role="37vLTx">
+              <ref role="3cqZAo" node="7WKNeR8W0I5" resolve="repository" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR8VTNh" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR8VSa4" role="jymVt">
+      <property role="TrG5h" value="dispose" />
+      <node concept="3cqZAl" id="7WKNeR8VSa6" role="3clF45" />
+      <node concept="3Tm6S6" id="7WKNeR8VUi4" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR8VSa8" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR8Wr9j" role="3cqZAp">
+          <node concept="2OqwBi" id="7WKNeR8Wrvc" role="3clFbG">
+            <node concept="37vLTw" id="7WKNeR8Wr9h" role="2Oq$k0">
+              <ref role="3cqZAo" node="7WKNeR8Wgb9" resolve="sessionCache" />
+            </node>
+            <node concept="liA8E" id="7WKNeR8Ws6G" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Map.clear():void" resolve="clear" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7WKNeR8W1Tz" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR8W2nY" role="3clFbG">
+            <node concept="10Nm6u" id="7WKNeR8W2pI" role="37vLTx" />
+            <node concept="2OqwBi" id="7WKNeR8W1XX" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR8W1Ty" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR8W2bE" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR8W19_" resolve="repository" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR8VM1V" role="jymVt" />
+    <node concept="Wx3nA" id="7WKNeR8VMzY" role="jymVt">
+      <property role="TrG5h" value="ourInstances" />
+      <node concept="3Tm6S6" id="7WKNeR8VMzZ" role="1B3o_S" />
+      <node concept="3uibUv" id="7WKNeR8VM$0" role="1tU5fm">
+        <ref role="3uigEE" to="5zyv:~ConcurrentMap" resolve="ConcurrentMap" />
+        <node concept="3uibUv" id="7WKNeR8VM$1" role="11_B2D">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+        <node concept="3uibUv" id="7WKNeR8VN2d" role="11_B2D">
+          <ref role="3uigEE" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7WKNeR8VM$3" role="33vP2m">
+        <node concept="1pGfFk" id="7WKNeR8VM$4" role="2ShVmc">
+          <ref role="37wK5l" to="5zyv:~ConcurrentHashMap.&lt;init&gt;()" resolve="ConcurrentHashMap" />
+          <node concept="3uibUv" id="7WKNeR8VM$5" role="1pMfVU">
+            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+          </node>
+          <node concept="3uibUv" id="7WKNeR8VNg3" role="1pMfVU">
+            <ref role="3uigEE" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR8VM1Z" role="jymVt" />
+    <node concept="312cEg" id="7WKNeR8Wgb9" role="jymVt">
+      <property role="TrG5h" value="sessionCache" />
+      <node concept="3Tm6S6" id="7WKNeR8Wgba" role="1B3o_S" />
+      <node concept="3uibUv" id="7WKNeR8WiEd" role="1tU5fm">
+        <ref role="3uigEE" to="5zyv:~ConcurrentMap" resolve="ConcurrentMap" />
+        <node concept="3uibUv" id="7WKNeR8Wlc6" role="11_B2D">
+          <ref role="3uigEE" to="mhbf:~SModelReference" resolve="SModelReference" />
+        </node>
+        <node concept="3uibUv" id="7WKNeR8Wq2D" role="11_B2D">
+          <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7WKNeR8Win4" role="33vP2m">
+        <node concept="1pGfFk" id="7WKNeR8WkaM" role="2ShVmc">
+          <ref role="37wK5l" to="5zyv:~ConcurrentHashMap.&lt;init&gt;()" resolve="ConcurrentHashMap" />
+          <node concept="3uibUv" id="7WKNeR8WkAs" role="1pMfVU">
+            <ref role="3uigEE" to="mhbf:~SModelReference" resolve="SModelReference" />
+          </node>
+          <node concept="3uibUv" id="7WKNeR8WpL7" role="1pMfVU">
+            <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="7WKNeR8VLpI" role="1B3o_S" />
+    <node concept="3UR2Jj" id="7WKNeR8VMqz" role="lGtFl">
+      <node concept="TZ5HA" id="7WKNeR8VMq$" role="TZ5H$">
+        <node concept="1dT_AC" id="7WKNeR8VMq_" role="1dT_Ay">
+          <property role="1dT_AB" value="A per-repository cache of code rule indices." />
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="7WKNeR8W19_" role="jymVt">
+      <property role="TrG5h" value="repository" />
+      <node concept="3Tm6S6" id="7WKNeR8W19A" role="1B3o_S" />
+      <node concept="3uibUv" id="7WKNeR8W19C" role="1tU5fm">
+        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+      </node>
+    </node>
+  </node>
+  <node concept="2uRRBy" id="7WKNeR8VWis">
+    <property role="TrG5h" value="CodeRulesManagerLifecycle" />
+    <node concept="2uRRBT" id="7WKNeR8VWiQ" role="2uRRB$">
+      <node concept="3clFbS" id="7WKNeR8VWiR" role="2VODD2">
+        <node concept="3clFbF" id="7WKNeR8VWpv" role="3cqZAp">
+          <node concept="2YIFZM" id="7WKNeR8VW_Q" role="3clFbG">
+            <ref role="37wK5l" node="7WKNeR8VMwW" resolve="get" />
+            <ref role="1Pybhc" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+            <node concept="2OqwBi" id="7WKNeR8VWXq" role="37wK5m">
+              <node concept="1KvdUw" id="7WKNeR8VWAi" role="2Oq$k0" />
+              <node concept="liA8E" id="7WKNeR8VY8y" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2uRRBN" id="7WKNeR8VWjc" role="2uRRB_">
+      <node concept="3clFbS" id="7WKNeR8VWjd" role="2VODD2">
+        <node concept="3clFbF" id="7WKNeR8VYg9" role="3cqZAp">
+          <node concept="2YIFZM" id="7WKNeR8VYgC" role="3clFbG">
+            <ref role="37wK5l" node="7WKNeR8VPWJ" resolve="dispose" />
+            <ref role="1Pybhc" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+            <node concept="2OqwBi" id="7WKNeR8VZ0O" role="37wK5m">
+              <node concept="1KvdUw" id="7WKNeR8VYiU" role="2Oq$k0" />
+              <node concept="liA8E" id="7WKNeR8W0bW" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
index b929852a..1569aa88 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
@@ -3162,17 +3162,6 @@
                     </node>
                   </node>
                   <node concept="3clFbH" id="Hg6Enc7kMq" role="3cqZAp" />
-                  <node concept="3cpWs8" id="Hg6Enc7CPt" role="3cqZAp">
-                    <node concept="3cpWsn" id="Hg6Enc7CPu" role="3cpWs9">
-                      <property role="TrG5h" value="sessionSolver" />
-                      <node concept="3uibUv" id="Hg6Enc7CPv" role="1tU5fm">
-                        <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
-                      </node>
-                      <node concept="1rXfSq" id="Hg6Enc7CPw" role="33vP2m">
-                        <ref role="37wK5l" node="23c4kVtaQus" resolve="createSessionSolver" />
-                      </node>
-                    </node>
-                  </node>
                   <node concept="2GUZhq" id="Hg6Enc7CPG" role="3cqZAp">
                     <node concept="3clFbS" id="Hg6Enc7CPH" role="2GV8ay">
                       <node concept="3clFbF" id="Hg6Enc7CPI" role="3cqZAp">
@@ -3225,28 +3214,6 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3cpWs8" id="Hg6Enc7CPK" role="3cqZAp">
-                        <node concept="3cpWsn" id="Hg6Enc7CPL" role="3cpWs9">
-                          <property role="TrG5h" value="progEval" />
-                          <node concept="3uibUv" id="Hg6Enc7CPM" role="1tU5fm">
-                            <ref role="3uigEE" to="hano:41ox5Vnk76a" resolve="ProgramEvaluator" />
-                          </node>
-                          <node concept="2ShNRf" id="Hg6Enc7CPN" role="33vP2m">
-                            <node concept="1pGfFk" id="Hg6Enc7CPO" role="2ShVmc">
-                              <ref role="37wK5l" to="hano:4F3SXIF5Xa$" resolve="ProgramEvaluator" />
-                              <node concept="37vLTw" id="Hg6Enc7CPP" role="37wK5m">
-                                <ref role="3cqZAo" node="Hg6Enc7CPu" resolve="sessionSolver" />
-                              </node>
-                              <node concept="37vLTw" id="23c4kVtm7Iq" role="37wK5m">
-                                <ref role="3cqZAo" node="23c4kVtm7Il" resolve="profile" />
-                              </node>
-                              <node concept="37vLTw" id="23c4kVtmfZ7" role="37wK5m">
-                                <ref role="3cqZAo" node="23c4kVtm90v" resolve="checkGarbage" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
                       <node concept="3cpWs8" id="Hg6Enc7CPR" role="3cqZAp">
                         <node concept="3cpWsn" id="Hg6Enc7CPS" role="3cpWs9">
                           <property role="TrG5h" value="result" />
@@ -3260,10 +3227,187 @@
                         </node>
                       </node>
                       <node concept="3clFbH" id="4BHjwwGAHtg" role="3cqZAp" />
+                      <node concept="3cpWs8" id="7WKNeR9z3I$" role="3cqZAp">
+                        <node concept="3cpWsn" id="7WKNeR9z3I_" role="3cpWs9">
+                          <property role="TrG5h" value="queryTemplate" />
+                          <node concept="3uibUv" id="7WKNeR9z3I6" role="1tU5fm">
+                            <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+                          </node>
+                          <node concept="2OqwBi" id="7WKNeR9z3IA" role="33vP2m">
+                            <node concept="37vLTw" id="7WKNeR9z3IB" role="2Oq$k0">
+                              <ref role="3cqZAo" node="Hg6Enc9a3G" resolve="prev" />
+                            </node>
+                            <node concept="liA8E" id="7WKNeR9z3IC" role="2OqNvi">
+                              <ref role="37wK5l" node="7WKNeR9kDKp" resolve="queryTemplate" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs8" id="7WKNeR9_f8v" role="3cqZAp">
+                        <node concept="3cpWsn" id="7WKNeR9_f8w" role="3cpWs9">
+                          <property role="TrG5h" value="queryObserver" />
+                          <node concept="3uibUv" id="7WKNeR9_f8t" role="1tU5fm">
+                            <ref role="3uigEE" to="18ew:~Reference" resolve="Reference" />
+                            <node concept="3uibUv" id="7WKNeR9_g2W" role="11_B2D">
+                              <ref role="3uigEE" to="i348:7P_FdVQ_jCo" resolve="QueryTemplate.QueryObserver" />
+                            </node>
+                          </node>
+                          <node concept="2ShNRf" id="7WKNeR9_m1_" role="33vP2m">
+                            <node concept="1pGfFk" id="7WKNeR9_lXk" role="2ShVmc">
+                              <ref role="37wK5l" to="18ew:~Reference.&lt;init&gt;()" resolve="Reference" />
+                              <node concept="3uibUv" id="7WKNeR9_lXl" role="1pMfVU">
+                                <ref role="3uigEE" to="i348:7P_FdVQ_jCo" resolve="QueryTemplate.QueryObserver" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs8" id="7WKNeR9zcC9" role="3cqZAp">
+                        <node concept="3cpWsn" id="7WKNeR9zcCa" role="3cpWs9">
+                          <property role="TrG5h" value="queryConfig" />
+                          <property role="3TUv4t" value="true" />
+                          <node concept="3uibUv" id="7WKNeR9zcC5" role="1tU5fm">
+                            <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
+                          </node>
+                          <node concept="3K4zz7" id="7WKNeR9$7h9" role="33vP2m">
+                            <node concept="2OqwBi" id="7WKNeR9$8Sy" role="3K4E3e">
+                              <node concept="37vLTw" id="7WKNeR9$86c" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7WKNeR9z3I_" resolve="queryTemplate" />
+                              </node>
+                              <node concept="liA8E" id="7WKNeR9$9EE" role="2OqNvi">
+                                <ref role="37wK5l" to="i348:7P_FdVPsDM6" resolve="newQuery" />
+                                <node concept="2ShNRf" id="7WKNeR9$c6Q" role="37wK5m">
+                                  <node concept="YeOm9" id="7WKNeR9$e5a" role="2ShVmc">
+                                    <node concept="1Y3b0j" id="7WKNeR9$e5d" role="YeSDq">
+                                      <property role="2bfB8j" value="true" />
+                                      <ref role="1Y3XeK" to="i348:7P_FdVQ_k3b" resolve="QueryTemplate.QueryObservable" />
+                                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                                      <node concept="3Tm1VV" id="7WKNeR9$e5e" role="1B3o_S" />
+                                      <node concept="3clFb_" id="7WKNeR9$e5f" role="jymVt">
+                                        <property role="1EzhhJ" value="false" />
+                                        <property role="TrG5h" value="subscribe" />
+                                        <node concept="37vLTG" id="7WKNeR9$e5g" role="3clF46">
+                                          <property role="TrG5h" value="observer" />
+                                          <node concept="3uibUv" id="7WKNeR9$e5h" role="1tU5fm">
+                                            <ref role="3uigEE" to="i348:7P_FdVQ_jCo" resolve="QueryTemplate.QueryObserver" />
+                                          </node>
+                                        </node>
+                                        <node concept="3cqZAl" id="7WKNeR9$e5i" role="3clF45" />
+                                        <node concept="3Tm1VV" id="7WKNeR9$e5j" role="1B3o_S" />
+                                        <node concept="3clFbS" id="7WKNeR9$e5l" role="3clF47">
+                                          <node concept="3clFbF" id="7WKNeR9_oZD" role="3cqZAp">
+                                            <node concept="2OqwBi" id="7WKNeR9_pke" role="3clFbG">
+                                              <node concept="37vLTw" id="7WKNeR9_oZB" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
+                                              </node>
+                                              <node concept="liA8E" id="7WKNeR9_puh" role="2OqNvi">
+                                                <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
+                                                <node concept="37vLTw" id="7WKNeR9_pSd" role="37wK5m">
+                                                  <ref role="3cqZAo" node="7WKNeR9$e5g" resolve="observer" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="10Nm6u" id="7WKNeR9$atX" role="3K4GZi" />
+                            <node concept="3y3z36" id="7WKNeR9$5GD" role="3K4Cdx">
+                              <node concept="10Nm6u" id="7WKNeR9$6wG" role="3uHU7w" />
+                              <node concept="37vLTw" id="7WKNeR9$4QN" role="3uHU7B">
+                                <ref role="3cqZAo" node="7WKNeR9z3I_" resolve="queryTemplate" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="7WKNeR9$3Zm" role="3cqZAp" />
+                      <node concept="3cpWs8" id="Hg6Enc7CPK" role="3cqZAp">
+                        <node concept="3cpWsn" id="Hg6Enc7CPL" role="3cpWs9">
+                          <property role="TrG5h" value="progEval" />
+                          <node concept="3uibUv" id="Hg6Enc7CPM" role="1tU5fm">
+                            <ref role="3uigEE" to="hano:41ox5Vnk76a" resolve="ProgramEvaluator" />
+                          </node>
+                          <node concept="2ShNRf" id="Hg6Enc7CPN" role="33vP2m">
+                            <node concept="YeOm9" id="7WKNeR9ynVz" role="2ShVmc">
+                              <node concept="1Y3b0j" id="7WKNeR9ynVA" role="YeSDq">
+                                <property role="2bfB8j" value="true" />
+                                <ref role="1Y3XeK" to="hano:41ox5Vnk76a" resolve="ProgramEvaluator" />
+                                <ref role="37wK5l" to="hano:4F3SXIF5Xa$" resolve="ProgramEvaluator" />
+                                <node concept="3Tm1VV" id="7WKNeR9ynVB" role="1B3o_S" />
+                                <node concept="1rXfSq" id="7WKNeR9_X4s" role="37wK5m">
+                                  <ref role="37wK5l" node="23c4kVtaQus" resolve="createSessionSolver" />
+                                </node>
+                                <node concept="37vLTw" id="23c4kVtm7Iq" role="37wK5m">
+                                  <ref role="3cqZAo" node="23c4kVtm7Il" resolve="profile" />
+                                </node>
+                                <node concept="37vLTw" id="23c4kVtmfZ7" role="37wK5m">
+                                  <ref role="3cqZAo" node="23c4kVtm90v" resolve="checkGarbage" />
+                                </node>
+                                <node concept="3clFb_" id="7WKNeR9yo$l" role="jymVt">
+                                  <property role="TrG5h" value="configure" />
+                                  <property role="1EzhhJ" value="false" />
+                                  <node concept="37vLTG" id="7WKNeR9Gcor" role="3clF46">
+                                    <property role="TrG5h" value="stage" />
+                                    <node concept="17QB3L" id="7WKNeR9Gdfm" role="1tU5fm" />
+                                  </node>
+                                  <node concept="37vLTG" id="7WKNeR9yo$m" role="3clF46">
+                                    <property role="TrG5h" value="config" />
+                                    <node concept="3uibUv" id="7WKNeR9yo$n" role="1tU5fm">
+                                      <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+                                    </node>
+                                  </node>
+                                  <node concept="3uibUv" id="7WKNeR9yo$o" role="3clF45">
+                                    <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+                                  </node>
+                                  <node concept="3Tm1VV" id="7WKNeR9yo$p" role="1B3o_S" />
+                                  <node concept="3clFbS" id="7WKNeR9yo$x" role="3clF47">
+                                    <node concept="3clFbF" id="7WKNeR9zwhr" role="3cqZAp">
+                                      <node concept="3K4zz7" id="7WKNeR9zwY7" role="3clFbG">
+                                        <node concept="37vLTw" id="7WKNeR9zx_R" role="3K4GZi">
+                                          <ref role="3cqZAo" node="7WKNeR9yo$m" resolve="config" />
+                                        </node>
+                                        <node concept="3y3z36" id="7WKNeR9zwht" role="3K4Cdx">
+                                          <node concept="10Nm6u" id="7WKNeR9zwhu" role="3uHU7w" />
+                                          <node concept="37vLTw" id="7WKNeR9zwhv" role="3uHU7B">
+                                            <ref role="3cqZAo" node="7WKNeR9zcCa" resolve="queryConfig" />
+                                          </node>
+                                        </node>
+                                        <node concept="2OqwBi" id="7WKNeR9zxaL" role="3K4E3e">
+                                          <node concept="37vLTw" id="7WKNeR9zxaM" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="7WKNeR9zcCa" resolve="queryConfig" />
+                                          </node>
+                                          <node concept="liA8E" id="7WKNeR9zxaN" role="2OqNvi">
+                                            <ref role="37wK5l" to="i348:7P_FdVPsE9p" resolve="configure" />
+                                            <node concept="37vLTw" id="7WKNeR9GkfO" role="37wK5m">
+                                              <ref role="3cqZAo" node="7WKNeR9Gcor" resolve="stage" />
+                                            </node>
+                                            <node concept="37vLTw" id="7WKNeR9zxaR" role="37wK5m">
+                                              <ref role="3cqZAo" node="7WKNeR9yo$m" resolve="config" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="2AHcQZ" id="7WKNeR9yo$y" role="2AJF6D">
+                                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="7WKNeR9GfTo" role="3cqZAp" />
                       <node concept="1_o_46" id="4BHjwwGAILv" role="3cqZAp">
                         <node concept="1_o_bx" id="4BHjwwGAILx" role="1_o_by">
                           <node concept="1_o_bG" id="4BHjwwGAILz" role="1_o_aQ">
-                            <property role="TrG5h" value="program" />
+                            <property role="TrG5h" value="stage_program" />
                           </node>
                           <node concept="2OqwBi" id="4BHjwwGB8a_" role="1_o_bz">
                             <node concept="liA8E" id="4BHjwwGB8aA" role="2OqNvi">
@@ -3283,40 +3427,39 @@
                           </node>
                         </node>
                         <node concept="3clFbS" id="4BHjwwGAILB" role="2LFqv$">
-                          <node concept="3cpWs8" id="Hg6Enc7CPY" role="3cqZAp">
-                            <node concept="3cpWsn" id="Hg6Enc7CPZ" role="3cpWs9">
-                              <property role="TrG5h" value="multitrace" />
-                              <node concept="3uibUv" id="Hg6Enc7CQ0" role="1tU5fm">
-                                <ref role="3uigEE" node="7nPD14NbIif" resolve="MultiTrace" />
-                              </node>
-                              <node concept="2ShNRf" id="Hg6Enc7CQ1" role="33vP2m">
-                                <node concept="1pGfFk" id="Hg6Enc7CQ2" role="2ShVmc">
-                                  <ref role="37wK5l" node="7nPD14NbIzp" resolve="MultiTrace" />
-                                  <node concept="3M$PaV" id="4BHjwwGB67D" role="37wK5m">
-                                    <ref role="3M$S_o" node="4BHjwwGAPcV" resolve="trace" />
-                                  </node>
-                                  <node concept="1rXfSq" id="6kREIVkyQuW" role="37wK5m">
-                                    <ref role="37wK5l" node="6kREIVky9Kx" resolve="timeout" />
-                                  </node>
+                          <node concept="3cpWs8" id="7WKNeR9AkUc" role="3cqZAp">
+                            <node concept="3cpWsn" id="7WKNeR9AkUd" role="3cpWs9">
+                              <property role="TrG5h" value="stage" />
+                              <property role="3TUv4t" value="true" />
+                              <node concept="17QB3L" id="7WKNeR9AkTR" role="1tU5fm" />
+                              <node concept="1LFfDK" id="7WKNeR9AkUe" role="33vP2m">
+                                <node concept="3cmrfG" id="7WKNeR9AkUf" role="1LF_Uc">
+                                  <property role="3cmrfH" value="0" />
+                                </node>
+                                <node concept="3M$PaV" id="7WKNeR9AkUg" role="1LFl5Q">
+                                  <ref role="3M$S_o" node="4BHjwwGAILz" resolve="stage_program" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="3clFbH" id="Hg6Enc7CQ6" role="3cqZAp" />
-                          <node concept="3cpWs8" id="Hg6Enc7CQ7" role="3cqZAp">
-                            <node concept="3cpWsn" id="Hg6Enc7CQ8" role="3cpWs9">
-                              <property role="TrG5h" value="config" />
-                              <node concept="3uibUv" id="Hg6Enc7CQ9" role="1tU5fm">
-                                <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+                          <node concept="3cpWs8" id="7WKNeR9AoxH" role="3cqZAp">
+                            <node concept="3cpWsn" id="7WKNeR9AoxI" role="3cpWs9">
+                              <property role="TrG5h" value="program" />
+                              <property role="3TUv4t" value="true" />
+                              <node concept="3uibUv" id="7WKNeR9AowU" role="1tU5fm">
+                                <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
                               </node>
-                              <node concept="1rXfSq" id="Hg6Enc7CQa" role="33vP2m">
-                                <ref role="37wK5l" node="3F6vMxqjkf6" resolve="createConfig" />
-                                <node concept="3M$PaV" id="4BHjwwGB6Cb" role="37wK5m">
-                                  <ref role="3M$S_o" node="4BHjwwGAILz" resolve="program" />
+                              <node concept="1LFfDK" id="7WKNeR9AoxJ" role="33vP2m">
+                                <node concept="3cmrfG" id="7WKNeR9AoxK" role="1LF_Uc">
+                                  <property role="3cmrfH" value="1" />
+                                </node>
+                                <node concept="3M$PaV" id="7WKNeR9AoxL" role="1LFl5Q">
+                                  <ref role="3M$S_o" node="4BHjwwGAILz" resolve="stage_program" />
                                 </node>
                               </node>
                             </node>
                           </node>
+                          <node concept="3clFbH" id="7WKNeR9AmNV" role="3cqZAp" />
                           <node concept="3clFbF" id="Hg6Enc7CQd" role="3cqZAp">
                             <node concept="37vLTI" id="Hg6Enc7CQe" role="3clFbG">
                               <node concept="37vLTw" id="Hg6Enc7CQf" role="37vLTJ">
@@ -3334,14 +3477,22 @@
                                     </node>
                                     <node concept="liA8E" id="Hg6Enc7CQl" role="2OqNvi">
                                       <ref role="37wK5l" to="hano:HV6urVFrQ9" resolve="eval" />
-                                      <node concept="3M$PaV" id="7lt0LtQtHHG" role="37wK5m">
-                                        <ref role="3M$S_o" node="4BHjwwGAILz" resolve="program" />
+                                      <node concept="37vLTw" id="7WKNeR9GipL" role="37wK5m">
+                                        <ref role="3cqZAo" node="7WKNeR9AkUd" resolve="stage" />
                                       </node>
-                                      <node concept="37vLTw" id="Hg6Enc7CQm" role="37wK5m">
-                                        <ref role="3cqZAo" node="Hg6Enc7CQ8" resolve="config" />
+                                      <node concept="37vLTw" id="7WKNeR9AoxM" role="37wK5m">
+                                        <ref role="3cqZAo" node="7WKNeR9AoxI" resolve="program" />
                                       </node>
-                                      <node concept="37vLTw" id="Hg6Enc7CQn" role="37wK5m">
-                                        <ref role="3cqZAo" node="Hg6Enc7CPZ" resolve="multitrace" />
+                                      <node concept="2ShNRf" id="7WKNeR9Gjbf" role="37wK5m">
+                                        <node concept="1pGfFk" id="7WKNeR9Gjbg" role="2ShVmc">
+                                          <ref role="37wK5l" node="7nPD14NbIzp" resolve="MultiTrace" />
+                                          <node concept="3M$PaV" id="7WKNeR9Gjbh" role="37wK5m">
+                                            <ref role="3M$S_o" node="4BHjwwGAPcV" resolve="trace" />
+                                          </node>
+                                          <node concept="1rXfSq" id="7WKNeR9Gjbi" role="37wK5m">
+                                            <ref role="37wK5l" node="6kREIVky9Kx" resolve="timeout" />
+                                          </node>
+                                        </node>
                                       </node>
                                     </node>
                                   </node>
@@ -3350,142 +3501,259 @@
                             </node>
                           </node>
                           <node concept="3clFbH" id="Hg6Enc7CQo" role="3cqZAp" />
-                          <node concept="3cpWs8" id="19wqdqOkjca" role="3cqZAp">
-                            <node concept="3cpWsn" id="19wqdqOkjcb" role="3cpWs9">
-                              <property role="TrG5h" value="ex" />
-                              <node concept="3uibUv" id="19wqdqOkjc9" role="1tU5fm">
-                                <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+                          <node concept="3clFbJ" id="Hg6Enc7CQp" role="3cqZAp">
+                            <node concept="2OqwBi" id="Hg6Enc7CQr" role="3clFbw">
+                              <node concept="37vLTw" id="Hg6Enc7CQs" role="2Oq$k0">
+                                <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
                               </node>
-                              <node concept="2EnYce" id="19wqdqOszQK" role="33vP2m">
-                                <node concept="2OqwBi" id="19wqdqOkjcd" role="2Oq$k0">
-                                  <node concept="1eOMI4" id="19wqdqOkjce" role="2Oq$k0">
-                                    <node concept="10QFUN" id="19wqdqOkjcf" role="1eOMHV">
-                                      <node concept="A3Dl8" id="19wqdqOkjcg" role="10QFUM">
-                                        <node concept="3uibUv" id="19wqdqOkjch" role="A3Ik2">
-                                          <ref role="3uigEE" to="hano:6i42QSs$lgC" resolve="Result.ReportedError" />
+                              <node concept="liA8E" id="Hg6Enc7CQt" role="2OqNvi">
+                                <ref role="37wK5l" to="hano:7Oc59RS_hsj" resolve="isSuccessful" />
+                              </node>
+                            </node>
+                            <node concept="3clFbS" id="7WKNeR9zVo8" role="3clFbx">
+                              <node concept="3clFbJ" id="7WKNeR9$rEF" role="3cqZAp">
+                                <node concept="3clFbS" id="7WKNeR9$rEG" role="3clFbx">
+                                  <node concept="3clFbF" id="7WKNeR9$Mkw" role="3cqZAp">
+                                    <node concept="2OqwBi" id="7WKNeR9$N7D" role="3clFbG">
+                                      <node concept="2OqwBi" id="7WKNeR9_x9U" role="2Oq$k0">
+                                        <node concept="37vLTw" id="7WKNeR9_qKx" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
+                                        </node>
+                                        <node concept="liA8E" id="7WKNeR9_ybk" role="2OqNvi">
+                                          <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
                                         </node>
                                       </node>
-                                      <node concept="2OqwBi" id="19wqdqOkjci" role="10QFUP">
-                                        <node concept="37vLTw" id="19wqdqOkjcj" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
+                                      <node concept="liA8E" id="7WKNeR9$NVL" role="2OqNvi">
+                                        <ref role="37wK5l" to="i348:7P_FdVQ_jFm" resolve="onNext" />
+                                        <node concept="37vLTw" id="7WKNeR9AuTl" role="37wK5m">
+                                          <ref role="3cqZAo" node="7WKNeR9AkUd" resolve="stage" />
                                         </node>
-                                        <node concept="liA8E" id="19wqdqOkjck" role="2OqNvi">
-                                          <ref role="37wK5l" to="hano:7Oc59RSEnG3" resolve="errors" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="1z4cxt" id="19wqdqOkjcl" role="2OqNvi">
-                                    <node concept="1bVj0M" id="19wqdqOkjcm" role="23t8la">
-                                      <node concept="3clFbS" id="19wqdqOkjcn" role="1bW5cS">
-                                        <node concept="3clFbF" id="19wqdqOkjco" role="3cqZAp">
-                                          <node concept="1Wc70l" id="19wqdqOs4QT" role="3clFbG">
-                                            <node concept="3y3z36" id="19wqdqOs6wx" role="3uHU7B">
-                                              <node concept="10Nm6u" id="19wqdqOs7ae" role="3uHU7w" />
-                                              <node concept="37vLTw" id="19wqdqOs5Mh" role="3uHU7B">
-                                                <ref role="3cqZAo" node="19wqdqOkjcu" resolve="it" />
-                                              </node>
-                                            </node>
-                                            <node concept="3y3z36" id="19wqdqOkjcp" role="3uHU7w">
-                                              <node concept="10Nm6u" id="19wqdqOkjcq" role="3uHU7w" />
-                                              <node concept="2OqwBi" id="19wqdqOkjcr" role="3uHU7B">
-                                                <node concept="37vLTw" id="19wqdqOkjcs" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="19wqdqOkjcu" resolve="it" />
-                                                </node>
-                                                <node concept="liA8E" id="19wqdqOkjct" role="2OqNvi">
-                                                  <ref role="37wK5l" to="hano:6i42QSs$lhc" resolve="exception" />
-                                                </node>
-                                              </node>
-                                            </node>
+                                        <node concept="2OqwBi" id="7WKNeR9$Y1M" role="37wK5m">
+                                          <node concept="37vLTw" id="7WKNeR9$Xd$" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
+                                          </node>
+                                          <node concept="liA8E" id="7WKNeR9$YSO" role="2OqNvi">
+                                            <ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Rh6nW" id="19wqdqOkjcu" role="1bW2Oz">
-                                        <property role="TrG5h" value="it" />
-                                        <node concept="2jxLKc" id="19wqdqOkjcv" role="1tU5fm" />
-                                      </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="liA8E" id="19wqdqOs$W0" role="2OqNvi">
-                                  <ref role="37wK5l" to="hano:6i42QSs$lhc" resolve="exception" />
+                                <node concept="3y3z36" id="7WKNeR9$rEM" role="3clFbw">
+                                  <node concept="10Nm6u" id="7WKNeR9$rEN" role="3uHU7w" />
+                                  <node concept="2OqwBi" id="7WKNeR9_vhW" role="3uHU7B">
+                                    <node concept="37vLTw" id="7WKNeR9_um5" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
+                                    </node>
+                                    <node concept="liA8E" id="7WKNeR9_waj" role="2OqNvi">
+                                      <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbH" id="7WKNeR9zZA8" role="3cqZAp" />
+                            </node>
+                            <node concept="9aQIb" id="7WKNeR9zW7_" role="9aQIa">
+                              <node concept="3clFbS" id="Hg6Enc7CQu" role="9aQI4">
+                                <node concept="3cpWs8" id="19wqdqOkjca" role="3cqZAp">
+                                  <node concept="3cpWsn" id="19wqdqOkjcb" role="3cpWs9">
+                                    <property role="TrG5h" value="ex" />
+                                    <node concept="3uibUv" id="19wqdqOkjc9" role="1tU5fm">
+                                      <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+                                    </node>
+                                    <node concept="2EnYce" id="19wqdqOszQK" role="33vP2m">
+                                      <node concept="2OqwBi" id="19wqdqOkjcd" role="2Oq$k0">
+                                        <node concept="1eOMI4" id="19wqdqOkjce" role="2Oq$k0">
+                                          <node concept="10QFUN" id="19wqdqOkjcf" role="1eOMHV">
+                                            <node concept="A3Dl8" id="19wqdqOkjcg" role="10QFUM">
+                                              <node concept="3uibUv" id="19wqdqOkjch" role="A3Ik2">
+                                                <ref role="3uigEE" to="hano:6i42QSs$lgC" resolve="Result.ReportedError" />
+                                              </node>
+                                            </node>
+                                            <node concept="2OqwBi" id="19wqdqOkjci" role="10QFUP">
+                                              <node concept="37vLTw" id="19wqdqOkjcj" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
+                                              </node>
+                                              <node concept="liA8E" id="19wqdqOkjck" role="2OqNvi">
+                                                <ref role="37wK5l" to="hano:7Oc59RSEnG3" resolve="errors" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="1z4cxt" id="19wqdqOkjcl" role="2OqNvi">
+                                          <node concept="1bVj0M" id="19wqdqOkjcm" role="23t8la">
+                                            <node concept="3clFbS" id="19wqdqOkjcn" role="1bW5cS">
+                                              <node concept="3clFbF" id="19wqdqOkjco" role="3cqZAp">
+                                                <node concept="1Wc70l" id="19wqdqOs4QT" role="3clFbG">
+                                                  <node concept="3y3z36" id="19wqdqOs6wx" role="3uHU7B">
+                                                    <node concept="10Nm6u" id="19wqdqOs7ae" role="3uHU7w" />
+                                                    <node concept="37vLTw" id="19wqdqOs5Mh" role="3uHU7B">
+                                                      <ref role="3cqZAo" node="19wqdqOkjcu" resolve="it" />
+                                                    </node>
+                                                  </node>
+                                                  <node concept="3y3z36" id="19wqdqOkjcp" role="3uHU7w">
+                                                    <node concept="10Nm6u" id="19wqdqOkjcq" role="3uHU7w" />
+                                                    <node concept="2OqwBi" id="19wqdqOkjcr" role="3uHU7B">
+                                                      <node concept="37vLTw" id="19wqdqOkjcs" role="2Oq$k0">
+                                                        <ref role="3cqZAo" node="19wqdqOkjcu" resolve="it" />
+                                                      </node>
+                                                      <node concept="liA8E" id="19wqdqOkjct" role="2OqNvi">
+                                                        <ref role="37wK5l" to="hano:6i42QSs$lhc" resolve="exception" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                            <node concept="Rh6nW" id="19wqdqOkjcu" role="1bW2Oz">
+                                              <property role="TrG5h" value="it" />
+                                              <node concept="2jxLKc" id="19wqdqOkjcv" role="1tU5fm" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="19wqdqOs$W0" role="2OqNvi">
+                                        <ref role="37wK5l" to="hano:6i42QSs$lhc" resolve="exception" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbJ" id="7WKNeR9$11B" role="3cqZAp">
+                                  <node concept="3clFbS" id="7WKNeR9$11D" role="3clFbx">
+                                    <node concept="3clFbF" id="7WKNeR9$kQ6" role="3cqZAp">
+                                      <node concept="2OqwBi" id="7WKNeR9$lHy" role="3clFbG">
+                                        <node concept="2OqwBi" id="7WKNeR9_BAK" role="2Oq$k0">
+                                          <node concept="37vLTw" id="7WKNeR9_AAA" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
+                                          </node>
+                                          <node concept="liA8E" id="7WKNeR9_Cwm" role="2OqNvi">
+                                            <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                                          </node>
+                                        </node>
+                                        <node concept="liA8E" id="7WKNeR9$mx1" role="2OqNvi">
+                                          <ref role="37wK5l" to="i348:7P_FdVQ_jU$" resolve="onFailure" />
+                                          <node concept="37vLTw" id="7WKNeR9$o3_" role="37wK5m">
+                                            <ref role="3cqZAo" node="19wqdqOkjcb" resolve="ex" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3y3z36" id="7WKNeR9$jSU" role="3clFbw">
+                                    <node concept="10Nm6u" id="7WKNeR9$jXg" role="3uHU7w" />
+                                    <node concept="2OqwBi" id="7WKNeR9_$Ih" role="3uHU7B">
+                                      <node concept="37vLTw" id="7WKNeR9_zLu" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
+                                      </node>
+                                      <node concept="liA8E" id="7WKNeR9__Ke" role="2OqNvi">
+                                        <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbH" id="7WKNeR9$0ha" role="3cqZAp" />
+                                <node concept="YS8fn" id="6kREIVkirxV" role="3cqZAp">
+                                  <node concept="2ShNRf" id="6kREIVkitlD" role="YScLw">
+                                    <node concept="1pGfFk" id="6kREIVkix5J" role="2ShVmc">
+                                      <ref role="37wK5l" node="6kREIVkwjAo" resolve="ResumeNextStepException" />
+                                      <node concept="2OqwBi" id="6kREIVkwoyV" role="37wK5m">
+                                        <node concept="37vLTw" id="6kREIVkwoyW" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
+                                        </node>
+                                        <node concept="liA8E" id="6kREIVkwoyX" role="2OqNvi">
+                                          <ref role="37wK5l" to="hano:6i42QSsna8j" resolve="message" />
+                                        </node>
+                                      </node>
+                                      <node concept="Xjq3P" id="6kREIVkiCK$" role="37wK5m" />
+                                      <node concept="2ShNRf" id="4BHjwwGKNNn" role="37wK5m">
+                                        <node concept="1pGfFk" id="4BHjwwGKP9i" role="2ShVmc">
+                                          <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="RuntimeException" />
+                                          <node concept="3cpWs3" id="4BHjwwGKTpz" role="37wK5m">
+                                            <node concept="Xl_RD" id="4BHjwwGKU2M" role="3uHU7B">
+                                              <property role="Xl_RC" value="Failure evaluating rules: " />
+                                            </node>
+                                            <node concept="2OqwBi" id="4BHjwwGKQQi" role="3uHU7w">
+                                              <node concept="37vLTw" id="4BHjwwGKQb5" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
+                                              </node>
+                                              <node concept="liA8E" id="4BHjwwGKR$K" role="2OqNvi">
+                                                <ref role="37wK5l" to="hano:6i42QSsna8j" resolve="message" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="37vLTw" id="19wqdqOklYq" role="37wK5m">
+                                            <ref role="3cqZAo" node="19wqdqOkjcb" resolve="ex" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="3clFbJ" id="Hg6Enc7CQp" role="3cqZAp">
-                            <node concept="3fqX7Q" id="Hg6Enc7CQq" role="3clFbw">
-                              <node concept="2OqwBi" id="Hg6Enc7CQr" role="3fr31v">
-                                <node concept="37vLTw" id="Hg6Enc7CQs" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
+                          <node concept="3clFbH" id="7WKNeR9zC9b" role="3cqZAp" />
+                          <node concept="3SKdUt" id="7WKNeR9zDBE" role="3cqZAp">
+                            <node concept="3SKdUq" id="7WKNeR9zDBG" role="3SKWNk">
+                              <property role="3SKdUp" value="the store view after the last successful stage evaluation" />
+                            </node>
+                          </node>
+                          <node concept="3clFbF" id="Hg6Enc7CQZ" role="3cqZAp">
+                            <node concept="37vLTI" id="Hg6Enc7CR0" role="3clFbG">
+                              <node concept="2OqwBi" id="Hg6Enc7CR1" role="37vLTJ">
+                                <node concept="Xjq3P" id="Hg6Enc7CR2" role="2Oq$k0" />
+                                <node concept="2OwXpG" id="Hg6Enc7CR3" role="2OqNvi">
+                                  <ref role="2Oxat5" node="1CcQBrQoJoP" resolve="storeView" />
                                 </node>
-                                <node concept="liA8E" id="Hg6Enc7CQt" role="2OqNvi">
-                                  <ref role="37wK5l" to="hano:7Oc59RS_hsj" resolve="isSuccessful" />
+                              </node>
+                              <node concept="2OqwBi" id="Hg6Enc7CR4" role="37vLTx">
+                                <node concept="37vLTw" id="Hg6Enc7CR5" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
+                                </node>
+                                <node concept="liA8E" id="Hg6Enc7CR6" role="2OqNvi">
+                                  <ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbS" id="Hg6Enc7CQu" role="3clFbx">
-                              <node concept="YS8fn" id="6kREIVkirxV" role="3cqZAp">
-                                <node concept="2ShNRf" id="6kREIVkitlD" role="YScLw">
-                                  <node concept="1pGfFk" id="6kREIVkix5J" role="2ShVmc">
-                                    <ref role="37wK5l" node="6kREIVkwjAo" resolve="ResumeNextStepException" />
-                                    <node concept="2OqwBi" id="6kREIVkwoyV" role="37wK5m">
-                                      <node concept="37vLTw" id="6kREIVkwoyW" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
-                                      </node>
-                                      <node concept="liA8E" id="6kREIVkwoyX" role="2OqNvi">
-                                        <ref role="37wK5l" to="hano:6i42QSsna8j" resolve="message" />
-                                      </node>
-                                    </node>
-                                    <node concept="Xjq3P" id="6kREIVkiCK$" role="37wK5m" />
-                                    <node concept="2ShNRf" id="4BHjwwGKNNn" role="37wK5m">
-                                      <node concept="1pGfFk" id="4BHjwwGKP9i" role="2ShVmc">
-                                        <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="RuntimeException" />
-                                        <node concept="3cpWs3" id="4BHjwwGKTpz" role="37wK5m">
-                                          <node concept="Xl_RD" id="4BHjwwGKU2M" role="3uHU7B">
-                                            <property role="Xl_RC" value="Failure evaluating rules: " />
-                                          </node>
-                                          <node concept="2OqwBi" id="4BHjwwGKQQi" role="3uHU7w">
-                                            <node concept="37vLTw" id="4BHjwwGKQb5" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
-                                            </node>
-                                            <node concept="liA8E" id="4BHjwwGKR$K" role="2OqNvi">
-                                              <ref role="37wK5l" to="hano:6i42QSsna8j" resolve="message" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                        <node concept="37vLTw" id="19wqdqOklYq" role="37wK5m">
-                                          <ref role="3cqZAo" node="19wqdqOkjcb" resolve="ex" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="7WKNeR9$wcP" role="3cqZAp" />
+                      <node concept="3clFbJ" id="7WKNeR9$wYz" role="3cqZAp">
+                        <node concept="3clFbS" id="7WKNeR9$wY$" role="3clFbx">
+                          <node concept="3clFbF" id="7WKNeR9$wY_" role="3cqZAp">
+                            <node concept="2OqwBi" id="7WKNeR9$wYA" role="3clFbG">
+                              <node concept="2OqwBi" id="7WKNeR9_Hb9" role="2Oq$k0">
+                                <node concept="37vLTw" id="7WKNeR9_Gar" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
+                                </node>
+                                <node concept="liA8E" id="7WKNeR9_I5L" role="2OqNvi">
+                                  <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
                                 </node>
                               </node>
+                              <node concept="liA8E" id="7WKNeR9$wYC" role="2OqNvi">
+                                <ref role="37wK5l" to="i348:7P_FdVQ_jLY" resolve="onCompleted" />
+                                <node concept="37vLTw" id="7WKNeR9$IH$" role="37wK5m">
+                                  <ref role="3cqZAo" node="1CcQBrQoJoP" resolve="storeView" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3y3z36" id="7WKNeR9$wYE" role="3clFbw">
+                          <node concept="10Nm6u" id="7WKNeR9$wYF" role="3uHU7w" />
+                          <node concept="2OqwBi" id="7WKNeR9_El1" role="3uHU7B">
+                            <node concept="37vLTw" id="7WKNeR9_Dnc" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
+                            </node>
+                            <node concept="liA8E" id="7WKNeR9_FeI" role="2OqNvi">
+                              <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
                             </node>
                           </node>
                         </node>
                       </node>
                       <node concept="3clFbH" id="Hg6Enc7CQY" role="3cqZAp" />
-                      <node concept="3clFbF" id="Hg6Enc7CQZ" role="3cqZAp">
-                        <node concept="37vLTI" id="Hg6Enc7CR0" role="3clFbG">
-                          <node concept="2OqwBi" id="Hg6Enc7CR1" role="37vLTJ">
-                            <node concept="Xjq3P" id="Hg6Enc7CR2" role="2Oq$k0" />
-                            <node concept="2OwXpG" id="Hg6Enc7CR3" role="2OqNvi">
-                              <ref role="2Oxat5" node="1CcQBrQoJoP" resolve="storeView" />
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="Hg6Enc7CR4" role="37vLTx">
-                            <node concept="37vLTw" id="Hg6Enc7CR5" role="2Oq$k0">
-                              <ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
-                            </node>
-                            <node concept="liA8E" id="Hg6Enc7CR6" role="2OqNvi">
-                              <ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="Hg6Enc7CR7" role="3cqZAp" />
                     </node>
                     <node concept="3clFbS" id="Hg6Enc7CRG" role="2GVbov">
                       <node concept="3clFbF" id="Hg6Enc7CRH" role="3cqZAp">
@@ -3850,31 +4118,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="52a_GfIGUah" role="jymVt" />
-    <node concept="3clFb_" id="3F6vMxqjkf6" role="jymVt">
-      <property role="TrG5h" value="createConfig" />
-      <node concept="3Tmbuc" id="3F6vMxqjqea" role="1B3o_S" />
-      <node concept="3uibUv" id="3F6vMxqjkf8" role="3clF45">
-        <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
-      </node>
-      <node concept="37vLTG" id="3F6vMxqjkeU" role="3clF46">
-        <property role="TrG5h" value="program" />
-        <node concept="3uibUv" id="3F6vMxqjkeV" role="1tU5fm">
-          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="3F6vMxqjkeg" role="3clF47">
-        <node concept="3cpWs6" id="3F6vMxqjkeS" role="3cqZAp">
-          <node concept="2YIFZM" id="3F6vMxqk2yy" role="3cqZAk">
-            <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-            <ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="newSession" />
-            <node concept="37vLTw" id="3F6vMxqk2yz" role="37wK5m">
-              <ref role="3cqZAo" node="3F6vMxqjkeU" resolve="program" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6kREIVl13fp" role="jymVt" />
     <node concept="3clFb_" id="6kREIVl0T6d" role="jymVt">
       <property role="TrG5h" value="getStoreView" />
       <node concept="3uibUv" id="6kREIVl0T6e" role="3clF45">
@@ -4093,6 +4336,126 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7kTeLbPt4n9" role="jymVt" />
+    <node concept="3clFbW" id="7WKNeR9fh8C" role="jymVt">
+      <node concept="3cqZAl" id="7WKNeR9fh8D" role="3clF45" />
+      <node concept="3Tm1VV" id="7WKNeR9fh8E" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR9fh8F" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR9fh8G" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR9fh8H" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR9fh8I" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR9fh8J" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR9fh8K" role="2OqNvi">
+                <ref role="2Oxat5" node="1pPth$lD$Ft" resolve="root" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7WKNeR9fh8L" role="37vLTx">
+              <ref role="3cqZAo" node="7WKNeR9fh8S" resolve="root" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7WKNeR9fh8M" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR9fh8N" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR9fh8O" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR9fh8P" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR9fh8Q" role="2OqNvi">
+                <ref role="2Oxat5" node="6kREIVkLEGt" resolve="repository" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7WKNeR9fh8R" role="37vLTx">
+              <ref role="3cqZAo" node="7WKNeR9fh8U" resolve="repository" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7WKNeR9fj4j" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR9fj4l" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR9fk1N" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR9fk6j" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR9fk1Q" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR9fj4f" resolve="queryFqName" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7WKNeR9fj4p" role="37vLTx">
+              <ref role="3cqZAo" node="7WKNeR9finm" resolve="queryFqName" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7WKNeR9finm" role="3clF46">
+        <property role="TrG5h" value="queryFqName" />
+        <node concept="17QB3L" id="7WKNeR9fivN" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7WKNeR9fh8S" role="3clF46">
+        <property role="TrG5h" value="root" />
+        <node concept="3Tqbb2" id="7WKNeR9fh8T" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7WKNeR9fh8U" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="7WKNeR9fh8V" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR9fh8B" role="jymVt" />
+    <node concept="3clFbW" id="7WKNeR9fh8j" role="jymVt">
+      <node concept="3cqZAl" id="7WKNeR9fh8k" role="3clF45" />
+      <node concept="3Tm1VV" id="7WKNeR9fh8l" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR9fh8m" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR9fh8n" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR9fh8o" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR9fh8p" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR9fh8q" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR9fh8r" role="2OqNvi">
+                <ref role="2Oxat5" node="6kREIVkLEGt" resolve="repository" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7WKNeR9fh8s" role="37vLTx">
+              <ref role="3cqZAo" node="7WKNeR9fh8_" resolve="repository" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7WKNeR9fh8t" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR9fh8u" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR9fh8v" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR9fh8w" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR9fh8x" role="2OqNvi">
+                <ref role="2Oxat5" node="7kTeLbPt5$3" resolve="nodes" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7WKNeR9fh8y" role="37vLTx">
+              <ref role="3cqZAo" node="7WKNeR9fh8z" resolve="nodes" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7WKNeR9fkhk" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR9fkhl" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR9fkhm" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR9fkhn" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR9fkho" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR9fj4f" resolve="queryFqName" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7WKNeR9fkhp" role="37vLTx">
+              <ref role="3cqZAo" node="7WKNeR9fiNv" resolve="queryFqName" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7WKNeR9fiNv" role="3clF46">
+        <property role="TrG5h" value="queryFqName" />
+        <node concept="17QB3L" id="7WKNeR9fiNw" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7WKNeR9fh8z" role="3clF46">
+        <property role="TrG5h" value="nodes" />
+        <node concept="2I9FWS" id="7WKNeR9fh8$" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7WKNeR9fh8_" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="7WKNeR9fh8A" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR9fh8i" role="jymVt" />
     <node concept="3clFb_" id="1pPth$lMB$v" role="jymVt">
       <property role="TrG5h" value="info" />
       <property role="1EzhhJ" value="false" />
@@ -4261,29 +4624,70 @@
                           </node>
                         </node>
                         <node concept="3clFbH" id="7DvO2M9pLdh" role="3cqZAp" />
-                        <node concept="3clFbF" id="7DvO2M9pC8x" role="3cqZAp">
-                          <node concept="37vLTI" id="7DvO2M9pC8y" role="3clFbG">
-                            <node concept="2OqwBi" id="7DvO2M9pC8z" role="37vLTJ">
-                              <node concept="Xjq3P" id="7DvO2M9pC8$" role="2Oq$k0" />
-                              <node concept="2OwXpG" id="7DvO2M9pC8_" role="2OqNvi">
+                        <node concept="3clFbF" id="7WKNeR92tLq" role="3cqZAp">
+                          <node concept="37vLTI" id="7WKNeR92tLs" role="3clFbG">
+                            <node concept="2OqwBi" id="7WKNeR92tLt" role="37vLTJ">
+                              <node concept="Xjq3P" id="7WKNeR92tLu" role="2Oq$k0" />
+                              <node concept="2OwXpG" id="7WKNeR92tLv" role="2OqNvi">
                                 <ref role="2Oxat5" node="7DvO2M9pC8m" resolve="ruleProcessingSession" />
                               </node>
                             </node>
-                            <node concept="2YIFZM" id="7DvO2M9pC8A" role="37vLTx">
-                              <ref role="37wK5l" to="hano:7DvO2M9p276" resolve="newSession" />
-                              <ref role="1Pybhc" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
-                              <node concept="37vLTw" id="7DvO2M9pC8B" role="37wK5m">
-                                <ref role="3cqZAo" node="6kREIVkLEGt" resolve="repository" />
-                              </node>
-                              <node concept="2OqwBi" id="7DvO2M9pC8C" role="37wK5m">
-                                <node concept="37vLTw" id="7DvO2M9pC8D" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7kTeLbPtnTq" resolve="node" />
+                            <node concept="2OqwBi" id="7WKNeR8WGI1" role="37vLTx">
+                              <node concept="2YIFZM" id="7WKNeR8WF9k" role="2Oq$k0">
+                                <ref role="37wK5l" to="qox2:7WKNeR8VMwW" resolve="get" />
+                                <ref role="1Pybhc" to="qox2:7WKNeR8VLpH" resolve="CodeRulesManager" />
+                                <node concept="37vLTw" id="7WKNeR8WFV1" role="37wK5m">
+                                  <ref role="3cqZAo" node="6kREIVkLEGt" resolve="repository" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="7WKNeR8WHyV" role="2OqNvi">
+                                <ref role="37wK5l" to="qox2:7WKNeR8W8qn" resolve="getSession" />
+                                <node concept="2OqwBi" id="7WKNeR8WKBL" role="37wK5m">
+                                  <node concept="37vLTw" id="7WKNeR8WJUI" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="7kTeLbPtnTq" resolve="node" />
+                                  </node>
+                                  <node concept="I4A8Y" id="7WKNeR8WLnF" role="2OqNvi" />
                                 </node>
-                                <node concept="I4A8Y" id="7DvO2M9pC8E" role="2OqNvi" />
                               </node>
                             </node>
                           </node>
                         </node>
+                        <node concept="3clFbF" id="7WKNeR9kv7F" role="3cqZAp">
+                          <node concept="37vLTI" id="7WKNeR9kv7G" role="3clFbG">
+                            <node concept="2OqwBi" id="7WKNeR9kv7H" role="37vLTJ">
+                              <node concept="Xjq3P" id="7WKNeR9kv7I" role="2Oq$k0" />
+                              <node concept="2OwXpG" id="7WKNeR9kv7J" role="2OqNvi">
+                                <ref role="2Oxat5" node="7WKNeR9kv7q" resolve="queryTemplate" />
+                              </node>
+                            </node>
+                            <node concept="3K4zz7" id="7WKNeR9kv7K" role="37vLTx">
+                              <node concept="10Nm6u" id="7WKNeR9kv7L" role="3K4GZi" />
+                              <node concept="3y3z36" id="7WKNeR9kv7M" role="3K4Cdx">
+                                <node concept="10Nm6u" id="7WKNeR9kv7N" role="3uHU7w" />
+                                <node concept="37vLTw" id="7WKNeR9kv7O" role="3uHU7B">
+                                  <ref role="3cqZAo" node="7WKNeR9fj4f" resolve="queryFqName" />
+                                </node>
+                              </node>
+                              <node concept="2OqwBi" id="7WKNeR9kv7P" role="3K4E3e">
+                                <node concept="2OqwBi" id="7WKNeR9kv7Q" role="2Oq$k0">
+                                  <node concept="37vLTw" id="7WKNeR9kv7R" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="7DvO2M9pC8m" resolve="ruleProcessingSession" />
+                                  </node>
+                                  <node concept="liA8E" id="7WKNeR9kv7S" role="2OqNvi">
+                                    <ref role="37wK5l" to="hano:7WKNeR9alW4" resolve="queryTemplates" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="7WKNeR9kv7T" role="2OqNvi">
+                                  <ref role="37wK5l" to="hano:7WKNeR95RPZ" resolve="byFqName" />
+                                  <node concept="37vLTw" id="7WKNeR9kv7U" role="37wK5m">
+                                    <ref role="3cqZAo" node="7WKNeR9fj4f" resolve="queryFqName" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="7WKNeR9aiQX" role="3cqZAp" />
                         <node concept="3clFbF" id="Hg6Enc4Wbq" role="3cqZAp">
                           <node concept="37vLTI" id="Hg6Enc4Wbr" role="3clFbG">
                             <node concept="2OqwBi" id="Hg6Enc4Wbs" role="37vLTJ">
@@ -4294,13 +4698,19 @@
                             </node>
                             <node concept="2ShNRf" id="Hg6Enc4Wbv" role="37vLTx">
                               <node concept="1pGfFk" id="Hg6Enc4Wbw" role="2ShVmc">
-                                <ref role="37wK5l" to="hano:7DvO2M9pdut" resolve="ProgramBuilder" />
+                                <ref role="37wK5l" to="hano:7WKNeR9bcL$" resolve="ProgramBuilder" />
                                 <node concept="2OqwBi" id="7DvO2M9pC8F" role="37wK5m">
                                   <node concept="Xjq3P" id="7DvO2M9pC8G" role="2Oq$k0" />
                                   <node concept="2OwXpG" id="7DvO2M9pC8H" role="2OqNvi">
                                     <ref role="2Oxat5" node="7DvO2M9pC8m" resolve="ruleProcessingSession" />
                                   </node>
                                 </node>
+                                <node concept="2OqwBi" id="7WKNeR9kBNr" role="37wK5m">
+                                  <node concept="Xjq3P" id="7WKNeR9kBNs" role="2Oq$k0" />
+                                  <node concept="2OwXpG" id="7WKNeR9kBNt" role="2OqNvi">
+                                    <ref role="2Oxat5" node="7WKNeR9kv7q" resolve="queryTemplate" />
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -4468,12 +4878,30 @@
         <ref role="3uigEE" to="hano:6fdr4UgftiG" resolve="RuleTemplateIndex" />
       </node>
     </node>
+    <node concept="2tJIrI" id="7WKNeR9kCIM" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR9kDKp" role="jymVt">
+      <property role="TrG5h" value="queryTemplate" />
+      <node concept="3uibUv" id="7WKNeR9kEIG" role="3clF45">
+        <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+      </node>
+      <node concept="3Tm1VV" id="7WKNeR9kDKs" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR9kDKt" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR9kGZW" role="3cqZAp">
+          <node concept="37vLTw" id="7WKNeR9kGZV" role="3clFbG">
+            <ref role="3cqZAo" node="7WKNeR9kv7q" resolve="queryTemplate" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="20Ay2VeQP0v" role="jymVt" />
     <node concept="3clFb_" id="6kREIVl0HhM" role="jymVt">
       <property role="TrG5h" value="getPrograms" />
       <node concept="_YKpA" id="6kREIVl0HhN" role="3clF45">
-        <node concept="3uibUv" id="6kREIVl0HhO" role="_ZDj9">
-          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+        <node concept="1LlUBW" id="7WKNeR9lnVH" role="_ZDj9">
+          <node concept="17QB3L" id="7WKNeR9loeH" role="1Lm7xW" />
+          <node concept="3uibUv" id="7WKNeR9look" role="1Lm7xW">
+            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+          </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="6kREIVl0HhP" role="1B3o_S" />
@@ -4514,6 +4942,13 @@
         <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
       </node>
     </node>
+    <node concept="312cEg" id="7WKNeR9kv7q" role="jymVt">
+      <property role="TrG5h" value="queryTemplate" />
+      <node concept="3Tm6S6" id="7WKNeR9kv7o" role="1B3o_S" />
+      <node concept="3uibUv" id="7WKNeR9kv7p" role="1tU5fm">
+        <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+      </node>
+    </node>
     <node concept="312cEg" id="3GlpCDSzA$E" role="jymVt">
       <property role="TrG5h" value="programBuilder" />
       <node concept="3Tm6S6" id="6kREIVkHEOZ" role="1B3o_S" />
@@ -4528,6 +4963,11 @@
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
     </node>
+    <node concept="312cEg" id="7WKNeR9fj4f" role="jymVt">
+      <property role="TrG5h" value="queryFqName" />
+      <node concept="3Tm6S6" id="7WKNeR9fj4g" role="1B3o_S" />
+      <node concept="17QB3L" id="7WKNeR9fj4i" role="1tU5fm" />
+    </node>
   </node>
   <node concept="312cEu" id="7nPD14NbIif">
     <property role="TrG5h" value="MultiTrace" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index dc0fd889..db295a2e 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -766,7 +766,7 @@
     <node concept="2rT7sh" id="7P_FdVPtAzR" role="2rTMjI">
       <property role="TrG5h" value="query_template" />
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
-      <ref role="2rTdP9" to="tpck:gw2VY9q" resolve="BaseConcept" />
+      <ref role="2rTdP9" to="wq2x:7P_FdVQ_S6B" resolve="Query" />
     </node>
     <node concept="2rT7sh" id="6w6CYIRhsKS" role="2rTMjI">
       <property role="TrG5h" value="rule_class" />
@@ -883,6 +883,11 @@
       <ref role="3lhOvi" node="4MqhgXU9Ebr" resolve="HandlerTemplateImpl" />
       <ref role="2sgKRv" node="4MqhgXUaC7X" resolve="handler_template_class" />
     </node>
+    <node concept="3lhOvk" id="7P_FdVQ_Uvo" role="3lj3bC">
+      <ref role="30HIoZ" to="wq2x:7P_FdVQ_S6B" resolve="Query" />
+      <ref role="3lhOvi" node="7P_FdVPsJiz" resolve="QueryTemplateImpl" />
+      <ref role="2sgKRv" node="7P_FdVPtAzR" resolve="query_template" />
+    </node>
     <node concept="3lhOvk" id="4vbeH84zIB1" role="3lj3bC">
       <ref role="3lhOvi" node="4vbeH84zLYz" resolve="RuleTemplateImpl_deprecated" />
       <ref role="2sgKRv" node="6w6CYIRhsKS" resolve="rule_class" />
@@ -6020,12 +6025,20 @@
                   </node>
                 </node>
               </node>
-              <node concept="1W57fq" id="7P_FdVP$pbe" role="lGtFl">
-                <node concept="3IZrLx" id="7P_FdVP$pbg" role="3IZSJc">
-                  <node concept="3clFbS" id="7P_FdVP$pbi" role="2VODD2">
-                    <node concept="3clFbF" id="7P_FdVP$pQk" role="3cqZAp">
-                      <node concept="3clFbT" id="7P_FdVP$pQj" role="3clFbG">
-                        <property role="3clFbU" value="false" />
+              <node concept="1WS0z7" id="7P_FdVQCu2M" role="lGtFl">
+                <node concept="3JmXsc" id="7P_FdVQCu2S" role="3Jn$fo">
+                  <node concept="3clFbS" id="7P_FdVQCu2Y" role="2VODD2">
+                    <node concept="3clFbF" id="7P_FdVQCuKn" role="3cqZAp">
+                      <node concept="2OqwBi" id="7P_FdVQCuKo" role="3clFbG">
+                        <node concept="2OqwBi" id="7P_FdVQCuKp" role="2Oq$k0">
+                          <node concept="1iwH7S" id="7P_FdVQCuKq" role="2Oq$k0" />
+                          <node concept="1r8y6K" id="7P_FdVQCuKr" role="2OqNvi" />
+                        </node>
+                        <node concept="2SmgA7" id="7P_FdVQCuKs" role="2OqNvi">
+                          <node concept="chp4Y" id="7P_FdVQCvkd" role="1dBWTz">
+                            <ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="Query" />
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -19946,23 +19959,85 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7P_FdVPsZu6" role="jymVt" />
-    <node concept="3clFb_" id="7P_FdVPsXbn" role="jymVt">
+    <node concept="3clFb_" id="7P_FdVQ_sF3" role="jymVt">
       <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="handlerTemplates" />
-      <node concept="_YKpA" id="7P_FdVPsXbo" role="3clF45">
-        <node concept="3uibUv" id="7P_FdVPsXbp" role="_ZDj9">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7P_FdVPsXbq" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVPsXbt" role="3clF47">
-        <node concept="3clFbF" id="7P_FdVPsZkm" role="3cqZAp">
-          <node concept="37vLTw" id="7P_FdVPsZkl" role="3clFbG">
-            <ref role="3cqZAo" node="7P_FdVPsYak" resolve="handlerTemplates" />
+      <property role="TrG5h" value="name" />
+      <node concept="17QB3L" id="7P_FdVQ_sF4" role="3clF45" />
+      <node concept="3Tm1VV" id="7P_FdVQ_sF5" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVQ_sF8" role="3clF47">
+        <node concept="3clFbF" id="7P_FdVQ_t4O" role="3cqZAp">
+          <node concept="Xl_RD" id="7P_FdVQ_t4N" role="3clFbG">
+            <node concept="17Uvod" id="7P_FdVQBm6D" role="lGtFl">
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <property role="2qtEX9" value="value" />
+              <node concept="3zFVjK" id="7P_FdVQBm6E" role="3zH0cK">
+                <node concept="3clFbS" id="7P_FdVQBm6F" role="2VODD2">
+                  <node concept="3clFbF" id="7P_FdVQBmDg" role="3cqZAp">
+                    <node concept="2OqwBi" id="7P_FdVQBmPZ" role="3clFbG">
+                      <node concept="30H73N" id="7P_FdVQBmDf" role="2Oq$k0" />
+                      <node concept="3TrcHB" id="7P_FdVQBpgC" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="7P_FdVPsXbu" role="2AJF6D">
+      <node concept="2AHcQZ" id="7P_FdVQ_sF9" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQ_sS8" role="jymVt" />
+    <node concept="2tJIrI" id="7WKNeR94O6t" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR94Ovt" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="fqName" />
+      <node concept="17QB3L" id="7WKNeR94Ovu" role="3clF45" />
+      <node concept="3Tm1VV" id="7WKNeR94Ovv" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR94Ovy" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR94Q7J" role="3cqZAp">
+          <node concept="Xl_RD" id="7WKNeR94Q7K" role="3clFbG">
+            <property role="Xl_RC" value="" />
+            <node concept="17Uvod" id="7WKNeR94Q7L" role="lGtFl">
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <property role="2qtEX9" value="value" />
+              <node concept="3zFVjK" id="7WKNeR94Q7M" role="3zH0cK">
+                <node concept="3clFbS" id="7WKNeR94Q7N" role="2VODD2">
+                  <node concept="3clFbF" id="7WKNeR94Q7O" role="3cqZAp">
+                    <node concept="2OqwBi" id="7WKNeR94Q7P" role="3clFbG">
+                      <node concept="2qgKlT" id="7WKNeR94Q7Q" role="2OqNvi">
+                        <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                      </node>
+                      <node concept="30H73N" id="7WKNeR94Q7R" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7WKNeR94Ovz" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQBlF6" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVQBlR_" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="usedHandlersFqNames" />
+      <node concept="_YKpA" id="7P_FdVQBlRA" role="3clF45">
+        <node concept="17QB3L" id="7P_FdVQBlRB" role="_ZDj9" />
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVQBlRC" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVQBlRF" role="3clF47">
+        <node concept="3clFbF" id="7P_FdVQBpDp" role="3cqZAp">
+          <node concept="10Nm6u" id="7P_FdVQBpDo" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7P_FdVQBlRG" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
@@ -19970,6 +20045,12 @@
     <node concept="3clFb_" id="7P_FdVPsJk6" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="newQuery" />
+      <node concept="37vLTG" id="7P_FdVQ_t5i" role="3clF46">
+        <property role="TrG5h" value="observable" />
+        <node concept="3uibUv" id="7P_FdVQ_thj" role="1tU5fm">
+          <ref role="3uigEE" to="i348:7P_FdVQ_k3b" resolve="QueryTemplate.QueryObservable" />
+        </node>
+      </node>
       <node concept="37vLTG" id="7P_FdVPsJk7" role="3clF46">
         <property role="TrG5h" value="parameters" />
         <node concept="8X2XB" id="7P_FdVPsJk8" role="1tU5fm">
@@ -19979,12 +20060,16 @@
         </node>
       </node>
       <node concept="3uibUv" id="7P_FdVPsJka" role="3clF45">
-        <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.Query" />
+        <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
       </node>
       <node concept="3Tm1VV" id="7P_FdVPsJkb" role="1B3o_S" />
       <node concept="3clFbS" id="7P_FdVPsJkd" role="3clF47">
-        <node concept="3clFbF" id="7P_FdVPsJkg" role="3cqZAp">
-          <node concept="10Nm6u" id="7P_FdVPsJkf" role="3clFbG" />
+        <node concept="3clFbF" id="7P_FdVQ_tYj" role="3cqZAp">
+          <node concept="2ShNRf" id="7P_FdVQ_tYh" role="3clFbG">
+            <node concept="HV5vD" id="7P_FdVQ_uet" role="2ShVmc">
+              <ref role="HV5vE" node="7P_FdVPsNol" resolve="QueryTemplateImpl.Configurable" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2AHcQZ" id="7P_FdVPsJke" role="2AJF6D">
@@ -20001,7 +20086,7 @@
           <node concept="3clFbC" id="7P_FdVPsY9y" role="3clFbw">
             <node concept="10Nm6u" id="7P_FdVPsY9z" role="3uHU7w" />
             <node concept="37vLTw" id="7P_FdVPsY9$" role="3uHU7B">
-              <ref role="3cqZAo" node="7P_FdVPsYak" resolve="handlerTemplates" />
+              <ref role="3cqZAo" node="7P_FdVPsYak" resolve="handlerFqNames" />
             </node>
           </node>
           <node concept="3clFbS" id="7P_FdVPsY9_" role="3clFbx">
@@ -20009,15 +20094,11 @@
               <node concept="3cpWsn" id="7P_FdVPsY9B" role="3cpWs9">
                 <property role="TrG5h" value="list" />
                 <node concept="_YKpA" id="7P_FdVPsY9C" role="1tU5fm">
-                  <node concept="3uibUv" id="7P_FdVPsY9D" role="_ZDj9">
-                    <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-                  </node>
+                  <node concept="17QB3L" id="7P_FdVQBqB_" role="_ZDj9" />
                 </node>
                 <node concept="2ShNRf" id="7P_FdVPsY9E" role="33vP2m">
                   <node concept="Tc6Ow" id="7P_FdVPsY9F" role="2ShVmc">
-                    <node concept="3uibUv" id="7P_FdVPsY9G" role="HW$YZ">
-                      <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-                    </node>
+                    <node concept="17QB3L" id="7P_FdVQBqX4" role="HW$YZ" />
                   </node>
                 </node>
               </node>
@@ -20028,21 +20109,18 @@
                   <ref role="3cqZAo" node="7P_FdVPsY9B" resolve="list" />
                 </node>
                 <node concept="TSZUe" id="7P_FdVPsY9K" role="2OqNvi">
-                  <node concept="2ShNRf" id="7P_FdVPsY9L" role="25WWJ7">
-                    <node concept="HV5vD" id="7P_FdVPsY9M" role="2ShVmc">
-                      <ref role="HV5vE" node="4MqhgXU9Ebr" resolve="HandlerTemplateImpl" />
-                      <node concept="1ZhdrF" id="7P_FdVPsY9N" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/2820489544401957797/2820489544401957798" />
-                        <property role="2qtEX8" value="classifier" />
-                        <node concept="3$xsQk" id="7P_FdVPsY9O" role="3$ytzL">
-                          <node concept="3clFbS" id="7P_FdVPsY9P" role="2VODD2">
-                            <node concept="3clFbF" id="7P_FdVPsY9Q" role="3cqZAp">
-                              <node concept="2OqwBi" id="7P_FdVPsY9R" role="3clFbG">
-                                <node concept="1iwH7S" id="7P_FdVPsY9S" role="2Oq$k0" />
-                                <node concept="1iwH70" id="7P_FdVPsY9T" role="2OqNvi">
-                                  <ref role="1iwH77" node="4MqhgXUaC7X" resolve="handler_template_class" />
-                                  <node concept="30H73N" id="7P_FdVPsY9U" role="1iwH7V" />
-                                </node>
+                  <node concept="Xl_RD" id="7P_FdVQBre6" role="25WWJ7">
+                    <property role="Xl_RC" value="" />
+                    <node concept="17Uvod" id="7P_FdVQBrvJ" role="lGtFl">
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+                      <property role="2qtEX9" value="value" />
+                      <node concept="3zFVjK" id="7P_FdVQBrvK" role="3zH0cK">
+                        <node concept="3clFbS" id="7P_FdVQBrvL" role="2VODD2">
+                          <node concept="3clFbF" id="7P_FdVQBrRo" role="3cqZAp">
+                            <node concept="2OqwBi" id="7P_FdVQBs6A" role="3clFbG">
+                              <node concept="30H73N" id="7P_FdVQBrRn" role="2Oq$k0" />
+                              <node concept="2qgKlT" id="7P_FdVQBsOI" role="2OqNvi">
+                                <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
                               </node>
                             </node>
                           </node>
@@ -20083,7 +20161,7 @@
                 <node concept="2OqwBi" id="7P_FdVPsYaa" role="37vLTJ">
                   <node concept="Xjq3P" id="7P_FdVPsYab" role="2Oq$k0" />
                   <node concept="2OwXpG" id="7P_FdVPsYac" role="2OqNvi">
-                    <ref role="2Oxat5" node="7P_FdVPsYak" resolve="handlerTemplates" />
+                    <ref role="2Oxat5" node="7P_FdVPsYak" resolve="handlerFqNames" />
                   </node>
                 </node>
               </node>
@@ -20094,96 +20172,85 @@
     </node>
     <node concept="2tJIrI" id="7P_FdVPsYaj" role="jymVt" />
     <node concept="312cEu" id="7P_FdVPsNol" role="jymVt">
-      <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Query" />
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="Configurable" />
       <node concept="2tJIrI" id="7P_FdVPsNz5" role="jymVt" />
-      <node concept="3clFb_" id="7P_FdVPsN_j" role="jymVt">
+      <node concept="3clFb_" id="7P_FdVQ_tvH" role="jymVt">
         <property role="1EzhhJ" value="false" />
         <property role="TrG5h" value="configure" />
-        <node concept="37vLTG" id="7P_FdVPsN_k" role="3clF46">
+        <node concept="37vLTG" id="7P_FdVQ_tvI" role="3clF46">
+          <property role="TrG5h" value="stage" />
+          <node concept="17QB3L" id="7P_FdVQ_tvJ" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="7P_FdVQ_tvK" role="3clF46">
           <property role="TrG5h" value="config" />
-          <node concept="3uibUv" id="7P_FdVPsN_l" role="1tU5fm">
+          <node concept="3uibUv" id="7P_FdVQ_tvL" role="1tU5fm">
             <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
           </node>
         </node>
-        <node concept="3uibUv" id="7P_FdVPsN_m" role="3clF45">
+        <node concept="3uibUv" id="7P_FdVQ_tvM" role="3clF45">
           <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
         </node>
-        <node concept="3Tm1VV" id="7P_FdVPsN_n" role="1B3o_S" />
-        <node concept="3clFbS" id="7P_FdVPsN_p" role="3clF47">
-          <node concept="3clFbF" id="7P_FdVPsN_s" role="3cqZAp">
-            <node concept="10Nm6u" id="7P_FdVPsN_r" role="3clFbG" />
+        <node concept="3Tm1VV" id="7P_FdVQ_tvN" role="1B3o_S" />
+        <node concept="3clFbS" id="7P_FdVQ_tvP" role="3clF47">
+          <node concept="3clFbF" id="7P_FdVQ_tGn" role="3cqZAp">
+            <node concept="2OqwBi" id="7P_FdVQBZOm" role="3clFbG">
+              <node concept="37vLTw" id="7P_FdVQ_tGk" role="2Oq$k0">
+                <ref role="3cqZAo" node="7P_FdVQ_tvK" resolve="config" />
+              </node>
+              <node concept="liA8E" id="7P_FdVQC013" role="2OqNvi">
+                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParam(java.lang.String,java.lang.Object):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withParam" />
+                <node concept="Xl_RD" id="3GlpCDSC7E4" role="37wK5m">
+                  <property role="Xl_RC" value="main" />
+                </node>
+                <node concept="2OqwBi" id="3GlpCDSC7E5" role="37wK5m">
+                  <node concept="2ShNRf" id="3GlpCDSC7E6" role="2Oq$k0">
+                    <node concept="1pGfFk" id="3GlpCDSC7E7" role="2ShVmc">
+                      <ref role="37wK5l" to="6pyv:4sSe4$oM2rk" resolve="ConstraintBuilder" />
+                      <node concept="2ShNRf" id="3GlpCDSC7E8" role="37wK5m">
+                        <node concept="1pGfFk" id="3GlpCDSC7E9" role="2ShVmc">
+                          <ref role="37wK5l" to="av0y:~ConstraintSymbol.&lt;init&gt;(java.lang.String,int)" resolve="ConstraintSymbol" />
+                          <node concept="Xl_RD" id="3GlpCDSC7Ea" role="37wK5m">
+                            <property role="Xl_RC" value="main" />
+                          </node>
+                          <node concept="3cmrfG" id="3GlpCDSC7Eb" role="37wK5m">
+                            <property role="3cmrfH" value="0" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="3GlpCDSC7Ec" role="2OqNvi">
+                    <ref role="37wK5l" to="6pyv:4sSe4$oM2zI" resolve="toConstraint" />
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="2AHcQZ" id="7P_FdVPsN_q" role="2AJF6D">
+        <node concept="2AHcQZ" id="7P_FdVQ_tvQ" role="2AJF6D">
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
-      <node concept="2tJIrI" id="7P_FdVPsNIT" role="jymVt" />
-      <node concept="3clFb_" id="7P_FdVPsN_t" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="onSuccess" />
-        <node concept="37vLTG" id="7P_FdVPsN_u" role="3clF46">
-          <property role="TrG5h" value="storeView" />
-          <node concept="3uibUv" id="7P_FdVPsN_v" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~StoreView" resolve="StoreView" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="7P_FdVPsN_w" role="3clF45">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-        <node concept="3Tm1VV" id="7P_FdVPsN_x" role="1B3o_S" />
-        <node concept="3clFbS" id="7P_FdVPsN_z" role="3clF47">
-          <node concept="3clFbF" id="7P_FdVPsN_A" role="3cqZAp">
-            <node concept="10Nm6u" id="7P_FdVPsN__" role="3clFbG" />
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="7P_FdVPsN_$" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="7P_FdVPsNOL" role="jymVt" />
-      <node concept="3clFb_" id="7P_FdVPsN_B" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="onFailure" />
-        <node concept="37vLTG" id="7P_FdVPsN_C" role="3clF46">
-          <property role="TrG5h" value="exception" />
-          <node concept="3uibUv" id="7P_FdVPsN_D" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="7P_FdVPsN_E" role="3clF45">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-        <node concept="3Tm1VV" id="7P_FdVPsN_F" role="1B3o_S" />
-        <node concept="3clFbS" id="7P_FdVPsN_H" role="3clF47">
-          <node concept="3clFbF" id="7P_FdVPsN_K" role="3cqZAp">
-            <node concept="10Nm6u" id="7P_FdVPsN_J" role="3clFbG" />
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="7P_FdVPsN_I" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="7P_FdVPsNUE" role="jymVt" />
+      <node concept="2tJIrI" id="7P_FdVQ_tI0" role="jymVt" />
       <node concept="3Tm1VV" id="7P_FdVPsNom" role="1B3o_S" />
       <node concept="3uibUv" id="7P_FdVPsNwi" role="EKbjA">
-        <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.Query" />
+        <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
       </node>
     </node>
     <node concept="2tJIrI" id="7P_FdVPsJvQ" role="jymVt" />
     <node concept="312cEg" id="7P_FdVPsYak" role="jymVt">
-      <property role="TrG5h" value="handlerTemplates" />
+      <property role="TrG5h" value="handlerFqNames" />
       <node concept="3Tm6S6" id="7P_FdVPsYal" role="1B3o_S" />
       <node concept="_YKpA" id="7P_FdVPsYam" role="1tU5fm">
-        <node concept="3uibUv" id="7P_FdVPsYan" role="_ZDj9">
-          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-        </node>
+        <node concept="17QB3L" id="7P_FdVQBpKf" role="_ZDj9" />
       </node>
     </node>
     <node concept="2tJIrI" id="7P_FdVPsY3k" role="jymVt" />
     <node concept="3Tm1VV" id="7P_FdVPsJi$" role="1B3o_S" />
-    <node concept="n94m4" id="7P_FdVPsJi_" role="lGtFl" />
+    <node concept="n94m4" id="7P_FdVPsJi_" role="lGtFl">
+      <ref role="n9lRv" to="wq2x:7P_FdVQ_S6B" resolve="Query" />
+    </node>
     <node concept="3uibUv" id="7P_FdVPsJjx" role="EKbjA">
       <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
     </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 07f1867e..44dba237 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -6842,5 +6842,17 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="7P_FdVQ_S6G">
+    <ref role="1XX52x" to="wq2x:7P_FdVQ_S6B" resolve="Query" />
+    <node concept="3EZMnI" id="7P_FdVQ_S6R" role="2wV5jI">
+      <node concept="PMmxH" id="7P_FdVQ_S6Y" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="3F0A7n" id="7P_FdVQ_S77" role="3EZMnx">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+      </node>
+      <node concept="l2Vlx" id="7P_FdVQ_S6U" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index badade68..02225ecc 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -1589,5 +1589,15 @@
       <ref role="20lvS9" to="5j4j:7E86$tKsl45" resolve="LogicalItem" />
     </node>
   </node>
+  <node concept="1TIwiD" id="7P_FdVQ_S6B">
+    <property role="EcuMT" value="9035818301008609703" />
+    <property role="TrG5h" value="Query" />
+    <property role="19KtqR" value="true" />
+    <property role="34LRSv" value="query" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="PrWs8" id="7P_FdVQ_S6O" role="PzmwI">
+      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
index 5eb06f75..2b82e684 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
@@ -489,6 +489,7 @@
         <child id="1225711182005" name="list" index="1y566C" />
         <child id="1225711191269" name="index" index="1y58nS" />
       </concept>
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
@@ -775,22 +776,52 @@
       </node>
     </node>
     <node concept="2tJIrI" id="HV6urVFFCx" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR9xdDN" role="jymVt">
+      <property role="TrG5h" value="configure" />
+      <node concept="37vLTG" id="7WKNeR9GbWj" role="3clF46">
+        <property role="TrG5h" value="stage" />
+        <node concept="17QB3L" id="7WKNeR9Gc6Q" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7WKNeR9xf0F" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="7WKNeR9xfbO" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="7WKNeR9xey5" role="3clF45">
+        <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+      </node>
+      <node concept="3Tm1VV" id="7WKNeR9xdDQ" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR9xdDR" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR9xfec" role="3cqZAp">
+          <node concept="37vLTw" id="7WKNeR9xfeb" role="3clFbG">
+            <ref role="3cqZAo" node="7WKNeR9xf0F" resolve="config" />
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="7WKNeR9xfet" role="lGtFl">
+        <node concept="TZ5HA" id="7WKNeR9xfeu" role="TZ5H$">
+          <node concept="1dT_AC" id="7WKNeR9xfev" role="1dT_Ay">
+            <property role="1dT_AB" value="Override to provide custom configuration options. " />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR9xcNq" role="jymVt" />
     <node concept="3clFb_" id="HV6urVFrQ9" role="jymVt">
       <property role="TrG5h" value="eval" />
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
+      <node concept="37vLTG" id="7WKNeR9G0zS" role="3clF46">
+        <property role="TrG5h" value="stage" />
+        <node concept="17QB3L" id="7WKNeR9G2Fq" role="1tU5fm" />
+      </node>
       <node concept="37vLTG" id="7lt0LtQtD2v" role="3clF46">
         <property role="TrG5h" value="program" />
         <node concept="3uibUv" id="7lt0LtQtEFj" role="1tU5fm">
           <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
         </node>
       </node>
-      <node concept="37vLTG" id="3F6vMxqrzZY" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="3F6vMxqrBcz" role="1tU5fm">
-          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
-        </node>
-      </node>
       <node concept="37vLTG" id="24Vro6cQKgF" role="3clF46">
         <property role="TrG5h" value="tracer" />
         <node concept="3uibUv" id="qubcdtxFI2" role="1tU5fm">
@@ -809,11 +840,26 @@
           </node>
         </node>
         <node concept="3clFbH" id="41ox5VnkhIX" role="3cqZAp" />
+        <node concept="3cpWs8" id="7WKNeR9xpPO" role="3cqZAp">
+          <node concept="3cpWsn" id="7WKNeR9xpPP" role="3cpWs9">
+            <property role="TrG5h" value="config" />
+            <node concept="3uibUv" id="7WKNeR9xpPL" role="1tU5fm">
+              <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+            </node>
+            <node concept="2YIFZM" id="7WKNeR9xpPQ" role="33vP2m">
+              <ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="newSession" />
+              <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+              <node concept="37vLTw" id="7WKNeR9xpPR" role="37wK5m">
+                <ref role="3cqZAo" node="7lt0LtQtD2v" resolve="program" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="3GlpCDSC7RP" role="3cqZAp">
           <node concept="37vLTI" id="3GlpCDSC7RR" role="3clFbG">
             <node concept="2OqwBi" id="3GlpCDSC7E1" role="37vLTx">
               <node concept="37vLTw" id="3GlpCDSC7E2" role="2Oq$k0">
-                <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
+                <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
               </node>
               <node concept="liA8E" id="3GlpCDSC7E3" role="2OqNvi">
                 <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParam(java.lang.String,java.lang.Object):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withParam" />
@@ -844,7 +890,7 @@
               </node>
             </node>
             <node concept="37vLTw" id="3GlpCDSC862" role="37vLTJ">
-              <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
+              <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
             </node>
           </node>
         </node>
@@ -867,7 +913,7 @@
               <node concept="37vLTI" id="3GlpCDSC8uh" role="3clFbG">
                 <node concept="2OqwBi" id="3GlpCDSC8ui" role="37vLTx">
                   <node concept="37vLTw" id="3GlpCDSC8uj" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
+                    <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
                   </node>
                   <node concept="liA8E" id="3F6vMxqqwSs" role="2OqNvi">
                     <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withParam(java.lang.String,java.lang.Object):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withParam" />
@@ -880,7 +926,7 @@
                   </node>
                 </node>
                 <node concept="37vLTw" id="3GlpCDSC8uu" role="37vLTJ">
-                  <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
+                  <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
                 </node>
               </node>
             </node>
@@ -892,11 +938,11 @@
         <node concept="3clFbF" id="3GlpCDSD2Ms" role="3cqZAp">
           <node concept="37vLTI" id="3GlpCDSD39k" role="3clFbG">
             <node concept="37vLTw" id="3GlpCDSD2Mq" role="37vLTJ">
-              <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
+              <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
             </node>
             <node concept="2OqwBi" id="3GlpCDSD3d1" role="37vLTx">
               <node concept="37vLTw" id="3GlpCDSD3d2" role="2Oq$k0">
-                <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
+                <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
               </node>
               <node concept="liA8E" id="3GlpCDSD3d3" role="2OqNvi">
                 <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withTrace(jetbrains.mps.logic.reactor.evaluation.EvaluationTrace):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withTrace" />
@@ -911,7 +957,7 @@
           <node concept="37vLTI" id="3GlpCDSD3HK" role="3clFbG">
             <node concept="2OqwBi" id="3GlpCDSD3OA" role="37vLTx">
               <node concept="37vLTw" id="3GlpCDSD3Iy" role="2Oq$k0">
-                <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
+                <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
               </node>
               <node concept="liA8E" id="3GlpCDSD3Yx" role="2OqNvi">
                 <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withPredicates(jetbrains.mps.logic.reactor.program.PredicateSymbol...):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withPredicates" />
@@ -921,7 +967,7 @@
               </node>
             </node>
             <node concept="37vLTw" id="3GlpCDSD3rw" role="37vLTJ">
-              <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
+              <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
             </node>
           </node>
         </node>
@@ -931,7 +977,7 @@
               <node concept="37vLTI" id="7lt0LtQtSBJ" role="3clFbG">
                 <node concept="2OqwBi" id="7lt0LtQtU6a" role="37vLTx">
                   <node concept="37vLTw" id="7lt0LtQtU01" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
+                    <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
                   </node>
                   <node concept="liA8E" id="7lt0LtQtUkF" role="2OqNvi">
                     <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withPredicates(jetbrains.mps.logic.reactor.program.PredicateSymbol...):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withPredicates" />
@@ -941,7 +987,7 @@
                   </node>
                 </node>
                 <node concept="37vLTw" id="7lt0LtQtR7S" role="37vLTJ">
-                  <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
+                  <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
                 </node>
               </node>
             </node>
@@ -967,7 +1013,7 @@
               <node concept="37vLTI" id="5cnt3vh3Fvz" role="3clFbG">
                 <node concept="2OqwBi" id="5cnt3vh3FAj" role="37vLTx">
                   <node concept="37vLTw" id="5cnt3vh3Fwi" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
+                    <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
                   </node>
                   <node concept="liA8E" id="5cnt3vh3FQa" role="2OqNvi">
                     <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withStoreView(jetbrains.mps.logic.reactor.evaluation.StoreView):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withStoreView" />
@@ -977,7 +1023,7 @@
                   </node>
                 </node>
                 <node concept="37vLTw" id="5cnt3vh3Fl5" role="37vLTJ">
-                  <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
+                  <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
                 </node>
               </node>
             </node>
@@ -1022,6 +1068,28 @@
           </node>
         </node>
         <node concept="3clFbH" id="3GlpCDSBYQN" role="3cqZAp" />
+        <node concept="3SKdUt" id="7WKNeR9xESt" role="3cqZAp">
+          <node concept="3SKdUq" id="7WKNeR9xESv" role="3SKWNk">
+            <property role="3SKdUp" value="allow for custom configuration" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="7WKNeR9xAwA" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR9xC3C" role="3clFbG">
+            <node concept="1rXfSq" id="7WKNeR9xDpZ" role="37vLTx">
+              <ref role="37wK5l" node="7WKNeR9xdDN" resolve="configure" />
+              <node concept="37vLTw" id="7WKNeR9GNCc" role="37wK5m">
+                <ref role="3cqZAo" node="7WKNeR9G0zS" resolve="stage" />
+              </node>
+              <node concept="37vLTw" id="7WKNeR9xDt7" role="37wK5m">
+                <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7WKNeR9xAw$" role="37vLTJ">
+              <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7WKNeR9x_5m" role="3cqZAp" />
         <node concept="3clFbF" id="1Ry9kf2v6eb" role="3cqZAp">
           <node concept="2YIFZM" id="2FXL1yZvCpJ" role="3clFbG">
             <ref role="37wK5l" node="2k2r9bMbV$8" resolve="init" />
@@ -1123,7 +1191,7 @@
               <node concept="37vLTI" id="1Ry9kf2vmS3" role="3clFbG">
                 <node concept="2OqwBi" id="5mr7UHcbsDT" role="37vLTx">
                   <node concept="37vLTw" id="3GlpCDSC8kM" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3F6vMxqrzZY" resolve="config" />
+                    <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
                   </node>
                   <node concept="liA8E" id="5mr7UHcbsE5" role="2OqNvi">
                     <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="start" />
@@ -2924,19 +2992,9 @@
             <node concept="2ShNRf" id="7P_FdVPITOf" role="33vP2m">
               <node concept="1pGfFk" id="7P_FdVPITOg" role="2ShVmc">
                 <ref role="37wK5l" node="7P_FdVPIH2n" resolve="RuleTemplateIndex" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7P_FdVPISQf" role="3cqZAp">
-          <node concept="2OqwBi" id="7P_FdVPITox" role="3clFbG">
-            <node concept="37vLTw" id="7P_FdVPITOh" role="2Oq$k0">
-              <ref role="3cqZAo" node="7P_FdVPITOe" resolve="index" />
-            </node>
-            <node concept="liA8E" id="7P_FdVPITAF" role="2OqNvi">
-              <ref role="37wK5l" node="7DvO2Mandqg" resolve="initWithManifests" />
-              <node concept="37vLTw" id="7P_FdVPITLs" role="37wK5m">
-                <ref role="3cqZAo" node="7P_FdVPISMR" resolve="manifests" />
+                <node concept="37vLTw" id="7WKNeR94iqD" role="37wK5m">
+                  <ref role="3cqZAo" node="7P_FdVPISMR" resolve="manifests" />
+                </node>
               </node>
             </node>
           </node>
@@ -2957,9 +3015,34 @@
     </node>
     <node concept="2tJIrI" id="7P_FdVPIMz3" role="jymVt" />
     <node concept="3clFbW" id="7P_FdVPIH2n" role="jymVt">
+      <node concept="37vLTG" id="7WKNeR94ikN" role="3clF46">
+        <property role="TrG5h" value="manifests" />
+        <node concept="A3Dl8" id="7WKNeR94ikO" role="1tU5fm">
+          <node concept="3uibUv" id="7WKNeR94ikP" role="A3Ik2">
+            <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+          </node>
+        </node>
+      </node>
       <node concept="3cqZAl" id="7P_FdVPIH2p" role="3clF45" />
-      <node concept="3Tm6S6" id="7P_FdVPIJMV" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVPIH2r" role="3clF47" />
+      <node concept="3Tm1VV" id="7WKNeR94iu3" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPIH2r" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR96aA4" role="3cqZAp">
+          <node concept="1rXfSq" id="7WKNeR96aA3" role="3clFbG">
+            <ref role="37wK5l" node="7DvO2Mandqg" resolve="initWithManifests" />
+            <node concept="37vLTw" id="7WKNeR96aIu" role="37wK5m">
+              <ref role="3cqZAo" node="7WKNeR94ikN" resolve="manifests" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="7WKNeR94iw8" role="lGtFl">
+        <node concept="TZ5HA" id="7WKNeR94iw9" role="TZ5H$">
+          <node concept="1dT_AC" id="7WKNeR94iyE" role="1dT_Ay">
+            <property role="1dT_AB" value="The list of manifests must be sorted in the topological order." />
+          </node>
+          <node concept="1dT_AC" id="7WKNeR94iwa" role="1dT_Ay" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="7P_FdVPH0_B" role="jymVt" />
     <node concept="3clFb_" id="4QPCta1zKCT" role="jymVt">
@@ -2981,7 +3064,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="4MqhgXU$$4Z" role="jymVt" />
+    <node concept="2tJIrI" id="7WKNeR97Olx" role="jymVt" />
     <node concept="3clFb_" id="6fdr4UgfuGk" role="jymVt">
       <property role="TrG5h" value="allRuleTemplates" />
       <node concept="37vLTG" id="12yN8DyvzeF" role="3clF46">
@@ -3229,19 +3312,19 @@
           </node>
         </node>
       </node>
-      <node concept="P$JXv" id="12yN8Dyv_NV" role="lGtFl">
-        <node concept="TZ5HA" id="12yN8Dyv_NW" role="TZ5H$">
-          <node concept="1dT_AC" id="12yN8Dyv_NX" role="1dT_Ay">
+      <node concept="P$JXv" id="7WKNeR97Sa0" role="lGtFl">
+        <node concept="TZ5HA" id="7WKNeR981Js" role="TZ5H$">
+          <node concept="1dT_AC" id="7WKNeR981Jt" role="1dT_Ay">
             <property role="1dT_AB" value="Searches and returns all rule templates applicable to the specified node. Extracts the node's concept to search for matching templates." />
           </node>
         </node>
-        <node concept="TUZQ0" id="12yN8Dyv_NY" role="3nqlJM">
+        <node concept="TUZQ0" id="7WKNeR981P6" role="3nqlJM">
           <property role="TUZQ4" value="node to search templates for" />
-          <node concept="zr_55" id="12yN8Dyv_O0" role="zr_5Q">
+          <node concept="zr_55" id="7WKNeR981P7" role="zr_5Q">
             <ref role="zr_51" node="12yN8DyvzeF" resolve="node" />
           </node>
         </node>
-        <node concept="x79VA" id="12yN8Dyv_O1" role="3nqlJM">
+        <node concept="x79VA" id="7WKNeR981P8" role="3nqlJM">
           <property role="x79VB" value="all templates applicable to node as a tuple [stage, template]" />
         </node>
       </node>
@@ -3385,13 +3468,13 @@
           </node>
         </node>
       </node>
-      <node concept="P$JXv" id="5NuEpF1qnbp" role="lGtFl">
-        <node concept="TZ5HA" id="5NuEpF1qnbq" role="TZ5H$">
-          <node concept="1dT_AC" id="5NuEpF1qnbr" role="1dT_Ay">
+      <node concept="P$JXv" id="7WKNeR988t2" role="lGtFl">
+        <node concept="TZ5HA" id="7WKNeR988t3" role="TZ5H$">
+          <node concept="1dT_AC" id="7WKNeR988t4" role="1dT_Ay">
             <property role="1dT_AB" value="Searches and returns all rule templates applicable without the input node." />
           </node>
         </node>
-        <node concept="x79VA" id="5NuEpF1qnbD" role="3nqlJM">
+        <node concept="x79VA" id="7WKNeR98b70" role="3nqlJM">
           <property role="x79VB" value="all templates applicable to node as a tuple [stage, template]" />
         </node>
       </node>
@@ -3450,7 +3533,7 @@
         </node>
       </node>
       <node concept="3cqZAl" id="7DvO2Mandqi" role="3clF45" />
-      <node concept="3Tm6S6" id="7DvO2ManfvF" role="1B3o_S" />
+      <node concept="3Tm6S6" id="7WKNeR94fF2" role="1B3o_S" />
       <node concept="3clFbS" id="7DvO2Mandqk" role="3clF47">
         <node concept="3clFbF" id="7P_FdVPIgWH" role="3cqZAp">
           <node concept="1rXfSq" id="7P_FdVPIgWF" role="3clFbG">
@@ -3465,12 +3548,32 @@
                     <node concept="3clFbF" id="7P_FdVPIjDk" role="3cqZAp">
                       <node concept="1rXfSq" id="7P_FdVPPstQ" role="3clFbG">
                         <ref role="37wK5l" node="7P_FdVPsPOY" resolve="handlingStages" />
-                        <node concept="2OqwBi" id="7P_FdVPPsJB" role="37wK5m">
-                          <node concept="37vLTw" id="7P_FdVPPs$d" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7P_FdVPIjy4" resolve="it" />
+                        <node concept="2OqwBi" id="7WKNeR97qwC" role="37wK5m">
+                          <node concept="2OqwBi" id="7P_FdVPPsJB" role="2Oq$k0">
+                            <node concept="37vLTw" id="7P_FdVPPs$d" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7P_FdVPIjy4" resolve="it" />
+                            </node>
+                            <node concept="liA8E" id="7P_FdVPPsZB" role="2OqNvi">
+                              <ref role="37wK5l" to="i348:4MqhgXUaiLz" resolve="handlerTemplates" />
+                            </node>
                           </node>
-                          <node concept="liA8E" id="7P_FdVPPsZB" role="2OqNvi">
-                            <ref role="37wK5l" to="i348:4MqhgXUaiLz" resolve="handlerTemplates" />
+                          <node concept="3zZkjj" id="7WKNeR97rb9" role="2OqNvi">
+                            <node concept="1bVj0M" id="7WKNeR97rbb" role="23t8la">
+                              <node concept="3clFbS" id="7WKNeR97rbc" role="1bW5cS">
+                                <node concept="3clFbF" id="7WKNeR97rsO" role="3cqZAp">
+                                  <node concept="1rXfSq" id="7WKNeR97rsN" role="3clFbG">
+                                    <ref role="37wK5l" node="7WKNeR96Yfw" resolve="acceptHandlerTemplate" />
+                                    <node concept="37vLTw" id="7WKNeR97rDp" role="37wK5m">
+                                      <ref role="3cqZAo" node="7WKNeR97rbd" resolve="ht" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="Rh6nW" id="7WKNeR97rbd" role="1bW2Oz">
+                                <property role="TrG5h" value="ht" />
+                                <node concept="2jxLKc" id="7WKNeR97rbe" role="1tU5fm" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -3499,7 +3602,7 @@
         </node>
       </node>
       <node concept="3cqZAl" id="7P_FdVPHmHW" role="3clF45" />
-      <node concept="3Tm6S6" id="7P_FdVPHplf" role="1B3o_S" />
+      <node concept="3Tm6S6" id="7WKNeR94dbG" role="1B3o_S" />
       <node concept="3clFbS" id="7P_FdVPHmHY" role="3clF47">
         <node concept="2Gpval" id="7P_FdVPHCXG" role="3cqZAp">
           <node concept="3clFbS" id="7P_FdVPHCXH" role="2LFqv$">
@@ -3675,6 +3778,25 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="7WKNeR96Vd3" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR96Yfw" role="jymVt">
+      <property role="TrG5h" value="acceptHandlerTemplate" />
+      <node concept="37vLTG" id="7WKNeR97mL3" role="3clF46">
+        <property role="TrG5h" value="ht" />
+        <node concept="3uibUv" id="7WKNeR97pBy" role="1tU5fm">
+          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+        </node>
+      </node>
+      <node concept="10P_77" id="7WKNeR973YE" role="3clF45" />
+      <node concept="3Tmbuc" id="7WKNeR9712B" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR96Yf$" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR97pSu" role="3cqZAp">
+          <node concept="3clFbT" id="7WKNeR97pSt" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="7DvO2Manhxe" role="jymVt" />
     <node concept="3clFb_" id="12yN8Dyvyy6" role="jymVt">
       <property role="TrG5h" value="collectTemplates" />
@@ -3685,7 +3807,7 @@
         </node>
       </node>
       <node concept="3cqZAl" id="12yN8Dyvyy8" role="3clF45" />
-      <node concept="3Tm6S6" id="429xoypKETd" role="1B3o_S" />
+      <node concept="3Tmbuc" id="7WKNeR94aeI" role="1B3o_S" />
       <node concept="3clFbS" id="12yN8Dyvyya" role="3clF47">
         <node concept="3SKdUt" id="12yN8DyFw_S" role="3cqZAp">
           <node concept="3SKdUq" id="12yN8DyFwRk" role="3SKWNk">
@@ -3865,8 +3987,8 @@
       <property role="TrG5h" value="handlingStages" />
       <node concept="37vLTG" id="7P_FdVPPiuI" role="3clF46">
         <property role="TrG5h" value="handlerTemplates" />
-        <node concept="_YKpA" id="7P_FdVPPnff" role="1tU5fm">
-          <node concept="3uibUv" id="7P_FdVPPngi" role="_ZDj9">
+        <node concept="A3Dl8" id="7WKNeR94L24" role="1tU5fm">
+          <node concept="3uibUv" id="7WKNeR94L26" role="A3Ik2">
             <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
           </node>
         </node>
@@ -3876,7 +3998,7 @@
           <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
         </node>
       </node>
-      <node concept="3Tm6S6" id="7P_FdVPPexE" role="1B3o_S" />
+      <node concept="3Tmbuc" id="7WKNeR9475y" role="1B3o_S" />
       <node concept="3clFbS" id="7P_FdVPsPP3" role="3clF47">
         <node concept="3cpWs8" id="7P_FdVPsQ4_" role="3cqZAp">
           <node concept="3cpWsn" id="7P_FdVPsQ4A" role="3cpWs9">
@@ -5126,6 +5248,21 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7DvO2M9Icar" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR9alW4" role="jymVt">
+      <property role="TrG5h" value="queryTemplates" />
+      <node concept="3uibUv" id="7WKNeR9am5J" role="3clF45">
+        <ref role="3uigEE" node="7WKNeR93NDF" resolve="QueryTemplateIndex" />
+      </node>
+      <node concept="3Tm1VV" id="7WKNeR9alW7" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR9alW8" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR9amOI" role="3cqZAp">
+          <node concept="37vLTw" id="7WKNeR9amOH" role="3clFbG">
+            <ref role="3cqZAo" node="7WKNeR99MZ$" resolve="queryTemplateIndex" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR9amE4" role="jymVt" />
     <node concept="3clFbW" id="7DvO2M9VeM1" role="jymVt">
       <node concept="3cqZAl" id="7DvO2M9VeM2" role="3clF45" />
       <node concept="3Tm6S6" id="7P_FdVPFPA2" role="1B3o_S" />
@@ -5308,19 +5445,38 @@
         </node>
         <node concept="3clFbF" id="7DvO2M9VeMw" role="3cqZAp">
           <node concept="37vLTI" id="7DvO2M9VeMx" role="3clFbG">
-            <node concept="2YIFZM" id="7P_FdVPIUb1" role="37vLTx">
-              <ref role="37wK5l" node="7P_FdVPIPE$" resolve="withManifests" />
-              <ref role="1Pybhc" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
-              <node concept="37vLTw" id="7P_FdVPIUf8" role="37wK5m">
-                <ref role="3cqZAo" node="6UWSvq5d8md" resolve="ruleManifests" />
-              </node>
-            </node>
             <node concept="2OqwBi" id="7DvO2M9VeM$" role="37vLTJ">
               <node concept="Xjq3P" id="7DvO2M9VeM_" role="2Oq$k0" />
               <node concept="2OwXpG" id="7DvO2M9VeMA" role="2OqNvi">
                 <ref role="2Oxat5" node="7P_FdVPFMy6" resolve="ruleTemplateIndex" />
               </node>
             </node>
+            <node concept="2ShNRf" id="7WKNeR99Rwt" role="37vLTx">
+              <node concept="1pGfFk" id="7WKNeR99RWw" role="2ShVmc">
+                <ref role="37wK5l" node="7P_FdVPIH2n" resolve="RuleTemplateIndex" />
+                <node concept="37vLTw" id="7WKNeR99RYR" role="37wK5m">
+                  <ref role="3cqZAo" node="6UWSvq5d8md" resolve="ruleManifests" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7WKNeR99S1f" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR99SBB" role="3clFbG">
+            <node concept="2ShNRf" id="7WKNeR99SEp" role="37vLTx">
+              <node concept="1pGfFk" id="7WKNeR99T6s" role="2ShVmc">
+                <ref role="37wK5l" node="7WKNeR93OQV" resolve="QueryTemplateIndex" />
+                <node concept="37vLTw" id="7WKNeR99T8e" role="37wK5m">
+                  <ref role="3cqZAo" node="6UWSvq5d8md" resolve="ruleManifests" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7WKNeR99Seq" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR99S1d" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR99SqY" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR99MZ$" resolve="queryTemplateIndex" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -5328,7 +5484,7 @@
     <node concept="2tJIrI" id="6UWSvq5b6xS" role="jymVt" />
     <node concept="312cEg" id="7P_FdVPFMy3" role="jymVt">
       <property role="TrG5h" value="macroTemplatesIndex" />
-      <node concept="3Tmbuc" id="7P_FdVPFMy4" role="1B3o_S" />
+      <node concept="3Tm6S6" id="7WKNeR9dEfV" role="1B3o_S" />
       <node concept="3uibUv" id="7P_FdVPFMy5" role="1tU5fm">
         <ref role="3uigEE" node="1hX44vNlSIA" resolve="MacroTemplateIndex" />
       </node>
@@ -5336,11 +5492,19 @@
     <node concept="2tJIrI" id="7P_FdVPG1ZY" role="jymVt" />
     <node concept="312cEg" id="7P_FdVPFMy6" role="jymVt">
       <property role="TrG5h" value="ruleTemplateIndex" />
-      <node concept="3Tmbuc" id="7P_FdVPFMy7" role="1B3o_S" />
+      <node concept="3Tm6S6" id="7WKNeR9dEi9" role="1B3o_S" />
       <node concept="3uibUv" id="7P_FdVPFMy8" role="1tU5fm">
         <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
       </node>
     </node>
+    <node concept="2tJIrI" id="7WKNeR99MP_" role="jymVt" />
+    <node concept="312cEg" id="7WKNeR99MZ$" role="jymVt">
+      <property role="TrG5h" value="queryTemplateIndex" />
+      <node concept="3Tm6S6" id="7WKNeR9dEk7" role="1B3o_S" />
+      <node concept="3uibUv" id="7WKNeR99N7Z" role="1tU5fm">
+        <ref role="3uigEE" node="7WKNeR93NDF" resolve="QueryTemplateIndex" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="7P_FdVPFLhr" role="jymVt" />
     <node concept="3Tm1VV" id="CGeqIk8WWV" role="1B3o_S" />
   </node>
@@ -5352,39 +5516,16 @@
       <node concept="3cqZAl" id="7DvO2M9pduv" role="3clF45" />
       <node concept="3Tm1VV" id="7DvO2M9pduw" role="1B3o_S" />
       <node concept="3clFbS" id="7DvO2M9pdux" role="3clF47">
-        <node concept="3clFbF" id="7P_FdVPEi8v" role="3cqZAp">
-          <node concept="37vLTI" id="7P_FdVPEi8w" role="3clFbG">
-            <node concept="2OqwBi" id="7P_FdVPEi8x" role="37vLTJ">
-              <node concept="Xjq3P" id="7P_FdVPEi8y" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7P_FdVPEi8z" role="2OqNvi">
-                <ref role="2Oxat5" node="7P_FdVPEi8m" resolve="ruleTemplates" />
+        <node concept="3clFbF" id="7WKNeR9bpBj" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR9bpBl" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR9bvwG" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR9bvxC" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR9bvwJ" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
               </node>
             </node>
-            <node concept="2OqwBi" id="7P_FdVPEi8$" role="37vLTx">
-              <node concept="37vLTw" id="7P_FdVPEi8_" role="2Oq$k0">
-                <ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
-              </node>
-              <node concept="liA8E" id="7P_FdVPEi8A" role="2OqNvi">
-                <ref role="37wK5l" node="20Ay2VeR9qk" resolve="ruleTemplates" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7P_FdVPFo1t" role="3cqZAp">
-          <node concept="37vLTI" id="7P_FdVPFoPp" role="3clFbG">
-            <node concept="2OqwBi" id="7P_FdVPFoZA" role="37vLTx">
-              <node concept="37vLTw" id="7P_FdVPFoSk" role="2Oq$k0">
-                <ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
-              </node>
-              <node concept="liA8E" id="7P_FdVPFpdl" role="2OqNvi">
-                <ref role="37wK5l" node="7DvO2M9Icas" resolve="macroTemplates" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="7P_FdVPFo93" role="37vLTJ">
-              <node concept="Xjq3P" id="7P_FdVPFo1r" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7P_FdVPFole" role="2OqNvi">
-                <ref role="2Oxat5" node="7P_FdVPFb2V" resolve="macroTemplates" />
-              </node>
+            <node concept="37vLTw" id="7WKNeR9bpBp" role="37vLTx">
+              <ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
             </node>
           </node>
         </node>
@@ -5396,6 +5537,51 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="7WKNeR9b5Ef" role="jymVt" />
+    <node concept="3clFbW" id="7WKNeR9bcL$" role="jymVt">
+      <node concept="37vLTG" id="7WKNeR9biVB" role="3clF46">
+        <property role="TrG5h" value="ruleProcessingSession" />
+        <node concept="3uibUv" id="7WKNeR9biVC" role="1tU5fm">
+          <ref role="3uigEE" node="CGeqIk8WWU" resolve="RuleProcessingSession" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7WKNeR9biTm" role="3clF46">
+        <property role="TrG5h" value="queryTemplate" />
+        <node concept="3uibUv" id="7WKNeR9bpo1" role="1tU5fm">
+          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7WKNeR9bcLA" role="3clF45" />
+      <node concept="3Tm1VV" id="7WKNeR9bcLB" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR9bcLC" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR9b_gH" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR9b_gI" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR9b_gJ" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR9b_gK" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR9b_gL" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7WKNeR9b_gM" role="37vLTx">
+              <ref role="3cqZAo" node="7WKNeR9biVB" resolve="ruleProcessingSession" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7WKNeR9b_iV" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR9b_iX" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR9bFoy" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR9bFpu" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR9bFo_" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR9b_iR" resolve="queryTemplate" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7WKNeR9b_j1" role="37vLTx">
+              <ref role="3cqZAo" node="7WKNeR9biTm" resolve="queryTemplate" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="3GlpCDSxTK6" role="jymVt" />
     <node concept="3clFb_" id="3GlpCDSxTKz" role="jymVt">
       <property role="TrG5h" value="forRoot" />
@@ -5549,20 +5735,96 @@
     <node concept="3clFb_" id="3GlpCDSyO$P" role="jymVt">
       <property role="TrG5h" value="getPrograms" />
       <node concept="_YKpA" id="20Ay2VeYwM6" role="3clF45">
-        <node concept="3uibUv" id="20Ay2VeYwM7" role="_ZDj9">
-          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+        <node concept="1LlUBW" id="7WKNeR9luDN" role="_ZDj9">
+          <node concept="17QB3L" id="7WKNeR9lv4Z" role="1Lm7xW" />
+          <node concept="3uibUv" id="7WKNeR9lvwj" role="1Lm7xW">
+            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+          </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="3GlpCDSyO$S" role="1B3o_S" />
       <node concept="3clFbS" id="3GlpCDSyO$T" role="3clF47">
         <node concept="3clFbF" id="3GlpCDSyQWA" role="3cqZAp">
           <node concept="37vLTw" id="3GlpCDSyQW_" role="3clFbG">
-            <ref role="3cqZAo" node="1pPth$lE8Xs" resolve="programs" />
+            <ref role="3cqZAo" node="1pPth$lE8Xs" resolve="stage_programs" />
           </node>
         </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7kTeLbPnC47" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR9c0Kn" role="jymVt">
+      <property role="TrG5h" value="ruleTemplates" />
+      <node concept="3uibUv" id="7WKNeR9cd5o" role="3clF45">
+        <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
+      </node>
+      <node concept="3Tm6S6" id="7WKNeR9c7gI" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR9c0Kr" role="3clF47">
+        <node concept="3clFbJ" id="7WKNeR9ctuv" role="3cqZAp">
+          <node concept="3y3z36" id="7WKNeR9ctCP" role="3clFbw">
+            <node concept="10Nm6u" id="7WKNeR9ctEU" role="3uHU7w" />
+            <node concept="37vLTw" id="7WKNeR9ctw9" role="3uHU7B">
+              <ref role="3cqZAo" node="7WKNeR9b_iR" resolve="queryTemplate" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="7WKNeR9ctux" role="3clFbx">
+            <node concept="3cpWs6" id="7WKNeR9cKJK" role="3cqZAp">
+              <node concept="2OqwBi" id="7WKNeR9cKJL" role="3cqZAk">
+                <node concept="2OqwBi" id="7WKNeR9cKJM" role="2Oq$k0">
+                  <node concept="37vLTw" id="7WKNeR9cKJN" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
+                  </node>
+                  <node concept="liA8E" id="7WKNeR9cKJO" role="2OqNvi">
+                    <ref role="37wK5l" node="7WKNeR9alW4" resolve="queryTemplates" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="7WKNeR9cKJP" role="2OqNvi">
+                  <ref role="37wK5l" node="7WKNeR98sU4" resolve="ruleTemplates" />
+                  <node concept="37vLTw" id="7WKNeR9cKJQ" role="37wK5m">
+                    <ref role="3cqZAo" node="7WKNeR9b_iR" resolve="queryTemplate" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="7WKNeR9cW1A" role="3cqZAp" />
+          </node>
+          <node concept="9aQIb" id="7WKNeR9d1qz" role="9aQIa">
+            <node concept="3clFbS" id="7WKNeR9d1q$" role="9aQI4">
+              <node concept="3cpWs6" id="7WKNeR9d7U5" role="3cqZAp">
+                <node concept="2OqwBi" id="7WKNeR9diJ6" role="3cqZAk">
+                  <node concept="37vLTw" id="7WKNeR9ddyK" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
+                  </node>
+                  <node concept="liA8E" id="7WKNeR9d$jv" role="2OqNvi">
+                    <ref role="37wK5l" node="20Ay2VeR9qk" resolve="ruleTemplates" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR9e45a" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR9e9Q$" role="jymVt">
+      <property role="TrG5h" value="macroTemplates" />
+      <node concept="3uibUv" id="7WKNeR9emMw" role="3clF45">
+        <ref role="3uigEE" node="1hX44vNlSIA" resolve="MacroTemplateIndex" />
+      </node>
+      <node concept="3Tm6S6" id="7WKNeR9efQB" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR9e9QC" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR9eS_5" role="3cqZAp">
+          <node concept="2OqwBi" id="7WKNeR9eSGJ" role="3clFbG">
+            <node concept="37vLTw" id="7WKNeR9eS_4" role="2Oq$k0">
+              <ref role="3cqZAo" node="7WKNeR9bpBf" resolve="ruleProcessingSession" />
+            </node>
+            <node concept="liA8E" id="7WKNeR9eSO9" role="2OqNvi">
+              <ref role="37wK5l" node="7DvO2M9Icas" resolve="macroTemplates" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR9bOnB" role="jymVt" />
     <node concept="3clFb_" id="7kTeLbPnDc0" role="jymVt">
       <property role="TrG5h" value="build" />
       <node concept="37vLTG" id="7kTeLbPnFaf" role="3clF46">
@@ -5655,8 +5917,8 @@
             <node concept="2OqwBi" id="4vBwiiVefTl" role="33vP2m">
               <node concept="2OqwBi" id="4vBwiiVefTm" role="2Oq$k0">
                 <node concept="2OqwBi" id="4vBwiiVefTn" role="2Oq$k0">
-                  <node concept="37vLTw" id="7P_FdVPF8uB" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7P_FdVPEi8m" resolve="ruleTemplates" />
+                  <node concept="1rXfSq" id="7WKNeR9dMsA" role="2Oq$k0">
+                    <ref role="37wK5l" node="7WKNeR9c0Kn" resolve="ruleTemplates" />
                   </node>
                   <node concept="liA8E" id="4vBwiiVefTr" role="2OqNvi">
                     <ref role="37wK5l" node="4QPCta1zKCT" resolve="stages" />
@@ -5736,34 +5998,49 @@
                     <node concept="2OqwBi" id="4vBwiiVen0N" role="2Oq$k0">
                       <node concept="Xjq3P" id="4vBwiiVen0O" role="2Oq$k0" />
                       <node concept="2OwXpG" id="4vBwiiVen0P" role="2OqNvi">
-                        <ref role="2Oxat5" node="1pPth$lE8Xs" resolve="programs" />
+                        <ref role="2Oxat5" node="1pPth$lE8Xs" resolve="stage_programs" />
                       </node>
                     </node>
                     <node concept="TSZUe" id="4vBwiiVen0Q" role="2OqNvi">
-                      <node concept="2OqwBi" id="4vBwiiVen0R" role="25WWJ7">
-                        <node concept="1LFfDK" id="4vBwiiVexUs" role="2Oq$k0">
-                          <node concept="3cmrfG" id="4vBwiiVeyfV" role="1LF_Uc">
-                            <property role="3cmrfH" value="1" />
+                      <node concept="1Ls8ON" id="7WKNeR9lAVH" role="25WWJ7">
+                        <node concept="2OqwBi" id="7WKNeR9lDcf" role="1Lso8e">
+                          <node concept="1LFfDK" id="7WKNeR9lCuA" role="2Oq$k0">
+                            <node concept="3cmrfG" id="7WKNeR9lCMP" role="1LF_Uc">
+                              <property role="3cmrfH" value="0" />
+                            </node>
+                            <node concept="37vLTw" id="7WKNeR9lBQn" role="1LFl5Q">
+                              <ref role="3cqZAo" node="4vBwiiVep0U" resolve="stage_builder" />
+                            </node>
                           </node>
-                          <node concept="37vLTw" id="4vBwiiVexk7" role="1LFl5Q">
-                            <ref role="3cqZAo" node="4vBwiiVep0U" resolve="stage_builder" />
+                          <node concept="liA8E" id="7WKNeR9lDAB" role="2OqNvi">
+                            <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
                           </node>
                         </node>
-                        <node concept="liA8E" id="4vBwiiVen0T" role="2OqNvi">
-                          <ref role="37wK5l" to="7n8k:5rhZO$TZiL1" resolve="toProgram" />
-                          <node concept="3cpWs3" id="4vBwiiVen0U" role="37wK5m">
-                            <node concept="3cpWs3" id="4vBwiiVen0V" role="3uHU7B">
-                              <node concept="37vLTw" id="4vBwiiVen0W" role="3uHU7B">
-                                <ref role="3cqZAo" node="7kTeLbPo56q" resolve="nameHint" />
-                              </node>
-                              <node concept="Xl_RD" id="4vBwiiVen0X" role="3uHU7w">
-                                <property role="Xl_RC" value="-" />
-                              </node>
+                        <node concept="2OqwBi" id="4vBwiiVen0R" role="1Lso8e">
+                          <node concept="1LFfDK" id="4vBwiiVexUs" role="2Oq$k0">
+                            <node concept="3cmrfG" id="4vBwiiVeyfV" role="1LF_Uc">
+                              <property role="3cmrfH" value="1" />
                             </node>
-                            <node concept="1eOMI4" id="4vBwiiVen0Y" role="3uHU7w">
-                              <node concept="3uNrnE" id="4vBwiiVen0Z" role="1eOMHV">
-                                <node concept="37vLTw" id="4vBwiiVen10" role="2$L3a6">
-                                  <ref role="3cqZAo" node="7kTeLbPnP2F" resolve="stageIdx" />
+                            <node concept="37vLTw" id="4vBwiiVexk7" role="1LFl5Q">
+                              <ref role="3cqZAo" node="4vBwiiVep0U" resolve="stage_builder" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="4vBwiiVen0T" role="2OqNvi">
+                            <ref role="37wK5l" to="7n8k:5rhZO$TZiL1" resolve="toProgram" />
+                            <node concept="3cpWs3" id="4vBwiiVen0U" role="37wK5m">
+                              <node concept="3cpWs3" id="4vBwiiVen0V" role="3uHU7B">
+                                <node concept="37vLTw" id="4vBwiiVen0W" role="3uHU7B">
+                                  <ref role="3cqZAo" node="7kTeLbPo56q" resolve="nameHint" />
+                                </node>
+                                <node concept="Xl_RD" id="4vBwiiVen0X" role="3uHU7w">
+                                  <property role="Xl_RC" value="-" />
+                                </node>
+                              </node>
+                              <node concept="1eOMI4" id="4vBwiiVen0Y" role="3uHU7w">
+                                <node concept="3uNrnE" id="4vBwiiVen0Z" role="1eOMHV">
+                                  <node concept="37vLTw" id="4vBwiiVen10" role="2$L3a6">
+                                    <ref role="3cqZAo" node="7kTeLbPnP2F" resolve="stageIdx" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
@@ -5945,8 +6222,8 @@
               <node concept="1rXfSq" id="2Qe6u2cluiq" role="33vP2m">
                 <ref role="37wK5l" node="tIwzd1I3Xv" resolve="applyAndCollectRequired" />
                 <node concept="2OqwBi" id="2Qe6u2cluir" role="37wK5m">
-                  <node concept="37vLTw" id="7P_FdVPF9AW" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7P_FdVPEi8m" resolve="ruleTemplates" />
+                  <node concept="1rXfSq" id="7WKNeR9dXk_" role="2Oq$k0">
+                    <ref role="37wK5l" node="7WKNeR9c0Kn" resolve="ruleTemplates" />
                   </node>
                   <node concept="liA8E" id="2Qe6u2cluiv" role="2OqNvi">
                     <ref role="37wK5l" node="5NuEpF1qn9x" resolve="allRuleTemplatesWithNoInput" />
@@ -6129,8 +6406,8 @@
               <node concept="1rXfSq" id="2Qe6u2cltUx" role="33vP2m">
                 <ref role="37wK5l" node="tIwzd1I3Xv" resolve="applyAndCollectRequired" />
                 <node concept="2OqwBi" id="2Qe6u2cltUy" role="37wK5m">
-                  <node concept="37vLTw" id="7P_FdVPFai9" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7P_FdVPEi8m" resolve="ruleTemplates" />
+                  <node concept="1rXfSq" id="7WKNeR9dXvY" role="2Oq$k0">
+                    <ref role="37wK5l" node="7WKNeR9c0Kn" resolve="ruleTemplates" />
                   </node>
                   <node concept="liA8E" id="2Qe6u2cltUA" role="2OqNvi">
                     <ref role="37wK5l" node="5NuEpF1qn9x" resolve="allRuleTemplatesWithNoInput" />
@@ -7839,8 +8116,8 @@
                   <node concept="2ShNRf" id="7DvO2Mah9zj" role="37vLTx">
                     <node concept="1pGfFk" id="7DvO2Mah9zk" role="2ShVmc">
                       <ref role="37wK5l" node="7DvO2Ma0h_M" resolve="MacroProcessing" />
-                      <node concept="37vLTw" id="7P_FdVPFpDP" role="37wK5m">
-                        <ref role="3cqZAo" node="7P_FdVPFb2V" resolve="macroTemplates" />
+                      <node concept="1rXfSq" id="7WKNeR9f2QG" role="37wK5m">
+                        <ref role="37wK5l" node="7WKNeR9e9Q$" resolve="macroTemplates" />
                       </node>
                     </node>
                   </node>
@@ -8391,8 +8668,8 @@
                   </node>
                 </node>
                 <node concept="2OqwBi" id="5ntLU8GlzSK" role="33vP2m">
-                  <node concept="37vLTw" id="7P_FdVPFaMl" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7P_FdVPEi8m" resolve="ruleTemplates" />
+                  <node concept="1rXfSq" id="7WKNeR9dXOK" role="2Oq$k0">
+                    <ref role="37wK5l" node="7WKNeR9c0Kn" resolve="ruleTemplates" />
                   </node>
                   <node concept="liA8E" id="5ntLU8GlzSM" role="2OqNvi">
                     <ref role="37wK5l" node="6fdr4UgfuGk" resolve="allRuleTemplates" />
@@ -9830,37 +10107,43 @@
     <node concept="312cEg" id="1pPth$lE8Xs" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
-      <property role="TrG5h" value="programs" />
+      <property role="TrG5h" value="stage_programs" />
       <property role="3TUv4t" value="false" />
       <node concept="_YKpA" id="20Ay2VeYy5g" role="1tU5fm">
-        <node concept="3uibUv" id="20Ay2VeYy5h" role="_ZDj9">
-          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+        <node concept="1LlUBW" id="7WKNeR9lvI2" role="_ZDj9">
+          <node concept="17QB3L" id="7WKNeR9lwOJ" role="1Lm7xW" />
+          <node concept="3uibUv" id="7WKNeR9lxqX" role="1Lm7xW">
+            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+          </node>
         </node>
       </node>
       <node concept="3Tm6S6" id="3GlpCDSyB5g" role="1B3o_S" />
       <node concept="2ShNRf" id="20Ay2VeYyxo" role="33vP2m">
         <node concept="Tc6Ow" id="20Ay2VeYywP" role="2ShVmc">
-          <node concept="3uibUv" id="20Ay2VeYywQ" role="HW$YZ">
-            <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+          <node concept="1LlUBW" id="7WKNeR9l$pX" role="HW$YZ">
+            <node concept="17QB3L" id="7WKNeR9l_jJ" role="1Lm7xW" />
+            <node concept="3uibUv" id="7WKNeR9l_Mu" role="1Lm7xW">
+              <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+            </node>
           </node>
         </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7P_FdVPwf9L" role="jymVt" />
     <node concept="3Tm1VV" id="3GlpCDSxTG8" role="1B3o_S" />
-    <node concept="312cEg" id="7P_FdVPEi8m" role="jymVt">
-      <property role="TrG5h" value="ruleTemplates" />
-      <node concept="3Tm6S6" id="7P_FdVPEi8k" role="1B3o_S" />
-      <node concept="3uibUv" id="7P_FdVPEi8l" role="1tU5fm">
-        <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
+    <node concept="312cEg" id="7WKNeR9bpBf" role="jymVt">
+      <property role="TrG5h" value="ruleProcessingSession" />
+      <node concept="3Tm6S6" id="7WKNeR9bpBg" role="1B3o_S" />
+      <node concept="3uibUv" id="7WKNeR9bpBi" role="1tU5fm">
+        <ref role="3uigEE" node="CGeqIk8WWU" resolve="RuleProcessingSession" />
       </node>
     </node>
-    <node concept="2tJIrI" id="7P_FdVPFhzn" role="jymVt" />
-    <node concept="312cEg" id="7P_FdVPFb2V" role="jymVt">
-      <property role="TrG5h" value="macroTemplates" />
-      <node concept="3Tm6S6" id="7P_FdVPFb2W" role="1B3o_S" />
-      <node concept="3uibUv" id="7P_FdVPFnNA" role="1tU5fm">
-        <ref role="3uigEE" node="1hX44vNlSIA" resolve="MacroTemplateIndex" />
+    <node concept="2tJIrI" id="7WKNeR9bJ9p" role="jymVt" />
+    <node concept="312cEg" id="7WKNeR9b_iR" role="jymVt">
+      <property role="TrG5h" value="queryTemplate" />
+      <node concept="3Tm6S6" id="7WKNeR9b_iS" role="1B3o_S" />
+      <node concept="3uibUv" id="7WKNeR9b_iU" role="1tU5fm">
+        <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
       </node>
     </node>
   </node>
@@ -11216,5 +11499,321 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="7WKNeR93NDF">
+    <property role="TrG5h" value="QueryTemplateIndex" />
+    <node concept="2tJIrI" id="7WKNeR93NF5" role="jymVt" />
+    <node concept="3clFbW" id="7WKNeR93OQV" role="jymVt">
+      <node concept="37vLTG" id="7WKNeR93Q47" role="3clF46">
+        <property role="TrG5h" value="manifests" />
+        <node concept="A3Dl8" id="7WKNeR93Q48" role="1tU5fm">
+          <node concept="3uibUv" id="7WKNeR93Q49" role="A3Ik2">
+            <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7WKNeR93OQX" role="3clF45" />
+      <node concept="3Tm1VV" id="7WKNeR93OQY" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR93OQZ" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR96np4" role="3cqZAp">
+          <node concept="1rXfSq" id="7WKNeR96np3" role="3clFbG">
+            <ref role="37wK5l" node="7WKNeR96ejn" resolve="init" />
+            <node concept="37vLTw" id="7WKNeR96nuQ" role="37wK5m">
+              <ref role="3cqZAo" node="7WKNeR93Q47" resolve="manifests" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR93OR7" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR94Nd_" role="jymVt">
+      <property role="TrG5h" value="allQueryTemplates" />
+      <node concept="3vKaQO" id="7WKNeR94Nkz" role="3clF45">
+        <node concept="3uibUv" id="7WKNeR94Nlu" role="3O5elw">
+          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7WKNeR94NdC" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR94NdD" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR98nc4" role="3cqZAp">
+          <node concept="2OqwBi" id="7WKNeR98pCX" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR98orp" role="2Oq$k0">
+              <node concept="2OqwBi" id="7WKNeR98nAX" role="2Oq$k0">
+                <node concept="37vLTw" id="7WKNeR98nc3" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7WKNeR96fg2" resolve="fqName2queryTemplate" />
+                </node>
+                <node concept="T8wYR" id="7WKNeR98nUy" role="2OqNvi" />
+              </node>
+              <node concept="ANE8D" id="7WKNeR98oNj" role="2OqNvi" />
+            </node>
+            <node concept="26Dbio" id="7WKNeR98qO4" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR94Nc$" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR95RPZ" role="jymVt">
+      <property role="TrG5h" value="byFqName" />
+      <node concept="37vLTG" id="7WKNeR95RTI" role="3clF46">
+        <property role="TrG5h" value="queryFqName" />
+        <node concept="17QB3L" id="7WKNeR95RU3" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="7WKNeR95RRJ" role="3clF45">
+        <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+      </node>
+      <node concept="3Tm1VV" id="7WKNeR95RQ2" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR95RQ3" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR98qTB" role="3cqZAp">
+          <node concept="3EllGN" id="7WKNeR98rMD" role="3clFbG">
+            <node concept="37vLTw" id="7WKNeR98rR7" role="3ElVtu">
+              <ref role="3cqZAo" node="7WKNeR95RTI" resolve="queryFqName" />
+            </node>
+            <node concept="37vLTw" id="7WKNeR98qTA" role="3ElQJh">
+              <ref role="3cqZAo" node="7WKNeR96fg2" resolve="fqName2queryTemplate" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR98smD" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR98sU4" role="jymVt">
+      <property role="TrG5h" value="ruleTemplates" />
+      <node concept="37vLTG" id="7WKNeR98uXx" role="3clF46">
+        <property role="TrG5h" value="qt" />
+        <node concept="3uibUv" id="7WKNeR98vto" role="1tU5fm">
+          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="7WKNeR98tsh" role="3clF45">
+        <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
+      </node>
+      <node concept="3Tm1VV" id="7WKNeR98sU7" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR98sU8" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR98vvL" role="3cqZAp">
+          <node concept="3EllGN" id="7WKNeR98vUB" role="3clFbG">
+            <node concept="37vLTw" id="7WKNeR98vYr" role="3ElVtu">
+              <ref role="3cqZAo" node="7WKNeR98uXx" resolve="qt" />
+            </node>
+            <node concept="37vLTw" id="7WKNeR98vvK" role="3ElQJh">
+              <ref role="3cqZAo" node="7WKNeR97s2V" resolve="queryTemplate2index" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR96a4r" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR96ejn" role="jymVt">
+      <property role="TrG5h" value="init" />
+      <node concept="37vLTG" id="7WKNeR96eOL" role="3clF46">
+        <property role="TrG5h" value="manifests" />
+        <node concept="A3Dl8" id="7WKNeR96eOM" role="1tU5fm">
+          <node concept="3uibUv" id="7WKNeR96eON" role="A3Ik2">
+            <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7WKNeR96ejp" role="3clF45" />
+      <node concept="3Tm6S6" id="7WKNeR96esZ" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR96ejr" role="3clF47">
+        <node concept="3cpWs8" id="7WKNeR97vRM" role="3cqZAp">
+          <node concept="3cpWsn" id="7WKNeR97vRN" role="3cpWs9">
+            <property role="TrG5h" value="queryTemplates" />
+            <node concept="A3Dl8" id="7WKNeR97vRj" role="1tU5fm">
+              <node concept="3uibUv" id="7WKNeR97vRm" role="A3Ik2">
+                <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7WKNeR97vRO" role="33vP2m">
+              <node concept="37vLTw" id="7WKNeR97vRP" role="2Oq$k0">
+                <ref role="3cqZAo" node="7WKNeR96eOL" resolve="manifests" />
+              </node>
+              <node concept="3goQfb" id="7WKNeR97vRQ" role="2OqNvi">
+                <node concept="1bVj0M" id="7WKNeR97vRR" role="23t8la">
+                  <node concept="3clFbS" id="7WKNeR97vRS" role="1bW5cS">
+                    <node concept="3clFbF" id="7WKNeR97vRT" role="3cqZAp">
+                      <node concept="2OqwBi" id="7WKNeR97vRU" role="3clFbG">
+                        <node concept="37vLTw" id="7WKNeR97vRV" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7WKNeR97vRX" resolve="it" />
+                        </node>
+                        <node concept="liA8E" id="7WKNeR97vRW" role="2OqNvi">
+                          <ref role="37wK5l" to="i348:7P_FdVPtq7Z" resolve="queryTemplates" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="7WKNeR97vRX" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="7WKNeR97vRY" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="7WKNeR97wDx" role="3cqZAp">
+          <node concept="3clFbS" id="7WKNeR97wtM" role="2LFqv$">
+            <node concept="3clFbF" id="7WKNeR96jDw" role="3cqZAp">
+              <node concept="37vLTI" id="7WKNeR96mxm" role="3clFbG">
+                <node concept="2GrUjf" id="7WKNeR97x_V" role="37vLTx">
+                  <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                </node>
+                <node concept="3EllGN" id="7WKNeR96lbe" role="37vLTJ">
+                  <node concept="2OqwBi" id="7WKNeR96lHw" role="3ElVtu">
+                    <node concept="2GrUjf" id="7WKNeR97xLn" role="2Oq$k0">
+                      <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                    </node>
+                    <node concept="liA8E" id="7WKNeR96m6R" role="2OqNvi">
+                      <ref role="37wK5l" to="i348:7WKNeR94Np2" resolve="fqName" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="7WKNeR96jDv" role="3ElQJh">
+                    <ref role="3cqZAo" node="7WKNeR96fg2" resolve="fqName2queryTemplate" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="7WKNeR97HMt" role="3cqZAp">
+              <node concept="3cpWsn" id="7WKNeR97HMu" role="3cpWs9">
+                <property role="TrG5h" value="handlerFqNames" />
+                <property role="3TUv4t" value="true" />
+                <node concept="2hMVRd" id="7WKNeR97HL8" role="1tU5fm">
+                  <node concept="17QB3L" id="7WKNeR97HLb" role="2hN53Y" />
+                </node>
+                <node concept="2ShNRf" id="7WKNeR97HMv" role="33vP2m">
+                  <node concept="2i4dXS" id="7WKNeR97HMw" role="2ShVmc">
+                    <node concept="17QB3L" id="7WKNeR97HMx" role="HW$YZ" />
+                    <node concept="2OqwBi" id="7WKNeR97HMy" role="I$8f6">
+                      <node concept="2GrUjf" id="7WKNeR97HMz" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                      </node>
+                      <node concept="liA8E" id="7WKNeR97HM$" role="2OqNvi">
+                        <ref role="37wK5l" to="i348:7P_FdVQBl1a" resolve="usedHandlersFqNames" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7WKNeR97y2N" role="3cqZAp">
+              <node concept="37vLTI" id="7WKNeR97yN$" role="3clFbG">
+                <node concept="2ShNRf" id="7WKNeR97yUL" role="37vLTx">
+                  <node concept="YeOm9" id="7WKNeR97$de" role="2ShVmc">
+                    <node concept="1Y3b0j" id="7WKNeR97$dh" role="YeSDq">
+                      <property role="2bfB8j" value="true" />
+                      <ref role="1Y3XeK" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
+                      <ref role="37wK5l" node="7P_FdVPIH2n" resolve="RuleTemplateIndex" />
+                      <node concept="3Tm1VV" id="7WKNeR97$di" role="1B3o_S" />
+                      <node concept="37vLTw" id="7WKNeR97zYe" role="37wK5m">
+                        <ref role="3cqZAo" node="7WKNeR96eOL" resolve="manifests" />
+                      </node>
+                      <node concept="3clFb_" id="7WKNeR97$sU" role="jymVt">
+                        <property role="TrG5h" value="acceptHandlerTemplate" />
+                        <property role="1EzhhJ" value="false" />
+                        <node concept="37vLTG" id="7WKNeR97$sV" role="3clF46">
+                          <property role="TrG5h" value="ht" />
+                          <node concept="3uibUv" id="7WKNeR97$sW" role="1tU5fm">
+                            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+                          </node>
+                        </node>
+                        <node concept="10P_77" id="7WKNeR97$sX" role="3clF45" />
+                        <node concept="3Tmbuc" id="7WKNeR97$sY" role="1B3o_S" />
+                        <node concept="3clFbS" id="7WKNeR97$t3" role="3clF47">
+                          <node concept="1X3_iC" id="7WKNeR99siZ" role="lGtFl">
+                            <property role="3V$3am" value="statement" />
+                            <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+                            <node concept="3clFbF" id="7WKNeR97JQ0" role="8Wnug">
+                              <node concept="2OqwBi" id="7WKNeR97Kz3" role="3clFbG">
+                                <node concept="37vLTw" id="7WKNeR97JPY" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="7WKNeR97HMu" resolve="handlerFqNames" />
+                                </node>
+                                <node concept="3JPx81" id="7WKNeR97Luz" role="2OqNvi">
+                                  <node concept="2OqwBi" id="7WKNeR97Mqs" role="25WWJ7">
+                                    <node concept="37vLTw" id="7WKNeR97Lxn" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="7WKNeR97$sV" resolve="ht" />
+                                    </node>
+                                    <node concept="liA8E" id="7WKNeR97Mz6" role="2OqNvi">
+                                      <ref role="37wK5l" to="i348:7P_FdVQoZmr" resolve="fqName" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbF" id="7WKNeR99snV" role="3cqZAp">
+                            <node concept="3clFbT" id="7WKNeR99snU" role="3clFbG">
+                              <property role="3clFbU" value="true" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2AHcQZ" id="7WKNeR97$t4" role="2AJF6D">
+                          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3EllGN" id="7WKNeR97yt4" role="37vLTJ">
+                  <node concept="2GrUjf" id="7WKNeR97ywI" role="3ElVtu">
+                    <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                  </node>
+                  <node concept="37vLTw" id="7WKNeR97y2L" role="3ElQJh">
+                    <ref role="3cqZAo" node="7WKNeR97s2V" resolve="queryTemplate2index" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="7WKNeR97wtS" role="2GsD0m">
+            <ref role="3cqZAo" node="7WKNeR97vRN" resolve="queryTemplates" />
+          </node>
+          <node concept="2GrKxI" id="7WKNeR97wDT" role="2Gsz3X">
+            <property role="TrG5h" value="qt" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR96f6_" role="jymVt" />
+    <node concept="312cEg" id="7WKNeR96fg2" role="jymVt">
+      <property role="TrG5h" value="fqName2queryTemplate" />
+      <node concept="3Tm6S6" id="7WKNeR96fg3" role="1B3o_S" />
+      <node concept="3rvAFt" id="7WKNeR96foD" role="1tU5fm">
+        <node concept="17QB3L" id="7WKNeR96fvo" role="3rvQeY" />
+        <node concept="3uibUv" id="7WKNeR96fz0" role="3rvSg0">
+          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7WKNeR96gm5" role="33vP2m">
+        <node concept="3rGOSV" id="7WKNeR96gl8" role="2ShVmc">
+          <node concept="17QB3L" id="7WKNeR96gl9" role="3rHrn6" />
+          <node concept="3uibUv" id="7WKNeR96gla" role="3rHtpV">
+            <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR97rJT" role="jymVt" />
+    <node concept="312cEg" id="7WKNeR97s2V" role="jymVt">
+      <property role="TrG5h" value="queryTemplate2index" />
+      <node concept="3Tm6S6" id="7WKNeR97s2W" role="1B3o_S" />
+      <node concept="3rvAFt" id="7WKNeR97skz" role="1tU5fm">
+        <node concept="3uibUv" id="7WKNeR97sro" role="3rvQeY">
+          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+        </node>
+        <node concept="3uibUv" id="7WKNeR97sCA" role="3rvSg0">
+          <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7WKNeR97tyT" role="33vP2m">
+        <node concept="3rGOSV" id="7WKNeR97txW" role="2ShVmc">
+          <node concept="3uibUv" id="7WKNeR97txX" role="3rHrn6">
+            <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+          </node>
+          <node concept="3uibUv" id="7WKNeR97txY" role="3rHtpV">
+            <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="7WKNeR93NDG" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
index c5024486..701e18a4 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
@@ -1996,21 +1996,41 @@
   <node concept="3HP615" id="7P_FdVPs4aA">
     <property role="TrG5h" value="QueryTemplate" />
     <node concept="2tJIrI" id="7P_FdVPs4b8" role="jymVt" />
-    <node concept="3clFb_" id="7P_FdVPsPY7" role="jymVt">
+    <node concept="3clFb_" id="7P_FdVQ_scW" role="jymVt">
       <property role="1EzhhJ" value="true" />
-      <property role="TrG5h" value="handlerTemplates" />
-      <node concept="_YKpA" id="7P_FdVPsQ00" role="3clF45">
-        <node concept="3uibUv" id="7P_FdVPsQ0y" role="_ZDj9">
-          <ref role="3uigEE" node="4MqhgXU9fm3" resolve="HandlerTemplate" />
-        </node>
+      <property role="TrG5h" value="name" />
+      <node concept="17QB3L" id="7P_FdVQ_seW" role="3clF45" />
+      <node concept="3Tm1VV" id="7P_FdVQ_scZ" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVQ_sd0" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQ_sbr" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR94Np2" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="fqName" />
+      <node concept="17QB3L" id="7WKNeR94Np3" role="3clF45" />
+      <node concept="3Tm1VV" id="7WKNeR94Np4" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR94Np5" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="7WKNeR94NnR" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVQBl1a" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="usedHandlersFqNames" />
+      <node concept="_YKpA" id="7P_FdVQBl3q" role="3clF45">
+        <node concept="17QB3L" id="7P_FdVQBl3W" role="_ZDj9" />
       </node>
-      <node concept="3Tm1VV" id="7P_FdVPsPYa" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVPsPYb" role="3clF47" />
+      <node concept="3Tm1VV" id="7P_FdVQBl1d" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVQBl1e" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="7P_FdVPsPXb" role="jymVt" />
     <node concept="3clFb_" id="7P_FdVPsDM6" role="jymVt">
       <property role="1EzhhJ" value="true" />
       <property role="TrG5h" value="newQuery" />
+      <node concept="37vLTG" id="7P_FdVQ_p5F" role="3clF46">
+        <property role="TrG5h" value="observable" />
+        <node concept="3uibUv" id="7P_FdVQ_p6p" role="1tU5fm">
+          <ref role="3uigEE" node="7P_FdVQ_k3b" resolve="QueryTemplate.QueryObservable" />
+        </node>
+      </node>
       <node concept="37vLTG" id="7P_FdVPsGBf" role="3clF46">
         <property role="TrG5h" value="parameters" />
         <node concept="8X2XB" id="7P_FdVPsGC6" role="1tU5fm">
@@ -2020,7 +2040,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="7P_FdVPsDNI" role="3clF45">
-        <ref role="3uigEE" node="7P_FdVPsDC0" resolve="QueryTemplate.Query" />
+        <ref role="3uigEE" node="7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
       </node>
       <node concept="3Tm1VV" id="7P_FdVPsDM9" role="1B3o_S" />
       <node concept="3clFbS" id="7P_FdVPsDMa" role="3clF47" />
@@ -2028,11 +2048,15 @@
     <node concept="2tJIrI" id="7P_FdVPsDA3" role="jymVt" />
     <node concept="3HP615" id="7P_FdVPsDC0" role="jymVt">
       <property role="2bfB8j" value="true" />
-      <property role="TrG5h" value="Query" />
+      <property role="TrG5h" value="QueryConfigurable" />
       <node concept="2tJIrI" id="7P_FdVPsDDy" role="jymVt" />
       <node concept="3clFb_" id="7P_FdVPsE9p" role="jymVt">
         <property role="1EzhhJ" value="true" />
         <property role="TrG5h" value="configure" />
+        <node concept="37vLTG" id="7P_FdVQ_jv0" role="3clF46">
+          <property role="TrG5h" value="stage" />
+          <node concept="17QB3L" id="7P_FdVQ_jw7" role="1tU5fm" />
+        </node>
         <node concept="37vLTG" id="7P_FdVPsEcX" role="3clF46">
           <property role="TrG5h" value="config" />
           <node concept="3uibUv" id="7P_FdVPsEeI" role="1tU5fm">
@@ -2045,42 +2069,84 @@
         <node concept="3Tm1VV" id="7P_FdVPsE9s" role="1B3o_S" />
         <node concept="3clFbS" id="7P_FdVPsE9t" role="3clF47" />
       </node>
-      <node concept="2tJIrI" id="7P_FdVPsEfJ" role="jymVt" />
-      <node concept="3clFb_" id="7P_FdVPsEjK" role="jymVt">
-        <property role="1EzhhJ" value="true" />
-        <property role="TrG5h" value="onSuccess" />
-        <node concept="37vLTG" id="7P_FdVPsEob" role="3clF46">
-          <property role="TrG5h" value="storeView" />
-          <node concept="3uibUv" id="7P_FdVPsGrx" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~StoreView" resolve="StoreView" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="7P_FdVPsGEh" role="3clF45">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-        <node concept="3Tm1VV" id="7P_FdVPsEjN" role="1B3o_S" />
-        <node concept="3clFbS" id="7P_FdVPsEjO" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="7P_FdVPsEqo" role="jymVt" />
-      <node concept="3clFb_" id="7P_FdVPsEsr" role="jymVt">
-        <property role="1EzhhJ" value="true" />
-        <property role="TrG5h" value="onFailure" />
-        <node concept="37vLTG" id="7P_FdVPsExH" role="3clF46">
-          <property role="TrG5h" value="exception" />
-          <node concept="3uibUv" id="7P_FdVPsGfh" role="1tU5fm">
-            <ref role="3uigEE" to="w7la:~EvaluationFailureException" resolve="EvaluationFailureException" />
-          </node>
-        </node>
-        <node concept="3uibUv" id="7P_FdVPsGFR" role="3clF45">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-        <node concept="3Tm1VV" id="7P_FdVPsEsu" role="1B3o_S" />
-        <node concept="3clFbS" id="7P_FdVPsEsv" role="3clF47" />
-      </node>
-      <node concept="2tJIrI" id="7P_FdVPsDDB" role="jymVt" />
+      <node concept="2tJIrI" id="7P_FdVQ_p0D" role="jymVt" />
       <node concept="3Tm1VV" id="7P_FdVPsDC1" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="7P_FdVPs4bh" role="jymVt" />
+    <node concept="3HP615" id="7P_FdVQ_k3b" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="QueryObservable" />
+      <node concept="2tJIrI" id="7P_FdVQ_k6c" role="jymVt" />
+      <node concept="3clFb_" id="7P_FdVQ_k6A" role="jymVt">
+        <property role="1EzhhJ" value="true" />
+        <property role="TrG5h" value="subscribe" />
+        <node concept="37vLTG" id="7P_FdVQ_ka7" role="3clF46">
+          <property role="TrG5h" value="observer" />
+          <node concept="3uibUv" id="7P_FdVQ_kaO" role="1tU5fm">
+            <ref role="3uigEE" node="7P_FdVQ_jCo" resolve="QueryTemplate.QueryObserver" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="7P_FdVQ_k6C" role="3clF45" />
+        <node concept="3Tm1VV" id="7P_FdVQ_k6D" role="1B3o_S" />
+        <node concept="3clFbS" id="7P_FdVQ_k6E" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="7P_FdVQ_oC2" role="jymVt" />
+      <node concept="3Tm1VV" id="7P_FdVQ_k3c" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQ_k1I" role="jymVt" />
+    <node concept="3HP615" id="7P_FdVQ_jCo" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="QueryObserver" />
+      <node concept="2tJIrI" id="7P_FdVQ_jEo" role="jymVt" />
+      <node concept="3clFb_" id="7P_FdVQ_jFm" role="jymVt">
+        <property role="1EzhhJ" value="true" />
+        <property role="TrG5h" value="onNext" />
+        <node concept="37vLTG" id="7P_FdVQ_jF$" role="3clF46">
+          <property role="TrG5h" value="stage" />
+          <node concept="17QB3L" id="7P_FdVQ_jI8" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="7P_FdVQ_jJ3" role="3clF46">
+          <property role="TrG5h" value="storeView" />
+          <node concept="3uibUv" id="7P_FdVQ_jJT" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~StoreView" resolve="StoreView" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="7P_FdVQ_jFp" role="3clF45" />
+        <node concept="3Tm1VV" id="7P_FdVQ_jFq" role="1B3o_S" />
+        <node concept="3clFbS" id="7P_FdVQ_jFr" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="7P_FdVQ_jL5" role="jymVt" />
+      <node concept="3clFb_" id="7P_FdVQ_jLY" role="jymVt">
+        <property role="1EzhhJ" value="true" />
+        <property role="TrG5h" value="onCompleted" />
+        <node concept="37vLTG" id="7P_FdVQ_jPZ" role="3clF46">
+          <property role="TrG5h" value="view" />
+          <node concept="3uibUv" id="7P_FdVQ_jQR" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~StoreView" resolve="StoreView" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="7P_FdVQ_jM0" role="3clF45" />
+        <node concept="3Tm1VV" id="7P_FdVQ_jM1" role="1B3o_S" />
+        <node concept="3clFbS" id="7P_FdVQ_jM2" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="7P_FdVQ_jS6" role="jymVt" />
+      <node concept="3clFb_" id="7P_FdVQ_jU$" role="jymVt">
+        <property role="1EzhhJ" value="true" />
+        <property role="TrG5h" value="onFailure" />
+        <node concept="37vLTG" id="7P_FdVQ_jY$" role="3clF46">
+          <property role="TrG5h" value="exception" />
+          <node concept="3uibUv" id="7WKNeR9$ZWp" role="1tU5fm">
+            <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="7P_FdVQ_jUB" role="3clF45" />
+        <node concept="3Tm1VV" id="7P_FdVQ_jUC" role="1B3o_S" />
+        <node concept="3clFbS" id="7P_FdVQ_jUD" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="7P_FdVQ_jEt" role="jymVt" />
+      <node concept="3Tm1VV" id="7P_FdVQ_jCp" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQ_jBm" role="jymVt" />
     <node concept="3Tm1VV" id="7P_FdVPs4aB" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="7P_FdVPsPNk">