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 a8940aa7..6883bd79 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
@@ -26445,7 +26445,7 @@
             <property role="TrG5h" value="tpl" />
             <node concept="1LlUBW" id="3YJ7yg2N3dO" role="1tU5fm">
               <node concept="3uibUv" id="1CcQBrPepNg" role="1Lm7xW">
-                <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                <ref role="3uigEE" to="hano:1CcQBrPcZVG" resolve="HandlingStage" />
               </node>
               <node concept="3uibUv" id="1ffsG7c4ezn" role="1Lm7xW">
                 <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -26462,7 +26462,7 @@
               <ref role="3cqZAo" node="20Ay2VeR5Dy" resolve="ruleTemplateIndex" />
             </node>
             <node concept="liA8E" id="3YJ7yg2N55j" role="2OqNvi">
-              <ref role="37wK5l" to="hano:6fdr4UgfuGk" resolve="allTemplates" />
+              <ref role="37wK5l" to="hano:6fdr4UgfuGk" resolve="allRuleTemplates" />
               <node concept="37vLTw" id="3YJ7yg2N7pX" role="37wK5m">
                 <ref role="3cqZAo" node="4n$QnzZQnen" resolve="node" />
               </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 52904154..dc0fd889 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
@@ -53,6 +53,7 @@
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.evaluation)" />
     <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.typesystem2.program)" />
     <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
+    <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
     <import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" implicit="true" />
     <import index="z8tp" ref="r:5bfbd177-208e-4d27-b74c-2ebd2a92eb80(jetbrains.mps.lang.smodel.types.structure)" implicit="true" />
@@ -753,10 +754,20 @@
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
     </node>
     <node concept="2rT7sh" id="4MqhgXUaC7X" role="2rTMjI">
-      <property role="TrG5h" value="handler_template" />
+      <property role="TrG5h" value="handler_template_class" />
       <ref role="2rTdP9" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
     </node>
+    <node concept="2rT7sh" id="7P_FdVQ488b" role="2rTMjI">
+      <property role="TrG5h" value="handler_template_constructor" />
+      <ref role="2rTdP9" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+      <ref role="2rZz_L" to="tpee:fzclF84" resolve="ConstructorDeclaration" />
+    </node>
+    <node concept="2rT7sh" id="7P_FdVPtAzR" role="2rTMjI">
+      <property role="TrG5h" value="query_template" />
+      <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
+      <ref role="2rTdP9" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    </node>
     <node concept="2rT7sh" id="6w6CYIRhsKS" role="2rTMjI">
       <property role="TrG5h" value="rule_class" />
       <ref role="2rZz_L" to="tpee:fz12cDA" resolve="ClassConcept" />
@@ -870,7 +881,7 @@
     <node concept="3lhOvk" id="4MqhgXUaA0d" role="3lj3bC">
       <ref role="30HIoZ" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
       <ref role="3lhOvi" node="4MqhgXU9Ebr" resolve="HandlerTemplateImpl" />
-      <ref role="2sgKRv" node="4MqhgXUaC7X" resolve="handler_template" />
+      <ref role="2sgKRv" node="4MqhgXUaC7X" resolve="handler_template_class" />
     </node>
     <node concept="3lhOvk" id="4vbeH84zIB1" role="3lj3bC">
       <ref role="3lhOvi" node="4vbeH84zLYz" resolve="RuleTemplateImpl_deprecated" />
@@ -5810,16 +5821,37 @@
     <node concept="2tJIrI" id="6w6CYIRhnJs" role="jymVt" />
     <node concept="3clFbW" id="4MqhgXUhWQk" role="jymVt">
       <node concept="3cqZAl" id="4MqhgXUhWQm" role="3clF45" />
-      <node concept="3Tm1VV" id="4MqhgXUhWQn" role="1B3o_S" />
+      <node concept="3Tmbuc" id="7P_FdVQ3QIz" role="1B3o_S" />
       <node concept="3clFbS" id="4MqhgXUhWQo" role="3clF47">
-        <node concept="3clFbF" id="4MqhgXUhX8c" role="3cqZAp">
-          <node concept="1rXfSq" id="4MqhgXUhX8b" role="3clFbG">
+        <node concept="3clFbF" id="7P_FdVQ4viH" role="3cqZAp">
+          <node concept="1rXfSq" id="7P_FdVQ4viG" role="3clFbG">
             <ref role="37wK5l" node="4MqhgXUajMY" resolve="init" />
           </node>
         </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4MqhgXUhW$N" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVPtt0i" role="jymVt">
+      <property role="TrG5h" value="queryTemplates" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="_YKpA" id="7P_FdVPtt0j" role="3clF45">
+        <node concept="3uibUv" id="7P_FdVPtt0k" role="_ZDj9">
+          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVPtt0l" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPtt0n" role="3clF47">
+        <node concept="3clFbF" id="7P_FdVPtIFz" role="3cqZAp">
+          <node concept="37vLTw" id="7P_FdVPtIFy" role="3clFbG">
+            <ref role="3cqZAo" node="7P_FdVPtty$" resolve="queryTemplates" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7P_FdVPtt0o" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPttnl" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUaj4Y" role="jymVt">
       <property role="TrG5h" value="handlerTemplates" />
       <property role="1EzhhJ" value="false" />
@@ -5844,7 +5876,7 @@
     <node concept="3clFb_" id="4MqhgXUajMY" role="jymVt">
       <property role="TrG5h" value="init" />
       <node concept="3cqZAl" id="4MqhgXUajN0" role="3clF45" />
-      <node concept="3Tm6S6" id="4MqhgXUajSA" role="1B3o_S" />
+      <node concept="3Tm6S6" id="7P_FdVQ4uXF" role="1B3o_S" />
       <node concept="3clFbS" id="4MqhgXUajN2" role="3clF47">
         <node concept="3clFbJ" id="4MqhgXUak5b" role="3cqZAp">
           <node concept="3clFbC" id="4MqhgXUakYI" role="3clFbw">
@@ -5856,7 +5888,7 @@
           <node concept="3clFbS" id="4MqhgXUak5d" role="3clFbx">
             <node concept="3cpWs8" id="4MqhgXUaKVh" role="3cqZAp">
               <node concept="3cpWsn" id="4MqhgXUaKVi" role="3cpWs9">
-                <property role="TrG5h" value="list" />
+                <property role="TrG5h" value="htpl" />
                 <node concept="_YKpA" id="4MqhgXUaKVd" role="1tU5fm">
                   <node concept="3uibUv" id="4MqhgXUaKVg" role="_ZDj9">
                     <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
@@ -5874,23 +5906,23 @@
             <node concept="3clFbF" id="4MqhgXUanCz" role="3cqZAp">
               <node concept="2OqwBi" id="4MqhgXUaoq2" role="3clFbG">
                 <node concept="37vLTw" id="4MqhgXUlzHQ" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4MqhgXUaKVi" resolve="list" />
+                  <ref role="3cqZAo" node="4MqhgXUaKVi" resolve="htpl" />
                 </node>
                 <node concept="TSZUe" id="4MqhgXUap$3" role="2OqNvi">
-                  <node concept="2ShNRf" id="4MqhgXUapFH" role="25WWJ7">
-                    <node concept="HV5vD" id="4MqhgXUaxiv" role="2ShVmc">
-                      <ref role="HV5vE" node="4MqhgXU9Ebr" resolve="HandlerTemplateImpl" />
-                      <node concept="1ZhdrF" id="4MqhgXUaGCY" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/2820489544401957797/2820489544401957798" />
-                        <property role="2qtEX8" value="classifier" />
-                        <node concept="3$xsQk" id="4MqhgXUaGCZ" role="3$ytzL">
-                          <node concept="3clFbS" id="4MqhgXUaGD0" role="2VODD2">
-                            <node concept="3clFbF" id="4MqhgXUaHen" role="3cqZAp">
-                              <node concept="2OqwBi" id="4MqhgXUaHHi" role="3clFbG">
-                                <node concept="1iwH7S" id="4MqhgXUaHem" role="2Oq$k0" />
-                                <node concept="1iwH70" id="4MqhgXUaHMe" role="2OqNvi">
-                                  <ref role="1iwH77" node="4MqhgXUaC7X" resolve="handler_template" />
-                                  <node concept="30H73N" id="4MqhgXUaHXZ" role="1iwH7V" />
+                  <node concept="2ShNRf" id="7P_FdVQ4c0e" role="25WWJ7">
+                    <node concept="1pGfFk" id="7P_FdVQ4c0f" role="2ShVmc">
+                      <ref role="37wK5l" node="4MqhgXUhXXR" resolve="HandlerTemplateImpl" />
+                      <node concept="1ZhdrF" id="7P_FdVQ4c0h" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                        <property role="2qtEX8" value="baseMethodDeclaration" />
+                        <node concept="3$xsQk" id="7P_FdVQ4c0i" role="3$ytzL">
+                          <node concept="3clFbS" id="7P_FdVQ4c0j" role="2VODD2">
+                            <node concept="3clFbF" id="7P_FdVQ4c0k" role="3cqZAp">
+                              <node concept="2OqwBi" id="7P_FdVQ4c0l" role="3clFbG">
+                                <node concept="1iwH7S" id="7P_FdVQ4c0m" role="2Oq$k0" />
+                                <node concept="1iwH70" id="7P_FdVQ4c0n" role="2OqNvi">
+                                  <ref role="1iwH77" node="7P_FdVQ488b" resolve="handler_template_constructor" />
+                                  <node concept="30H73N" id="7P_FdVQ4c0o" role="1iwH7V" />
                                 </node>
                               </node>
                             </node>
@@ -5925,7 +5957,7 @@
               <node concept="37vLTI" id="4MqhgXUancq" role="3clFbG">
                 <node concept="2OqwBi" id="4MqhgXUaM3n" role="37vLTx">
                   <node concept="37vLTw" id="4MqhgXUaKVm" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4MqhgXUaKVi" resolve="list" />
+                    <ref role="3cqZAo" node="4MqhgXUaKVi" resolve="htpl" />
                   </node>
                   <node concept="26Dbio" id="4MqhgXUaNaX" role="2OqNvi" />
                 </node>
@@ -5939,6 +5971,91 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbJ" id="7P_FdVPttUS" role="3cqZAp">
+          <node concept="3clFbS" id="7P_FdVPttUU" role="3clFbx">
+            <node concept="3cpWs8" id="7P_FdVPtxqh" role="3cqZAp">
+              <node concept="3cpWsn" id="7P_FdVPtxqi" role="3cpWs9">
+                <property role="TrG5h" value="qtpl" />
+                <node concept="_YKpA" id="7P_FdVPtxq9" role="1tU5fm">
+                  <node concept="3uibUv" id="7P_FdVPtxqc" role="_ZDj9">
+                    <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+                  </node>
+                </node>
+                <node concept="2ShNRf" id="7P_FdVPtxqj" role="33vP2m">
+                  <node concept="Tc6Ow" id="7P_FdVPtxqk" role="2ShVmc">
+                    <node concept="3uibUv" id="7P_FdVPtxql" role="HW$YZ">
+                      <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7P_FdVPtvoD" role="3cqZAp">
+              <node concept="2OqwBi" id="7P_FdVPtyUU" role="3clFbG">
+                <node concept="37vLTw" id="7P_FdVPtxqm" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7P_FdVPtxqi" resolve="qtpl" />
+                </node>
+                <node concept="TSZUe" id="7P_FdVPtztn" role="2OqNvi">
+                  <node concept="2ShNRf" id="7P_FdVPtzv0" role="25WWJ7">
+                    <node concept="HV5vD" id="7P_FdVPtCja" role="2ShVmc">
+                      <ref role="HV5vE" node="7P_FdVPsJiz" resolve="QueryTemplateImpl" />
+                      <node concept="1ZhdrF" id="7P_FdVPtCTC" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/2820489544401957797/2820489544401957798" />
+                        <property role="2qtEX8" value="classifier" />
+                        <node concept="3$xsQk" id="7P_FdVPtCTD" role="3$ytzL">
+                          <node concept="3clFbS" id="7P_FdVPtCTE" role="2VODD2">
+                            <node concept="3clFbF" id="7P_FdVPtDvB" role="3cqZAp">
+                              <node concept="2OqwBi" id="7P_FdVPtDvC" role="3clFbG">
+                                <node concept="1iwH7S" id="7P_FdVPtDvD" role="2Oq$k0" />
+                                <node concept="1iwH70" id="7P_FdVPtDvE" role="2OqNvi">
+                                  <ref role="1iwH77" node="7P_FdVPtAzR" resolve="query_template" />
+                                  <node concept="30H73N" id="7P_FdVPtDvF" role="1iwH7V" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </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>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7P_FdVPtDTn" role="3cqZAp">
+              <node concept="37vLTI" id="7P_FdVPtFOi" role="3clFbG">
+                <node concept="2OqwBi" id="7P_FdVPtHp1" role="37vLTx">
+                  <node concept="37vLTw" id="7P_FdVPtGF3" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7P_FdVPtxqi" resolve="qtpl" />
+                  </node>
+                  <node concept="26Dbio" id="7P_FdVPtIzT" role="2OqNvi" />
+                </node>
+                <node concept="2OqwBi" id="7P_FdVPtE4_" role="37vLTJ">
+                  <node concept="Xjq3P" id="7P_FdVPtDTl" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="7P_FdVPtEl1" role="2OqNvi">
+                    <ref role="2Oxat5" node="7P_FdVPtty$" resolve="queryTemplates" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="7P_FdVPtuUS" role="3clFbw">
+            <node concept="10Nm6u" id="7P_FdVPtviv" role="3uHU7w" />
+            <node concept="37vLTw" id="7P_FdVPtu3t" role="3uHU7B">
+              <ref role="3cqZAo" node="7P_FdVPtty$" resolve="queryTemplates" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="20Ay2Vf4BEv" role="jymVt" />
@@ -5951,6 +6068,15 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="7P_FdVPtty$" role="jymVt">
+      <property role="TrG5h" value="queryTemplates" />
+      <node concept="3Tm6S6" id="7P_FdVPtty_" role="1B3o_S" />
+      <node concept="_YKpA" id="7P_FdVPttyA" role="1tU5fm">
+        <node concept="3uibUv" id="7P_FdVPttIb" role="_ZDj9">
+          <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="bUwia" id="6FQzrygS9cb">
     <property role="TrG5h" value="rulemethod" />
@@ -14445,18 +14571,18 @@
       <node concept="3Tm1VV" id="2hteS6ClnqO" role="1B3o_S" />
       <node concept="3clFbS" id="2hteS6ClnqQ" role="3clF47">
         <node concept="3clFbF" id="2hteS6ClDlw" role="3cqZAp">
-          <node concept="2ShNRf" id="2hteS6ClDlu" role="3clFbG">
-            <node concept="HV5vD" id="2hteS6ClDS9" role="2ShVmc">
+          <node concept="2ShNRf" id="7P_FdVQ4vqS" role="3clFbG">
+            <node concept="HV5vD" id="7P_FdVQ4vqT" role="2ShVmc">
               <ref role="HV5vE" node="6w6CYIRhmZ8" resolve="RuleTemplateManifest" />
-              <node concept="1ZhdrF" id="2hteS6ClDXP" role="lGtFl">
+              <node concept="1ZhdrF" id="7P_FdVQ4vqU" role="lGtFl">
                 <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/2820489544401957797/2820489544401957798" />
                 <property role="2qtEX8" value="classifier" />
-                <node concept="3$xsQk" id="2hteS6ClDXQ" role="3$ytzL">
-                  <node concept="3clFbS" id="2hteS6ClDXR" role="2VODD2">
-                    <node concept="3clFbF" id="2hteS6ClE6n" role="3cqZAp">
-                      <node concept="2OqwBi" id="2hteS6ClEic" role="3clFbG">
-                        <node concept="1iwH7S" id="2hteS6ClE6m" role="2Oq$k0" />
-                        <node concept="1iwH7d" id="2hteS6ClEoy" role="2OqNvi">
+                <node concept="3$xsQk" id="7P_FdVQ4vqV" role="3$ytzL">
+                  <node concept="3clFbS" id="7P_FdVQ4vqW" role="2VODD2">
+                    <node concept="3clFbF" id="7P_FdVQ4vqX" role="3cqZAp">
+                      <node concept="2OqwBi" id="7P_FdVQ4vqY" role="3clFbG">
+                        <node concept="1iwH7S" id="7P_FdVQ4vqZ" role="2Oq$k0" />
+                        <node concept="1iwH7d" id="7P_FdVQ4vr0" role="2OqNvi">
                           <ref role="1iwH7c" node="2hteS6ClFWV" resolve="rule_manifest" />
                         </node>
                       </node>
@@ -14465,29 +14591,29 @@
                 </node>
               </node>
             </node>
-            <node concept="1W57fq" id="2hteS6ClHZi" role="lGtFl">
-              <node concept="3IZrLx" id="2hteS6ClHZk" role="3IZSJc">
-                <node concept="3clFbS" id="2hteS6ClHZm" role="2VODD2">
-                  <node concept="3clFbF" id="2hteS6ClIg7" role="3cqZAp">
-                    <node concept="2OqwBi" id="2hteS6ClIg8" role="3clFbG">
-                      <node concept="2OqwBi" id="2hteS6ClIg9" role="2Oq$k0">
-                        <node concept="2OqwBi" id="2hteS6ClIga" role="2Oq$k0">
-                          <node concept="1iwH7S" id="2hteS6ClIgb" role="2Oq$k0" />
-                          <node concept="1r8y6K" id="2hteS6ClIgc" role="2OqNvi" />
+            <node concept="1W57fq" id="7P_FdVQ4vr1" role="lGtFl">
+              <node concept="3IZrLx" id="7P_FdVQ4vr2" role="3IZSJc">
+                <node concept="3clFbS" id="7P_FdVQ4vr3" role="2VODD2">
+                  <node concept="3clFbF" id="7P_FdVQ4vr4" role="3cqZAp">
+                    <node concept="2OqwBi" id="7P_FdVQ4vr5" role="3clFbG">
+                      <node concept="2OqwBi" id="7P_FdVQ4vr6" role="2Oq$k0">
+                        <node concept="2OqwBi" id="7P_FdVQ4vr7" role="2Oq$k0">
+                          <node concept="1iwH7S" id="7P_FdVQ4vr8" role="2Oq$k0" />
+                          <node concept="1r8y6K" id="7P_FdVQ4vr9" role="2OqNvi" />
                         </node>
-                        <node concept="2SmgA7" id="2hteS6ClIgd" role="2OqNvi">
-                          <node concept="chp4Y" id="7lt0LtPNPa0" role="1dBWTz">
+                        <node concept="2SmgA7" id="7P_FdVQ4vra" role="2OqNvi">
+                          <node concept="chp4Y" id="7P_FdVQ4vrb" role="1dBWTz">
                             <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
                           </node>
                         </node>
                       </node>
-                      <node concept="3GX2aA" id="2hteS6ClIgf" role="2OqNvi" />
+                      <node concept="3GX2aA" id="7P_FdVQ4vrc" role="2OqNvi" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="gft3U" id="2hteS6ClIwT" role="UU_$l">
-                <node concept="10Nm6u" id="2hteS6ClIzr" role="gfFT$" />
+              <node concept="gft3U" id="7P_FdVQ4vrd" role="UU_$l">
+                <node concept="10Nm6u" id="7P_FdVQ4vre" role="gfFT$" />
               </node>
             </node>
           </node>
@@ -15864,16 +15990,19 @@
     <node concept="2tJIrI" id="4MqhgXUa3oI" role="jymVt" />
     <node concept="3clFbW" id="4MqhgXUhXXR" role="jymVt">
       <node concept="3cqZAl" id="4MqhgXUhXXT" role="3clF45" />
-      <node concept="3Tm1VV" id="4MqhgXUhXXU" role="1B3o_S" />
+      <node concept="3Tmbuc" id="7P_FdVQ43kJ" role="1B3o_S" />
       <node concept="3clFbS" id="4MqhgXUhXXV" role="3clF47">
-        <node concept="3clFbF" id="4MqhgXUhY$9" role="3cqZAp">
-          <node concept="1rXfSq" id="4MqhgXUhY$8" role="3clFbG">
+        <node concept="3clFbF" id="7P_FdVQ43Zr" role="3cqZAp">
+          <node concept="1rXfSq" id="7P_FdVQ43Zq" role="3clFbG">
             <ref role="37wK5l" node="4MqhgXUcrKp" resolve="init" />
           </node>
         </node>
       </node>
+      <node concept="2ZBi8u" id="7P_FdVQ4tWQ" role="lGtFl">
+        <ref role="2rW$FS" node="7P_FdVQ488b" resolve="handler_template_constructor" />
+      </node>
     </node>
-    <node concept="2tJIrI" id="4MqhgXUhXqy" role="jymVt" />
+    <node concept="2tJIrI" id="7P_FdVQah3X" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUN3bO" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="name" />
@@ -15907,6 +16036,77 @@
       </node>
     </node>
     <node concept="2tJIrI" id="4MqhgXUN2yr" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVQp3L8" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="fqName" />
+      <node concept="17QB3L" id="7P_FdVQp3L9" role="3clF45" />
+      <node concept="3Tm1VV" id="7P_FdVQp3La" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVQp3Lc" role="3clF47">
+        <node concept="3clFbF" id="7P_FdVQp5he" role="3cqZAp">
+          <node concept="Xl_RD" id="7P_FdVQp5hf" role="3clFbG">
+            <property role="Xl_RC" value="" />
+            <node concept="17Uvod" id="7P_FdVQp5hg" role="lGtFl">
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <property role="2qtEX9" value="value" />
+              <node concept="3zFVjK" id="7P_FdVQp5hh" role="3zH0cK">
+                <node concept="3clFbS" id="7P_FdVQp5hi" role="2VODD2">
+                  <node concept="3clFbF" id="7P_FdVQp5hj" role="3cqZAp">
+                    <node concept="2OqwBi" id="7P_FdVQp5hk" role="3clFbG">
+                      <node concept="2qgKlT" id="7P_FdVQp7Yf" role="2OqNvi">
+                        <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                      </node>
+                      <node concept="30H73N" id="7P_FdVQp5hm" role="2Oq$k0" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7P_FdVQp3Ld" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQp5sI" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVQp9tZ" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="extendedFqName" />
+      <node concept="17QB3L" id="7P_FdVQp9u0" role="3clF45" />
+      <node concept="3Tm1VV" id="7P_FdVQp9u1" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVQp9u3" role="3clF47">
+        <node concept="3clFbF" id="7P_FdVQpbLk" role="3cqZAp">
+          <node concept="Xl_RD" id="7P_FdVQpbLj" role="3clFbG">
+            <property role="Xl_RC" value="" />
+            <node concept="17Uvod" id="7P_FdVQpbL_" role="lGtFl">
+              <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
+              <property role="2qtEX9" value="value" />
+              <node concept="3zFVjK" id="7P_FdVQpbLA" role="3zH0cK">
+                <node concept="3clFbS" id="7P_FdVQpbLB" role="2VODD2">
+                  <node concept="3clFbF" id="7P_FdVQpcJX" role="3cqZAp">
+                    <node concept="2OqwBi" id="7P_FdVQpee7" role="3clFbG">
+                      <node concept="2OqwBi" id="7P_FdVQpcYC" role="2Oq$k0">
+                        <node concept="30H73N" id="7P_FdVQpcJW" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="7P_FdVQpdJn" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:34$A1Mf2w7l" resolve="extends" />
+                        </node>
+                      </node>
+                      <node concept="2qgKlT" id="7P_FdVQpeNW" role="2OqNvi">
+                        <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7P_FdVQp9u4" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQpaC1" role="jymVt" />
     <node concept="3clFb_" id="20Ay2Vf1jGw" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="2aFKle" value="false" />
@@ -16154,6 +16354,13 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="7P_FdVQ40WA" role="jymVt">
+      <property role="TrG5h" value="extended" />
+      <node concept="3Tm6S6" id="7P_FdVQ40WB" role="1B3o_S" />
+      <node concept="3uibUv" id="7P_FdVQ420T" role="1tU5fm">
+        <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+      </node>
+    </node>
     <node concept="312cEg" id="2vGNdoJKThO" role="jymVt">
       <property role="TrG5h" value="primarySymbols" />
       <node concept="3Tm6S6" id="2vGNdoJKThP" role="1B3o_S" />
@@ -19724,5 +19931,265 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="7P_FdVPsJiz">
+    <property role="TrG5h" value="QueryTemplateImpl" />
+    <node concept="2tJIrI" id="7P_FdVPsJjJ" role="jymVt" />
+    <node concept="3clFbW" id="7P_FdVPsZGY" role="jymVt">
+      <node concept="3cqZAl" id="7P_FdVPsZH0" role="3clF45" />
+      <node concept="3Tm1VV" id="7P_FdVPsZH1" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPsZH2" role="3clF47">
+        <node concept="3clFbF" id="7P_FdVPsZW$" role="3cqZAp">
+          <node concept="1rXfSq" id="7P_FdVPsZWz" role="3clFbG">
+            <ref role="37wK5l" node="7P_FdVPsY9t" resolve="init" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPsZu6" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVPsXbn" 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" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="7P_FdVPsXbu" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPsJsW" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVPsJk6" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="newQuery" />
+      <node concept="37vLTG" id="7P_FdVPsJk7" role="3clF46">
+        <property role="TrG5h" value="parameters" />
+        <node concept="8X2XB" id="7P_FdVPsJk8" role="1tU5fm">
+          <node concept="3uibUv" id="7P_FdVPsJk9" role="8Xvag">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="7P_FdVPsJka" role="3clF45">
+        <ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.Query" />
+      </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>
+      </node>
+      <node concept="2AHcQZ" id="7P_FdVPsJke" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPsJjN" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVPsY9t" role="jymVt">
+      <property role="TrG5h" value="init" />
+      <node concept="3cqZAl" id="7P_FdVPsY9u" role="3clF45" />
+      <node concept="3Tm6S6" id="7P_FdVPsY9v" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPsY9w" role="3clF47">
+        <node concept="3clFbJ" id="7P_FdVPsY9x" role="3cqZAp">
+          <node concept="3clFbC" id="7P_FdVPsY9y" role="3clFbw">
+            <node concept="10Nm6u" id="7P_FdVPsY9z" role="3uHU7w" />
+            <node concept="37vLTw" id="7P_FdVPsY9$" role="3uHU7B">
+              <ref role="3cqZAo" node="7P_FdVPsYak" resolve="handlerTemplates" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="7P_FdVPsY9_" role="3clFbx">
+            <node concept="3cpWs8" id="7P_FdVPsY9A" role="3cqZAp">
+              <node concept="3cpWsn" id="7P_FdVPsY9B" role="3cpWs9">
+                <property role="TrG5h" value="list" />
+                <node concept="_YKpA" id="7P_FdVPsY9C" role="1tU5fm">
+                  <node concept="3uibUv" id="7P_FdVPsY9D" role="_ZDj9">
+                    <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+                  </node>
+                </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>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7P_FdVPsY9H" role="3cqZAp">
+              <node concept="2OqwBi" id="7P_FdVPsY9I" role="3clFbG">
+                <node concept="37vLTw" id="7P_FdVPsY9J" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7P_FdVPsY9B" resolve="list" />
+                </node>
+                <node concept="TSZUe" id="7P_FdVPsY9K" role="2OqNvi">
+                  <node concept="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>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1WS0z7" id="7P_FdVPsY9V" role="lGtFl">
+                <node concept="3JmXsc" id="7P_FdVPsY9W" role="3Jn$fo">
+                  <node concept="3clFbS" id="7P_FdVPsY9X" role="2VODD2">
+                    <node concept="3clFbF" id="7P_FdVPsY9Y" role="3cqZAp">
+                      <node concept="2OqwBi" id="7P_FdVPsY9Z" role="3clFbG">
+                        <node concept="2OqwBi" id="7P_FdVPsYa0" role="2Oq$k0">
+                          <node concept="1iwH7S" id="7P_FdVPsYa1" role="2Oq$k0" />
+                          <node concept="1r8y6K" id="7P_FdVPsYa2" role="2OqNvi" />
+                        </node>
+                        <node concept="2SmgA7" id="7P_FdVPsYa3" role="2OqNvi">
+                          <node concept="chp4Y" id="7P_FdVPsYa4" role="1dBWTz">
+                            <ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7P_FdVPsYa5" role="3cqZAp">
+              <node concept="37vLTI" id="7P_FdVPsYa6" role="3clFbG">
+                <node concept="2OqwBi" id="7P_FdVPsYa7" role="37vLTx">
+                  <node concept="37vLTw" id="7P_FdVPsYa8" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7P_FdVPsY9B" resolve="list" />
+                  </node>
+                  <node concept="26Dbio" id="7P_FdVPsYa9" role="2OqNvi" />
+                </node>
+                <node concept="2OqwBi" id="7P_FdVPsYaa" role="37vLTJ">
+                  <node concept="Xjq3P" id="7P_FdVPsYab" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="7P_FdVPsYac" role="2OqNvi">
+                    <ref role="2Oxat5" node="7P_FdVPsYak" resolve="handlerTemplates" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </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" />
+      <node concept="2tJIrI" id="7P_FdVPsNz5" role="jymVt" />
+      <node concept="3clFb_" id="7P_FdVPsN_j" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="configure" />
+        <node concept="37vLTG" id="7P_FdVPsN_k" role="3clF46">
+          <property role="TrG5h" value="config" />
+          <node concept="3uibUv" id="7P_FdVPsN_l" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="7P_FdVPsN_m" 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>
+        </node>
+        <node concept="2AHcQZ" id="7P_FdVPsN_q" 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="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" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPsJvQ" role="jymVt" />
+    <node concept="312cEg" id="7P_FdVPsYak" role="jymVt">
+      <property role="TrG5h" value="handlerTemplates" />
+      <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>
+    </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="3uibUv" id="7P_FdVPsJjx" role="EKbjA">
+      <ref role="3uigEE" to="i348:7P_FdVPs4aA" resolve="QueryTemplate" />
+    </node>
+    <node concept="3uibUv" id="7P_FdVPsWWe" role="1zkMxy">
+      <ref role="3uigEE" to="i348:7P_FdVPsPNk" resolve="AbstractQueryTemplate" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
index 87ef906d..3daa5158 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
@@ -1525,7 +1525,7 @@
                             </node>
                           </node>
                           <node concept="2qgKlT" id="34$A1Mf4Hzk" role="2OqNvi">
-                            <ref role="37wK5l" to="x5bw:34$A1Mf3_WJ" resolve="allExtends" />
+                            <ref role="37wK5l" to="x5bw:34$A1Mf3_WJ" resolve="handlerClosure" />
                           </node>
                         </node>
                         <node concept="3goQfb" id="34$A1Mf4TZE" role="2OqNvi">
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 c20149f0..5eb06f75 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
@@ -360,10 +360,6 @@
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
-      <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
-        <property id="2034914114981261751" name="severity" index="RRSoG" />
-        <child id="2034914114981261753" name="message" index="RRSoy" />
-      </concept>
       <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
         <property id="1167228628751" name="hasException" index="34fQS0" />
         <property id="1167245565795" name="severity" index="35gtTG" />
@@ -438,18 +434,13 @@
         <child id="1224414456414" name="elementType" index="kMuH3" />
         <child id="1224414466839" name="initializer" index="kMx8a" />
       </concept>
-      <concept id="6801639034384703212" name="jetbrains.mps.baseLanguage.collections.structure.StackType" flags="in" index="oyxx6" />
-      <concept id="5784983078884872741" name="jetbrains.mps.baseLanguage.collections.structure.PeekOperation" flags="nn" index="2oR75g" />
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="3358009230508699637" name="jetbrains.mps.baseLanguage.collections.structure.PopOperation" flags="nn" index="2AryhJ" />
-      <concept id="3358009230508699932" name="jetbrains.mps.baseLanguage.collections.structure.PushOperation" flags="nn" index="2ArzE6" />
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
-      <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" />
@@ -468,7 +459,6 @@
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
-      <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
       <concept id="1227022179634" name="jetbrains.mps.baseLanguage.collections.structure.AddLastElementOperation" flags="nn" index="2Ke9KJ" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
       <concept id="1227026082377" name="jetbrains.mps.baseLanguage.collections.structure.RemoveFirstElementOperation" flags="nn" index="2Kt2Hk" />
@@ -499,7 +489,6 @@
         <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" />
@@ -2911,58 +2900,73 @@
   <node concept="312cEu" id="6fdr4UgftiG">
     <property role="TrG5h" value="RuleTemplateIndex" />
     <node concept="2tJIrI" id="20Ay2VeQfgH" role="jymVt" />
-    <node concept="3clFbW" id="7DvO2Man94t" role="jymVt">
-      <node concept="37vLTG" id="7DvO2Manb3v" role="3clF46">
-        <property role="TrG5h" value="ruleTemplateManifests" />
-        <node concept="A3Dl8" id="7DvO2Manb4O" role="1tU5fm">
-          <node concept="3uibUv" id="7DvO2Manbii" role="A3Ik2">
+    <node concept="2YIFZL" id="7P_FdVPIPE$" role="jymVt">
+      <property role="TrG5h" value="withManifests" />
+      <node concept="37vLTG" id="7P_FdVPISMR" role="3clF46">
+        <property role="TrG5h" value="manifests" />
+        <node concept="A3Dl8" id="7P_FdVPISMS" role="1tU5fm">
+          <node concept="3uibUv" id="7P_FdVPISMT" role="A3Ik2">
             <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
           </node>
         </node>
       </node>
-      <node concept="3cqZAl" id="7DvO2Man94v" role="3clF45" />
-      <node concept="3Tmbuc" id="7DvO2MasENE" role="1B3o_S" />
-      <node concept="3clFbS" id="7DvO2Man94x" role="3clF47">
-        <node concept="3clFbF" id="7DvO2ManzrF" role="3cqZAp">
-          <node concept="37vLTI" id="7DvO2Man_rW" role="3clFbG">
-            <node concept="2ShNRf" id="7DvO2Man_$p" role="37vLTx">
-              <node concept="Tc6Ow" id="7DvO2Man_yM" role="2ShVmc">
-                <node concept="3uibUv" id="7DvO2Man_yN" role="HW$YZ">
-                  <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
-                </node>
-                <node concept="37vLTw" id="7DvO2ManAg9" role="I$8f6">
-                  <ref role="3cqZAo" node="7DvO2Manb3v" resolve="ruleTemplateManifests" />
-                </node>
-              </node>
+      <node concept="3uibUv" id="7P_FdVPISEg" role="3clF45">
+        <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVPIPEB" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPIPEC" role="3clF47">
+        <node concept="3cpWs8" id="7P_FdVPITOd" role="3cqZAp">
+          <node concept="3cpWsn" id="7P_FdVPITOe" role="3cpWs9">
+            <property role="TrG5h" value="index" />
+            <node concept="3uibUv" id="7P_FdVPITOc" role="1tU5fm">
+              <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
             </node>
-            <node concept="2OqwBi" id="7DvO2Manzxh" role="37vLTJ">
-              <node concept="Xjq3P" id="7DvO2ManzrE" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7DvO2ManzGD" role="2OqNvi">
-                <ref role="2Oxat5" node="7DvO2Manxmv" resolve="ruleTemplateManifests" />
+            <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="7DvO2Mao82g" role="3cqZAp">
-          <node concept="1rXfSq" id="7DvO2Mao82e" role="3clFbG">
-            <ref role="37wK5l" node="7DvO2Mandqg" resolve="collectRuleTemplates" />
+        <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>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7P_FdVPITWo" role="3cqZAp">
+          <node concept="37vLTw" id="7P_FdVPITWm" role="3clFbG">
+            <ref role="3cqZAo" node="7P_FdVPITOe" resolve="index" />
           </node>
         </node>
       </node>
-      <node concept="P$JXv" id="7DvO2ManbiQ" role="lGtFl">
-        <node concept="TZ5HA" id="7DvO2ManbiR" role="TZ5H$">
-          <node concept="1dT_AC" id="7DvO2ManbiS" role="1dT_Ay">
+      <node concept="P$JXv" id="7P_FdVPIUAE" role="lGtFl">
+        <node concept="TZ5HA" id="7P_FdVPIUDa" role="TZ5H$">
+          <node concept="1dT_AC" id="7P_FdVPIUDb" role="1dT_Ay">
             <property role="1dT_AB" value="The list of manifests must be sorted in the topological order." />
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7DvO2Man73Y" role="jymVt" />
+    <node concept="2tJIrI" id="7P_FdVPIMz3" role="jymVt" />
+    <node concept="3clFbW" id="7P_FdVPIH2n" role="jymVt">
+      <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>
+    <node concept="2tJIrI" id="7P_FdVPH0_B" role="jymVt" />
     <node concept="3clFb_" id="4QPCta1zKCT" role="jymVt">
       <property role="TrG5h" value="stages" />
       <node concept="A3Dl8" id="4QPCta1zMzv" role="3clF45">
         <node concept="3uibUv" id="4QPCta1zOh1" role="A3Ik2">
-          <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+          <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
         </node>
       </node>
       <node concept="3Tm1VV" id="4QPCta1zKCW" role="1B3o_S" />
@@ -2979,7 +2983,7 @@
     </node>
     <node concept="2tJIrI" id="4MqhgXU$$4Z" role="jymVt" />
     <node concept="3clFb_" id="6fdr4UgfuGk" role="jymVt">
-      <property role="TrG5h" value="allTemplates" />
+      <property role="TrG5h" value="allRuleTemplates" />
       <node concept="37vLTG" id="12yN8DyvzeF" role="3clF46">
         <property role="TrG5h" value="node" />
         <node concept="3Tqbb2" id="12yN8Dyv_JV" role="1tU5fm" />
@@ -2987,7 +2991,7 @@
       <node concept="A3Dl8" id="6fdr4UgfxqC" role="3clF45">
         <node concept="1LlUBW" id="7t5VLKHa5QV" role="A3Ik2">
           <node concept="3uibUv" id="1CcQBrPdyGK" role="1Lm7xW">
-            <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
           </node>
           <node concept="3uibUv" id="1ffsG7c4ezn" role="1Lm7xW">
             <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3007,7 +3011,7 @@
             <node concept="_YKpA" id="12yN8DyvAUd" role="1tU5fm">
               <node concept="1LlUBW" id="7t5VLKHacJO" role="_ZDj9">
                 <node concept="3uibUv" id="1CcQBrPd_Sl" role="1Lm7xW">
-                  <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                 </node>
                 <node concept="3uibUv" id="7XdbJdyRODp" role="1Lm7xW">
                   <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3023,7 +3027,7 @@
               <node concept="Tc6Ow" id="12yN8DyvD72" role="2ShVmc">
                 <node concept="1LlUBW" id="7t5VLKHa9fr" role="HW$YZ">
                   <node concept="3uibUv" id="1CcQBrPdCZx" role="1Lm7xW">
-                    <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                    <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                   </node>
                   <node concept="3uibUv" id="7XdbJdyRQxJ" role="1Lm7xW">
                     <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3117,7 +3121,7 @@
                     <node concept="3vKaQO" id="12yN8DyD$_b" role="1tU5fm">
                       <node concept="1LlUBW" id="1CcQBrPdqZp" role="3O5elw">
                         <node concept="3uibUv" id="1CcQBrPdqZq" role="1Lm7xW">
-                          <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                          <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                         </node>
                         <node concept="3uibUv" id="7XdbJdyRSmQ" role="1Lm7xW">
                           <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3134,7 +3138,7 @@
                         <ref role="3cqZAo" node="12yN8Dywugn" resolve="cpt" />
                       </node>
                       <node concept="37vLTw" id="12yN8DywoJc" role="3ElQJh">
-                        <ref role="3cqZAo" node="12yN8DyvDfi" resolve="templates" />
+                        <ref role="3cqZAo" node="12yN8DyvDfi" resolve="concept2ruleTemplates" />
                       </node>
                     </node>
                   </node>
@@ -3188,7 +3192,7 @@
                     <property role="TrG5h" value="tpl" />
                     <node concept="1LlUBW" id="1CcQBrPdrx8" role="1tU5fm">
                       <node concept="3uibUv" id="1CcQBrPdrx9" role="1Lm7xW">
-                        <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                        <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                       </node>
                       <node concept="3uibUv" id="7XdbJdySrgC" role="1Lm7xW">
                         <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3207,7 +3211,7 @@
               </node>
               <node concept="2OqwBi" id="12yN8DywaUF" role="3clFbw">
                 <node concept="37vLTw" id="12yN8Dyw7ap" role="2Oq$k0">
-                  <ref role="3cqZAo" node="12yN8DyvDfi" resolve="templates" />
+                  <ref role="3cqZAo" node="12yN8DyvDfi" resolve="concept2ruleTemplates" />
                 </node>
                 <node concept="2Nt0df" id="12yN8Dywmhb" role="2OqNvi">
                   <node concept="37vLTw" id="12yN8Dywuld" role="38cxEo">
@@ -3244,11 +3248,11 @@
     </node>
     <node concept="2tJIrI" id="5NuEpF1qqA9" role="jymVt" />
     <node concept="3clFb_" id="5NuEpF1qn9x" role="jymVt">
-      <property role="TrG5h" value="allTemplatesWithNoInput" />
+      <property role="TrG5h" value="allRuleTemplatesWithNoInput" />
       <node concept="A3Dl8" id="5NuEpF1qn9B" role="3clF45">
         <node concept="1LlUBW" id="23ITgZhhKsi" role="A3Ik2">
           <node concept="3uibUv" id="1CcQBrPdHb$" role="1Lm7xW">
-            <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
           </node>
           <node concept="3uibUv" id="7XdbJdyRWsv" role="1Lm7xW">
             <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3268,7 +3272,7 @@
             <node concept="_YKpA" id="5NuEpF1qn9H" role="1tU5fm">
               <node concept="1LlUBW" id="7t5VLKHb0SG" role="_ZDj9">
                 <node concept="3uibUv" id="1CcQBrPdKr0" role="1Lm7xW">
-                  <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                 </node>
                 <node concept="3uibUv" id="7XdbJdyS2mz" role="1Lm7xW">
                   <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3284,7 +3288,7 @@
               <node concept="Tc6Ow" id="5NuEpF1qn9K" role="2ShVmc">
                 <node concept="1LlUBW" id="7t5VLKHb1Xg" role="HW$YZ">
                   <node concept="3uibUv" id="1CcQBrPdQJh" role="1Lm7xW">
-                    <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                    <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                   </node>
                   <node concept="3uibUv" id="7XdbJdyS4j5" role="1Lm7xW">
                     <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3308,7 +3312,7 @@
                 <node concept="3vKaQO" id="5NuEpF1qnan" role="1tU5fm">
                   <node concept="1LlUBW" id="1CcQBrPdScq" role="3O5elw">
                     <node concept="3uibUv" id="1CcQBrPdT5w" role="1Lm7xW">
-                      <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                      <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                     </node>
                     <node concept="3uibUv" id="7XdbJdyS6dB" role="1Lm7xW">
                       <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3323,7 +3327,7 @@
                 <node concept="3EllGN" id="5NuEpF1qnap" role="33vP2m">
                   <node concept="10Nm6u" id="5NuEpF1qPk$" role="3ElVtu" />
                   <node concept="37vLTw" id="5NuEpF1qnar" role="3ElQJh">
-                    <ref role="3cqZAo" node="12yN8DyvDfi" resolve="templates" />
+                    <ref role="3cqZAo" node="12yN8DyvDfi" resolve="concept2ruleTemplates" />
                   </node>
                 </node>
               </node>
@@ -3348,7 +3352,7 @@
                 <property role="TrG5h" value="tpl" />
                 <node concept="1LlUBW" id="1CcQBrPdV7J" role="1tU5fm">
                   <node concept="3uibUv" id="1CcQBrPdV7K" role="1Lm7xW">
-                    <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                    <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                   </node>
                   <node concept="3uibUv" id="7XdbJdySs6B" role="1Lm7xW">
                     <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3367,7 +3371,7 @@
           </node>
           <node concept="2OqwBi" id="5NuEpF1qnaR" role="3clFbw">
             <node concept="37vLTw" id="5NuEpF1qnaS" role="2Oq$k0">
-              <ref role="3cqZAo" node="12yN8DyvDfi" resolve="templates" />
+              <ref role="3cqZAo" node="12yN8DyvDfi" resolve="concept2ruleTemplates" />
             </node>
             <node concept="2Nt0df" id="5NuEpF1qnaT" role="2OqNvi">
               <node concept="10Nm6u" id="5NuEpF1qPa2" role="38cxEo" />
@@ -3419,7 +3423,7 @@
               </node>
               <node concept="2OqwBi" id="12yN8DyMeDH" role="3uHU7w">
                 <node concept="37vLTw" id="12yN8DyMeg9" role="2Oq$k0">
-                  <ref role="3cqZAo" node="12yN8DyvDfi" resolve="templates" />
+                  <ref role="3cqZAo" node="12yN8DyvDfi" resolve="concept2ruleTemplates" />
                 </node>
                 <node concept="34oBXx" id="12yN8DyMfS1" role="2OqNvi" />
               </node>
@@ -3436,176 +3440,218 @@
     </node>
     <node concept="2tJIrI" id="429xoypKCy4" role="jymVt" />
     <node concept="3clFb_" id="7DvO2Mandqg" role="jymVt">
-      <property role="TrG5h" value="collectRuleTemplates" />
+      <property role="TrG5h" value="initWithManifests" />
+      <node concept="37vLTG" id="7P_FdVPGxfv" role="3clF46">
+        <property role="TrG5h" value="ruleTemplateManifests" />
+        <node concept="A3Dl8" id="7P_FdVPGxfw" role="1tU5fm">
+          <node concept="3uibUv" id="7P_FdVPGxfx" role="A3Ik2">
+            <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+          </node>
+        </node>
+      </node>
       <node concept="3cqZAl" id="7DvO2Mandqi" role="3clF45" />
       <node concept="3Tm6S6" id="7DvO2ManfvF" role="1B3o_S" />
       <node concept="3clFbS" id="7DvO2Mandqk" role="3clF47">
-        <node concept="2Gpval" id="7DvO2ManDOC" role="3cqZAp">
-          <node concept="2GrKxI" id="7DvO2ManDOE" role="2Gsz3X">
-            <property role="TrG5h" value="ruleManifest" />
-          </node>
-          <node concept="37vLTw" id="7DvO2ManFNL" role="2GsD0m">
-            <ref role="3cqZAo" node="7DvO2Manxmv" resolve="ruleTemplateManifests" />
-          </node>
-          <node concept="3clFbS" id="7DvO2ManDOI" role="2LFqv$">
-            <node concept="2Gpval" id="7DvO2Mate8N" role="3cqZAp">
-              <node concept="3clFbS" id="7DvO2ManCIM" role="2LFqv$">
-                <node concept="3clFbJ" id="6UWSvq54ywY" role="3cqZAp">
-                  <node concept="3clFbS" id="6UWSvq54yx0" role="3clFbx">
-                    <node concept="3cpWs8" id="6UWSvq55zce" role="3cqZAp">
-                      <node concept="3cpWsn" id="6UWSvq55zcf" role="3cpWs9">
-                        <property role="TrG5h" value="existing" />
-                        <node concept="3uibUv" id="6UWSvq55zbN" role="1tU5fm">
-                          <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
-                        </node>
-                        <node concept="3EllGN" id="6UWSvq55zcg" role="33vP2m">
-                          <node concept="2OqwBi" id="6UWSvq55zch" role="3ElVtu">
-                            <node concept="2GrUjf" id="6UWSvq55zci" role="2Oq$k0">
-                              <ref role="2Gs0qQ" node="7DvO2Mate9V" resolve="stage" />
-                            </node>
-                            <node concept="liA8E" id="6UWSvq55zcj" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:7DvO2Maz9cH" resolve="name" />
-                            </node>
-                          </node>
-                          <node concept="37vLTw" id="6UWSvq55zck" role="3ElQJh">
-                            <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3cpWs8" id="6UWSvq4K0l6" role="3cqZAp">
-                      <node concept="3cpWsn" id="6UWSvq4K0l7" role="3cpWs9">
-                        <property role="TrG5h" value="templates" />
-                        <node concept="_YKpA" id="6UWSvq4K0kS" role="1tU5fm">
-                          <node concept="3uibUv" id="6UWSvq4K0kV" role="_ZDj9">
-                            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-                          </node>
-                        </node>
-                        <node concept="2ShNRf" id="6UWSvq4K0l8" role="33vP2m">
-                          <node concept="Tc6Ow" id="6UWSvq4K0l9" role="2ShVmc">
-                            <node concept="3uibUv" id="6UWSvq4K0la" role="HW$YZ">
-                              <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
-                            </node>
-                            <node concept="2OqwBi" id="6UWSvq4K0lb" role="I$8f6">
-                              <node concept="37vLTw" id="6UWSvq4K0lc" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6UWSvq55zcf" resolve="existing" />
-                              </node>
-                              <node concept="liA8E" id="6UWSvq4K0ld" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:1CcQBrPd1dz" resolve="handlerTemplates" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="6UWSvq4JW__" role="3cqZAp">
-                      <node concept="2OqwBi" id="6UWSvq4K2xr" role="3clFbG">
-                        <node concept="37vLTw" id="6UWSvq4K0le" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6UWSvq4K0l7" resolve="templates" />
-                        </node>
-                        <node concept="X8dFx" id="6UWSvq4K3$s" role="2OqNvi">
-                          <node concept="2OqwBi" id="6UWSvq4K4oZ" role="25WWJ7">
-                            <node concept="2GrUjf" id="6UWSvq4K3Z1" role="2Oq$k0">
-                              <ref role="2Gs0qQ" node="7DvO2Mate9V" resolve="stage" />
-                            </node>
-                            <node concept="liA8E" id="6UWSvq4K5iG" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:1CcQBrPd1dz" resolve="handlerTemplates" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="6UWSvq57lEe" role="3cqZAp">
-                      <node concept="37vLTI" id="6UWSvq57$r3" role="3clFbG">
-                        <node concept="3EllGN" id="6UWSvq57n6l" role="37vLTJ">
-                          <node concept="2OqwBi" id="6UWSvq57nvw" role="3ElVtu">
-                            <node concept="2GrUjf" id="6UWSvq57njr" role="2Oq$k0">
-                              <ref role="2Gs0qQ" node="7DvO2Mate9V" resolve="stage" />
-                            </node>
-                            <node concept="liA8E" id="6UWSvq57qHO" role="2OqNvi">
-                              <ref role="37wK5l" to="i348:7DvO2Maz9cH" resolve="name" />
-                            </node>
-                          </node>
-                          <node concept="37vLTw" id="6UWSvq57lEc" role="3ElQJh">
-                            <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
-                          </node>
-                        </node>
-                        <node concept="2ShNRf" id="6UWSvq57$ri" role="37vLTx">
-                          <node concept="1pGfFk" id="6UWSvq57$rj" role="2ShVmc">
-                            <ref role="37wK5l" to="i348:1CcQBrPd004" resolve="HandlingStage" />
-                            <node concept="2OqwBi" id="6UWSvq57$rk" role="37wK5m">
-                              <node concept="37vLTw" id="6UWSvq57$rl" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6UWSvq55zcf" resolve="existing" />
-                              </node>
-                              <node concept="liA8E" id="6UWSvq57$rm" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:7DvO2Maz9cH" resolve="name" />
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="6UWSvq57$rn" role="37wK5m">
-                              <ref role="3cqZAo" node="6UWSvq4K0l7" resolve="templates" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbH" id="6UWSvq57ZWA" role="3cqZAp" />
-                  </node>
-                  <node concept="2OqwBi" id="6UWSvq54_Vu" role="3clFbw">
-                    <node concept="37vLTw" id="6UWSvq54_im" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
-                    </node>
-                    <node concept="2Nt0df" id="6UWSvq54ALS" role="2OqNvi">
-                      <node concept="2OqwBi" id="6UWSvq54B48" role="38cxEo">
-                        <node concept="2GrUjf" id="6UWSvq54ARX" role="2Oq$k0">
-                          <ref role="2Gs0qQ" node="7DvO2Mate9V" resolve="stage" />
-                        </node>
-                        <node concept="liA8E" id="6UWSvq54E5k" role="2OqNvi">
-                          <ref role="37wK5l" to="i348:7DvO2Maz9cH" resolve="name" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="9aQIb" id="6UWSvq54MFU" role="9aQIa">
-                    <node concept="3clFbS" id="6UWSvq54MFV" role="9aQI4">
-                      <node concept="3clFbF" id="6UWSvq54PtA" role="3cqZAp">
-                        <node concept="37vLTI" id="6UWSvq552z6" role="3clFbG">
-                          <node concept="2GrUjf" id="6UWSvq55hzZ" role="37vLTx">
-                            <ref role="2Gs0qQ" node="7DvO2Mate9V" resolve="stage" />
-                          </node>
-                          <node concept="3EllGN" id="6UWSvq54Q6z" role="37vLTJ">
-                            <node concept="2OqwBi" id="6UWSvq54QpG" role="3ElVtu">
-                              <node concept="2GrUjf" id="6UWSvq54QdB" role="2Oq$k0">
-                                <ref role="2Gs0qQ" node="7DvO2Mate9V" resolve="stage" />
-                              </node>
-                              <node concept="liA8E" id="6UWSvq54Tsh" role="2OqNvi">
-                                <ref role="37wK5l" to="i348:7DvO2Maz9cH" resolve="name" />
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="6UWSvq54Pt_" role="3ElQJh">
-                              <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
+        <node concept="3clFbF" id="7P_FdVPIgWH" role="3cqZAp">
+          <node concept="1rXfSq" id="7P_FdVPIgWF" role="3clFbG">
+            <ref role="37wK5l" node="7P_FdVPHmHU" resolve="initWithStages" />
+            <node concept="2OqwBi" id="7P_FdVPIiZ_" role="37wK5m">
+              <node concept="37vLTw" id="7P_FdVPIiMF" role="2Oq$k0">
+                <ref role="3cqZAo" node="7P_FdVPGxfv" resolve="ruleTemplateManifests" />
               </node>
-              <node concept="2OqwBi" id="7DvO2ManCJ1" role="2GsD0m">
-                <node concept="2GrUjf" id="7DvO2ManKIx" role="2Oq$k0">
-                  <ref role="2Gs0qQ" node="7DvO2ManDOE" resolve="ruleManifest" />
+              <node concept="3goQfb" id="7P_FdVPIjy0" role="2OqNvi">
+                <node concept="1bVj0M" id="7P_FdVPIjy2" role="23t8la">
+                  <node concept="3clFbS" id="7P_FdVPIjy3" role="1bW5cS">
+                    <node concept="3clFbF" id="7P_FdVPIjDk" role="3cqZAp">
+                      <node concept="1rXfSq" id="7P_FdVPPstQ" role="3clFbG">
+                        <ref role="37wK5l" node="7P_FdVPsPOY" resolve="handlingStages" />
+                        <node concept="2OqwBi" id="7P_FdVPPsJB" role="37wK5m">
+                          <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>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="7P_FdVPIjy4" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="7P_FdVPIjy5" role="1tU5fm" />
+                  </node>
                 </node>
-                <node concept="liA8E" id="7DvO2ManCJ3" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:20Ay2VeQ4QK" resolve="handlingStages" />
-                </node>
-              </node>
-              <node concept="2GrKxI" id="7DvO2Mate9V" role="2Gsz3X">
-                <property role="TrG5h" value="stage" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="6UWSvq4KAkY" role="3cqZAp" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPI535" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVPHmHU" role="jymVt">
+      <property role="TrG5h" value="initWithStages" />
+      <node concept="37vLTG" id="7P_FdVPHmOS" role="3clF46">
+        <property role="TrG5h" value="handlingStages" />
+        <node concept="A3Dl8" id="7P_FdVPHCUR" role="1tU5fm">
+          <node concept="3uibUv" id="7P_FdVPHCVT" role="A3Ik2">
+            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7P_FdVPHmHW" role="3clF45" />
+      <node concept="3Tm6S6" id="7P_FdVPHplf" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPHmHY" role="3clF47">
+        <node concept="2Gpval" id="7P_FdVPHCXG" role="3cqZAp">
+          <node concept="3clFbS" id="7P_FdVPHCXH" role="2LFqv$">
+            <node concept="3clFbJ" id="7P_FdVPHCXI" role="3cqZAp">
+              <node concept="3clFbS" id="7P_FdVPHCXJ" role="3clFbx">
+                <node concept="3cpWs8" id="7P_FdVPHCXK" role="3cqZAp">
+                  <node concept="3cpWsn" id="7P_FdVPHCXL" role="3cpWs9">
+                    <property role="TrG5h" value="existing" />
+                    <node concept="3uibUv" id="7P_FdVPHCXM" role="1tU5fm">
+                      <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+                    </node>
+                    <node concept="3EllGN" id="7P_FdVPHCXN" role="33vP2m">
+                      <node concept="2OqwBi" id="7P_FdVPHCXO" role="3ElVtu">
+                        <node concept="2GrUjf" id="7P_FdVPHCXP" role="2Oq$k0">
+                          <ref role="2Gs0qQ" node="7P_FdVPHCYE" resolve="stage" />
+                        </node>
+                        <node concept="liA8E" id="7P_FdVPHCXQ" role="2OqNvi">
+                          <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="7P_FdVPHCXR" role="3ElQJh">
+                        <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="7P_FdVPHCXS" role="3cqZAp">
+                  <node concept="3cpWsn" id="7P_FdVPHCXT" role="3cpWs9">
+                    <property role="TrG5h" value="templates" />
+                    <node concept="_YKpA" id="7P_FdVPHCXU" role="1tU5fm">
+                      <node concept="3uibUv" id="7P_FdVPHCXV" role="_ZDj9">
+                        <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+                      </node>
+                    </node>
+                    <node concept="2ShNRf" id="7P_FdVPHCXW" role="33vP2m">
+                      <node concept="Tc6Ow" id="7P_FdVPHCXX" role="2ShVmc">
+                        <node concept="3uibUv" id="7P_FdVPHCXY" role="HW$YZ">
+                          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+                        </node>
+                        <node concept="2OqwBi" id="7P_FdVPHCXZ" role="I$8f6">
+                          <node concept="37vLTw" id="7P_FdVPHCY0" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7P_FdVPHCXL" resolve="existing" />
+                          </node>
+                          <node concept="liA8E" id="7P_FdVPHCY1" role="2OqNvi">
+                            <ref role="37wK5l" node="1CcQBrPd1dz" resolve="handlerTemplates" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="7P_FdVPHCY2" role="3cqZAp">
+                  <node concept="2OqwBi" id="7P_FdVPHCY3" role="3clFbG">
+                    <node concept="37vLTw" id="7P_FdVPHCY4" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7P_FdVPHCXT" resolve="templates" />
+                    </node>
+                    <node concept="X8dFx" id="7P_FdVPHCY5" role="2OqNvi">
+                      <node concept="2OqwBi" id="7P_FdVPHCY6" role="25WWJ7">
+                        <node concept="2GrUjf" id="7P_FdVPHCY7" role="2Oq$k0">
+                          <ref role="2Gs0qQ" node="7P_FdVPHCYE" resolve="stage" />
+                        </node>
+                        <node concept="liA8E" id="7P_FdVPHCY8" role="2OqNvi">
+                          <ref role="37wK5l" node="1CcQBrPd1dz" resolve="handlerTemplates" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="7P_FdVPHCY9" role="3cqZAp">
+                  <node concept="37vLTI" id="7P_FdVPHCYa" role="3clFbG">
+                    <node concept="3EllGN" id="7P_FdVPHCYb" role="37vLTJ">
+                      <node concept="2OqwBi" id="7P_FdVPHCYc" role="3ElVtu">
+                        <node concept="2GrUjf" id="7P_FdVPHCYd" role="2Oq$k0">
+                          <ref role="2Gs0qQ" node="7P_FdVPHCYE" resolve="stage" />
+                        </node>
+                        <node concept="liA8E" id="7P_FdVPHCYe" role="2OqNvi">
+                          <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="7P_FdVPHCYf" role="3ElQJh">
+                        <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
+                      </node>
+                    </node>
+                    <node concept="2ShNRf" id="7P_FdVPHCYg" role="37vLTx">
+                      <node concept="1pGfFk" id="7P_FdVPHCYh" role="2ShVmc">
+                        <ref role="37wK5l" node="1CcQBrPd004" resolve="HandlingStage" />
+                        <node concept="2OqwBi" id="7P_FdVPHCYi" role="37wK5m">
+                          <node concept="37vLTw" id="7P_FdVPHCYj" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7P_FdVPHCXL" resolve="existing" />
+                          </node>
+                          <node concept="liA8E" id="7P_FdVPHCYk" role="2OqNvi">
+                            <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="7P_FdVPHCYl" role="37wK5m">
+                          <ref role="3cqZAo" node="7P_FdVPHCXT" resolve="templates" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="7P_FdVPHCYm" role="3cqZAp" />
+              </node>
+              <node concept="2OqwBi" id="7P_FdVPHCYn" role="3clFbw">
+                <node concept="37vLTw" id="7P_FdVPHCYo" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
+                </node>
+                <node concept="2Nt0df" id="7P_FdVPHCYp" role="2OqNvi">
+                  <node concept="2OqwBi" id="7P_FdVPHCYq" role="38cxEo">
+                    <node concept="2GrUjf" id="7P_FdVPHCYr" role="2Oq$k0">
+                      <ref role="2Gs0qQ" node="7P_FdVPHCYE" resolve="stage" />
+                    </node>
+                    <node concept="liA8E" id="7P_FdVPHCYs" role="2OqNvi">
+                      <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="9aQIb" id="7P_FdVPHCYt" role="9aQIa">
+                <node concept="3clFbS" id="7P_FdVPHCYu" role="9aQI4">
+                  <node concept="3clFbF" id="7P_FdVPHCYv" role="3cqZAp">
+                    <node concept="37vLTI" id="7P_FdVPHCYw" role="3clFbG">
+                      <node concept="2GrUjf" id="7P_FdVPHCYx" role="37vLTx">
+                        <ref role="2Gs0qQ" node="7P_FdVPHCYE" resolve="stage" />
+                      </node>
+                      <node concept="3EllGN" id="7P_FdVPHCYy" role="37vLTJ">
+                        <node concept="2OqwBi" id="7P_FdVPHCYz" role="3ElVtu">
+                          <node concept="2GrUjf" id="7P_FdVPHCY$" role="2Oq$k0">
+                            <ref role="2Gs0qQ" node="7P_FdVPHCYE" resolve="stage" />
+                          </node>
+                          <node concept="liA8E" id="7P_FdVPHCY_" role="2OqNvi">
+                            <ref role="37wK5l" node="7DvO2Maz9cH" resolve="name" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="7P_FdVPHCYA" role="3ElQJh">
+                          <ref role="3cqZAo" node="4QPCta1zvN6" resolve="stages" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="7P_FdVPHTJn" role="2GsD0m">
+            <ref role="3cqZAo" node="7P_FdVPHmOS" resolve="handlingStages" />
+          </node>
+          <node concept="2GrKxI" id="7P_FdVPHCYE" role="2Gsz3X">
+            <property role="TrG5h" value="stage" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="7P_FdVPIdck" role="3cqZAp" />
         <node concept="2Gpval" id="6UWSvq4KuKV" role="3cqZAp">
           <node concept="2GrKxI" id="6UWSvq4KuKX" role="2Gsz3X">
             <property role="TrG5h" value="stage" />
@@ -3635,7 +3681,7 @@
       <node concept="37vLTG" id="4MqhgXU9tzq" role="3clF46">
         <property role="TrG5h" value="stage" />
         <node concept="3uibUv" id="1CcQBrPdcWm" role="1tU5fm">
-          <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+          <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
         </node>
       </node>
       <node concept="3cqZAl" id="12yN8Dyvyy8" role="3clF45" />
@@ -3648,6 +3694,27 @@
         </node>
         <node concept="1DcWWT" id="4MqhgXUaOdr" role="3cqZAp">
           <node concept="3clFbS" id="4MqhgXUaOdu" role="2LFqv$">
+            <node concept="3clFbF" id="7P_FdVQpx7g" role="3cqZAp">
+              <node concept="37vLTI" id="7P_FdVQpz2N" role="3clFbG">
+                <node concept="37vLTw" id="7P_FdVQpzap" role="37vLTx">
+                  <ref role="3cqZAo" node="4MqhgXUaOdv" resolve="htpl" />
+                </node>
+                <node concept="3EllGN" id="7P_FdVQpy2T" role="37vLTJ">
+                  <node concept="2OqwBi" id="7P_FdVQpykU" role="3ElVtu">
+                    <node concept="37vLTw" id="7P_FdVQpy8u" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4MqhgXUaOdv" resolve="htpl" />
+                    </node>
+                    <node concept="liA8E" id="7P_FdVQpyOQ" role="2OqNvi">
+                      <ref role="37wK5l" to="i348:7P_FdVQoZmr" resolve="fqName" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="7P_FdVQpx7e" role="3ElQJh">
+                    <ref role="3cqZAo" node="7P_FdVQplXd" resolve="fqName2handlerTemplate" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="7P_FdVQpw$T" role="3cqZAp" />
             <node concept="1DcWWT" id="4MqhgXUaONv" role="3cqZAp">
               <node concept="3clFbS" id="4MqhgXUaONy" role="2LFqv$">
                 <node concept="3clFbH" id="4MqhgXUlY8K" role="3cqZAp" />
@@ -3657,7 +3724,7 @@
                     <node concept="3vKaQO" id="4MqhgXUaPfW" role="1tU5fm">
                       <node concept="1LlUBW" id="1CcQBrPdYFV" role="3O5elw">
                         <node concept="3uibUv" id="1CcQBrPdZmb" role="1Lm7xW">
-                          <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                          <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                         </node>
                         <node concept="3uibUv" id="7XdbJdySsFg" role="1Lm7xW">
                           <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3679,7 +3746,7 @@
                         </node>
                       </node>
                       <node concept="37vLTw" id="4MqhgXUaPg2" role="3ElQJh">
-                        <ref role="3cqZAo" node="12yN8DyvDfi" resolve="templates" />
+                        <ref role="3cqZAo" node="12yN8DyvDfi" resolve="concept2ruleTemplates" />
                       </node>
                     </node>
                   </node>
@@ -3694,7 +3761,7 @@
                               <node concept="Tc6Ow" id="4MqhgXUaPga" role="2ShVmc">
                                 <node concept="1LlUBW" id="1CcQBrPe1i5" role="HW$YZ">
                                   <node concept="3uibUv" id="1CcQBrPe1i6" role="1Lm7xW">
-                                    <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                                    <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                                   </node>
                                   <node concept="3uibUv" id="7XdbJdySth5" role="1Lm7xW">
                                     <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3722,7 +3789,7 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="4MqhgXUaPgh" role="3ElQJh">
-                            <ref role="3cqZAo" node="12yN8DyvDfi" resolve="templates" />
+                            <ref role="3cqZAo" node="12yN8DyvDfi" resolve="concept2ruleTemplates" />
                           </node>
                         </node>
                       </node>
@@ -3767,7 +3834,7 @@
               </node>
               <node concept="2OqwBi" id="4MqhgXUaONC" role="1DdaDG">
                 <node concept="37vLTw" id="4MqhgXUaOND" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4MqhgXUaOdv" resolve="handlerTemplate" />
+                  <ref role="3cqZAo" node="4MqhgXUaOdv" resolve="htpl" />
                 </node>
                 <node concept="liA8E" id="4MqhgXUaONE" role="2OqNvi">
                   <ref role="37wK5l" to="i348:4MqhgXUaiON" resolve="ruleTemplates" />
@@ -3776,7 +3843,7 @@
             </node>
           </node>
           <node concept="3cpWsn" id="4MqhgXUaOdv" role="1Duv9x">
-            <property role="TrG5h" value="handlerTemplate" />
+            <property role="TrG5h" value="htpl" />
             <node concept="3uibUv" id="4MqhgXUaOdz" role="1tU5fm">
               <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
             </node>
@@ -3786,22 +3853,231 @@
               <ref role="3cqZAo" node="4MqhgXU9tzq" resolve="stage" />
             </node>
             <node concept="liA8E" id="1CcQBrPddMT" role="2OqNvi">
-              <ref role="37wK5l" to="i348:1CcQBrPd1dz" resolve="handlerTemplates" />
+              <ref role="37wK5l" node="1CcQBrPd1dz" resolve="handlerTemplates" />
             </node>
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="6fdr4UgftJ4" role="jymVt" />
+    <node concept="2tJIrI" id="7P_FdVPP0yl" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVPsPOY" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <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">
+            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+          </node>
+        </node>
+      </node>
+      <node concept="_YKpA" id="7P_FdVPsPOZ" role="3clF45">
+        <node concept="3uibUv" id="7P_FdVPsPP0" role="_ZDj9">
+          <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="7P_FdVPPexE" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPsPP3" role="3clF47">
+        <node concept="3cpWs8" id="7P_FdVPsQ4_" role="3cqZAp">
+          <node concept="3cpWsn" id="7P_FdVPsQ4A" role="3cpWs9">
+            <property role="TrG5h" value="stagesMap" />
+            <node concept="3uibUv" id="7P_FdVPsQ4B" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~TreeMap" resolve="TreeMap" />
+              <node concept="17QB3L" id="7P_FdVPsQ4C" role="11_B2D" />
+              <node concept="_YKpA" id="7P_FdVPsQ4D" role="11_B2D">
+                <node concept="3uibUv" id="7P_FdVPsQ4E" role="_ZDj9">
+                  <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+                </node>
+              </node>
+            </node>
+            <node concept="2ShNRf" id="7P_FdVPsQ4F" role="33vP2m">
+              <node concept="1pGfFk" id="7P_FdVPsQ4G" role="2ShVmc">
+                <ref role="37wK5l" to="33ny:~TreeMap.&lt;init&gt;()" resolve="TreeMap" />
+                <node concept="17QB3L" id="7P_FdVPsQ4H" role="1pMfVU" />
+                <node concept="_YKpA" id="7P_FdVPsQ4I" role="1pMfVU">
+                  <node concept="3uibUv" id="7P_FdVPsQ4J" role="_ZDj9">
+                    <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="7P_FdVPsQ4K" role="3cqZAp">
+          <node concept="3clFbS" id="7P_FdVPsQ4L" role="2LFqv$">
+            <node concept="3clFbJ" id="7P_FdVPsQ4M" role="3cqZAp">
+              <node concept="3clFbS" id="7P_FdVPsQ4N" role="3clFbx">
+                <node concept="3clFbF" id="7P_FdVPsQ4O" role="3cqZAp">
+                  <node concept="2OqwBi" id="7P_FdVPsQ4P" role="3clFbG">
+                    <node concept="37vLTw" id="7P_FdVPsQ4Q" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7P_FdVPsQ4A" resolve="stagesMap" />
+                    </node>
+                    <node concept="liA8E" id="7P_FdVPsQ4R" role="2OqNvi">
+                      <ref role="37wK5l" to="33ny:~TreeMap.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
+                      <node concept="2OqwBi" id="7P_FdVPsQ4S" role="37wK5m">
+                        <node concept="37vLTw" id="7P_FdVPsQ4T" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7P_FdVPsQ5f" resolve="htpl" />
+                        </node>
+                        <node concept="liA8E" id="7P_FdVPsQ4U" role="2OqNvi">
+                          <ref role="37wK5l" to="i348:20Ay2Vf1i5R" resolve="stage" />
+                        </node>
+                      </node>
+                      <node concept="2ShNRf" id="7P_FdVPsQ4V" role="37wK5m">
+                        <node concept="Tc6Ow" id="7P_FdVPsQ4W" role="2ShVmc">
+                          <node concept="3uibUv" id="7P_FdVPsQ4X" role="HW$YZ">
+                            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3fqX7Q" id="7P_FdVPsQ4Y" role="3clFbw">
+                <node concept="2OqwBi" id="7P_FdVPsQ4Z" role="3fr31v">
+                  <node concept="37vLTw" id="7P_FdVPsQ50" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7P_FdVPsQ4A" resolve="stagesMap" />
+                  </node>
+                  <node concept="liA8E" id="7P_FdVPsQ51" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~TreeMap.containsKey(java.lang.Object):boolean" resolve="containsKey" />
+                    <node concept="2OqwBi" id="7P_FdVPsQ52" role="37wK5m">
+                      <node concept="37vLTw" id="7P_FdVPsQ53" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7P_FdVPsQ5f" resolve="htpl" />
+                      </node>
+                      <node concept="liA8E" id="7P_FdVPsQ54" role="2OqNvi">
+                        <ref role="37wK5l" to="i348:20Ay2Vf1i5R" resolve="stage" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7P_FdVPsQ55" role="3cqZAp">
+              <node concept="2OqwBi" id="7P_FdVPsQ56" role="3clFbG">
+                <node concept="2OqwBi" id="7P_FdVPsQ57" role="2Oq$k0">
+                  <node concept="37vLTw" id="7P_FdVPsQ58" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7P_FdVPsQ4A" resolve="stagesMap" />
+                  </node>
+                  <node concept="liA8E" id="7P_FdVPsQ59" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~TreeMap.get(java.lang.Object):java.lang.Object" resolve="get" />
+                    <node concept="2OqwBi" id="7P_FdVPsQ5a" role="37wK5m">
+                      <node concept="37vLTw" id="7P_FdVPsQ5b" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7P_FdVPsQ5f" resolve="htpl" />
+                      </node>
+                      <node concept="liA8E" id="7P_FdVPsQ5c" role="2OqNvi">
+                        <ref role="37wK5l" to="i348:20Ay2Vf1i5R" resolve="stage" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="TSZUe" id="7P_FdVPsQ5d" role="2OqNvi">
+                  <node concept="37vLTw" id="7P_FdVPsQ5e" role="25WWJ7">
+                    <ref role="3cqZAo" node="7P_FdVPsQ5f" resolve="htpl" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="7P_FdVPsQ5f" role="1Duv9x">
+            <property role="TrG5h" value="htpl" />
+            <node concept="3uibUv" id="7P_FdVPsQ5g" role="1tU5fm">
+              <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="7P_FdVPPo9F" role="1DdaDG">
+            <ref role="3cqZAo" node="7P_FdVPPiuI" resolve="handlerTemplates" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="7P_FdVPsQ5i" role="3cqZAp" />
+        <node concept="3cpWs8" id="7P_FdVPsQ5j" role="3cqZAp">
+          <node concept="3cpWsn" id="7P_FdVPsQ5k" role="3cpWs9">
+            <property role="TrG5h" value="stages" />
+            <node concept="_YKpA" id="7P_FdVPsQ5l" role="1tU5fm">
+              <node concept="3uibUv" id="7P_FdVPsQ5m" role="_ZDj9">
+                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="7P_FdVPsQ5n" role="33vP2m">
+              <node concept="Tc6Ow" id="7P_FdVPsQ5o" role="2ShVmc">
+                <node concept="3uibUv" id="7P_FdVPsQ5p" role="HW$YZ">
+                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="7P_FdVPsQ5q" role="3cqZAp">
+          <node concept="3clFbS" id="7P_FdVPsQ5r" role="2LFqv$">
+            <node concept="3clFbF" id="7P_FdVPsQ5s" role="3cqZAp">
+              <node concept="2OqwBi" id="7P_FdVPsQ5t" role="3clFbG">
+                <node concept="37vLTw" id="7P_FdVPsQ5u" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7P_FdVPsQ5k" resolve="stages" />
+                </node>
+                <node concept="TSZUe" id="7P_FdVPsQ5v" role="2OqNvi">
+                  <node concept="2ShNRf" id="7P_FdVPsQ5w" role="25WWJ7">
+                    <node concept="1pGfFk" id="7P_FdVPsQ5x" role="2ShVmc">
+                      <ref role="37wK5l" node="1CcQBrPd004" resolve="HandlingStage" />
+                      <node concept="2OqwBi" id="7P_FdVPsQ5y" role="37wK5m">
+                        <node concept="37vLTw" id="7P_FdVPsQ5z" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7P_FdVPsQ5C" resolve="e" />
+                        </node>
+                        <node concept="liA8E" id="7P_FdVPsQ5$" role="2OqNvi">
+                          <ref role="37wK5l" to="33ny:~Map$Entry.getKey():java.lang.Object" resolve="getKey" />
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="7P_FdVPsQ5_" role="37wK5m">
+                        <node concept="37vLTw" id="7P_FdVPsQ5A" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7P_FdVPsQ5C" resolve="e" />
+                        </node>
+                        <node concept="liA8E" id="7P_FdVPsQ5B" role="2OqNvi">
+                          <ref role="37wK5l" to="33ny:~Map$Entry.getValue():java.lang.Object" resolve="getValue" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="7P_FdVPsQ5C" role="1Duv9x">
+            <property role="TrG5h" value="e" />
+            <node concept="3uibUv" id="7P_FdVPsQ5D" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~Map$Entry" resolve="Map.Entry" />
+              <node concept="17QB3L" id="7P_FdVPsQ5E" role="11_B2D" />
+              <node concept="_YKpA" id="7P_FdVPsQ5F" role="11_B2D">
+                <node concept="3uibUv" id="7P_FdVPsQ5G" role="_ZDj9">
+                  <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="7P_FdVPsQ5H" role="1DdaDG">
+            <node concept="37vLTw" id="7P_FdVPsQ5I" role="2Oq$k0">
+              <ref role="3cqZAo" node="7P_FdVPsQ4A" resolve="stagesMap" />
+            </node>
+            <node concept="liA8E" id="7P_FdVPsQ5J" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~TreeMap.entrySet():java.util.Set" resolve="entrySet" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7P_FdVPsQ5K" role="3cqZAp" />
+        <node concept="3clFbF" id="7P_FdVPsQ5L" role="3cqZAp">
+          <node concept="37vLTw" id="7P_FdVPsQ5M" role="3clFbG">
+            <ref role="3cqZAo" node="7P_FdVPsQ5k" resolve="stages" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQmEG$" role="jymVt" />
     <node concept="312cEg" id="12yN8DyvDfi" role="jymVt">
-      <property role="TrG5h" value="templates" />
+      <property role="TrG5h" value="concept2ruleTemplates" />
       <node concept="3Tm6S6" id="12yN8DyvDfj" role="1B3o_S" />
       <node concept="3rvAFt" id="12yN8Dyw7uY" role="1tU5fm">
         <node concept="3bZ5Sz" id="YGS68MZPLr" role="3rvQeY" />
         <node concept="3vKaQO" id="12yN8DyDzne" role="3rvSg0">
           <node concept="1LlUBW" id="1CcQBrPdpQH" role="3O5elw">
             <node concept="3uibUv" id="1CcQBrPdpQI" role="1Lm7xW">
-              <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+              <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
             </node>
             <node concept="3uibUv" id="7XdbJdyRSXd" role="1Lm7xW">
               <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3820,7 +4096,7 @@
           <node concept="3vKaQO" id="429xoypKEop" role="3rHtpV">
             <node concept="1LlUBW" id="1CcQBrPdeWw" role="3O5elw">
               <node concept="3uibUv" id="1CcQBrPdhbo" role="1Lm7xW">
-                <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
               </node>
               <node concept="3uibUv" id="7XdbJdyRULm" role="1Lm7xW">
                 <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -3835,33 +4111,45 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="7P_FdVPGV6W" role="jymVt" />
     <node concept="312cEg" id="4QPCta1zvN6" role="jymVt">
       <property role="TrG5h" value="stages" />
       <node concept="3Tm6S6" id="4QPCta1zvN7" role="1B3o_S" />
       <node concept="341BcB" id="6UWSvq547Qk" role="1tU5fm">
         <node concept="17QB3L" id="6UWSvq54aOg" role="3rvQeY" />
         <node concept="3uibUv" id="6UWSvq54dNz" role="3rvSg0">
-          <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+          <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
         </node>
       </node>
       <node concept="2ShNRf" id="4QPCta1zxHP" role="33vP2m">
         <node concept="342d9q" id="6UWSvq54jYn" role="2ShVmc">
           <node concept="17QB3L" id="6UWSvq54pYp" role="3rHrn6" />
           <node concept="3uibUv" id="6UWSvq54sUa" role="3rHtpV">
-            <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
           </node>
         </node>
       </node>
     </node>
-    <node concept="312cEg" id="7DvO2Manxmv" role="jymVt">
-      <property role="TrG5h" value="ruleTemplateManifests" />
-      <node concept="3Tm6S6" id="7DvO2Manxmw" role="1B3o_S" />
-      <node concept="_YKpA" id="7DvO2ManzlK" role="1tU5fm">
-        <node concept="3uibUv" id="7DvO2ManzmW" role="_ZDj9">
-          <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+    <node concept="2tJIrI" id="7P_FdVPGY2g" role="jymVt" />
+    <node concept="312cEg" id="7P_FdVQplXd" role="jymVt">
+      <property role="TrG5h" value="fqName2handlerTemplate" />
+      <node concept="3Tm6S6" id="7P_FdVQplXe" role="1B3o_S" />
+      <node concept="3rvAFt" id="7P_FdVQpvfA" role="1tU5fm">
+        <node concept="17QB3L" id="7P_FdVQpvhe" role="3rvQeY" />
+        <node concept="3uibUv" id="7P_FdVQpviN" role="3rvSg0">
+          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7P_FdVQpvy1" role="33vP2m">
+        <node concept="3rGOSV" id="7P_FdVQpvww" role="2ShVmc">
+          <node concept="17QB3L" id="7P_FdVQpvwx" role="3rHrn6" />
+          <node concept="3uibUv" id="7P_FdVQpvwy" role="3rHtpV">
+            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+          </node>
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="7P_FdVQpiDB" role="jymVt" />
     <node concept="3Tm1VV" id="6fdr4UgftiH" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="4OKkcnfu_xo">
@@ -4788,96 +5076,18 @@
       </node>
       <node concept="3Tm1VV" id="7DvO2M9p279" role="1B3o_S" />
       <node concept="3clFbS" id="7DvO2M9p27a" role="3clF47">
-        <node concept="3cpWs8" id="6UWSvq5cOoy" role="3cqZAp">
-          <node concept="3cpWsn" id="6UWSvq5cOoz" role="3cpWs9">
-            <property role="TrG5h" value="allUsedLangDesc" />
-            <node concept="3vKaQO" id="6UWSvq5cOon" role="1tU5fm">
-              <node concept="3uibUv" id="6UWSvq5cOoq" role="3O5elw">
-                <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-              </node>
-            </node>
-            <node concept="1rXfSq" id="6UWSvq5cOo$" role="33vP2m">
-              <ref role="37wK5l" node="6UWSvq5cIj4" resolve="dependencyClosure" />
-              <node concept="2YIFZM" id="6UWSvq5cOo_" role="37wK5m">
-                <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="37vLTw" id="6UWSvq5cOoA" role="37wK5m">
+        <node concept="3clFbF" id="7P_FdVPG8pg" role="3cqZAp">
+          <node concept="2ShNRf" id="7DvO2M9ptMA" role="3clFbG">
+            <node concept="1pGfFk" id="7DvO2M9ptMB" role="2ShVmc">
+              <ref role="37wK5l" node="7DvO2M9VeM1" resolve="RuleProcessingSession" />
+              <node concept="2YIFZM" id="7P_FdVPWEK7" role="37wK5m">
+                <ref role="37wK5l" to="fqlx:7P_FdVPW9uU" resolve="allForModel" />
+                <ref role="1Pybhc" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+                <node concept="37vLTw" id="7P_FdVPWEO8" role="37wK5m">
                   <ref role="3cqZAo" node="4QPCta1yZW$" resolve="model" />
                 </node>
-              </node>
-              <node concept="37vLTw" id="6UWSvq5cOoB" role="37wK5m">
-                <ref role="3cqZAo" node="4QPCta1yZtK" resolve="repository" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6UWSvq5cUbN" role="3cqZAp">
-          <node concept="3cpWsn" id="6UWSvq5cUbO" role="3cpWs9">
-            <property role="TrG5h" value="typeAspects" />
-            <node concept="_YKpA" id="6UWSvq5cUaM" role="1tU5fm">
-              <node concept="3uibUv" id="6UWSvq5cUaP" role="_ZDj9">
-                <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="6UWSvq5cUbP" role="33vP2m">
-              <node concept="2OqwBi" id="6UWSvq5cUbQ" role="2Oq$k0">
-                <node concept="2OqwBi" id="6UWSvq5cUbR" role="2Oq$k0">
-                  <node concept="37vLTw" id="6UWSvq5cUbS" role="2Oq$k0">
-                    <ref role="3cqZAo" node="6UWSvq5cOoz" resolve="allUsedLangDesc" />
-                  </node>
-                  <node concept="3$u5V9" id="6UWSvq5cUbT" role="2OqNvi">
-                    <node concept="1bVj0M" id="6UWSvq5cUbU" role="23t8la">
-                      <node concept="3clFbS" id="6UWSvq5cUbV" role="1bW5cS">
-                        <node concept="3clFbF" id="6UWSvq5cUbW" role="3cqZAp">
-                          <node concept="2YIFZM" id="6UWSvq5cUbX" role="3clFbG">
-                            <ref role="37wK5l" to="fqlx:6UWSvq5bk3i" resolve="forLanguageDesc" />
-                            <ref role="1Pybhc" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
-                            <node concept="37vLTw" id="6UWSvq5cUbY" role="37wK5m">
-                              <ref role="3cqZAo" node="6UWSvq5cUbZ" resolve="it" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="6UWSvq5cUbZ" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6UWSvq5cUc0" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3zZkjj" id="6UWSvq5cUc1" role="2OqNvi">
-                  <node concept="1bVj0M" id="6UWSvq5cUc2" role="23t8la">
-                    <node concept="3clFbS" id="6UWSvq5cUc3" role="1bW5cS">
-                      <node concept="3clFbF" id="6UWSvq5cUc4" role="3cqZAp">
-                        <node concept="3y3z36" id="6UWSvq5cUc5" role="3clFbG">
-                          <node concept="10Nm6u" id="6UWSvq5cUc6" role="3uHU7w" />
-                          <node concept="37vLTw" id="6UWSvq5cUc7" role="3uHU7B">
-                            <ref role="3cqZAo" node="6UWSvq5cUc8" resolve="it" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="6UWSvq5cUc8" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6UWSvq5cUc9" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="ANE8D" id="6UWSvq5cUca" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="4QPCta1z7n$" role="3cqZAp">
-          <node concept="2ShNRf" id="7DvO2M9psZh" role="3cqZAk">
-            <node concept="1pGfFk" id="7DvO2M9psYR" role="2ShVmc">
-              <ref role="37wK5l" node="7DvO2M9pq3k" resolve="RuleProcessingSession" />
-              <node concept="2ShNRf" id="7DvO2M9ptMA" role="37wK5m">
-                <node concept="1pGfFk" id="7DvO2M9ptMB" role="2ShVmc">
-                  <ref role="37wK5l" node="7DvO2M9VeM1" resolve="RuleProcessingSession.TypeAspectRuntime" />
-                  <node concept="37vLTw" id="6UWSvq5dgDQ" role="37wK5m">
-                    <ref role="3cqZAo" node="6UWSvq5cUbO" resolve="typeAspects" />
-                  </node>
+                <node concept="37vLTw" id="7P_FdVPWETI" role="37wK5m">
+                  <ref role="3cqZAo" node="4QPCta1yZtK" resolve="repository" />
                 </node>
               </node>
             </node>
@@ -4890,14 +5100,9 @@
       <property role="TrG5h" value="ruleTemplates" />
       <node concept="3Tm1VV" id="20Ay2VeR9qm" role="1B3o_S" />
       <node concept="3clFbS" id="20Ay2VeR9qn" role="3clF47">
-        <node concept="3clFbF" id="20Ay2VeR9qo" role="3cqZAp">
-          <node concept="2OqwBi" id="7DvO2M9VvzB" role="3clFbG">
-            <node concept="37vLTw" id="4QPCta1$EIl" role="2Oq$k0">
-              <ref role="3cqZAo" node="7DvO2M9po9W" resolve="typeAspectRuntime" />
-            </node>
-            <node concept="2OwXpG" id="7DvO2M9VvJI" role="2OqNvi">
-              <ref role="2Oxat5" node="7DvO2M9VeNo" resolve="ruleTemplateIndex" />
-            </node>
+        <node concept="3clFbF" id="7P_FdVPFNRd" role="3cqZAp">
+          <node concept="37vLTw" id="7P_FdVPFNRb" role="3clFbG">
+            <ref role="3cqZAo" node="7P_FdVPFMy6" resolve="ruleTemplateIndex" />
           </node>
         </node>
       </node>
@@ -4910,14 +5115,9 @@
       <property role="TrG5h" value="macroTemplates" />
       <node concept="3Tm1VV" id="7DvO2M9VLTr" role="1B3o_S" />
       <node concept="3clFbS" id="7DvO2M9Icau" role="3clF47">
-        <node concept="3clFbF" id="7DvO2M9Icav" role="3cqZAp">
-          <node concept="2OqwBi" id="7DvO2M9VvfQ" role="3clFbG">
-            <node concept="37vLTw" id="7DvO2M9Icax" role="2Oq$k0">
-              <ref role="3cqZAo" node="7DvO2M9po9W" resolve="typeAspectRuntime" />
-            </node>
-            <node concept="2OwXpG" id="7DvO2M9VvmF" role="2OqNvi">
-              <ref role="2Oxat5" node="7DvO2M9VeNl" resolve="macroTemplatesIndex" />
-            </node>
+        <node concept="3clFbF" id="7P_FdVPFNWv" role="3cqZAp">
+          <node concept="37vLTw" id="7P_FdVPFNWt" role="3clFbG">
+            <ref role="3cqZAo" node="7P_FdVPFMy3" resolve="macroTemplatesIndex" />
           </node>
         </node>
       </node>
@@ -4926,978 +5126,222 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7DvO2M9Icar" role="jymVt" />
-    <node concept="3clFbW" id="7DvO2M9pq3k" role="jymVt">
-      <node concept="37vLTG" id="7DvO2M9pqu5" role="3clF46">
-        <property role="TrG5h" value="runtime" />
-        <node concept="3uibUv" id="6UWSvq5cHbT" role="1tU5fm">
-          <ref role="3uigEE" node="7DvO2M9VeLZ" resolve="RuleProcessingSession.TypeAspectRuntime" />
+    <node concept="3clFbW" id="7DvO2M9VeM1" role="jymVt">
+      <node concept="3cqZAl" id="7DvO2M9VeM2" role="3clF45" />
+      <node concept="3Tm6S6" id="7P_FdVPFPA2" role="1B3o_S" />
+      <node concept="3clFbS" id="7DvO2M9VeM4" role="3clF47">
+        <node concept="3clFbF" id="7DvO2M9VeM5" role="3cqZAp">
+          <node concept="1rXfSq" id="7DvO2M9VeM6" role="3clFbG">
+            <ref role="37wK5l" node="7DvO2M9VeMb" resolve="init" />
+            <node concept="37vLTw" id="7DvO2M9VeM7" role="37wK5m">
+              <ref role="3cqZAo" node="7DvO2M9VeM8" resolve="descriptors" />
+            </node>
+          </node>
         </node>
       </node>
-      <node concept="3cqZAl" id="7DvO2M9pq3m" role="3clF45" />
-      <node concept="3Tm6S6" id="7DvO2M9pqtP" role="1B3o_S" />
-      <node concept="3clFbS" id="7DvO2M9pq3o" role="3clF47">
-        <node concept="3clFbF" id="7DvO2M9pqvy" role="3cqZAp">
-          <node concept="37vLTI" id="7DvO2M9pqWz" role="3clFbG">
-            <node concept="37vLTw" id="7DvO2M9pqYu" role="37vLTx">
-              <ref role="3cqZAo" node="7DvO2M9pqu5" resolve="runtime" />
-            </node>
-            <node concept="2OqwBi" id="7DvO2M9pq_8" role="37vLTJ">
-              <node concept="Xjq3P" id="7DvO2M9pqvx" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7DvO2M9pqKj" role="2OqNvi">
-                <ref role="2Oxat5" node="7DvO2M9po9W" resolve="typeAspectRuntime" />
-              </node>
-            </node>
+      <node concept="37vLTG" id="7DvO2M9VeM8" role="3clF46">
+        <property role="TrG5h" value="descriptors" />
+        <node concept="A3Dl8" id="6UWSvq5dhn_" role="1tU5fm">
+          <node concept="3uibUv" id="6UWSvq5dhnB" role="A3Ik2">
+            <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7DvO2M9pm7E" role="jymVt" />
-    <node concept="312cEu" id="7DvO2M9VeLZ" role="jymVt">
-      <property role="TrG5h" value="TypeAspectRuntime" />
-      <node concept="2tJIrI" id="7DvO2M9VeM0" role="jymVt" />
-      <node concept="3clFbW" id="7DvO2M9VeM1" role="jymVt">
-        <node concept="3cqZAl" id="7DvO2M9VeM2" role="3clF45" />
-        <node concept="3Tm1VV" id="7DvO2M9VeM3" role="1B3o_S" />
-        <node concept="3clFbS" id="7DvO2M9VeM4" role="3clF47">
-          <node concept="3clFbF" id="7DvO2M9VeM5" role="3cqZAp">
-            <node concept="1rXfSq" id="7DvO2M9VeM6" role="3clFbG">
-              <ref role="37wK5l" node="7DvO2M9VeMb" resolve="init" />
-              <node concept="37vLTw" id="7DvO2M9VeM7" role="37wK5m">
-                <ref role="3cqZAo" node="7DvO2M9VeM8" resolve="descriptors" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="37vLTG" id="7DvO2M9VeM8" role="3clF46">
-          <property role="TrG5h" value="descriptors" />
-          <node concept="A3Dl8" id="6UWSvq5dhn_" role="1tU5fm">
-            <node concept="3uibUv" id="6UWSvq5dhnB" role="A3Ik2">
-              <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
-            </node>
+    <node concept="2tJIrI" id="7P_FdVPFS$d" role="jymVt" />
+    <node concept="3clFb_" id="7DvO2M9VeMb" role="jymVt">
+      <property role="TrG5h" value="init" />
+      <node concept="3Tm6S6" id="7DvO2M9VeMc" role="1B3o_S" />
+      <node concept="3cqZAl" id="7DvO2M9VeMd" role="3clF45" />
+      <node concept="37vLTG" id="7DvO2M9VeMe" role="3clF46">
+        <property role="TrG5h" value="descriptors" />
+        <node concept="A3Dl8" id="6UWSvq5dh__" role="1tU5fm">
+          <node concept="3uibUv" id="6UWSvq5dh_B" role="A3Ik2">
+            <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
           </node>
         </node>
       </node>
-      <node concept="2tJIrI" id="7DvO2M9VeMa" role="jymVt" />
-      <node concept="3clFb_" id="7DvO2M9VeMb" role="jymVt">
-        <property role="TrG5h" value="init" />
-        <node concept="3Tm6S6" id="7DvO2M9VeMc" role="1B3o_S" />
-        <node concept="3cqZAl" id="7DvO2M9VeMd" role="3clF45" />
-        <node concept="37vLTG" id="7DvO2M9VeMe" role="3clF46">
-          <property role="TrG5h" value="descriptors" />
-          <node concept="A3Dl8" id="6UWSvq5dh__" role="1tU5fm">
-            <node concept="3uibUv" id="6UWSvq5dh_B" role="A3Ik2">
-              <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+      <node concept="3clFbS" id="7DvO2M9VeMg" role="3clF47">
+        <node concept="3cpWs8" id="6UWSvq5d6Ly" role="3cqZAp">
+          <node concept="3cpWsn" id="6UWSvq5d6Lz" role="3cpWs9">
+            <property role="TrG5h" value="macroManifests" />
+            <node concept="_YKpA" id="6UWSvq5d6QU" role="1tU5fm">
+              <node concept="3uibUv" id="6UWSvq5d6QW" role="_ZDj9">
+                <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+              </node>
             </node>
-          </node>
-        </node>
-        <node concept="3clFbS" id="7DvO2M9VeMg" role="3clF47">
-          <node concept="3cpWs8" id="6UWSvq5d6Ly" role="3cqZAp">
-            <node concept="3cpWsn" id="6UWSvq5d6Lz" role="3cpWs9">
-              <property role="TrG5h" value="macroManifests" />
-              <node concept="_YKpA" id="6UWSvq5d6QU" role="1tU5fm">
-                <node concept="3uibUv" id="6UWSvq5d6QW" role="_ZDj9">
+            <node concept="2ShNRf" id="6UWSvq5d8fo" role="33vP2m">
+              <node concept="Tc6Ow" id="6UWSvq5d8dH" role="2ShVmc">
+                <node concept="3uibUv" id="6UWSvq5d8dI" role="HW$YZ">
                   <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
                 </node>
               </node>
-              <node concept="2ShNRf" id="6UWSvq5d8fo" role="33vP2m">
-                <node concept="Tc6Ow" id="6UWSvq5d8dH" role="2ShVmc">
-                  <node concept="3uibUv" id="6UWSvq5d8dI" role="HW$YZ">
-                    <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
-                  </node>
-                </node>
-              </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="6UWSvq5d8mc" role="3cqZAp">
-            <node concept="3cpWsn" id="6UWSvq5d8md" role="3cpWs9">
-              <property role="TrG5h" value="ruleManifests" />
-              <node concept="_YKpA" id="6UWSvq5d8vu" role="1tU5fm">
-                <node concept="3uibUv" id="6UWSvq5d8vw" role="_ZDj9">
+        </node>
+        <node concept="3cpWs8" id="6UWSvq5d8mc" role="3cqZAp">
+          <node concept="3cpWsn" id="6UWSvq5d8md" role="3cpWs9">
+            <property role="TrG5h" value="ruleManifests" />
+            <node concept="_YKpA" id="6UWSvq5d8vu" role="1tU5fm">
+              <node concept="3uibUv" id="6UWSvq5d8vw" role="_ZDj9">
+                <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="6UWSvq5daoJ" role="33vP2m">
+              <node concept="Tc6Ow" id="6UWSvq5dan4" role="2ShVmc">
+                <node concept="3uibUv" id="6UWSvq5dan5" role="HW$YZ">
                   <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
                 </node>
               </node>
-              <node concept="2ShNRf" id="6UWSvq5daoJ" role="33vP2m">
-                <node concept="Tc6Ow" id="6UWSvq5dan4" role="2ShVmc">
-                  <node concept="3uibUv" id="6UWSvq5dan5" role="HW$YZ">
-                    <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7P_FdVPGUJh" role="3cqZAp" />
+        <node concept="1DcWWT" id="6UWSvq5d00k" role="3cqZAp">
+          <node concept="3clFbS" id="6UWSvq5d00n" role="2LFqv$">
+            <node concept="3cpWs8" id="7wfdmjRl1_C" role="3cqZAp">
+              <node concept="3cpWsn" id="7wfdmjRl1_D" role="3cpWs9">
+                <property role="TrG5h" value="macroManifest" />
+                <node concept="3uibUv" id="7wfdmjRl1_$" role="1tU5fm">
+                  <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
+                </node>
+                <node concept="2OqwBi" id="7wfdmjRl1_E" role="33vP2m">
+                  <node concept="37vLTw" id="7wfdmjRl1_F" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6UWSvq5d00o" resolve="aspect" />
                   </node>
+                  <node concept="liA8E" id="7wfdmjRl1_G" role="2OqNvi">
+                    <ref role="37wK5l" to="fqlx:2hteS6ClmbE" resolve="createMacroManifest" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="7wfdmjRl3BC" role="3cqZAp">
+              <node concept="3clFbS" id="7wfdmjRl3BE" role="3clFbx">
+                <node concept="3clFbF" id="6UWSvq5daIa" role="3cqZAp">
+                  <node concept="2OqwBi" id="6UWSvq5dbyT" role="3clFbG">
+                    <node concept="37vLTw" id="6UWSvq5daI8" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6UWSvq5d6Lz" resolve="macroManifests" />
+                    </node>
+                    <node concept="TSZUe" id="6UWSvq5dcAz" role="2OqNvi">
+                      <node concept="37vLTw" id="7wfdmjRl1_H" role="25WWJ7">
+                        <ref role="3cqZAo" node="7wfdmjRl1_D" resolve="macroManifest" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3y3z36" id="7wfdmjRl3R4" role="3clFbw">
+                <node concept="10Nm6u" id="7wfdmjRl3St" role="3uHU7w" />
+                <node concept="37vLTw" id="7wfdmjRl3I7" role="3uHU7B">
+                  <ref role="3cqZAo" node="7wfdmjRl1_D" resolve="macroManifest" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="7P_FdVPGvW1" role="3cqZAp" />
+            <node concept="3cpWs8" id="7wfdmjRl439" role="3cqZAp">
+              <node concept="3cpWsn" id="7wfdmjRl43a" role="3cpWs9">
+                <property role="TrG5h" value="ruleManifest" />
+                <node concept="3uibUv" id="7wfdmjRl436" role="1tU5fm">
+                  <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
+                </node>
+                <node concept="2OqwBi" id="7wfdmjRl43b" role="33vP2m">
+                  <node concept="37vLTw" id="7wfdmjRl43c" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6UWSvq5d00o" resolve="aspect" />
+                  </node>
+                  <node concept="liA8E" id="7wfdmjRl43d" role="2OqNvi">
+                    <ref role="37wK5l" to="fqlx:2hteS6ClmfS" resolve="createRuleManifest" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="7wfdmjRl4mB" role="3cqZAp">
+              <node concept="3clFbS" id="7wfdmjRl4mD" role="3clFbx">
+                <node concept="3clFbF" id="6UWSvq5dds6" role="3cqZAp">
+                  <node concept="2OqwBi" id="6UWSvq5deco" role="3clFbG">
+                    <node concept="37vLTw" id="6UWSvq5dds4" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6UWSvq5d8md" resolve="ruleManifests" />
+                    </node>
+                    <node concept="TSZUe" id="6UWSvq5dffY" role="2OqNvi">
+                      <node concept="37vLTw" id="7wfdmjRl43e" role="25WWJ7">
+                        <ref role="3cqZAo" node="7wfdmjRl43a" resolve="ruleManifest" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3y3z36" id="7wfdmjRl4B5" role="3clFbw">
+                <node concept="10Nm6u" id="7wfdmjRl4Dc" role="3uHU7w" />
+                <node concept="37vLTw" id="7wfdmjRl4u6" role="3uHU7B">
+                  <ref role="3cqZAo" node="7wfdmjRl43a" resolve="ruleManifest" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="1DcWWT" id="6UWSvq5d00k" role="3cqZAp">
-            <node concept="3clFbS" id="6UWSvq5d00n" role="2LFqv$">
-              <node concept="3cpWs8" id="7wfdmjRl1_C" role="3cqZAp">
-                <node concept="3cpWsn" id="7wfdmjRl1_D" role="3cpWs9">
-                  <property role="TrG5h" value="macroManifest" />
-                  <node concept="3uibUv" id="7wfdmjRl1_$" role="1tU5fm">
-                    <ref role="3uigEE" to="psr6:2N2MQGCMVqD" resolve="AbstractMacroManifest" />
-                  </node>
-                  <node concept="2OqwBi" id="7wfdmjRl1_E" role="33vP2m">
-                    <node concept="37vLTw" id="7wfdmjRl1_F" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6UWSvq5d00o" resolve="typeAspect" />
-                    </node>
-                    <node concept="liA8E" id="7wfdmjRl1_G" role="2OqNvi">
-                      <ref role="37wK5l" to="fqlx:2hteS6ClmbE" resolve="createMacroManifest" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbJ" id="7wfdmjRl3BC" role="3cqZAp">
-                <node concept="3clFbS" id="7wfdmjRl3BE" role="3clFbx">
-                  <node concept="3clFbF" id="6UWSvq5daIa" role="3cqZAp">
-                    <node concept="2OqwBi" id="6UWSvq5dbyT" role="3clFbG">
-                      <node concept="37vLTw" id="6UWSvq5daI8" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6UWSvq5d6Lz" resolve="macroManifests" />
-                      </node>
-                      <node concept="TSZUe" id="6UWSvq5dcAz" role="2OqNvi">
-                        <node concept="37vLTw" id="7wfdmjRl1_H" role="25WWJ7">
-                          <ref role="3cqZAo" node="7wfdmjRl1_D" resolve="macroManifest" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3y3z36" id="7wfdmjRl3R4" role="3clFbw">
-                  <node concept="10Nm6u" id="7wfdmjRl3St" role="3uHU7w" />
-                  <node concept="37vLTw" id="7wfdmjRl3I7" role="3uHU7B">
-                    <ref role="3cqZAo" node="7wfdmjRl1_D" resolve="macroManifest" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="7wfdmjRl439" role="3cqZAp">
-                <node concept="3cpWsn" id="7wfdmjRl43a" role="3cpWs9">
-                  <property role="TrG5h" value="ruleManifest" />
-                  <node concept="3uibUv" id="7wfdmjRl436" role="1tU5fm">
-                    <ref role="3uigEE" to="i348:4OKkcnfu_xe" resolve="AbstractRuleTemplateManifest" />
-                  </node>
-                  <node concept="2OqwBi" id="7wfdmjRl43b" role="33vP2m">
-                    <node concept="37vLTw" id="7wfdmjRl43c" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6UWSvq5d00o" resolve="typeAspect" />
-                    </node>
-                    <node concept="liA8E" id="7wfdmjRl43d" role="2OqNvi">
-                      <ref role="37wK5l" to="fqlx:2hteS6ClmfS" resolve="createRuleManifest" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbJ" id="7wfdmjRl4mB" role="3cqZAp">
-                <node concept="3clFbS" id="7wfdmjRl4mD" role="3clFbx">
-                  <node concept="3clFbF" id="6UWSvq5dds6" role="3cqZAp">
-                    <node concept="2OqwBi" id="6UWSvq5deco" role="3clFbG">
-                      <node concept="37vLTw" id="6UWSvq5dds4" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6UWSvq5d8md" resolve="ruleManifests" />
-                      </node>
-                      <node concept="TSZUe" id="6UWSvq5dffY" role="2OqNvi">
-                        <node concept="37vLTw" id="7wfdmjRl43e" role="25WWJ7">
-                          <ref role="3cqZAo" node="7wfdmjRl43a" resolve="ruleManifest" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3y3z36" id="7wfdmjRl4B5" role="3clFbw">
-                  <node concept="10Nm6u" id="7wfdmjRl4Dc" role="3uHU7w" />
-                  <node concept="37vLTw" id="7wfdmjRl4u6" role="3uHU7B">
-                    <ref role="3cqZAo" node="7wfdmjRl43a" resolve="ruleManifest" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWsn" id="6UWSvq5d00o" role="1Duv9x">
-              <property role="TrG5h" value="typeAspect" />
-              <node concept="3uibUv" id="6UWSvq5d00s" role="1tU5fm">
-                <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="6UWSvq5d00t" role="1DdaDG">
-              <ref role="3cqZAo" node="7DvO2M9VeMe" resolve="descriptors" />
+          <node concept="3cpWsn" id="6UWSvq5d00o" role="1Duv9x">
+            <property role="TrG5h" value="aspect" />
+            <node concept="3uibUv" id="6UWSvq5d00s" role="1tU5fm">
+              <ref role="3uigEE" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
             </node>
           </node>
-          <node concept="3clFbF" id="7DvO2M9VeMo" role="3cqZAp">
-            <node concept="37vLTI" id="7DvO2M9VeMp" role="3clFbG">
-              <node concept="2OqwBi" id="7DvO2M9VeMq" role="37vLTJ">
-                <node concept="Xjq3P" id="7DvO2M9VeMr" role="2Oq$k0" />
-                <node concept="2OwXpG" id="7DvO2M9VeMs" role="2OqNvi">
-                  <ref role="2Oxat5" node="7DvO2M9VeNl" resolve="macroTemplatesIndex" />
-                </node>
+          <node concept="37vLTw" id="6UWSvq5d00t" role="1DdaDG">
+            <ref role="3cqZAo" node="7DvO2M9VeMe" resolve="descriptors" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="7P_FdVPGUuH" role="3cqZAp" />
+        <node concept="3clFbF" id="7DvO2M9VeMo" role="3cqZAp">
+          <node concept="37vLTI" id="7DvO2M9VeMp" role="3clFbG">
+            <node concept="2OqwBi" id="7DvO2M9VeMq" role="37vLTJ">
+              <node concept="Xjq3P" id="7DvO2M9VeMr" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7DvO2M9VeMs" role="2OqNvi">
+                <ref role="2Oxat5" node="7P_FdVPFMy3" resolve="macroTemplatesIndex" />
               </node>
-              <node concept="2ShNRf" id="7DvO2M9VeMt" role="37vLTx">
-                <node concept="1pGfFk" id="7DvO2M9VeMu" role="2ShVmc">
-                  <ref role="37wK5l" node="1hX44vNlSOK" resolve="MacroTemplateIndex" />
-                  <node concept="37vLTw" id="6UWSvq5d6LC" role="37wK5m">
-                    <ref role="3cqZAo" node="6UWSvq5d6Lz" resolve="macroManifests" />
-                  </node>
+            </node>
+            <node concept="2ShNRf" id="7DvO2M9VeMt" role="37vLTx">
+              <node concept="1pGfFk" id="7DvO2M9VeMu" role="2ShVmc">
+                <ref role="37wK5l" node="1hX44vNlSOK" resolve="MacroTemplateIndex" />
+                <node concept="37vLTw" id="6UWSvq5d6LC" role="37wK5m">
+                  <ref role="3cqZAo" node="6UWSvq5d6Lz" resolve="macroManifests" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="7DvO2M9VeMw" role="3cqZAp">
-            <node concept="37vLTI" id="7DvO2M9VeMx" role="3clFbG">
-              <node concept="2ShNRf" id="7DvO2M9VeMy" role="37vLTx">
-                <node concept="1pGfFk" id="7DvO2ManARn" role="2ShVmc">
-                  <ref role="37wK5l" node="7DvO2Man94t" resolve="RuleTemplateIndex" />
-                  <node concept="37vLTw" id="6UWSvq5d8mi" role="37wK5m">
-                    <ref role="3cqZAo" node="6UWSvq5d8md" resolve="ruleManifests" />
-                  </node>
-                </node>
+        </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 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="7DvO2M9VeNo" resolve="ruleTemplateIndex" />
-                </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>
         </node>
       </node>
-      <node concept="2tJIrI" id="7DvO2M9VeN6" role="jymVt" />
-      <node concept="312cEg" id="7DvO2M9VeNl" role="jymVt">
-        <property role="TrG5h" value="macroTemplatesIndex" />
-        <node concept="3Tmbuc" id="7DvO2M9Vv5Y" role="1B3o_S" />
-        <node concept="3uibUv" id="7DvO2M9VeNn" role="1tU5fm">
-          <ref role="3uigEE" node="1hX44vNlSIA" resolve="MacroTemplateIndex" />
-        </node>
-      </node>
-      <node concept="312cEg" id="7DvO2M9VeNo" role="jymVt">
-        <property role="TrG5h" value="ruleTemplateIndex" />
-        <node concept="3Tmbuc" id="7DvO2M9Vv7$" role="1B3o_S" />
-        <node concept="3uibUv" id="7DvO2M9VeNq" role="1tU5fm">
-          <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="7DvO2M9VuAH" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="6UWSvq5b15A" role="jymVt" />
-    <node concept="2YIFZL" id="6UWSvq5cIj4" role="jymVt">
-      <property role="TrG5h" value="dependencyClosure" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="6UWSvq5b73$" role="3clF47">
-        <node concept="3cpWs8" id="6UWSvq5bdBO" role="3cqZAp">
-          <node concept="3cpWsn" id="6UWSvq5bdBR" role="3cpWs9">
-            <property role="TrG5h" value="closure" />
-            <node concept="2hMVRd" id="6UWSvq5bdBK" role="1tU5fm">
-              <node concept="3uibUv" id="6UWSvq5bdFo" role="2hN53Y">
-                <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="6UWSvq5bdJp" role="33vP2m">
-              <node concept="2i4dXS" id="6UWSvq5bdI6" role="2ShVmc">
-                <node concept="3uibUv" id="6UWSvq5bdI7" role="HW$YZ">
-                  <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="6UWSvq5ba91" role="3cqZAp">
-          <node concept="3clFbS" id="6UWSvq5ba94" role="2LFqv$">
-            <node concept="3cpWs8" id="2hteS6Cndme" role="3cqZAp">
-              <node concept="3cpWsn" id="2hteS6Cndmf" role="3cpWs9">
-                <property role="TrG5h" value="langrt" />
-                <node concept="3uibUv" id="2hteS6Cndmg" role="1tU5fm">
-                  <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-                </node>
-                <node concept="2OqwBi" id="2hteS6Cndmh" role="33vP2m">
-                  <node concept="2YIFZM" id="2hteS6Cndmi" role="2Oq$k0">
-                    <ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository):jetbrains.mps.smodel.language.LanguageRegistry" resolve="getInstance" />
-                    <ref role="1Pybhc" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
-                    <node concept="37vLTw" id="6UWSvq5bdbd" role="37wK5m">
-                      <ref role="3cqZAo" node="6UWSvq5bb8I" resolve="repository" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="2hteS6Cndmm" role="2OqNvi">
-                    <ref role="37wK5l" to="vndm:~LanguageRegistry.getLanguage(org.jetbrains.mps.openapi.language.SLanguage):jetbrains.mps.smodel.language.LanguageRuntime" resolve="getLanguage" />
-                    <node concept="37vLTw" id="6UWSvq5bdd2" role="37wK5m">
-                      <ref role="3cqZAo" node="6UWSvq5ba95" resolve="slang" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="6UWSvq5cnO9" role="3cqZAp">
-              <node concept="3clFbS" id="6UWSvq5cnOb" role="3clFbx">
-                <node concept="RRSsy" id="6UWSvq5cobt" role="3cqZAp">
-                  <property role="RRSoG" value="warn" />
-                  <node concept="3cpWs3" id="6UWSvq5cq08" role="RRSoy">
-                    <node concept="Xl_RD" id="6UWSvq5cq1k" role="3uHU7w">
-                      <property role="Xl_RC" value="\&quot;" />
-                    </node>
-                    <node concept="3cpWs3" id="6UWSvq5coLv" role="3uHU7B">
-                      <node concept="Xl_RD" id="6UWSvq5cobv" role="3uHU7B">
-                        <property role="Xl_RC" value="no language descriptor for \&quot;" />
-                      </node>
-                      <node concept="2OqwBi" id="6UWSvq5coXi" role="3uHU7w">
-                        <node concept="37vLTw" id="6UWSvq5coNc" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6UWSvq5ba95" resolve="slang" />
-                        </node>
-                        <node concept="liA8E" id="6UWSvq5cp5A" role="2OqNvi">
-                          <ref role="37wK5l" to="c17a:~SLanguage.getQualifiedName():java.lang.String" resolve="getQualifiedName" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="6UWSvq5cqBt" role="3cqZAp" />
-              </node>
-              <node concept="3clFbC" id="6UWSvq5co6d" role="3clFbw">
-                <node concept="10Nm6u" id="6UWSvq5co7t" role="3uHU7w" />
-                <node concept="37vLTw" id="6UWSvq5cnWM" role="3uHU7B">
-                  <ref role="3cqZAo" node="2hteS6Cndmf" resolve="langrt" />
-                </node>
-              </node>
-              <node concept="9aQIb" id="6UWSvq5cqkU" role="9aQIa">
-                <node concept="3clFbS" id="6UWSvq5cqkV" role="9aQI4">
-                  <node concept="3clFbF" id="6UWSvq5hKi9" role="3cqZAp">
-                    <node concept="2OqwBi" id="6UWSvq5hLpW" role="3clFbG">
-                      <node concept="37vLTw" id="6UWSvq5hKi7" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6UWSvq5bdBR" resolve="closure" />
-                      </node>
-                      <node concept="TSZUe" id="6UWSvq5hMof" role="2OqNvi">
-                        <node concept="37vLTw" id="6UWSvq5hMoe" role="25WWJ7">
-                          <ref role="3cqZAo" node="2hteS6Cndmf" resolve="langrt" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbF" id="6UWSvq5bdNn" role="3cqZAp">
-                    <node concept="2OqwBi" id="6UWSvq5beo8" role="3clFbG">
-                      <node concept="37vLTw" id="6UWSvq5bdNl" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6UWSvq5bdBR" resolve="closure" />
-                      </node>
-                      <node concept="X8dFx" id="6UWSvq5hGgr" role="2OqNvi">
-                        <node concept="2OqwBi" id="6UWSvq5hGgo" role="25WWJ7">
-                          <node concept="37vLTw" id="6UWSvq5hGgp" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hteS6Cndmf" resolve="langrt" />
-                          </node>
-                          <node concept="liA8E" id="6UWSvq5hGgq" role="2OqNvi">
-                            <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages():java.util.Collection" resolve="getExtendedLanguages" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="6UWSvq5ba95" role="1Duv9x">
-            <property role="TrG5h" value="slang" />
-            <node concept="3uibUv" id="6UWSvq5ba99" role="1tU5fm">
-              <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="6UWSvq5ba9a" role="1DdaDG">
-            <ref role="3cqZAo" node="6UWSvq5b76q" resolve="slanguages" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="6UWSvq5cnwi" role="3cqZAp">
-          <node concept="1rXfSq" id="6UWSvq5cnwg" role="3clFbG">
-            <ref role="37wK5l" node="6UWSvq5cKtf" resolve="topoSort" />
-            <node concept="37vLTw" id="6UWSvq5cnDM" role="37wK5m">
-              <ref role="3cqZAo" node="6UWSvq5bdBR" resolve="closure" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="6UWSvq5b76q" role="3clF46">
-        <property role="TrG5h" value="slanguages" />
-        <node concept="3vKaQO" id="6UWSvq5ba0O" role="1tU5fm">
-          <node concept="3uibUv" id="6UWSvq5ba1d" role="3O5elw">
-            <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="6UWSvq5bb8I" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="6UWSvq5bbCv" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="3vKaQO" id="6UWSvq5b7_$" role="3clF45">
-        <node concept="3uibUv" id="6UWSvq5bgmd" role="3O5elw">
-          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="6UWSvq5bgnS" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="6UWSvq5b6xS" role="jymVt" />
-    <node concept="2YIFZL" id="6UWSvq5cKtf" role="jymVt">
-      <property role="TrG5h" value="topoSort" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="6UWSvq5b4Zu" role="3clF47">
-        <node concept="3cpWs8" id="6UWSvq5bi2y" role="3cqZAp">
-          <node concept="3cpWsn" id="6UWSvq5bi2C" role="3cpWs9">
-            <property role="TrG5h" value="graph" />
-            <node concept="3rvAFt" id="6UWSvq5bi2E" role="1tU5fm">
-              <node concept="3uibUv" id="6UWSvq5bi3D" role="3rvQeY">
-                <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-              </node>
-              <node concept="3uibUv" id="6UWSvq5bi4t" role="3rvSg0">
-                <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="6UWSvq5bi98" role="33vP2m">
-              <node concept="3rGOSV" id="6UWSvq5bi7Q" role="2ShVmc">
-                <node concept="3uibUv" id="6UWSvq5bi7R" role="3rHrn6">
-                  <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-                </node>
-                <node concept="3uibUv" id="6UWSvq5bi7S" role="3rHtpV">
-                  <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6UWSvq5bjVG" role="3cqZAp" />
-        <node concept="3SKdUt" id="6UWSvq5ciUe" role="3cqZAp">
-          <node concept="3SKdUq" id="6UWSvq5ciUg" role="3SKWNk">
-            <property role="3SKdUp" value="build a subgraph of language dependencies containing only languages with Type aspect" />
-          </node>
-        </node>
-        <node concept="1DcWWT" id="6UWSvq5blpe" role="3cqZAp">
-          <node concept="3clFbS" id="6UWSvq5blph" role="2LFqv$">
-            <node concept="3clFbJ" id="6UWSvq5bmUr" role="3cqZAp">
-              <node concept="3clFbS" id="6UWSvq5bmUt" role="3clFbx">
-                <node concept="3cpWs8" id="6UWSvq5bs7n" role="3cqZAp">
-                  <node concept="3cpWsn" id="6UWSvq5bs7o" role="3cpWs9">
-                    <property role="TrG5h" value="vtx" />
-                    <node concept="3uibUv" id="6UWSvq5bs7l" role="1tU5fm">
-                      <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-                    </node>
-                    <node concept="2ShNRf" id="6UWSvq5bs7p" role="33vP2m">
-                      <node concept="1pGfFk" id="6UWSvq5bs7q" role="2ShVmc">
-                        <ref role="37wK5l" node="6UWSvq5bnwr" resolve="RuleProcessingSession.Vtx" />
-                        <node concept="37vLTw" id="6UWSvq5bs7r" role="37wK5m">
-                          <ref role="3cqZAo" node="6UWSvq5blpi" resolve="langDesc" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="6UWSvq5borz" role="3cqZAp">
-                  <node concept="37vLTI" id="6UWSvq5bp_x" role="3clFbG">
-                    <node concept="3EllGN" id="6UWSvq5bpls" role="37vLTJ">
-                      <node concept="37vLTw" id="6UWSvq5bpoP" role="3ElVtu">
-                        <ref role="3cqZAo" node="6UWSvq5blpi" resolve="langDesc" />
-                      </node>
-                      <node concept="37vLTw" id="6UWSvq5borx" role="3ElQJh">
-                        <ref role="3cqZAo" node="6UWSvq5bi2C" resolve="graph" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="6UWSvq5bs7s" role="37vLTx">
-                      <ref role="3cqZAo" node="6UWSvq5bs7o" resolve="vtx" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="6UWSvq5bEvg" role="3cqZAp">
-                  <node concept="2OqwBi" id="6UWSvq5bEMY" role="3clFbG">
-                    <node concept="37vLTw" id="6UWSvq5bEve" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6UWSvq5bs7o" resolve="vtx" />
-                    </node>
-                    <node concept="liA8E" id="6UWSvq5bEUp" role="2OqNvi">
-                      <ref role="37wK5l" node="6UWSvq5bCMn" resolve="update" />
-                      <node concept="37vLTw" id="6UWSvq5bEYs" role="37wK5m">
-                        <ref role="3cqZAo" node="6UWSvq5bi2C" resolve="graph" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="1Wc70l" id="6UWSvq5bpIy" role="3clFbw">
-                <node concept="3fqX7Q" id="6UWSvq5bpMb" role="3uHU7w">
-                  <node concept="2OqwBi" id="6UWSvq5bqdu" role="3fr31v">
-                    <node concept="37vLTw" id="6UWSvq5bpO7" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6UWSvq5bi2C" resolve="graph" />
-                    </node>
-                    <node concept="2Nt0df" id="6UWSvq5bqJ9" role="2OqNvi">
-                      <node concept="37vLTw" id="6UWSvq5bqMH" role="38cxEo">
-                        <ref role="3cqZAo" node="6UWSvq5blpi" resolve="langDesc" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3y3z36" id="6UWSvq5bn8R" role="3uHU7B">
-                  <node concept="2YIFZM" id="6UWSvq5bokN" role="3uHU7B">
-                    <ref role="37wK5l" to="fqlx:6UWSvq5bk3i" resolve="forLanguageDesc" />
-                    <ref role="1Pybhc" to="fqlx:7km57Pkjxf4" resolve="TypeAspectDescriptor" />
-                    <node concept="37vLTw" id="6UWSvq5bokO" role="37wK5m">
-                      <ref role="3cqZAo" node="6UWSvq5blpi" resolve="langDesc" />
-                    </node>
-                  </node>
-                  <node concept="10Nm6u" id="6UWSvq5bna7" role="3uHU7w" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="6UWSvq5blpi" role="1Duv9x">
-            <property role="TrG5h" value="langDesc" />
-            <node concept="3uibUv" id="6UWSvq5blpm" role="1tU5fm">
-              <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="6UWSvq5blpn" role="1DdaDG">
-            <ref role="3cqZAo" node="6UWSvq5b52d" resolve="unsorted" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="6UWSvq5bqZk" role="3cqZAp" />
-        <node concept="3SKdUt" id="6UWSvq5bYkw" role="3cqZAp">
-          <node concept="3SKdUq" id="6UWSvq5bYky" role="3SKWNk">
-            <property role="3SKdUp" value="depth-first search. the vertex that is visited last moves in front of others" />
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6UWSvq5bI2Y" role="3cqZAp">
-          <node concept="3cpWsn" id="6UWSvq5bI31" role="3cpWs9">
-            <property role="TrG5h" value="stack" />
-            <node concept="oyxx6" id="6UWSvq5bI2V" role="1tU5fm">
-              <node concept="3uibUv" id="6UWSvq5bIaN" role="3O5elw">
-                <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="6UWSvq5bId8" role="33vP2m">
-              <node concept="2Jqq0_" id="6UWSvq5bIbX" role="2ShVmc">
-                <node concept="3uibUv" id="6UWSvq5bIbY" role="HW$YZ">
-                  <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6UWSvq5bIpb" role="3cqZAp">
-          <node concept="3cpWsn" id="6UWSvq5bIpe" role="3cpWs9">
-            <property role="TrG5h" value="sorted" />
-            <node concept="2BANLN" id="6UWSvq5bIp7" role="1tU5fm">
-              <node concept="3uibUv" id="6UWSvq5bIs_" role="_ZDj9">
-                <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="6UWSvq5bIyo" role="33vP2m">
-              <node concept="2Jqq0_" id="6UWSvq5bIxd" role="2ShVmc">
-                <node concept="3uibUv" id="6UWSvq5bIxe" role="HW$YZ">
-                  <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6UWSvq5bICu" role="3cqZAp">
-          <node concept="3cpWsn" id="6UWSvq5bICx" role="3cpWs9">
-            <property role="TrG5h" value="visited" />
-            <node concept="2hMVRd" id="6UWSvq5bICq" role="1tU5fm">
-              <node concept="3uibUv" id="6UWSvq5bIG0" role="2hN53Y">
-                <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="6UWSvq5bIKR" role="33vP2m">
-              <node concept="2i4dXS" id="6UWSvq5bIJD" role="2ShVmc">
-                <node concept="3uibUv" id="6UWSvq5bIJE" role="HW$YZ">
-                  <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="6UWSvq5bJJz" role="3cqZAp">
-          <node concept="3clFbS" id="6UWSvq5bJJA" role="2LFqv$">
-            <node concept="3clFbJ" id="6UWSvq5bK74" role="3cqZAp">
-              <node concept="3clFbS" id="6UWSvq5bK76" role="3clFbx">
-                <node concept="3N13vt" id="6UWSvq5bLNu" role="3cqZAp" />
-              </node>
-              <node concept="2OqwBi" id="6UWSvq5bKO5" role="3clFbw">
-                <node concept="37vLTw" id="6UWSvq5bK8A" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6UWSvq5bICx" resolve="visited" />
-                </node>
-                <node concept="3JPx81" id="6UWSvq5bLHD" role="2OqNvi">
-                  <node concept="37vLTw" id="6UWSvq5bLKk" role="25WWJ7">
-                    <ref role="3cqZAo" node="6UWSvq5bJJB" resolve="vtx" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="6UWSvq5bK5C" role="3cqZAp" />
-            <node concept="3clFbF" id="6UWSvq5bLQm" role="3cqZAp">
-              <node concept="2OqwBi" id="6UWSvq5bMEe" role="3clFbG">
-                <node concept="37vLTw" id="6UWSvq5bLQk" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6UWSvq5bI31" resolve="stack" />
-                </node>
-                <node concept="2ArzE6" id="6UWSvq5bOkq" role="2OqNvi">
-                  <node concept="37vLTw" id="6UWSvq5bOmK" role="25WWJ7">
-                    <ref role="3cqZAo" node="6UWSvq5bJJB" resolve="vtx" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2$JKZl" id="6UWSvq5bOrf" role="3cqZAp">
-              <node concept="3clFbS" id="6UWSvq5bOrh" role="2LFqv$">
-                <node concept="3cpWs8" id="6UWSvq5bSiU" role="3cqZAp">
-                  <node concept="3cpWsn" id="6UWSvq5bSiV" role="3cpWs9">
-                    <property role="TrG5h" value="v" />
-                    <node concept="3uibUv" id="6UWSvq5bSiH" role="1tU5fm">
-                      <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-                    </node>
-                    <node concept="2OqwBi" id="6UWSvq5bSiW" role="33vP2m">
-                      <node concept="37vLTw" id="6UWSvq5bSiX" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6UWSvq5bI31" resolve="stack" />
-                      </node>
-                      <node concept="2oR75g" id="6UWSvq5bSiY" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="1DcWWT" id="6UWSvq5bT4_" role="3cqZAp">
-                  <node concept="3clFbS" id="6UWSvq5bT4C" role="2LFqv$">
-                    <node concept="3clFbJ" id="6UWSvq5c9fo" role="3cqZAp">
-                      <node concept="3clFbS" id="6UWSvq5c9fq" role="3clFbx">
-                        <node concept="3clFbF" id="6UWSvq5bW0v" role="3cqZAp">
-                          <node concept="2OqwBi" id="6UWSvq5bWOg" role="3clFbG">
-                            <node concept="37vLTw" id="6UWSvq5bW0u" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6UWSvq5bI31" resolve="stack" />
-                            </node>
-                            <node concept="2ArzE6" id="6UWSvq5bXVm" role="2OqNvi">
-                              <node concept="37vLTw" id="6UWSvq5bXX$" role="25WWJ7">
-                                <ref role="3cqZAo" node="6UWSvq5bT4D" resolve="e" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3fqX7Q" id="6UWSvq5cb6V" role="3clFbw">
-                        <node concept="2OqwBi" id="6UWSvq5cb6X" role="3fr31v">
-                          <node concept="37vLTw" id="6UWSvq5cb6Y" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6UWSvq5bICx" resolve="visited" />
-                          </node>
-                          <node concept="3JPx81" id="6UWSvq5cb6Z" role="2OqNvi">
-                            <node concept="37vLTw" id="6UWSvq5cb70" role="25WWJ7">
-                              <ref role="3cqZAo" node="6UWSvq5bT4D" resolve="e" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3cpWsn" id="6UWSvq5bT4D" role="1Duv9x">
-                    <property role="TrG5h" value="e" />
-                    <node concept="3uibUv" id="6UWSvq5bT4H" role="1tU5fm">
-                      <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="6UWSvq5bT4I" role="1DdaDG">
-                    <node concept="37vLTw" id="6UWSvq5bT4J" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6UWSvq5bSiV" resolve="v" />
-                    </node>
-                    <node concept="2OwXpG" id="6UWSvq5bT4K" role="2OqNvi">
-                      <ref role="2Oxat5" node="6UWSvq5brPb" resolve="extended" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="6UWSvq5cbeO" role="3cqZAp">
-                  <node concept="3clFbS" id="6UWSvq5cbeQ" role="3clFbx">
-                    <node concept="3clFbF" id="6UWSvq5c2dx" role="3cqZAp">
-                      <node concept="2OqwBi" id="6UWSvq5c3gn" role="3clFbG">
-                        <node concept="37vLTw" id="6UWSvq5c2dw" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6UWSvq5bIpe" resolve="sorted" />
-                        </node>
-                        <node concept="2Ke4WJ" id="6UWSvq5c5jG" role="2OqNvi">
-                          <node concept="37vLTw" id="6UWSvq5c5nO" role="25WWJ7">
-                            <ref role="3cqZAo" node="6UWSvq5bSiV" resolve="v" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="6UWSvq5c6Xb" role="3cqZAp">
-                      <node concept="2OqwBi" id="6UWSvq5c7xp" role="3clFbG">
-                        <node concept="37vLTw" id="6UWSvq5c6X9" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6UWSvq5bICx" resolve="visited" />
-                        </node>
-                        <node concept="TSZUe" id="6UWSvq5cj_a" role="2OqNvi">
-                          <node concept="37vLTw" id="6UWSvq5cjGN" role="25WWJ7">
-                            <ref role="3cqZAo" node="6UWSvq5bSiV" resolve="v" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="6UWSvq5c5uM" role="3cqZAp">
-                      <node concept="2OqwBi" id="6UWSvq5c6js" role="3clFbG">
-                        <node concept="37vLTw" id="6UWSvq5c5uK" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6UWSvq5bI31" resolve="stack" />
-                        </node>
-                        <node concept="2AryhJ" id="6UWSvq5c6Ss" role="2OqNvi" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbC" id="6UWSvq5cdZ2" role="3clFbw">
-                    <node concept="37vLTw" id="6UWSvq5ce42" role="3uHU7w">
-                      <ref role="3cqZAo" node="6UWSvq5bSiV" resolve="v" />
-                    </node>
-                    <node concept="2OqwBi" id="6UWSvq5cch3" role="3uHU7B">
-                      <node concept="37vLTw" id="6UWSvq5cbis" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6UWSvq5bI31" resolve="stack" />
-                      </node>
-                      <node concept="2oR75g" id="6UWSvq5ccPO" role="2OqNvi" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2OqwBi" id="6UWSvq5bPqG" role="2$JKZa">
-                <node concept="37vLTw" id="6UWSvq5bOsV" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6UWSvq5bI31" resolve="stack" />
-                </node>
-                <node concept="3GX2aA" id="6UWSvq5bQxO" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="6UWSvq5bJJB" role="1Duv9x">
-            <property role="TrG5h" value="vtx" />
-            <node concept="3uibUv" id="6UWSvq5bJJF" role="1tU5fm">
-              <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-            </node>
-          </node>
-          <node concept="2OqwBi" id="6UWSvq5bJJG" role="1DdaDG">
-            <node concept="37vLTw" id="6UWSvq5bJJH" role="2Oq$k0">
-              <ref role="3cqZAo" node="6UWSvq5bi2C" resolve="graph" />
-            </node>
-            <node concept="T8wYR" id="6UWSvq5bJJI" role="2OqNvi" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="6UWSvq5br1f" role="3cqZAp" />
-        <node concept="3clFbF" id="6UWSvq5ceJn" role="3cqZAp">
-          <node concept="2OqwBi" id="6UWSvq5ci1O" role="3clFbG">
-            <node concept="2OqwBi" id="6UWSvq5cg1e" role="2Oq$k0">
-              <node concept="37vLTw" id="6UWSvq5ceJl" role="2Oq$k0">
-                <ref role="3cqZAo" node="6UWSvq5bIpe" resolve="sorted" />
-              </node>
-              <node concept="3$u5V9" id="6UWSvq5ch8$" role="2OqNvi">
-                <node concept="1bVj0M" id="6UWSvq5ch8A" role="23t8la">
-                  <node concept="3clFbS" id="6UWSvq5ch8B" role="1bW5cS">
-                    <node concept="3clFbF" id="6UWSvq5chh3" role="3cqZAp">
-                      <node concept="2OqwBi" id="6UWSvq5chts" role="3clFbG">
-                        <node concept="37vLTw" id="6UWSvq5chh2" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6UWSvq5ch8C" resolve="it" />
-                        </node>
-                        <node concept="2OwXpG" id="6UWSvq5chFA" role="2OqNvi">
-                          <ref role="2Oxat5" node="6UWSvq5b30P" resolve="langDesc" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="Rh6nW" id="6UWSvq5ch8C" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6UWSvq5ch8D" role="1tU5fm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="ANE8D" id="6UWSvq5ciKw" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="6UWSvq5b52d" role="3clF46">
-        <property role="TrG5h" value="unsorted" />
-        <node concept="3vKaQO" id="6UWSvq5bhsn" role="1tU5fm">
-          <node concept="3uibUv" id="6UWSvq5bhsK" role="3O5elw">
-            <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-          </node>
-        </node>
-      </node>
-      <node concept="3vKaQO" id="6UWSvq5bgWN" role="3clF45">
-        <node concept="3uibUv" id="6UWSvq5bhs4" role="3O5elw">
-          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="6UWSvq5irkL" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="6UWSvq5b3aO" role="jymVt" />
-    <node concept="312cEu" id="6UWSvq5b2YZ" role="jymVt">
-      <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="Vtx" />
-      <node concept="3clFbW" id="6UWSvq5bnwr" role="jymVt">
-        <node concept="37vLTG" id="6UWSvq5bny4" role="3clF46">
-          <property role="TrG5h" value="langDesc" />
-          <node concept="3uibUv" id="6UWSvq5bnyg" role="1tU5fm">
-            <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="6UWSvq5bnwt" role="3clF45" />
-        <node concept="3Tm1VV" id="6UWSvq5bnwu" role="1B3o_S" />
-        <node concept="3clFbS" id="6UWSvq5bnwv" role="3clF47">
-          <node concept="3clFbF" id="6UWSvq5bn$q" role="3cqZAp">
-            <node concept="37vLTI" id="6UWSvq5bo16" role="3clFbG">
-              <node concept="37vLTw" id="6UWSvq5bo4H" role="37vLTx">
-                <ref role="3cqZAo" node="6UWSvq5bny4" resolve="langDesc" />
-              </node>
-              <node concept="2OqwBi" id="6UWSvq5bnE0" role="37vLTJ">
-                <node concept="Xjq3P" id="6UWSvq5bn$p" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6UWSvq5bnOZ" role="2OqNvi">
-                  <ref role="2Oxat5" node="6UWSvq5b30P" resolve="langDesc" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3clFb_" id="6UWSvq5bCMn" role="jymVt">
-        <property role="TrG5h" value="update" />
-        <node concept="37vLTG" id="6UWSvq5bCMP" role="3clF46">
-          <property role="TrG5h" value="graph" />
-          <node concept="3rvAFt" id="6UWSvq5bDiX" role="1tU5fm">
-            <node concept="3uibUv" id="6UWSvq5bDiY" role="3rvQeY">
-              <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-            </node>
-            <node concept="3uibUv" id="6UWSvq5bDiZ" role="3rvSg0">
-              <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cqZAl" id="6UWSvq5bCMp" role="3clF45" />
-        <node concept="3Tm1VV" id="6UWSvq5bCMq" role="1B3o_S" />
-        <node concept="3clFbS" id="6UWSvq5bCMr" role="3clF47">
-          <node concept="3SKdUt" id="6UWSvq5bDkW" role="3cqZAp">
-            <node concept="3SKdUq" id="6UWSvq5bDkX" role="3SKWNk">
-              <property role="3SKdUp" value="update the graph" />
-            </node>
-          </node>
-          <node concept="1DcWWT" id="6UWSvq5bDkY" role="3cqZAp">
-            <node concept="3clFbS" id="6UWSvq5bDkZ" role="2LFqv$">
-              <node concept="3clFbJ" id="6UWSvq5bDl0" role="3cqZAp">
-                <node concept="2OqwBi" id="6UWSvq5bDl1" role="3clFbw">
-                  <node concept="37vLTw" id="6UWSvq5bDl2" role="2Oq$k0">
-                    <ref role="3cqZAo" node="6UWSvq5bCMP" resolve="graph" />
-                  </node>
-                  <node concept="2Nt0df" id="6UWSvq5bDl3" role="2OqNvi">
-                    <node concept="37vLTw" id="6UWSvq5bDl4" role="38cxEo">
-                      <ref role="3cqZAo" node="6UWSvq5bDlf" resolve="extends_" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbS" id="6UWSvq5bDl5" role="3clFbx">
-                  <node concept="3clFbF" id="6UWSvq5bDl6" role="3cqZAp">
-                    <node concept="2OqwBi" id="6UWSvq5bDl7" role="3clFbG">
-                      <node concept="2OqwBi" id="6UWSvq5bDl8" role="2Oq$k0">
-                        <node concept="Xjq3P" id="6UWSvq5bDWo" role="2Oq$k0" />
-                        <node concept="2OwXpG" id="6UWSvq5bDla" role="2OqNvi">
-                          <ref role="2Oxat5" node="6UWSvq5brPb" resolve="extended" />
-                        </node>
-                      </node>
-                      <node concept="TSZUe" id="6UWSvq5bDlb" role="2OqNvi">
-                        <node concept="3EllGN" id="6UWSvq5bDlc" role="25WWJ7">
-                          <node concept="37vLTw" id="6UWSvq5bDld" role="3ElVtu">
-                            <ref role="3cqZAo" node="6UWSvq5bDlf" resolve="extends_" />
-                          </node>
-                          <node concept="37vLTw" id="6UWSvq5bDle" role="3ElQJh">
-                            <ref role="3cqZAo" node="6UWSvq5bCMP" resolve="graph" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWsn" id="6UWSvq5bDlf" role="1Duv9x">
-              <property role="TrG5h" value="extends_" />
-              <node concept="3uibUv" id="6UWSvq5bDlg" role="1tU5fm">
-                <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="6UWSvq5bDlh" role="1DdaDG">
-              <node concept="37vLTw" id="6UWSvq5bDli" role="2Oq$k0">
-                <ref role="3cqZAo" node="6UWSvq5b30P" resolve="langDesc" />
-              </node>
-              <node concept="liA8E" id="6UWSvq5bDlj" role="2OqNvi">
-                <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages():java.util.Collection" resolve="getExtendedLanguages" />
-              </node>
-            </node>
-          </node>
-          <node concept="1DcWWT" id="6UWSvq5bDlk" role="3cqZAp">
-            <node concept="3clFbS" id="6UWSvq5bDll" role="2LFqv$">
-              <node concept="3clFbJ" id="6UWSvq5bDlm" role="3cqZAp">
-                <node concept="2OqwBi" id="6UWSvq5bDln" role="3clFbw">
-                  <node concept="37vLTw" id="6UWSvq5bDlo" role="2Oq$k0">
-                    <ref role="3cqZAo" node="6UWSvq5bCMP" resolve="graph" />
-                  </node>
-                  <node concept="2Nt0df" id="6UWSvq5bDlp" role="2OqNvi">
-                    <node concept="37vLTw" id="6UWSvq5bDlq" role="38cxEo">
-                      <ref role="3cqZAo" node="6UWSvq5bDl_" resolve="extendedBy" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbS" id="6UWSvq5bDlr" role="3clFbx">
-                  <node concept="3clFbF" id="6UWSvq5bDls" role="3cqZAp">
-                    <node concept="2OqwBi" id="6UWSvq5bDlt" role="3clFbG">
-                      <node concept="2OqwBi" id="6UWSvq5bDlu" role="2Oq$k0">
-                        <node concept="3EllGN" id="6UWSvq5bDlv" role="2Oq$k0">
-                          <node concept="37vLTw" id="6UWSvq5bDlw" role="3ElVtu">
-                            <ref role="3cqZAo" node="6UWSvq5bDl_" resolve="extendedBy" />
-                          </node>
-                          <node concept="37vLTw" id="6UWSvq5bDlx" role="3ElQJh">
-                            <ref role="3cqZAo" node="6UWSvq5bCMP" resolve="graph" />
-                          </node>
-                        </node>
-                        <node concept="2OwXpG" id="6UWSvq5bDly" role="2OqNvi">
-                          <ref role="2Oxat5" node="6UWSvq5brPb" resolve="extended" />
-                        </node>
-                      </node>
-                      <node concept="TSZUe" id="6UWSvq5bDlz" role="2OqNvi">
-                        <node concept="Xjq3P" id="6UWSvq5bE6d" role="25WWJ7" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWsn" id="6UWSvq5bDl_" role="1Duv9x">
-              <property role="TrG5h" value="extendedBy" />
-              <node concept="3uibUv" id="6UWSvq5bDlA" role="1tU5fm">
-                <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="6UWSvq5bDlB" role="1DdaDG">
-              <node concept="37vLTw" id="6UWSvq5bDlC" role="2Oq$k0">
-                <ref role="3cqZAo" node="6UWSvq5b30P" resolve="langDesc" />
-              </node>
-              <node concept="liA8E" id="6UWSvq5bDlD" role="2OqNvi">
-                <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendingLanguages():java.lang.Iterable" resolve="getExtendingLanguages" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="6UWSvq5bCxc" role="jymVt" />
-      <node concept="312cEg" id="6UWSvq5b30P" role="jymVt">
-        <property role="TrG5h" value="langDesc" />
-        <node concept="3Tm6S6" id="6UWSvq5b30Q" role="1B3o_S" />
-        <node concept="3uibUv" id="6UWSvq5bjln" role="1tU5fm">
-          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
-        </node>
-      </node>
-      <node concept="312cEg" id="6UWSvq5brPb" role="jymVt">
-        <property role="TrG5h" value="extended" />
-        <node concept="3Tm6S6" id="6UWSvq5brPc" role="1B3o_S" />
-        <node concept="_YKpA" id="6UWSvq5bs2U" role="1tU5fm">
-          <node concept="3uibUv" id="6UWSvq5bs3c" role="_ZDj9">
-            <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-          </node>
-        </node>
-        <node concept="2ShNRf" id="6UWSvq5cmEt" role="33vP2m">
-          <node concept="Tc6Ow" id="6UWSvq5cmCP" role="2ShVmc">
-            <node concept="3uibUv" id="6UWSvq5cmCQ" role="HW$YZ">
-              <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="RuleProcessingSession.Vtx" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="6UWSvq5cjOk" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="6UWSvq5b1CY" role="jymVt" />
-    <node concept="312cEg" id="7DvO2M9po9W" role="jymVt">
-      <property role="TrG5h" value="typeAspectRuntime" />
-      <node concept="3Tm6S6" id="7DvO2M9po9X" role="1B3o_S" />
-      <node concept="3uibUv" id="6UWSvq5cXt0" role="1tU5fm">
-        <ref role="3uigEE" node="7DvO2M9VeLZ" resolve="RuleProcessingSession.TypeAspectRuntime" />
+    <node concept="312cEg" id="7P_FdVPFMy3" role="jymVt">
+      <property role="TrG5h" value="macroTemplatesIndex" />
+      <node concept="3Tmbuc" id="7P_FdVPFMy4" role="1B3o_S" />
+      <node concept="3uibUv" id="7P_FdVPFMy5" role="1tU5fm">
+        <ref role="3uigEE" node="1hX44vNlSIA" resolve="MacroTemplateIndex" />
       </node>
     </node>
+    <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="3uibUv" id="7P_FdVPFMy8" role="1tU5fm">
+        <ref role="3uigEE" node="6fdr4UgftiG" resolve="RuleTemplateIndex" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPFLhr" role="jymVt" />
     <node concept="3Tm1VV" id="CGeqIk8WWV" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="3GlpCDSxTG7">
@@ -5908,15 +5352,38 @@
       <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="7DvO2M9peKs" role="3cqZAp">
-          <node concept="37vLTI" id="7DvO2M9pfl8" role="3clFbG">
-            <node concept="37vLTw" id="7DvO2M9pfva" role="37vLTx">
-              <ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
+        <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>
             </node>
-            <node concept="2OqwBi" id="7DvO2M9pePW" role="37vLTJ">
-              <node concept="Xjq3P" id="7DvO2M9peKr" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7DvO2M9pf1T" role="2OqNvi">
-                <ref role="2Oxat5" node="7DvO2M9p7hC" resolve="ruleProcessingSession" />
+            <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>
           </node>
@@ -5960,7 +5427,7 @@
                 <node concept="_YKpA" id="4vBwiiVemA9" role="1tU5fm">
                   <node concept="1LlUBW" id="4vBwiiVemAa" role="_ZDj9">
                     <node concept="3uibUv" id="4vBwiiVemAb" role="1Lm7xW">
-                      <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                      <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                     </node>
                     <node concept="3uibUv" id="4vBwiiVemAc" role="1Lm7xW">
                       <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
@@ -6035,7 +5502,7 @@
                 <node concept="_YKpA" id="4vBwiiVem7I" role="1tU5fm">
                   <node concept="1LlUBW" id="4vBwiiVem7J" role="_ZDj9">
                     <node concept="3uibUv" id="4vBwiiVem7K" role="1Lm7xW">
-                      <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                      <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                     </node>
                     <node concept="3uibUv" id="4vBwiiVem7L" role="1Lm7xW">
                       <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
@@ -6107,7 +5574,7 @@
           <node concept="_YKpA" id="4vBwiiVbNcz" role="1ajw0F">
             <node concept="1LlUBW" id="4vBwiiVbNji" role="_ZDj9">
               <node concept="3uibUv" id="4vBwiiVbNx9" role="1Lm7xW">
-                <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
               </node>
               <node concept="3uibUv" id="4vBwiiVbNJW" role="1Lm7xW">
                 <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
@@ -6178,7 +5645,7 @@
             <node concept="_YKpA" id="4vBwiiVefSq" role="1tU5fm">
               <node concept="1LlUBW" id="4vBwiiVefSz" role="_ZDj9">
                 <node concept="3uibUv" id="4vBwiiVefS$" role="1Lm7xW">
-                  <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                 </node>
                 <node concept="3uibUv" id="4vBwiiVefS_" role="1Lm7xW">
                   <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
@@ -6188,13 +5655,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="2OqwBi" id="7DvO2M9uMVA" role="2Oq$k0">
-                    <node concept="37vLTw" id="7DvO2M9uM8h" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7DvO2M9p7hC" resolve="ruleProcessingSession" />
-                    </node>
-                    <node concept="liA8E" id="7DvO2M9uNJ8" role="2OqNvi">
-                      <ref role="37wK5l" node="20Ay2VeR9qk" resolve="ruleTemplates" />
-                    </node>
+                  <node concept="37vLTw" id="7P_FdVPF8uB" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7P_FdVPEi8m" resolve="ruleTemplates" />
                   </node>
                   <node concept="liA8E" id="4vBwiiVefTr" role="2OqNvi">
                     <ref role="37wK5l" node="4QPCta1zKCT" resolve="stages" />
@@ -6316,7 +5778,7 @@
                 <property role="TrG5h" value="stage_builder" />
                 <node concept="1LlUBW" id="4vBwiiVep0Y" role="1tU5fm">
                   <node concept="3uibUv" id="4vBwiiVep0Z" role="1Lm7xW">
-                    <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                    <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                   </node>
                   <node concept="3uibUv" id="4vBwiiVep10" role="1Lm7xW">
                     <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
@@ -6443,7 +5905,7 @@
           <node concept="_YKpA" id="4vBwiiVbVPL" role="1tU5fm">
             <node concept="1LlUBW" id="4vBwiiVbVPM" role="_ZDj9">
               <node concept="3uibUv" id="4vBwiiVbVPN" role="1Lm7xW">
-                <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
               </node>
               <node concept="3uibUv" id="4vBwiiVbVPO" role="1Lm7xW">
                 <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
@@ -6483,16 +5945,11 @@
               <node concept="1rXfSq" id="2Qe6u2cluiq" role="33vP2m">
                 <ref role="37wK5l" node="tIwzd1I3Xv" resolve="applyAndCollectRequired" />
                 <node concept="2OqwBi" id="2Qe6u2cluir" role="37wK5m">
-                  <node concept="2OqwBi" id="7DvO2M9vx_h" role="2Oq$k0">
-                    <node concept="37vLTw" id="7DvO2M9vxaW" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7DvO2M9p7hC" resolve="ruleProcessingSession" />
-                    </node>
-                    <node concept="liA8E" id="7DvO2M9vxSF" role="2OqNvi">
-                      <ref role="37wK5l" node="20Ay2VeR9qk" resolve="ruleTemplates" />
-                    </node>
+                  <node concept="37vLTw" id="7P_FdVPF9AW" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7P_FdVPEi8m" resolve="ruleTemplates" />
                   </node>
                   <node concept="liA8E" id="2Qe6u2cluiv" role="2OqNvi">
-                    <ref role="37wK5l" node="5NuEpF1qn9x" resolve="allTemplatesWithNoInput" />
+                    <ref role="37wK5l" node="5NuEpF1qn9x" resolve="allRuleTemplatesWithNoInput" />
                   </node>
                 </node>
                 <node concept="10Nm6u" id="2Qe6u2cluiw" role="37wK5m" />
@@ -6599,7 +6056,7 @@
               <property role="TrG5h" value="stage_builder" />
               <node concept="1LlUBW" id="4vBwiiVc5q8" role="1tU5fm">
                 <node concept="3uibUv" id="4vBwiiVc5q9" role="1Lm7xW">
-                  <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                 </node>
                 <node concept="3uibUv" id="4vBwiiVc5qa" role="1Lm7xW">
                   <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
@@ -6632,7 +6089,7 @@
           <node concept="_YKpA" id="7DvO2M9$$6U" role="1tU5fm">
             <node concept="1LlUBW" id="7DvO2M9$$6V" role="_ZDj9">
               <node concept="3uibUv" id="7DvO2M9$$6W" role="1Lm7xW">
-                <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
               </node>
               <node concept="3uibUv" id="7DvO2M9$$6X" role="1Lm7xW">
                 <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
@@ -6672,16 +6129,11 @@
               <node concept="1rXfSq" id="2Qe6u2cltUx" role="33vP2m">
                 <ref role="37wK5l" node="tIwzd1I3Xv" resolve="applyAndCollectRequired" />
                 <node concept="2OqwBi" id="2Qe6u2cltUy" role="37wK5m">
-                  <node concept="2OqwBi" id="7DvO2M9vyYK" role="2Oq$k0">
-                    <node concept="37vLTw" id="7DvO2M9vyx9" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7DvO2M9p7hC" resolve="ruleProcessingSession" />
-                    </node>
-                    <node concept="liA8E" id="7DvO2M9v$1p" role="2OqNvi">
-                      <ref role="37wK5l" node="20Ay2VeR9qk" resolve="ruleTemplates" />
-                    </node>
+                  <node concept="37vLTw" id="7P_FdVPFai9" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7P_FdVPEi8m" resolve="ruleTemplates" />
                   </node>
                   <node concept="liA8E" id="2Qe6u2cltUA" role="2OqNvi">
-                    <ref role="37wK5l" node="5NuEpF1qn9x" resolve="allTemplatesWithNoInput" />
+                    <ref role="37wK5l" node="5NuEpF1qn9x" resolve="allRuleTemplatesWithNoInput" />
                   </node>
                 </node>
                 <node concept="10Nm6u" id="2Qe6u2cltUB" role="37wK5m" />
@@ -6788,7 +6240,7 @@
               <property role="TrG5h" value="stage_builder" />
               <node concept="1LlUBW" id="4vBwiiVca$2" role="1tU5fm">
                 <node concept="3uibUv" id="4vBwiiVca$3" role="1Lm7xW">
-                  <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                 </node>
                 <node concept="3uibUv" id="4vBwiiVca$4" role="1Lm7xW">
                   <ref role="3uigEE" to="7n8k:5rhZO$TYZJM" resolve="ChrProgramBuilder" />
@@ -6813,7 +6265,7 @@
         <node concept="37vLTG" id="4vBwiiVccBe" role="3clF46">
           <property role="TrG5h" value="stage" />
           <node concept="3uibUv" id="4vBwiiVcgAO" role="1tU5fm">
-            <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
           </node>
         </node>
         <node concept="37vLTG" id="1CcQBrPh8x2" role="3clF46">
@@ -8205,7 +7657,7 @@
           <node concept="A3Dl8" id="tIwzd1I3Xn" role="1tU5fm">
             <node concept="1LlUBW" id="7t5VLKHawYT" role="A3Ik2">
               <node concept="3uibUv" id="1CcQBrPeaZd" role="1Lm7xW">
-                <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
               </node>
               <node concept="3uibUv" id="1ffsG7c4WJ7" role="1Lm7xW">
                 <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -8387,8 +7839,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="7DvO2Mah9zl" role="37wK5m">
-                        <ref role="3cqZAo" node="7DvO2M9p7hC" resolve="ruleProcessingSession" />
+                      <node concept="37vLTw" id="7P_FdVPFpDP" role="37wK5m">
+                        <ref role="3cqZAo" node="7P_FdVPFb2V" resolve="macroTemplates" />
                       </node>
                     </node>
                   </node>
@@ -8413,7 +7865,7 @@
                     <node concept="3cpWsn" id="1CcQBrPen4s" role="3cpWs9">
                       <property role="TrG5h" value="stage" />
                       <node concept="3uibUv" id="1CcQBrPen46" role="1tU5fm">
-                        <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                        <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                       </node>
                       <node concept="1LFfDK" id="1CcQBrPen4t" role="33vP2m">
                         <node concept="3cmrfG" id="1CcQBrPen4u" role="1LF_Uc">
@@ -8869,7 +8321,7 @@
               <property role="TrG5h" value="stage_tpl" />
               <node concept="1LlUBW" id="7t5VLKHazo3" role="1tU5fm">
                 <node concept="3uibUv" id="1CcQBrPeewI" role="1Lm7xW">
-                  <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                 </node>
                 <node concept="3uibUv" id="1ffsG7c4Zfy" role="1Lm7xW">
                   <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -8926,7 +8378,7 @@
                 <node concept="A3Dl8" id="5ntLU8GlzSt" role="1tU5fm">
                   <node concept="1LlUBW" id="7t5VLKHavfN" role="A3Ik2">
                     <node concept="3uibUv" id="1CcQBrPe8g0" role="1Lm7xW">
-                      <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+                      <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
                     </node>
                     <node concept="3uibUv" id="1ffsG7c5hrm" role="1Lm7xW">
                       <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
@@ -8939,16 +8391,11 @@
                   </node>
                 </node>
                 <node concept="2OqwBi" id="5ntLU8GlzSK" role="33vP2m">
-                  <node concept="2OqwBi" id="7DvO2M9v$Yd" role="2Oq$k0">
-                    <node concept="37vLTw" id="7DvO2M9v$$W" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7DvO2M9p7hC" resolve="ruleProcessingSession" />
-                    </node>
-                    <node concept="liA8E" id="7DvO2M9v_n3" role="2OqNvi">
-                      <ref role="37wK5l" node="20Ay2VeR9qk" resolve="ruleTemplates" />
-                    </node>
+                  <node concept="37vLTw" id="7P_FdVPFaMl" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7P_FdVPEi8m" resolve="ruleTemplates" />
                   </node>
                   <node concept="liA8E" id="5ntLU8GlzSM" role="2OqNvi">
-                    <ref role="37wK5l" node="6fdr4UgfuGk" resolve="allTemplates" />
+                    <ref role="37wK5l" node="6fdr4UgfuGk" resolve="allRuleTemplates" />
                     <node concept="37vLTw" id="5ntLU8GlzSN" role="37wK5m">
                       <ref role="3cqZAo" node="5ntLU8GlzgG" resolve="node" />
                     </node>
@@ -9315,7 +8762,7 @@
         <node concept="3Tm6S6" id="4MqhgXUBtmG" role="1B3o_S" />
         <node concept="3rvAFt" id="1CcQBrPgZ71" role="1tU5fm">
           <node concept="3uibUv" id="1CcQBrPgZto" role="3rvQeY">
-            <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+            <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
           </node>
           <node concept="3uibUv" id="1CcQBrPgZJH" role="3rvSg0">
             <ref role="3uigEE" node="7DvO2M9Uago" resolve="ProgramBuilder.RuleTable" />
@@ -9324,7 +8771,7 @@
         <node concept="2ShNRf" id="1CcQBrPh0w5" role="33vP2m">
           <node concept="3rGOSV" id="1CcQBrPh0ro" role="2ShVmc">
             <node concept="3uibUv" id="1CcQBrPh0rp" role="3rHrn6">
-              <ref role="3uigEE" to="i348:1CcQBrPcZVG" resolve="HandlingStage" />
+              <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
             </node>
             <node concept="3uibUv" id="1CcQBrPh0rq" role="3rHtpV">
               <ref role="3uigEE" node="7DvO2M9Uago" resolve="ProgramBuilder.RuleTable" />
@@ -10399,12 +9846,21 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="7P_FdVPwf9L" role="jymVt" />
     <node concept="3Tm1VV" id="3GlpCDSxTG8" role="1B3o_S" />
-    <node concept="312cEg" id="7DvO2M9p7hC" role="jymVt">
-      <property role="TrG5h" value="ruleProcessingSession" />
-      <node concept="3Tm6S6" id="7DvO2M9p7hD" role="1B3o_S" />
-      <node concept="3uibUv" id="7DvO2M9pccL" role="1tU5fm">
-        <ref role="3uigEE" node="CGeqIk8WWU" resolve="RuleProcessingSession" />
+    <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>
+    </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>
     </node>
   </node>
@@ -10421,19 +9877,19 @@
             <node concept="2OqwBi" id="7DvO2Ma0lz7" role="37vLTJ">
               <node concept="Xjq3P" id="7DvO2Ma0l$$" role="2Oq$k0" />
               <node concept="2OwXpG" id="7DvO2Ma0lza" role="2OqNvi">
-                <ref role="2Oxat5" node="7DvO2Ma0klb" resolve="ruleProcessingSession" />
+                <ref role="2Oxat5" node="7DvO2Ma0klb" resolve="macroTemplateIndex" />
               </node>
             </node>
             <node concept="37vLTw" id="7DvO2Ma0kll" role="37vLTx">
-              <ref role="3cqZAo" node="7DvO2Ma0k9h" resolve="ruleProcessingSession" />
+              <ref role="3cqZAo" node="7DvO2Ma0k9h" resolve="macroTemplateIndex" />
             </node>
           </node>
         </node>
       </node>
       <node concept="37vLTG" id="7DvO2Ma0k9h" role="3clF46">
-        <property role="TrG5h" value="ruleProcessingSession" />
-        <node concept="3uibUv" id="7DvO2Ma0k9g" role="1tU5fm">
-          <ref role="3uigEE" node="CGeqIk8WWU" resolve="RuleProcessingSession" />
+        <property role="TrG5h" value="macroTemplateIndex" />
+        <node concept="3uibUv" id="7P_FdVPvlsI" role="1tU5fm">
+          <ref role="3uigEE" node="1hX44vNlSIA" resolve="MacroTemplateIndex" />
         </node>
       </node>
     </node>
@@ -10795,19 +10251,17 @@
               </node>
             </node>
             <node concept="2OqwBi" id="6UWSvq4Qt2a" role="33vP2m">
-              <node concept="2OqwBi" id="7DvO2Ma0lUJ" role="2Oq$k0">
-                <node concept="37vLTw" id="7DvO2Ma0lZJ" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7DvO2Ma0klb" resolve="ruleProcessingSession" />
-                </node>
-                <node concept="liA8E" id="7DvO2Ma0lUM" role="2OqNvi">
-                  <ref role="37wK5l" node="7DvO2M9Icas" resolve="macroTemplates" />
-                </node>
+              <node concept="37vLTw" id="7DvO2Ma0lZJ" role="2Oq$k0">
+                <ref role="3cqZAo" node="7DvO2Ma0klb" resolve="macroTemplateIndex" />
               </node>
               <node concept="liA8E" id="6UWSvq4Qtpf" role="2OqNvi">
                 <ref role="37wK5l" node="4nxCIBqy$vr" resolve="macroTemplate" />
                 <node concept="37vLTw" id="6UWSvq4Qujo" role="37wK5m">
                   <ref role="3cqZAo" node="7DvO2M9IiNQ" resolve="typeConcept" />
                 </node>
+                <node concept="16syzq" id="7P_FdVPvn_N" role="3PaCim">
+                  <ref role="16sUi3" node="7DvO2M9IiNW" resolve="Cfg" />
+                </node>
               </node>
             </node>
           </node>
@@ -10895,19 +10349,17 @@
               </node>
             </node>
             <node concept="2OqwBi" id="6UWSvq4QB3K" role="33vP2m">
-              <node concept="2OqwBi" id="7DvO2Ma0me_" role="2Oq$k0">
-                <node concept="37vLTw" id="7DvO2Ma0mj_" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7DvO2Ma0klb" resolve="ruleProcessingSession" />
-                </node>
-                <node concept="liA8E" id="7DvO2Ma0meC" role="2OqNvi">
-                  <ref role="37wK5l" node="7DvO2M9Icas" resolve="macroTemplates" />
-                </node>
+              <node concept="37vLTw" id="7DvO2Ma0mj_" role="2Oq$k0">
+                <ref role="3cqZAo" node="7DvO2Ma0klb" resolve="macroTemplateIndex" />
               </node>
               <node concept="liA8E" id="6UWSvq4QBqP" role="2OqNvi">
                 <ref role="37wK5l" node="6UWSvq4Qqe$" resolve="macroTemplate" />
                 <node concept="37vLTw" id="6UWSvq4QBzV" role="37wK5m">
                   <ref role="3cqZAo" node="7DvO2M9IiO2" resolve="templateId" />
                 </node>
+                <node concept="16syzq" id="7P_FdVPvnni" role="3PaCim">
+                  <ref role="16sUi3" node="7DvO2M9IiOw" resolve="Cfg" />
+                </node>
               </node>
             </node>
           </node>
@@ -10948,10 +10400,10 @@
     <node concept="3Tm1VV" id="7DvO2M9IiOz" role="1B3o_S" />
     <node concept="2tJIrI" id="7DvO2M9IiO$" role="jymVt" />
     <node concept="312cEg" id="7DvO2Ma0klb" role="jymVt">
-      <property role="TrG5h" value="ruleProcessingSession" />
+      <property role="TrG5h" value="macroTemplateIndex" />
       <node concept="3Tm6S6" id="7DvO2Ma0klc" role="1B3o_S" />
-      <node concept="3uibUv" id="7DvO2Ma0kle" role="1tU5fm">
-        <ref role="3uigEE" node="CGeqIk8WWU" resolve="RuleProcessingSession" />
+      <node concept="3uibUv" id="7P_FdVPvlwo" role="1tU5fm">
+        <ref role="3uigEE" node="1hX44vNlSIA" resolve="MacroTemplateIndex" />
       </node>
     </node>
     <node concept="3uibUv" id="7DvO2M9IiOV" role="1zkMxy">
@@ -11659,5 +11111,110 @@
       <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
     </node>
   </node>
+  <node concept="312cEu" id="1CcQBrPcZVG">
+    <property role="TrG5h" value="HandlingStage" />
+    <node concept="2tJIrI" id="1CcQBrPcZWg" role="jymVt" />
+    <node concept="3clFbW" id="1CcQBrPd004" role="jymVt">
+      <node concept="37vLTG" id="7DvO2MaziaI" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="7DvO2Mazihr" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="1CcQBrPd00y" role="3clF46">
+        <property role="TrG5h" value="handlerTemplates" />
+        <node concept="_YKpA" id="1CcQBrPd00Q" role="1tU5fm">
+          <node concept="3uibUv" id="1CcQBrPd01d" role="_ZDj9">
+            <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="1CcQBrPd006" role="3clF45" />
+      <node concept="3Tm1VV" id="1CcQBrPd007" role="1B3o_S" />
+      <node concept="3clFbS" id="1CcQBrPd008" role="3clF47">
+        <node concept="3clFbF" id="1CcQBrPd029" role="3cqZAp">
+          <node concept="37vLTI" id="1CcQBrPd0UF" role="3clFbG">
+            <node concept="37vLTw" id="1CcQBrPd11p" role="37vLTx">
+              <ref role="3cqZAo" node="1CcQBrPd00y" resolve="handlerTemplates" />
+            </node>
+            <node concept="2OqwBi" id="1CcQBrPd06n" role="37vLTJ">
+              <node concept="Xjq3P" id="1CcQBrPd028" role="2Oq$k0" />
+              <node concept="2OwXpG" id="1CcQBrPd0gK" role="2OqNvi">
+                <ref role="2Oxat5" node="1CcQBrPcZWy" resolve="handlerTemplates" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7DvO2MazihR" role="3cqZAp">
+          <node concept="37vLTI" id="7DvO2MazihT" role="3clFbG">
+            <node concept="2OqwBi" id="7DvO2Maziva" role="37vLTJ">
+              <node concept="Xjq3P" id="7DvO2MazivM" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7DvO2Mazivd" role="2OqNvi">
+                <ref role="2Oxat5" node="7DvO2MazihN" resolve="name" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7DvO2MazihX" role="37vLTx">
+              <ref role="3cqZAo" node="7DvO2MaziaI" resolve="name" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1CcQBrPcZZC" role="jymVt" />
+    <node concept="3clFb_" id="1CcQBrPd1dz" role="jymVt">
+      <property role="TrG5h" value="handlerTemplates" />
+      <node concept="_YKpA" id="1CcQBrPd1k7" role="3clF45">
+        <node concept="3uibUv" id="1CcQBrPd1qg" role="_ZDj9">
+          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1CcQBrPd1dA" role="1B3o_S" />
+      <node concept="3clFbS" id="1CcQBrPd1dB" role="3clF47">
+        <node concept="3clFbF" id="1CcQBrPd1$F" role="3cqZAp">
+          <node concept="2OqwBi" id="6UWSvq4JGuP" role="3clFbG">
+            <node concept="37vLTw" id="1CcQBrPd1$E" role="2Oq$k0">
+              <ref role="3cqZAo" node="1CcQBrPcZWy" resolve="handlerTemplates" />
+            </node>
+            <node concept="26Dbio" id="6UWSvq4JHBk" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7DvO2Maz94F" role="jymVt" />
+    <node concept="3clFb_" id="7DvO2Maz9cH" role="jymVt">
+      <property role="TrG5h" value="name" />
+      <node concept="17QB3L" id="7DvO2Maz9kE" role="3clF45" />
+      <node concept="3Tm1VV" id="7DvO2Maz9cK" role="1B3o_S" />
+      <node concept="3clFbS" id="7DvO2Maz9cL" role="3clF47">
+        <node concept="3clFbF" id="7DvO2MaziJG" role="3cqZAp">
+          <node concept="37vLTw" id="7DvO2MaziJF" role="3clFbG">
+            <ref role="3cqZAo" node="7DvO2MazihN" resolve="name" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1CcQBrPcZZL" role="jymVt" />
+    <node concept="312cEg" id="7DvO2MazihN" role="jymVt">
+      <property role="TrG5h" value="name" />
+      <node concept="3Tm6S6" id="7DvO2MazihO" role="1B3o_S" />
+      <node concept="17QB3L" id="7DvO2MazihQ" role="1tU5fm" />
+    </node>
+    <node concept="312cEg" id="1CcQBrPcZWy" role="jymVt">
+      <property role="TrG5h" value="handlerTemplates" />
+      <node concept="3Tm6S6" id="1CcQBrPcZWz" role="1B3o_S" />
+      <node concept="_YKpA" id="1CcQBrPcZWR" role="1tU5fm">
+        <node concept="3uibUv" id="1CcQBrPcZZ7" role="_ZDj9">
+          <ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="HandlerTemplate" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1CcQBrPcZWl" role="jymVt" />
+    <node concept="3Tm1VV" id="1CcQBrPcZVH" role="1B3o_S" />
+    <node concept="3UR2Jj" id="7P_FdVPH8tE" role="lGtFl">
+      <node concept="TZ5HA" id="7P_FdVPH8tF" role="TZ5H$">
+        <node concept="1dT_AC" id="7P_FdVPH8tG" role="1dT_Ay">
+          <property role="1dT_AB" value="A view on collection of handler templates." />
+        </node>
+      </node>
+    </node>
+  </node>
 </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 beae08c2..c5024486 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
@@ -157,17 +157,13 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
-        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
-      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
         <child id="1107880067339" name="method" index="3MN40a" />
       </concept>
@@ -237,228 +233,30 @@
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
-        <child id="540871147943773366" name="argument" index="25WWJ7" />
-      </concept>
-      <concept id="2526372162255441536" name="jetbrains.mps.baseLanguage.collections.structure.AsUnmodifiableOperation" flags="nn" index="26Dbio" />
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
-      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
-        <child id="1237721435807" name="elementType" index="HW$YZ" />
-      </concept>
-      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
-      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
     </language>
   </registry>
   <node concept="312cEu" id="4OKkcnfu_xe">
     <property role="TrG5h" value="AbstractRuleTemplateManifest" />
     <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="1ggxSI7z1Os" role="jymVt" />
-    <node concept="3clFb_" id="20Ay2VeQ4QK" role="jymVt">
-      <property role="TrG5h" value="handlingStages" />
-      <property role="1EzhhJ" value="false" />
-      <node concept="_YKpA" id="20Ay2VeQ4RT" role="3clF45">
-        <node concept="3uibUv" id="7DvO2MazfT$" role="_ZDj9">
-          <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="20Ay2VeQ4QN" role="1B3o_S" />
-      <node concept="3clFbS" id="20Ay2VeQ4QO" role="3clF47">
-        <node concept="3cpWs8" id="20Ay2Vf3Pqy" role="3cqZAp">
-          <node concept="3cpWsn" id="20Ay2Vf3Pqz" role="3cpWs9">
-            <property role="TrG5h" value="stagesMap" />
-            <node concept="3uibUv" id="20Ay2Vf3Pqc" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~TreeMap" resolve="TreeMap" />
-              <node concept="17QB3L" id="20Ay2Vf3Pqm" role="11_B2D" />
-              <node concept="_YKpA" id="20Ay2Vf3Pqk" role="11_B2D">
-                <node concept="3uibUv" id="20Ay2Vf3Pql" role="_ZDj9">
-                  <ref role="3uigEE" node="4MqhgXU9fm3" resolve="HandlerTemplate" />
-                </node>
-              </node>
-            </node>
-            <node concept="2ShNRf" id="20Ay2Vf3Pq$" role="33vP2m">
-              <node concept="1pGfFk" id="20Ay2Vf3Pq_" role="2ShVmc">
-                <ref role="37wK5l" to="33ny:~TreeMap.&lt;init&gt;()" resolve="TreeMap" />
-                <node concept="17QB3L" id="20Ay2Vf3PqA" role="1pMfVU" />
-                <node concept="_YKpA" id="20Ay2Vf3PqB" role="1pMfVU">
-                  <node concept="3uibUv" id="20Ay2Vf3PqC" role="_ZDj9">
-                    <ref role="3uigEE" node="4MqhgXU9fm3" resolve="HandlerTemplate" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="20Ay2Vf3Rdm" role="3cqZAp">
-          <node concept="3clFbS" id="20Ay2Vf3Rdp" role="2LFqv$">
-            <node concept="3clFbJ" id="20Ay2Vf3Uu3" role="3cqZAp">
-              <node concept="3clFbS" id="20Ay2Vf3Uu5" role="3clFbx">
-                <node concept="3clFbF" id="20Ay2Vf41Lk" role="3cqZAp">
-                  <node concept="2OqwBi" id="20Ay2Vf43Gz" role="3clFbG">
-                    <node concept="37vLTw" id="20Ay2Vf41Li" role="2Oq$k0">
-                      <ref role="3cqZAo" node="20Ay2Vf3Pqz" resolve="stagesMap" />
-                    </node>
-                    <node concept="liA8E" id="20Ay2Vf45ff" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~TreeMap.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
-                      <node concept="2OqwBi" id="20Ay2Vf47fB" role="37wK5m">
-                        <node concept="37vLTw" id="20Ay2Vf46oZ" role="2Oq$k0">
-                          <ref role="3cqZAo" node="20Ay2Vf3Rdq" resolve="htpl" />
-                        </node>
-                        <node concept="liA8E" id="20Ay2Vf482A" role="2OqNvi">
-                          <ref role="37wK5l" node="20Ay2Vf1i5R" resolve="stage" />
-                        </node>
-                      </node>
-                      <node concept="2ShNRf" id="20Ay2Vf491p" role="37wK5m">
-                        <node concept="Tc6Ow" id="20Ay2Vf490W" role="2ShVmc">
-                          <node concept="3uibUv" id="20Ay2Vf490X" role="HW$YZ">
-                            <ref role="3uigEE" node="4MqhgXU9fm3" resolve="HandlerTemplate" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3fqX7Q" id="20Ay2Vf418n" role="3clFbw">
-                <node concept="2OqwBi" id="20Ay2Vf418p" role="3fr31v">
-                  <node concept="37vLTw" id="20Ay2Vf418q" role="2Oq$k0">
-                    <ref role="3cqZAo" node="20Ay2Vf3Pqz" resolve="stagesMap" />
-                  </node>
-                  <node concept="liA8E" id="20Ay2Vf418r" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~TreeMap.containsKey(java.lang.Object):boolean" resolve="containsKey" />
-                    <node concept="2OqwBi" id="20Ay2Vf418s" role="37wK5m">
-                      <node concept="37vLTw" id="20Ay2Vf418t" role="2Oq$k0">
-                        <ref role="3cqZAo" node="20Ay2Vf3Rdq" resolve="htpl" />
-                      </node>
-                      <node concept="liA8E" id="20Ay2Vf418u" role="2OqNvi">
-                        <ref role="37wK5l" node="20Ay2Vf1i5R" resolve="stage" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="20Ay2Vf49Um" role="3cqZAp">
-              <node concept="2OqwBi" id="20Ay2Vf4hlJ" role="3clFbG">
-                <node concept="2OqwBi" id="20Ay2Vf4b3V" role="2Oq$k0">
-                  <node concept="37vLTw" id="20Ay2Vf49Uk" role="2Oq$k0">
-                    <ref role="3cqZAo" node="20Ay2Vf3Pqz" resolve="stagesMap" />
-                  </node>
-                  <node concept="liA8E" id="20Ay2Vf4cAB" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~TreeMap.get(java.lang.Object):java.lang.Object" resolve="get" />
-                    <node concept="2OqwBi" id="20Ay2Vf4ep7" role="37wK5m">
-                      <node concept="37vLTw" id="20Ay2Vf4dKn" role="2Oq$k0">
-                        <ref role="3cqZAo" node="20Ay2Vf3Rdq" resolve="htpl" />
-                      </node>
-                      <node concept="liA8E" id="20Ay2Vf4fc6" role="2OqNvi">
-                        <ref role="37wK5l" node="20Ay2Vf1i5R" resolve="stage" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="TSZUe" id="20Ay2Vf4j0T" role="2OqNvi">
-                  <node concept="37vLTw" id="20Ay2Vf4jj6" role="25WWJ7">
-                    <ref role="3cqZAo" node="20Ay2Vf3Rdq" resolve="htpl" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="20Ay2Vf3Rdq" role="1Duv9x">
-            <property role="TrG5h" value="htpl" />
-            <node concept="3uibUv" id="20Ay2Vf3Rdu" role="1tU5fm">
-              <ref role="3uigEE" node="4MqhgXU9fm3" resolve="HandlerTemplate" />
-            </node>
-          </node>
-          <node concept="1rXfSq" id="7DvO2Matz5P" role="1DdaDG">
-            <ref role="37wK5l" node="4MqhgXUaiLz" resolve="handlerTemplates" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="20Ay2Vf3NtG" role="3cqZAp" />
-        <node concept="3cpWs8" id="20Ay2Vf4xo$" role="3cqZAp">
-          <node concept="3cpWsn" id="20Ay2Vf4xo_" role="3cpWs9">
-            <property role="TrG5h" value="stages" />
-            <node concept="_YKpA" id="20Ay2Vf4xow" role="1tU5fm">
-              <node concept="3uibUv" id="7DvO2Mazgxi" role="_ZDj9">
-                <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-              </node>
-            </node>
-            <node concept="2ShNRf" id="20Ay2Vf4xoA" role="33vP2m">
-              <node concept="Tc6Ow" id="20Ay2Vf4xoB" role="2ShVmc">
-                <node concept="3uibUv" id="7DvO2Mazhbn" role="HW$YZ">
-                  <ref role="3uigEE" node="1CcQBrPcZVG" resolve="HandlingStage" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="20Ay2Vf4srC" role="3cqZAp">
-          <node concept="3clFbS" id="20Ay2Vf4srF" role="2LFqv$">
-            <node concept="3clFbF" id="20Ay2Vf4zIj" role="3cqZAp">
-              <node concept="2OqwBi" id="20Ay2Vf4$lz" role="3clFbG">
-                <node concept="37vLTw" id="20Ay2Vf4zIh" role="2Oq$k0">
-                  <ref role="3cqZAo" node="20Ay2Vf4xo_" resolve="stages" />
-                </node>
-                <node concept="TSZUe" id="20Ay2Vf4$QP" role="2OqNvi">
-                  <node concept="2ShNRf" id="7DvO2MazhCL" role="25WWJ7">
-                    <node concept="1pGfFk" id="7DvO2MazhXw" role="2ShVmc">
-                      <ref role="37wK5l" node="1CcQBrPd004" resolve="HandlingStage" />
-                      <node concept="2OqwBi" id="7DvO2MazkbM" role="37wK5m">
-                        <node concept="37vLTw" id="7DvO2Mazk1N" role="2Oq$k0">
-                          <ref role="3cqZAo" node="20Ay2Vf4srG" resolve="e" />
-                        </node>
-                        <node concept="liA8E" id="7DvO2Mazkvq" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~Map$Entry.getKey():java.lang.Object" resolve="getKey" />
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="7DvO2MazkRH" role="37wK5m">
-                        <node concept="37vLTw" id="7DvO2MazkGC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="20Ay2Vf4srG" resolve="e" />
-                        </node>
-                        <node concept="liA8E" id="7DvO2MazllZ" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~Map$Entry.getValue():java.lang.Object" resolve="getValue" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="20Ay2Vf4srG" role="1Duv9x">
-            <property role="TrG5h" value="e" />
-            <node concept="3uibUv" id="20Ay2Vf4srK" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~Map$Entry" resolve="Map.Entry" />
-              <node concept="17QB3L" id="20Ay2Vf4srL" role="11_B2D" />
-              <node concept="_YKpA" id="20Ay2Vf4srM" role="11_B2D">
-                <node concept="3uibUv" id="20Ay2Vf4srN" role="_ZDj9">
-                  <ref role="3uigEE" node="4MqhgXU9fm3" resolve="HandlerTemplate" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2OqwBi" id="20Ay2Vf4srO" role="1DdaDG">
-            <node concept="37vLTw" id="20Ay2Vf4srP" role="2Oq$k0">
-              <ref role="3cqZAo" node="20Ay2Vf3Pqz" resolve="stagesMap" />
-            </node>
-            <node concept="liA8E" id="20Ay2Vf4srQ" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~TreeMap.entrySet():java.util.Set" resolve="entrySet" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7DvO2Mazly5" role="3cqZAp" />
-        <node concept="3clFbF" id="20Ay2Vf4SEx" role="3cqZAp">
-          <node concept="37vLTw" id="20Ay2Vf4SEv" role="3clFbG">
-            <ref role="3cqZAo" node="20Ay2Vf4xo_" resolve="stages" />
-          </node>
+    <node concept="3clFb_" id="7P_FdVPtq7Z" role="jymVt">
+      <property role="TrG5h" value="queryTemplates" />
+      <property role="1EzhhJ" value="true" />
+      <node concept="_YKpA" id="7P_FdVPtqGB" role="3clF45">
+        <node concept="3uibUv" id="7P_FdVPtr81" role="_ZDj9">
+          <ref role="3uigEE" node="7P_FdVPs4aA" resolve="QueryTemplate" />
         </node>
       </node>
+      <node concept="3Tm1VV" id="7P_FdVPtq82" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPtq83" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="20Ay2VeQ4EW" role="jymVt" />
+    <node concept="2tJIrI" id="7P_FdVPtpzK" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUaiLz" role="jymVt">
       <property role="TrG5h" value="handlerTemplates" />
       <property role="1EzhhJ" value="true" />
@@ -1960,7 +1758,23 @@
       <node concept="3Tm1VV" id="4MqhgXUN1Ph" role="1B3o_S" />
       <node concept="3clFbS" id="4MqhgXUN1Pi" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="4MqhgXUN1OI" role="jymVt" />
+    <node concept="2tJIrI" id="7P_FdVPVjam" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVQoZmr" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="fqName" />
+      <node concept="17QB3L" id="7P_FdVQp2lr" role="3clF45" />
+      <node concept="3Tm1VV" id="7P_FdVQoZmu" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVQoZmv" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQoWCy" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVQoGPt" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="extendedFqName" />
+      <node concept="17QB3L" id="7P_FdVQoJS0" role="3clF45" />
+      <node concept="3Tm1VV" id="7P_FdVQoGPw" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVQoGPx" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQoNeh" role="jymVt" />
     <node concept="3clFb_" id="20Ay2Vf1i5R" role="jymVt">
       <property role="1EzhhJ" value="true" />
       <property role="2aFKle" value="false" />
@@ -1980,6 +1794,9 @@
       </node>
       <node concept="3Tm1VV" id="4MqhgXU9lmr" role="1B3o_S" />
       <node concept="3clFbS" id="4MqhgXU9lms" role="3clF47" />
+      <node concept="2AHcQZ" id="7P_FdVPH75_" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+      </node>
     </node>
     <node concept="2tJIrI" id="4MqhgXU9fJA" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUaiON" role="jymVt">
@@ -2156,104 +1973,6 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="1CcQBrPcZVG">
-    <property role="TrG5h" value="HandlingStage" />
-    <node concept="2tJIrI" id="1CcQBrPcZWg" role="jymVt" />
-    <node concept="3clFbW" id="1CcQBrPd004" role="jymVt">
-      <node concept="37vLTG" id="7DvO2MaziaI" role="3clF46">
-        <property role="TrG5h" value="name" />
-        <node concept="17QB3L" id="7DvO2Mazihr" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="1CcQBrPd00y" role="3clF46">
-        <property role="TrG5h" value="handlerTemplates" />
-        <node concept="_YKpA" id="1CcQBrPd00Q" role="1tU5fm">
-          <node concept="3uibUv" id="1CcQBrPd01d" role="_ZDj9">
-            <ref role="3uigEE" node="4MqhgXU9fm3" resolve="HandlerTemplate" />
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1CcQBrPd006" role="3clF45" />
-      <node concept="3Tm1VV" id="1CcQBrPd007" role="1B3o_S" />
-      <node concept="3clFbS" id="1CcQBrPd008" role="3clF47">
-        <node concept="3clFbF" id="1CcQBrPd029" role="3cqZAp">
-          <node concept="37vLTI" id="1CcQBrPd0UF" role="3clFbG">
-            <node concept="37vLTw" id="1CcQBrPd11p" role="37vLTx">
-              <ref role="3cqZAo" node="1CcQBrPd00y" resolve="handlerTemplates" />
-            </node>
-            <node concept="2OqwBi" id="1CcQBrPd06n" role="37vLTJ">
-              <node concept="Xjq3P" id="1CcQBrPd028" role="2Oq$k0" />
-              <node concept="2OwXpG" id="1CcQBrPd0gK" role="2OqNvi">
-                <ref role="2Oxat5" node="1CcQBrPcZWy" resolve="handlerTemplates" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7DvO2MazihR" role="3cqZAp">
-          <node concept="37vLTI" id="7DvO2MazihT" role="3clFbG">
-            <node concept="2OqwBi" id="7DvO2Maziva" role="37vLTJ">
-              <node concept="Xjq3P" id="7DvO2MazivM" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7DvO2Mazivd" role="2OqNvi">
-                <ref role="2Oxat5" node="7DvO2MazihN" resolve="name" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="7DvO2MazihX" role="37vLTx">
-              <ref role="3cqZAo" node="7DvO2MaziaI" resolve="name" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1CcQBrPcZZC" role="jymVt" />
-    <node concept="3clFb_" id="1CcQBrPd1dz" role="jymVt">
-      <property role="TrG5h" value="handlerTemplates" />
-      <node concept="_YKpA" id="1CcQBrPd1k7" role="3clF45">
-        <node concept="3uibUv" id="1CcQBrPd1qg" role="_ZDj9">
-          <ref role="3uigEE" node="4MqhgXU9fm3" resolve="HandlerTemplate" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="1CcQBrPd1dA" role="1B3o_S" />
-      <node concept="3clFbS" id="1CcQBrPd1dB" role="3clF47">
-        <node concept="3clFbF" id="1CcQBrPd1$F" role="3cqZAp">
-          <node concept="2OqwBi" id="6UWSvq4JGuP" role="3clFbG">
-            <node concept="37vLTw" id="1CcQBrPd1$E" role="2Oq$k0">
-              <ref role="3cqZAo" node="1CcQBrPcZWy" resolve="handlerTemplates" />
-            </node>
-            <node concept="26Dbio" id="6UWSvq4JHBk" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7DvO2Maz94F" role="jymVt" />
-    <node concept="3clFb_" id="7DvO2Maz9cH" role="jymVt">
-      <property role="TrG5h" value="name" />
-      <node concept="17QB3L" id="7DvO2Maz9kE" role="3clF45" />
-      <node concept="3Tm1VV" id="7DvO2Maz9cK" role="1B3o_S" />
-      <node concept="3clFbS" id="7DvO2Maz9cL" role="3clF47">
-        <node concept="3clFbF" id="7DvO2MaziJG" role="3cqZAp">
-          <node concept="37vLTw" id="7DvO2MaziJF" role="3clFbG">
-            <ref role="3cqZAo" node="7DvO2MazihN" resolve="name" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1CcQBrPcZZL" role="jymVt" />
-    <node concept="312cEg" id="7DvO2MazihN" role="jymVt">
-      <property role="TrG5h" value="name" />
-      <node concept="3Tm6S6" id="7DvO2MazihO" role="1B3o_S" />
-      <node concept="17QB3L" id="7DvO2MazihQ" role="1tU5fm" />
-    </node>
-    <node concept="312cEg" id="1CcQBrPcZWy" role="jymVt">
-      <property role="TrG5h" value="handlerTemplates" />
-      <node concept="3Tm6S6" id="1CcQBrPcZWz" role="1B3o_S" />
-      <node concept="_YKpA" id="1CcQBrPcZWR" role="1tU5fm">
-        <node concept="3uibUv" id="1CcQBrPcZZ7" role="_ZDj9">
-          <ref role="3uigEE" node="4MqhgXU9fm3" resolve="HandlerTemplate" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="1CcQBrPcZWl" role="jymVt" />
-    <node concept="3Tm1VV" id="1CcQBrPcZVH" role="1B3o_S" />
-  </node>
   <node concept="3HP615" id="36tQV5AurZW">
     <property role="3GE5qa" value="ruleTemplate" />
     <property role="TrG5h" value="ConstraintRuleTemplate" />
@@ -2274,5 +1993,105 @@
     <node concept="2tJIrI" id="36tQV5AIeEy" role="jymVt" />
     <node concept="3Tm1VV" id="36tQV5AurZX" role="1B3o_S" />
   </node>
+  <node concept="3HP615" id="7P_FdVPs4aA">
+    <property role="TrG5h" value="QueryTemplate" />
+    <node concept="2tJIrI" id="7P_FdVPs4b8" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVPsPY7" 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>
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVPsPYa" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPsPYb" 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_FdVPsGBf" role="3clF46">
+        <property role="TrG5h" value="parameters" />
+        <node concept="8X2XB" id="7P_FdVPsGC6" role="1tU5fm">
+          <node concept="3uibUv" id="7P_FdVPsGC0" role="8Xvag">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="7P_FdVPsDNI" role="3clF45">
+        <ref role="3uigEE" node="7P_FdVPsDC0" resolve="QueryTemplate.Query" />
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVPsDM9" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPsDMa" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPsDA3" role="jymVt" />
+    <node concept="3HP615" id="7P_FdVPsDC0" role="jymVt">
+      <property role="2bfB8j" value="true" />
+      <property role="TrG5h" value="Query" />
+      <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_FdVPsEcX" role="3clF46">
+          <property role="TrG5h" value="config" />
+          <node concept="3uibUv" id="7P_FdVPsEeI" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="7P_FdVPsEdT" role="3clF45">
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+        </node>
+        <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="3Tm1VV" id="7P_FdVPsDC1" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPs4bh" role="jymVt" />
+    <node concept="3Tm1VV" id="7P_FdVPs4aB" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="7P_FdVPsPNk">
+    <property role="3GE5qa" value="ruleTemplate" />
+    <property role="TrG5h" value="AbstractQueryTemplate" />
+    <property role="1sVAO0" value="true" />
+    <node concept="2tJIrI" id="7P_FdVPsPTr" role="jymVt" />
+    <node concept="3Tm1VV" id="7P_FdVPsPNl" role="1B3o_S" />
+    <node concept="3uibUv" id="7P_FdVPsPOy" role="EKbjA">
+      <ref role="3uigEE" node="7P_FdVPs4aA" resolve="QueryTemplate" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/aspect.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/aspect.mps
index 1152fc67..0ece3521 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/aspect.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains/mps/lang/typesystem2/aspect.mps
@@ -6,6 +6,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
     <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
@@ -14,20 +15,47 @@
     <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.typesystem2.macro)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.rule)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="i5cy" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.atomic(JDK/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
+        <child id="1082485599096" name="statements" index="9aQI4" />
+      </concept>
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
+      <concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
+        <child id="1076505808688" name="condition" index="2$JKZa" />
+      </concept>
+      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
+        <child id="1154032183016" name="body" index="2LFqv$" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
+      <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
+        <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <property id="1075300953594" name="abstractClass" index="1sVAO0" />
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
@@ -39,6 +67,7 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </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="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -56,13 +85,17 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
       </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
@@ -70,33 +103,158 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
+        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
+      </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
+      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
+        <child id="1144226360166" name="iterable" index="1DdaDG" />
+      </concept>
+      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
+        <child id="1144230900587" name="variable" index="1Duv9x" />
+      </concept>
+      <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
+      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
+        <property id="6329021646629104958" name="text" index="3SKdUp" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
+      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
+        <property id="2034914114981261751" name="severity" index="RRSoG" />
+        <child id="2034914114981261753" name="message" index="RRSoy" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
+      <concept id="2526372162255441536" name="jetbrains.mps.baseLanguage.collections.structure.AsUnmodifiableOperation" flags="nn" index="26Dbio" />
+      <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
+        <child id="1226511765987" name="elementType" index="2hN53Y" />
+      </concept>
+      <concept id="1226516258405" name="jetbrains.mps.baseLanguage.collections.structure.HashSetCreator" flags="nn" index="2i4dXS" />
+      <concept id="6801639034384703212" name="jetbrains.mps.baseLanguage.collections.structure.StackType" flags="in" index="oyxx6" />
+      <concept id="5784983078884872741" name="jetbrains.mps.baseLanguage.collections.structure.PeekOperation" flags="nn" index="2oR75g" />
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
+      <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
+        <child id="1151689745422" name="elementType" index="A3Ik2" />
+      </concept>
+      <concept id="3358009230508699637" name="jetbrains.mps.baseLanguage.collections.structure.PopOperation" flags="nn" index="2AryhJ" />
+      <concept id="3358009230508699932" name="jetbrains.mps.baseLanguage.collections.structure.PushOperation" flags="nn" index="2ArzE6" />
+      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
+      <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="1235573135402" name="jetbrains.mps.baseLanguage.collections.structure.SingletonSequenceCreator" flags="nn" index="2HTt$P">
+        <child id="1235573175711" name="elementType" index="2HTBi0" />
+        <child id="1235573187520" name="singletonValue" index="2HTEbv" />
+      </concept>
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
+      <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
+      <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
+      <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
+        <child id="1201654602639" name="key" index="38cxEo" />
+      </concept>
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
+      <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
+        <child id="1197683466920" name="keyType" index="3rvQeY" />
+        <child id="1197683475734" name="valueType" index="3rvSg0" />
+      </concept>
+      <concept id="1197686869805" name="jetbrains.mps.baseLanguage.collections.structure.HashMapCreator" flags="nn" index="3rGOSV">
+        <child id="1197687026896" name="keyType" index="3rHrn6" />
+        <child id="1197687035757" name="valueType" index="3rHtpV" />
+      </concept>
+      <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
+      <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" />
+        <child id="1197932525128" name="key" index="3ElVtu" />
+      </concept>
+      <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
+      <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
+      <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
+        <child id="5686963296372573084" name="elementType" index="3O5elw" />
+      </concept>
+    </language>
   </registry>
   <node concept="312cEu" id="7km57Pkjxf4">
     <property role="TrG5h" value="TypeAspectDescriptor" />
@@ -173,37 +331,321 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6UWSvq5bjXg" role="jymVt" />
-    <node concept="2YIFZL" id="6UWSvq5bk3i" role="jymVt">
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <property role="TrG5h" value="forLanguageDesc" />
-      <node concept="37vLTG" id="6UWSvq5bk7O" role="3clF46">
-        <property role="TrG5h" value="langrt" />
-        <node concept="3uibUv" id="6UWSvq5bk8e" role="1tU5fm">
-          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+    <node concept="2YIFZL" id="7P_FdVPW9uU" role="jymVt">
+      <property role="TrG5h" value="allForModel" />
+      <node concept="37vLTG" id="7P_FdVPWb2y" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="H_c77" id="7P_FdVPWp2I" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7P_FdVPWb2$" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="7P_FdVPWb2_" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
-      <node concept="3clFbS" id="6UWSvq5bk0u" role="3clF47">
-        <node concept="3clFbF" id="6UWSvq5bk8J" role="3cqZAp">
-          <node concept="2OqwBi" id="6UWSvq5bk8K" role="3clFbG">
-            <node concept="37vLTw" id="6UWSvq5bkfV" role="2Oq$k0">
-              <ref role="3cqZAo" node="6UWSvq5bk7O" resolve="langrt" />
+      <node concept="3vKaQO" id="7P_FdVPWaUF" role="3clF45">
+        <node concept="3uibUv" id="7P_FdVPWaWw" role="3O5elw">
+          <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVPW9uX" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPW9uY" role="3clF47">
+        <node concept="3cpWs8" id="7P_FdVPWeqT" role="3cqZAp">
+          <node concept="3cpWsn" id="7P_FdVPWeqU" role="3cpWs9">
+            <property role="TrG5h" value="allAspects" />
+            <node concept="_YKpA" id="7P_FdVPWeqP" role="1tU5fm">
+              <node concept="3uibUv" id="7P_FdVPWeqS" role="_ZDj9">
+                <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+              </node>
             </node>
-            <node concept="liA8E" id="6UWSvq5bk8M" role="2OqNvi">
-              <ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class):jetbrains.mps.smodel.runtime.ILanguageAspect" resolve="getAspect" />
-              <node concept="3VsKOn" id="6UWSvq5bk8N" role="37wK5m">
-                <ref role="3VsUkX" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+            <node concept="2ShNRf" id="7P_FdVPWeqV" role="33vP2m">
+              <node concept="Tc6Ow" id="7P_FdVPWeqW" role="2ShVmc">
+                <node concept="3uibUv" id="7P_FdVPWeqX" role="HW$YZ">
+                  <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+                </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="2Gpval" id="7P_FdVPWdk$" role="3cqZAp">
+          <node concept="3clFbS" id="7P_FdVPWcTN" role="2LFqv$">
+            <node concept="3clFbF" id="7P_FdVQ33Wp" role="3cqZAp">
+              <node concept="2YIFZM" id="7P_FdVQ33Wo" role="3clFbG">
+                <ref role="1Pybhc" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+                <ref role="37wK5l" node="7P_FdVQ33Wj" resolve="getAndInitAspect" />
+                <node concept="2GrUjf" id="7P_FdVQ33Wm" role="37wK5m">
+                  <ref role="2Gs0qQ" node="7P_FdVPWdlg" resolve="lr" />
+                </node>
+                <node concept="37vLTw" id="7P_FdVQ33Wn" role="37wK5m">
+                  <ref role="3cqZAo" node="7P_FdVPWeqU" resolve="allAspects" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1rXfSq" id="7P_FdVPWcTT" role="2GsD0m">
+            <ref role="37wK5l" node="6UWSvq5cIj4" resolve="extendedLangClosure" />
+            <node concept="2YIFZM" id="6UWSvq5cOo_" role="37wK5m">
+              <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="37vLTw" id="6UWSvq5cOoA" role="37wK5m">
+                <ref role="3cqZAo" node="7P_FdVPWb2y" resolve="model" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7P_FdVPWcTY" role="37wK5m">
+              <ref role="3cqZAo" node="7P_FdVPWb2$" resolve="repository" />
+            </node>
+          </node>
+          <node concept="2GrKxI" id="7P_FdVPWdlg" role="2Gsz3X">
+            <property role="TrG5h" value="lr" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="7P_FdVPWhm5" role="3cqZAp">
+          <node concept="2OqwBi" id="7P_FdVPWhYA" role="3clFbG">
+            <node concept="37vLTw" id="7P_FdVPWhm3" role="2Oq$k0">
+              <ref role="3cqZAo" node="7P_FdVPWeqU" resolve="allAspects" />
+            </node>
+            <node concept="26Dbio" id="7P_FdVPWjai" role="2OqNvi" />
+          </node>
+        </node>
       </node>
-      <node concept="3uibUv" id="6UWSvq5bk65" role="3clF45">
-        <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
-      </node>
-      <node concept="3Tm1VV" id="6UWSvq5bk0t" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="7km57Pkjxhg" role="jymVt" />
+    <node concept="2tJIrI" id="7P_FdVQ35vN" role="jymVt" />
+    <node concept="2YIFZL" id="7P_FdVPWn7D" role="jymVt">
+      <property role="TrG5h" value="allForLanguage" />
+      <node concept="37vLTG" id="7P_FdVPWn7E" role="3clF46">
+        <property role="TrG5h" value="slang" />
+        <node concept="3uibUv" id="7P_FdVPWn7F" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7P_FdVPWn7G" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="7P_FdVPWn7H" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3vKaQO" id="7P_FdVPWn7I" role="3clF45">
+        <node concept="3uibUv" id="7P_FdVPWn7J" role="3O5elw">
+          <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVPWn7K" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVPWn7L" role="3clF47">
+        <node concept="3cpWs8" id="7P_FdVPWn7M" role="3cqZAp">
+          <node concept="3cpWsn" id="7P_FdVPWn7N" role="3cpWs9">
+            <property role="TrG5h" value="allAspects" />
+            <node concept="_YKpA" id="7P_FdVPWn7O" role="1tU5fm">
+              <node concept="3uibUv" id="7P_FdVPWn7P" role="_ZDj9">
+                <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="7P_FdVPWn7Q" role="33vP2m">
+              <node concept="Tc6Ow" id="7P_FdVPWn7R" role="2ShVmc">
+                <node concept="3uibUv" id="7P_FdVPWn7S" role="HW$YZ">
+                  <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="7P_FdVPWn7T" role="3cqZAp">
+          <node concept="3clFbS" id="7P_FdVPWn7U" role="2LFqv$">
+            <node concept="3clFbF" id="7P_FdVQ39Vc" role="3cqZAp">
+              <node concept="2YIFZM" id="7P_FdVQ39Vd" role="3clFbG">
+                <ref role="1Pybhc" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+                <ref role="37wK5l" node="7P_FdVQ33Wj" resolve="getAndInitAspect" />
+                <node concept="2GrUjf" id="7P_FdVQ39Ve" role="37wK5m">
+                  <ref role="2Gs0qQ" node="7P_FdVPWn8i" resolve="lr" />
+                </node>
+                <node concept="37vLTw" id="7P_FdVQ39Vf" role="37wK5m">
+                  <ref role="3cqZAo" node="7P_FdVPWn7N" resolve="allAspects" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1rXfSq" id="7P_FdVPWn8c" role="2GsD0m">
+            <ref role="37wK5l" node="6UWSvq5cIj4" resolve="extendedLangClosure" />
+            <node concept="2ShNRf" id="7P_FdVPWn8d" role="37wK5m">
+              <node concept="2HTt$P" id="7P_FdVPWn8e" role="2ShVmc">
+                <node concept="3uibUv" id="7P_FdVPWn8f" role="2HTBi0">
+                  <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+                </node>
+                <node concept="37vLTw" id="7P_FdVPWn8g" role="2HTEbv">
+                  <ref role="3cqZAo" node="7P_FdVPWn7E" resolve="slang" />
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="7P_FdVPWn8h" role="37wK5m">
+              <ref role="3cqZAo" node="7P_FdVPWn7G" resolve="repository" />
+            </node>
+          </node>
+          <node concept="2GrKxI" id="7P_FdVPWn8i" role="2Gsz3X">
+            <property role="TrG5h" value="lr" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="7P_FdVPWn8j" role="3cqZAp">
+          <node concept="2OqwBi" id="7P_FdVPWn8k" role="3clFbG">
+            <node concept="37vLTw" id="7P_FdVPWn8l" role="2Oq$k0">
+              <ref role="3cqZAo" node="7P_FdVPWn7N" resolve="allAspects" />
+            </node>
+            <node concept="26Dbio" id="7P_FdVPWn8m" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPWn7C" role="jymVt" />
+    <node concept="2YIFZL" id="7P_FdVPWjGf" role="jymVt">
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <property role="TrG5h" value="allForLanguage" />
+      <node concept="37vLTG" id="7P_FdVPWjGg" role="3clF46">
+        <property role="TrG5h" value="langrt" />
+        <node concept="3uibUv" id="7P_FdVPWjGh" role="1tU5fm">
+          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="7P_FdVPWjGi" role="3clF47">
+        <node concept="3cpWs8" id="7P_FdVPWls1" role="3cqZAp">
+          <node concept="3cpWsn" id="7P_FdVPWls2" role="3cpWs9">
+            <property role="TrG5h" value="allAspects" />
+            <node concept="_YKpA" id="7P_FdVPWls3" role="1tU5fm">
+              <node concept="3uibUv" id="7P_FdVPWls4" role="_ZDj9">
+                <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="7P_FdVPWls5" role="33vP2m">
+              <node concept="Tc6Ow" id="7P_FdVPWls6" role="2ShVmc">
+                <node concept="3uibUv" id="7P_FdVPWls7" role="HW$YZ">
+                  <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="7P_FdVPWls8" role="3cqZAp">
+          <node concept="3clFbS" id="7P_FdVPWls9" role="2LFqv$">
+            <node concept="3clFbF" id="7P_FdVQ3aiG" role="3cqZAp">
+              <node concept="2YIFZM" id="7P_FdVQ3aiH" role="3clFbG">
+                <ref role="1Pybhc" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+                <ref role="37wK5l" node="7P_FdVQ33Wj" resolve="getAndInitAspect" />
+                <node concept="2GrUjf" id="7P_FdVQ3aiI" role="37wK5m">
+                  <ref role="2Gs0qQ" node="7P_FdVPWlsx" resolve="lr" />
+                </node>
+                <node concept="37vLTw" id="7P_FdVQ3aiJ" role="37wK5m">
+                  <ref role="3cqZAo" node="7P_FdVPWls2" resolve="allAspects" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1rXfSq" id="7P_FdVPWlsr" role="2GsD0m">
+            <ref role="37wK5l" node="7P_FdVPV_6P" resolve="extendedLangClosure" />
+            <node concept="2ShNRf" id="7P_FdVPWmnN" role="37wK5m">
+              <node concept="2HTt$P" id="7P_FdVPWm__" role="2ShVmc">
+                <node concept="3uibUv" id="7P_FdVPWmDv" role="2HTBi0">
+                  <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+                </node>
+                <node concept="37vLTw" id="7P_FdVPWmJU" role="2HTEbv">
+                  <ref role="3cqZAo" node="7P_FdVPWjGg" resolve="langrt" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2GrKxI" id="7P_FdVPWlsx" role="2Gsz3X">
+            <property role="TrG5h" value="lr" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="7P_FdVPWlsy" role="3cqZAp">
+          <node concept="2OqwBi" id="7P_FdVPWlsz" role="3clFbG">
+            <node concept="37vLTw" id="7P_FdVPWls$" role="2Oq$k0">
+              <ref role="3cqZAo" node="7P_FdVPWls2" resolve="allAspects" />
+            </node>
+            <node concept="26Dbio" id="7P_FdVPWls_" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="3vKaQO" id="7P_FdVPWlen" role="3clF45">
+        <node concept="3uibUv" id="7P_FdVPWleo" role="3O5elw">
+          <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVPWjGp" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPWjGe" role="jymVt" />
+    <node concept="2YIFZL" id="7P_FdVQ33Wj" role="jymVt">
+      <property role="TrG5h" value="getAndInitAspect" />
+      <node concept="3Tm6S6" id="7P_FdVQ33Wk" role="1B3o_S" />
+      <node concept="3cqZAl" id="7P_FdVQ33Wl" role="3clF45" />
+      <node concept="37vLTG" id="7P_FdVQ33Wa" role="3clF46">
+        <property role="TrG5h" value="lr" />
+        <node concept="3uibUv" id="7P_FdVQ33Wb" role="1tU5fm">
+          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7P_FdVQ33Wc" role="3clF46">
+        <property role="TrG5h" value="allAspects" />
+        <node concept="_YKpA" id="7P_FdVQ33Wd" role="1tU5fm">
+          <node concept="3uibUv" id="7P_FdVQ33We" role="_ZDj9">
+            <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="7P_FdVQ33VS" role="3clF47">
+        <node concept="3cpWs8" id="7P_FdVQ33VT" role="3cqZAp">
+          <node concept="3cpWsn" id="7P_FdVQ33VU" role="3cpWs9">
+            <property role="TrG5h" value="aspect" />
+            <node concept="3uibUv" id="7P_FdVQ33VV" role="1tU5fm">
+              <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+            </node>
+            <node concept="2OqwBi" id="7P_FdVQ33VW" role="33vP2m">
+              <node concept="37vLTw" id="7P_FdVQ33Wf" role="2Oq$k0">
+                <ref role="3cqZAo" node="7P_FdVQ33Wa" resolve="lr" />
+              </node>
+              <node concept="liA8E" id="7P_FdVQ33VY" role="2OqNvi">
+                <ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class):jetbrains.mps.smodel.runtime.ILanguageAspect" resolve="getAspect" />
+                <node concept="3VsKOn" id="7P_FdVQ33VZ" role="37wK5m">
+                  <ref role="3VsUkX" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7P_FdVQ33W0" role="3cqZAp">
+          <node concept="3clFbS" id="7P_FdVQ33W1" role="3clFbx">
+            <node concept="3clFbF" id="7P_FdVQ3wau" role="3cqZAp">
+              <node concept="2YIFZM" id="7P_FdVQ3wat" role="3clFbG">
+                <ref role="1Pybhc" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+                <ref role="37wK5l" node="7P_FdVQ3wao" resolve="init" />
+                <node concept="37vLTw" id="7P_FdVQ3war" role="37wK5m">
+                  <ref role="3cqZAo" node="7P_FdVQ33VU" resolve="aspect" />
+                </node>
+                <node concept="37vLTw" id="7P_FdVQ3was" role="37wK5m">
+                  <ref role="3cqZAo" node="7P_FdVQ33Wa" resolve="lr" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7P_FdVQ33W2" role="3cqZAp">
+              <node concept="2OqwBi" id="7P_FdVQ33W3" role="3clFbG">
+                <node concept="37vLTw" id="7P_FdVQ33Wg" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7P_FdVQ33Wc" resolve="allAspects" />
+                </node>
+                <node concept="TSZUe" id="7P_FdVQ33W5" role="2OqNvi">
+                  <node concept="37vLTw" id="7P_FdVQ33W6" role="25WWJ7">
+                    <ref role="3cqZAo" node="7P_FdVQ33VU" resolve="aspect" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="7P_FdVQ33W7" role="3clFbw">
+            <node concept="10Nm6u" id="7P_FdVQ33W8" role="3uHU7w" />
+            <node concept="37vLTw" id="7P_FdVQ33W9" role="3uHU7B">
+              <ref role="3cqZAo" node="7P_FdVQ33VU" resolve="aspect" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQ3xMH" role="jymVt" />
     <node concept="3clFb_" id="2hteS6ClmbE" role="jymVt">
       <property role="TrG5h" value="createMacroManifest" />
       <property role="1EzhhJ" value="true" />
@@ -224,10 +666,1014 @@
       <node concept="3clFbS" id="2hteS6ClmfW" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="2hteS6Cleqc" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVQ2VEI" role="jymVt">
+      <property role="TrG5h" value="languageRuntime" />
+      <node concept="3uibUv" id="7P_FdVQ2ZEv" role="3clF45">
+        <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+      </node>
+      <node concept="3Tm1VV" id="7P_FdVQ2VEL" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVQ2VEM" role="3clF47">
+        <node concept="3clFbF" id="7P_FdVQ33FW" role="3cqZAp">
+          <node concept="2OqwBi" id="7P_FdVQ4dGp" role="3clFbG">
+            <node concept="37vLTw" id="7P_FdVQ33FV" role="2Oq$k0">
+              <ref role="3cqZAo" node="7P_FdVQ2BHb" resolve="languageRuntime" />
+            </node>
+            <node concept="liA8E" id="7P_FdVQ4e7J" role="2OqNvi">
+              <ref role="37wK5l" to="i5cy:~AtomicReference.get():java.lang.Object" resolve="get" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQ30T0" role="jymVt" />
+    <node concept="3clFb_" id="7P_FdVQ2EWw" role="jymVt">
+      <property role="TrG5h" value="setLanguageRuntime" />
+      <node concept="37vLTG" id="7P_FdVQ2PYd" role="3clF46">
+        <property role="TrG5h" value="langrt" />
+        <node concept="3uibUv" id="7P_FdVQ2Rb$" role="1tU5fm">
+          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7P_FdVQ2EWy" role="3clF45" />
+      <node concept="3Tm6S6" id="7P_FdVQ2Gsd" role="1B3o_S" />
+      <node concept="3clFbS" id="7P_FdVQ2EW$" role="3clF47">
+        <node concept="3clFbF" id="7P_FdVQ4ekh" role="3cqZAp">
+          <node concept="2OqwBi" id="7P_FdVQ4f5G" role="3clFbG">
+            <node concept="2OqwBi" id="7P_FdVQ4eue" role="2Oq$k0">
+              <node concept="Xjq3P" id="7P_FdVQ4ekf" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7P_FdVQ4eLj" role="2OqNvi">
+                <ref role="2Oxat5" node="7P_FdVQ2BHb" resolve="languageRuntime" />
+              </node>
+            </node>
+            <node concept="liA8E" id="7P_FdVQ4fZN" role="2OqNvi">
+              <ref role="37wK5l" to="i5cy:~AtomicReference.compareAndSet(java.lang.Object,java.lang.Object):boolean" resolve="compareAndSet" />
+              <node concept="10Nm6u" id="7P_FdVQ4g7y" role="37wK5m" />
+              <node concept="37vLTw" id="7P_FdVQ4gmf" role="37wK5m">
+                <ref role="3cqZAo" node="7P_FdVQ2PYd" resolve="langrt" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVQ2DqC" role="jymVt" />
+    <node concept="2YIFZL" id="6UWSvq5cIj4" role="jymVt">
+      <property role="TrG5h" value="extendedLangClosure" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="6UWSvq5b73$" role="3clF47">
+        <node concept="3cpWs8" id="6UWSvq5bdBO" role="3cqZAp">
+          <node concept="3cpWsn" id="6UWSvq5bdBR" role="3cpWs9">
+            <property role="TrG5h" value="closure" />
+            <node concept="2hMVRd" id="6UWSvq5bdBK" role="1tU5fm">
+              <node concept="3uibUv" id="6UWSvq5bdFo" role="2hN53Y">
+                <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="6UWSvq5bdJp" role="33vP2m">
+              <node concept="2i4dXS" id="6UWSvq5bdI6" role="2ShVmc">
+                <node concept="3uibUv" id="6UWSvq5bdI7" role="HW$YZ">
+                  <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="6UWSvq5ba91" role="3cqZAp">
+          <node concept="3clFbS" id="6UWSvq5ba94" role="2LFqv$">
+            <node concept="3cpWs8" id="7P_FdVPVueQ" role="3cqZAp">
+              <node concept="3cpWsn" id="7P_FdVPVueR" role="3cpWs9">
+                <property role="TrG5h" value="langrt" />
+                <node concept="3uibUv" id="7P_FdVPVueS" role="1tU5fm">
+                  <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+                </node>
+                <node concept="2OqwBi" id="7P_FdVPVueT" role="33vP2m">
+                  <node concept="2YIFZM" id="7P_FdVPVueU" role="2Oq$k0">
+                    <ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository):jetbrains.mps.smodel.language.LanguageRegistry" resolve="getInstance" />
+                    <ref role="1Pybhc" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
+                    <node concept="37vLTw" id="6UWSvq5bdbd" role="37wK5m">
+                      <ref role="3cqZAo" node="6UWSvq5bb8I" resolve="repository" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="7P_FdVPVueV" role="2OqNvi">
+                    <ref role="37wK5l" to="vndm:~LanguageRegistry.getLanguage(org.jetbrains.mps.openapi.language.SLanguage):jetbrains.mps.smodel.language.LanguageRuntime" resolve="getLanguage" />
+                    <node concept="37vLTw" id="6UWSvq5bdd2" role="37wK5m">
+                      <ref role="3cqZAo" node="6UWSvq5ba95" resolve="slang" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="6UWSvq5cnO9" role="3cqZAp">
+              <node concept="3clFbS" id="6UWSvq5cnOb" role="3clFbx">
+                <node concept="RRSsy" id="6UWSvq5cobt" role="3cqZAp">
+                  <property role="RRSoG" value="warn" />
+                  <node concept="3cpWs3" id="6UWSvq5cq08" role="RRSoy">
+                    <node concept="Xl_RD" id="6UWSvq5cq1k" role="3uHU7w">
+                      <property role="Xl_RC" value="\&quot;" />
+                    </node>
+                    <node concept="3cpWs3" id="6UWSvq5coLv" role="3uHU7B">
+                      <node concept="Xl_RD" id="6UWSvq5cobv" role="3uHU7B">
+                        <property role="Xl_RC" value="no language runtime for \&quot;" />
+                      </node>
+                      <node concept="2OqwBi" id="6UWSvq5coXi" role="3uHU7w">
+                        <node concept="37vLTw" id="6UWSvq5coNc" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6UWSvq5ba95" resolve="slang" />
+                        </node>
+                        <node concept="liA8E" id="6UWSvq5cp5A" role="2OqNvi">
+                          <ref role="37wK5l" to="c17a:~SLanguage.getQualifiedName():java.lang.String" resolve="getQualifiedName" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="6UWSvq5cqBt" role="3cqZAp" />
+              </node>
+              <node concept="3clFbC" id="6UWSvq5co6d" role="3clFbw">
+                <node concept="10Nm6u" id="6UWSvq5co7t" role="3uHU7w" />
+                <node concept="37vLTw" id="6UWSvq5cnWM" role="3uHU7B">
+                  <ref role="3cqZAo" node="7P_FdVPVueR" resolve="langrt" />
+                </node>
+              </node>
+              <node concept="9aQIb" id="6UWSvq5cqkU" role="9aQIa">
+                <node concept="3clFbS" id="6UWSvq5cqkV" role="9aQI4">
+                  <node concept="3clFbF" id="6UWSvq5hKi9" role="3cqZAp">
+                    <node concept="2OqwBi" id="6UWSvq5hLpW" role="3clFbG">
+                      <node concept="37vLTw" id="6UWSvq5hKi7" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6UWSvq5bdBR" resolve="closure" />
+                      </node>
+                      <node concept="TSZUe" id="6UWSvq5hMof" role="2OqNvi">
+                        <node concept="37vLTw" id="6UWSvq5hMoe" role="25WWJ7">
+                          <ref role="3cqZAo" node="7P_FdVPVueR" resolve="langrt" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="6UWSvq5bdNn" role="3cqZAp">
+                    <node concept="2OqwBi" id="6UWSvq5beo8" role="3clFbG">
+                      <node concept="37vLTw" id="6UWSvq5bdNl" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6UWSvq5bdBR" resolve="closure" />
+                      </node>
+                      <node concept="X8dFx" id="6UWSvq5hGgr" role="2OqNvi">
+                        <node concept="2OqwBi" id="6UWSvq5hGgo" role="25WWJ7">
+                          <node concept="37vLTw" id="6UWSvq5hGgp" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7P_FdVPVueR" resolve="langrt" />
+                          </node>
+                          <node concept="liA8E" id="6UWSvq5hGgq" role="2OqNvi">
+                            <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages():java.util.Collection" resolve="getExtendedLanguages" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="6UWSvq5ba95" role="1Duv9x">
+            <property role="TrG5h" value="slang" />
+            <node concept="3uibUv" id="6UWSvq5ba99" role="1tU5fm">
+              <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="6UWSvq5ba9a" role="1DdaDG">
+            <ref role="3cqZAo" node="6UWSvq5b76q" resolve="slanguages" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="6UWSvq5cnwi" role="3cqZAp">
+          <node concept="1rXfSq" id="6UWSvq5cnwg" role="3clFbG">
+            <ref role="37wK5l" node="6UWSvq5cKtf" resolve="topoSort" />
+            <node concept="37vLTw" id="6UWSvq5cnDM" role="37wK5m">
+              <ref role="3cqZAo" node="6UWSvq5bdBR" resolve="closure" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6UWSvq5b76q" role="3clF46">
+        <property role="TrG5h" value="slanguages" />
+        <node concept="A3Dl8" id="7P_FdVPWckH" role="1tU5fm">
+          <node concept="3uibUv" id="7P_FdVPWckJ" role="A3Ik2">
+            <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6UWSvq5bb8I" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="6UWSvq5bbCv" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3vKaQO" id="6UWSvq5b7_$" role="3clF45">
+        <node concept="3uibUv" id="6UWSvq5bgmd" role="3O5elw">
+          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6UWSvq5bgnS" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPVzZA" role="jymVt" />
+    <node concept="2YIFZL" id="7P_FdVPV_6P" role="jymVt">
+      <property role="TrG5h" value="extendedLangClosure" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="7P_FdVPV_6Q" role="3clF47">
+        <node concept="3cpWs8" id="7P_FdVPV_6R" role="3cqZAp">
+          <node concept="3cpWsn" id="7P_FdVPV_6S" role="3cpWs9">
+            <property role="TrG5h" value="closure" />
+            <node concept="2hMVRd" id="7P_FdVPV_6T" role="1tU5fm">
+              <node concept="3uibUv" id="7P_FdVPV_6U" role="2hN53Y">
+                <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="7P_FdVPV_6V" role="33vP2m">
+              <node concept="2i4dXS" id="7P_FdVPV_6W" role="2ShVmc">
+                <node concept="3uibUv" id="7P_FdVPV_6X" role="HW$YZ">
+                  <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="7P_FdVPV_6Y" role="3cqZAp">
+          <node concept="3clFbS" id="7P_FdVPV_6Z" role="2LFqv$">
+            <node concept="3clFbF" id="7P_FdVPV_7o" role="3cqZAp">
+              <node concept="2OqwBi" id="7P_FdVPV_7p" role="3clFbG">
+                <node concept="37vLTw" id="7P_FdVPV_7q" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7P_FdVPV_6S" resolve="closure" />
+                </node>
+                <node concept="TSZUe" id="7P_FdVPV_7r" role="2OqNvi">
+                  <node concept="37vLTw" id="7P_FdVPVM89" role="25WWJ7">
+                    <ref role="3cqZAo" node="7P_FdVPV_7$" resolve="langrt" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7P_FdVPV_7t" role="3cqZAp">
+              <node concept="2OqwBi" id="7P_FdVPV_7u" role="3clFbG">
+                <node concept="37vLTw" id="7P_FdVPV_7v" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7P_FdVPV_6S" resolve="closure" />
+                </node>
+                <node concept="X8dFx" id="7P_FdVPV_7w" role="2OqNvi">
+                  <node concept="2OqwBi" id="7P_FdVPV_7x" role="25WWJ7">
+                    <node concept="37vLTw" id="7P_FdVPVMtb" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7P_FdVPV_7$" resolve="langrt" />
+                    </node>
+                    <node concept="liA8E" id="7P_FdVPV_7z" role="2OqNvi">
+                      <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages():java.util.Collection" resolve="getExtendedLanguages" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="7P_FdVPV_7$" role="1Duv9x">
+            <property role="TrG5h" value="langrt" />
+            <node concept="3uibUv" id="7P_FdVPVE4m" role="1tU5fm">
+              <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="7P_FdVPV_7A" role="1DdaDG">
+            <ref role="3cqZAo" node="7P_FdVPV_7E" resolve="langRuntimes" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="7P_FdVPV_7B" role="3cqZAp">
+          <node concept="1rXfSq" id="7P_FdVPV_7C" role="3clFbG">
+            <ref role="37wK5l" node="6UWSvq5cKtf" resolve="topoSort" />
+            <node concept="37vLTw" id="7P_FdVPV_7D" role="37wK5m">
+              <ref role="3cqZAo" node="7P_FdVPV_6S" resolve="closure" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7P_FdVPV_7E" role="3clF46">
+        <property role="TrG5h" value="langRuntimes" />
+        <node concept="A3Dl8" id="7P_FdVPWcuQ" role="1tU5fm">
+          <node concept="3uibUv" id="7P_FdVPWcuS" role="A3Ik2">
+            <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+          </node>
+        </node>
+      </node>
+      <node concept="3vKaQO" id="7P_FdVPV_7J" role="3clF45">
+        <node concept="3uibUv" id="7P_FdVPV_7K" role="3O5elw">
+          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="7P_FdVPV_7L" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="6UWSvq5b6xS" role="jymVt" />
+    <node concept="2YIFZL" id="6UWSvq5cKtf" role="jymVt">
+      <property role="TrG5h" value="topoSort" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="6UWSvq5b4Zu" role="3clF47">
+        <node concept="3cpWs8" id="6UWSvq5bi2y" role="3cqZAp">
+          <node concept="3cpWsn" id="6UWSvq5bi2C" role="3cpWs9">
+            <property role="TrG5h" value="graph" />
+            <node concept="3rvAFt" id="6UWSvq5bi2E" role="1tU5fm">
+              <node concept="3uibUv" id="6UWSvq5bi3D" role="3rvQeY">
+                <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+              </node>
+              <node concept="3uibUv" id="6UWSvq5bi4t" role="3rvSg0">
+                <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="6UWSvq5bi98" role="33vP2m">
+              <node concept="3rGOSV" id="6UWSvq5bi7Q" role="2ShVmc">
+                <node concept="3uibUv" id="6UWSvq5bi7R" role="3rHrn6">
+                  <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+                </node>
+                <node concept="3uibUv" id="6UWSvq5bi7S" role="3rHtpV">
+                  <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6UWSvq5bjVG" role="3cqZAp" />
+        <node concept="3SKdUt" id="6UWSvq5ciUe" role="3cqZAp">
+          <node concept="3SKdUq" id="6UWSvq5ciUg" role="3SKWNk">
+            <property role="3SKdUp" value="build a subgraph of language dependencies containing only languages with Type aspect" />
+          </node>
+        </node>
+        <node concept="1DcWWT" id="6UWSvq5blpe" role="3cqZAp">
+          <node concept="3clFbS" id="6UWSvq5blph" role="2LFqv$">
+            <node concept="3clFbJ" id="6UWSvq5bmUr" role="3cqZAp">
+              <node concept="3clFbS" id="6UWSvq5bmUt" role="3clFbx">
+                <node concept="3cpWs8" id="6UWSvq5bs7n" role="3cqZAp">
+                  <node concept="3cpWsn" id="6UWSvq5bs7o" role="3cpWs9">
+                    <property role="TrG5h" value="vtx" />
+                    <node concept="3uibUv" id="6UWSvq5bs7l" role="1tU5fm">
+                      <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+                    </node>
+                    <node concept="2ShNRf" id="6UWSvq5bs7p" role="33vP2m">
+                      <node concept="1pGfFk" id="6UWSvq5bs7q" role="2ShVmc">
+                        <ref role="37wK5l" node="6UWSvq5bnwr" resolve="TypeAspectDescriptor.Vtx" />
+                        <node concept="37vLTw" id="6UWSvq5bs7r" role="37wK5m">
+                          <ref role="3cqZAo" node="6UWSvq5blpi" resolve="langDesc" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="6UWSvq5borz" role="3cqZAp">
+                  <node concept="37vLTI" id="6UWSvq5bp_x" role="3clFbG">
+                    <node concept="3EllGN" id="6UWSvq5bpls" role="37vLTJ">
+                      <node concept="37vLTw" id="6UWSvq5bpoP" role="3ElVtu">
+                        <ref role="3cqZAo" node="6UWSvq5blpi" resolve="langDesc" />
+                      </node>
+                      <node concept="37vLTw" id="6UWSvq5borx" role="3ElQJh">
+                        <ref role="3cqZAo" node="6UWSvq5bi2C" resolve="graph" />
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="6UWSvq5bs7s" role="37vLTx">
+                      <ref role="3cqZAo" node="6UWSvq5bs7o" resolve="vtx" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="6UWSvq5bEvg" role="3cqZAp">
+                  <node concept="2OqwBi" id="6UWSvq5bEMY" role="3clFbG">
+                    <node concept="37vLTw" id="6UWSvq5bEve" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6UWSvq5bs7o" resolve="vtx" />
+                    </node>
+                    <node concept="liA8E" id="6UWSvq5bEUp" role="2OqNvi">
+                      <ref role="37wK5l" node="6UWSvq5bCMn" resolve="update" />
+                      <node concept="37vLTw" id="6UWSvq5bEYs" role="37wK5m">
+                        <ref role="3cqZAo" node="6UWSvq5bi2C" resolve="graph" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1Wc70l" id="6UWSvq5bpIy" role="3clFbw">
+                <node concept="3fqX7Q" id="6UWSvq5bpMb" role="3uHU7w">
+                  <node concept="2OqwBi" id="6UWSvq5bqdu" role="3fr31v">
+                    <node concept="37vLTw" id="6UWSvq5bpO7" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6UWSvq5bi2C" resolve="graph" />
+                    </node>
+                    <node concept="2Nt0df" id="6UWSvq5bqJ9" role="2OqNvi">
+                      <node concept="37vLTw" id="6UWSvq5bqMH" role="38cxEo">
+                        <ref role="3cqZAo" node="6UWSvq5blpi" resolve="langDesc" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3y3z36" id="6UWSvq5bn8R" role="3uHU7B">
+                  <node concept="2YIFZM" id="6UWSvq5bokN" role="3uHU7B">
+                    <ref role="1Pybhc" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+                    <ref role="37wK5l" node="6UWSvq5bk3i" resolve="forLanguage" />
+                    <node concept="37vLTw" id="6UWSvq5bokO" role="37wK5m">
+                      <ref role="3cqZAo" node="6UWSvq5blpi" resolve="langDesc" />
+                    </node>
+                  </node>
+                  <node concept="10Nm6u" id="6UWSvq5bna7" role="3uHU7w" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="6UWSvq5blpi" role="1Duv9x">
+            <property role="TrG5h" value="langDesc" />
+            <node concept="3uibUv" id="6UWSvq5blpm" role="1tU5fm">
+              <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="6UWSvq5blpn" role="1DdaDG">
+            <ref role="3cqZAo" node="6UWSvq5b52d" resolve="unsorted" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="6UWSvq5bqZk" role="3cqZAp" />
+        <node concept="3SKdUt" id="6UWSvq5bYkw" role="3cqZAp">
+          <node concept="3SKdUq" id="6UWSvq5bYky" role="3SKWNk">
+            <property role="3SKdUp" value="depth-first search. the vertex that is visited last moves in front of others" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6UWSvq5bI2Y" role="3cqZAp">
+          <node concept="3cpWsn" id="6UWSvq5bI31" role="3cpWs9">
+            <property role="TrG5h" value="stack" />
+            <node concept="oyxx6" id="6UWSvq5bI2V" role="1tU5fm">
+              <node concept="3uibUv" id="6UWSvq5bIaN" role="3O5elw">
+                <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="6UWSvq5bId8" role="33vP2m">
+              <node concept="2Jqq0_" id="6UWSvq5bIbX" role="2ShVmc">
+                <node concept="3uibUv" id="6UWSvq5bIbY" role="HW$YZ">
+                  <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6UWSvq5bIpb" role="3cqZAp">
+          <node concept="3cpWsn" id="6UWSvq5bIpe" role="3cpWs9">
+            <property role="TrG5h" value="sorted" />
+            <node concept="2BANLN" id="6UWSvq5bIp7" role="1tU5fm">
+              <node concept="3uibUv" id="6UWSvq5bIs_" role="_ZDj9">
+                <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="6UWSvq5bIyo" role="33vP2m">
+              <node concept="2Jqq0_" id="6UWSvq5bIxd" role="2ShVmc">
+                <node concept="3uibUv" id="6UWSvq5bIxe" role="HW$YZ">
+                  <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6UWSvq5bICu" role="3cqZAp">
+          <node concept="3cpWsn" id="6UWSvq5bICx" role="3cpWs9">
+            <property role="TrG5h" value="visited" />
+            <node concept="2hMVRd" id="6UWSvq5bICq" role="1tU5fm">
+              <node concept="3uibUv" id="6UWSvq5bIG0" role="2hN53Y">
+                <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="6UWSvq5bIKR" role="33vP2m">
+              <node concept="2i4dXS" id="6UWSvq5bIJD" role="2ShVmc">
+                <node concept="3uibUv" id="6UWSvq5bIJE" role="HW$YZ">
+                  <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1DcWWT" id="6UWSvq5bJJz" role="3cqZAp">
+          <node concept="3clFbS" id="6UWSvq5bJJA" role="2LFqv$">
+            <node concept="3clFbJ" id="6UWSvq5bK74" role="3cqZAp">
+              <node concept="3clFbS" id="6UWSvq5bK76" role="3clFbx">
+                <node concept="3N13vt" id="6UWSvq5bLNu" role="3cqZAp" />
+              </node>
+              <node concept="2OqwBi" id="6UWSvq5bKO5" role="3clFbw">
+                <node concept="37vLTw" id="6UWSvq5bK8A" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6UWSvq5bICx" resolve="visited" />
+                </node>
+                <node concept="3JPx81" id="6UWSvq5bLHD" role="2OqNvi">
+                  <node concept="37vLTw" id="6UWSvq5bLKk" role="25WWJ7">
+                    <ref role="3cqZAo" node="6UWSvq5bJJB" resolve="vtx" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="6UWSvq5bK5C" role="3cqZAp" />
+            <node concept="3clFbF" id="6UWSvq5bLQm" role="3cqZAp">
+              <node concept="2OqwBi" id="6UWSvq5bMEe" role="3clFbG">
+                <node concept="37vLTw" id="6UWSvq5bLQk" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6UWSvq5bI31" resolve="stack" />
+                </node>
+                <node concept="2ArzE6" id="6UWSvq5bOkq" role="2OqNvi">
+                  <node concept="37vLTw" id="6UWSvq5bOmK" role="25WWJ7">
+                    <ref role="3cqZAo" node="6UWSvq5bJJB" resolve="vtx" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2$JKZl" id="6UWSvq5bOrf" role="3cqZAp">
+              <node concept="3clFbS" id="6UWSvq5bOrh" role="2LFqv$">
+                <node concept="3cpWs8" id="6UWSvq5bSiU" role="3cqZAp">
+                  <node concept="3cpWsn" id="6UWSvq5bSiV" role="3cpWs9">
+                    <property role="TrG5h" value="v" />
+                    <node concept="3uibUv" id="6UWSvq5bSiH" role="1tU5fm">
+                      <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+                    </node>
+                    <node concept="2OqwBi" id="6UWSvq5bSiW" role="33vP2m">
+                      <node concept="37vLTw" id="6UWSvq5bSiX" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6UWSvq5bI31" resolve="stack" />
+                      </node>
+                      <node concept="2oR75g" id="6UWSvq5bSiY" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="1DcWWT" id="6UWSvq5bT4_" role="3cqZAp">
+                  <node concept="3clFbS" id="6UWSvq5bT4C" role="2LFqv$">
+                    <node concept="3clFbJ" id="6UWSvq5c9fo" role="3cqZAp">
+                      <node concept="3clFbS" id="6UWSvq5c9fq" role="3clFbx">
+                        <node concept="3clFbF" id="6UWSvq5bW0v" role="3cqZAp">
+                          <node concept="2OqwBi" id="6UWSvq5bWOg" role="3clFbG">
+                            <node concept="37vLTw" id="6UWSvq5bW0u" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6UWSvq5bI31" resolve="stack" />
+                            </node>
+                            <node concept="2ArzE6" id="6UWSvq5bXVm" role="2OqNvi">
+                              <node concept="37vLTw" id="6UWSvq5bXX$" role="25WWJ7">
+                                <ref role="3cqZAo" node="6UWSvq5bT4D" resolve="e" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3fqX7Q" id="6UWSvq5cb6V" role="3clFbw">
+                        <node concept="2OqwBi" id="6UWSvq5cb6X" role="3fr31v">
+                          <node concept="37vLTw" id="6UWSvq5cb6Y" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6UWSvq5bICx" resolve="visited" />
+                          </node>
+                          <node concept="3JPx81" id="6UWSvq5cb6Z" role="2OqNvi">
+                            <node concept="37vLTw" id="6UWSvq5cb70" role="25WWJ7">
+                              <ref role="3cqZAo" node="6UWSvq5bT4D" resolve="e" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWsn" id="6UWSvq5bT4D" role="1Duv9x">
+                    <property role="TrG5h" value="e" />
+                    <node concept="3uibUv" id="6UWSvq5bT4H" role="1tU5fm">
+                      <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="6UWSvq5bT4I" role="1DdaDG">
+                    <node concept="37vLTw" id="6UWSvq5bT4J" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6UWSvq5bSiV" resolve="v" />
+                    </node>
+                    <node concept="2OwXpG" id="6UWSvq5bT4K" role="2OqNvi">
+                      <ref role="2Oxat5" node="6UWSvq5brPb" resolve="extended" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="6UWSvq5cbeO" role="3cqZAp">
+                  <node concept="3clFbS" id="6UWSvq5cbeQ" role="3clFbx">
+                    <node concept="3clFbF" id="6UWSvq5c2dx" role="3cqZAp">
+                      <node concept="2OqwBi" id="6UWSvq5c3gn" role="3clFbG">
+                        <node concept="37vLTw" id="6UWSvq5c2dw" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6UWSvq5bIpe" resolve="sorted" />
+                        </node>
+                        <node concept="2Ke4WJ" id="6UWSvq5c5jG" role="2OqNvi">
+                          <node concept="37vLTw" id="6UWSvq5c5nO" role="25WWJ7">
+                            <ref role="3cqZAo" node="6UWSvq5bSiV" resolve="v" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="6UWSvq5c6Xb" role="3cqZAp">
+                      <node concept="2OqwBi" id="6UWSvq5c7xp" role="3clFbG">
+                        <node concept="37vLTw" id="6UWSvq5c6X9" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6UWSvq5bICx" resolve="visited" />
+                        </node>
+                        <node concept="TSZUe" id="6UWSvq5cj_a" role="2OqNvi">
+                          <node concept="37vLTw" id="6UWSvq5cjGN" role="25WWJ7">
+                            <ref role="3cqZAo" node="6UWSvq5bSiV" resolve="v" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="6UWSvq5c5uM" role="3cqZAp">
+                      <node concept="2OqwBi" id="6UWSvq5c6js" role="3clFbG">
+                        <node concept="37vLTw" id="6UWSvq5c5uK" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6UWSvq5bI31" resolve="stack" />
+                        </node>
+                        <node concept="2AryhJ" id="6UWSvq5c6Ss" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbC" id="6UWSvq5cdZ2" role="3clFbw">
+                    <node concept="37vLTw" id="6UWSvq5ce42" role="3uHU7w">
+                      <ref role="3cqZAo" node="6UWSvq5bSiV" resolve="v" />
+                    </node>
+                    <node concept="2OqwBi" id="6UWSvq5cch3" role="3uHU7B">
+                      <node concept="37vLTw" id="6UWSvq5cbis" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6UWSvq5bI31" resolve="stack" />
+                      </node>
+                      <node concept="2oR75g" id="6UWSvq5ccPO" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6UWSvq5bPqG" role="2$JKZa">
+                <node concept="37vLTw" id="6UWSvq5bOsV" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6UWSvq5bI31" resolve="stack" />
+                </node>
+                <node concept="3GX2aA" id="6UWSvq5bQxO" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="6UWSvq5bJJB" role="1Duv9x">
+            <property role="TrG5h" value="vtx" />
+            <node concept="3uibUv" id="6UWSvq5bJJF" role="1tU5fm">
+              <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+            </node>
+          </node>
+          <node concept="2OqwBi" id="6UWSvq5bJJG" role="1DdaDG">
+            <node concept="37vLTw" id="6UWSvq5bJJH" role="2Oq$k0">
+              <ref role="3cqZAo" node="6UWSvq5bi2C" resolve="graph" />
+            </node>
+            <node concept="T8wYR" id="6UWSvq5bJJI" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="6UWSvq5br1f" role="3cqZAp" />
+        <node concept="3clFbF" id="6UWSvq5ceJn" role="3cqZAp">
+          <node concept="2OqwBi" id="6UWSvq5ci1O" role="3clFbG">
+            <node concept="2OqwBi" id="6UWSvq5cg1e" role="2Oq$k0">
+              <node concept="37vLTw" id="6UWSvq5ceJl" role="2Oq$k0">
+                <ref role="3cqZAo" node="6UWSvq5bIpe" resolve="sorted" />
+              </node>
+              <node concept="3$u5V9" id="6UWSvq5ch8$" role="2OqNvi">
+                <node concept="1bVj0M" id="6UWSvq5ch8A" role="23t8la">
+                  <node concept="3clFbS" id="6UWSvq5ch8B" role="1bW5cS">
+                    <node concept="3clFbF" id="6UWSvq5chh3" role="3cqZAp">
+                      <node concept="2OqwBi" id="6UWSvq5chts" role="3clFbG">
+                        <node concept="37vLTw" id="6UWSvq5chh2" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6UWSvq5ch8C" resolve="it" />
+                        </node>
+                        <node concept="2OwXpG" id="6UWSvq5chFA" role="2OqNvi">
+                          <ref role="2Oxat5" node="6UWSvq5b30P" resolve="langDesc" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="6UWSvq5ch8C" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="6UWSvq5ch8D" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="ANE8D" id="6UWSvq5ciKw" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6UWSvq5b52d" role="3clF46">
+        <property role="TrG5h" value="unsorted" />
+        <node concept="3vKaQO" id="6UWSvq5bhsn" role="1tU5fm">
+          <node concept="3uibUv" id="6UWSvq5bhsK" role="3O5elw">
+            <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+          </node>
+        </node>
+      </node>
+      <node concept="3vKaQO" id="6UWSvq5bgWN" role="3clF45">
+        <node concept="3uibUv" id="6UWSvq5bhs4" role="3O5elw">
+          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6UWSvq5irkL" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="6UWSvq5b3aO" role="jymVt" />
+    <node concept="2YIFZL" id="6UWSvq5bk3i" role="jymVt">
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <property role="TrG5h" value="forLanguage" />
+      <node concept="37vLTG" id="6UWSvq5bk7O" role="3clF46">
+        <property role="TrG5h" value="lr" />
+        <node concept="3uibUv" id="6UWSvq5bk8e" role="1tU5fm">
+          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="6UWSvq5bk0u" role="3clF47">
+        <node concept="3cpWs8" id="7P_FdVQ3aAZ" role="3cqZAp">
+          <node concept="3cpWsn" id="7P_FdVQ3aB0" role="3cpWs9">
+            <property role="TrG5h" value="aspect" />
+            <node concept="3uibUv" id="7P_FdVQ3aB1" role="1tU5fm">
+              <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+            </node>
+            <node concept="2OqwBi" id="7P_FdVQ3aB2" role="33vP2m">
+              <node concept="37vLTw" id="7P_FdVQ3aB3" role="2Oq$k0">
+                <ref role="3cqZAo" node="6UWSvq5bk7O" resolve="lr" />
+              </node>
+              <node concept="liA8E" id="7P_FdVQ3aB4" role="2OqNvi">
+                <ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class):jetbrains.mps.smodel.runtime.ILanguageAspect" resolve="getAspect" />
+                <node concept="3VsKOn" id="7P_FdVQ3aB5" role="37wK5m">
+                  <ref role="3VsUkX" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="7P_FdVQ3aB6" role="3cqZAp">
+          <node concept="3clFbS" id="7P_FdVQ3aB7" role="3clFbx">
+            <node concept="3clFbF" id="7P_FdVQ3xJE" role="3cqZAp">
+              <node concept="2YIFZM" id="7P_FdVQ3xJD" role="3clFbG">
+                <ref role="1Pybhc" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+                <ref role="37wK5l" node="7P_FdVQ3wao" resolve="init" />
+                <node concept="37vLTw" id="7P_FdVQ3xJB" role="37wK5m">
+                  <ref role="3cqZAo" node="7P_FdVQ3aB0" resolve="aspect" />
+                </node>
+                <node concept="37vLTw" id="7P_FdVQ3xJC" role="37wK5m">
+                  <ref role="3cqZAo" node="6UWSvq5bk7O" resolve="lr" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="7P_FdVQ3aBp" role="3clFbw">
+            <node concept="10Nm6u" id="7P_FdVQ3aBq" role="3uHU7w" />
+            <node concept="37vLTw" id="7P_FdVQ3aBr" role="3uHU7B">
+              <ref role="3cqZAo" node="7P_FdVQ3aB0" resolve="aspect" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7P_FdVQ3q$w" role="3cqZAp">
+          <node concept="37vLTw" id="7P_FdVQ3q$u" role="3clFbG">
+            <ref role="3cqZAo" node="7P_FdVQ3aB0" resolve="aspect" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="6UWSvq5bk65" role="3clF45">
+        <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+      </node>
+      <node concept="3Tm1VV" id="6UWSvq5bk0t" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7km57Pkjxhg" role="jymVt" />
+    <node concept="2YIFZL" id="7P_FdVQ3wao" role="jymVt">
+      <property role="TrG5h" value="init" />
+      <node concept="3Tm6S6" id="7P_FdVQ3wap" role="1B3o_S" />
+      <node concept="3cqZAl" id="7P_FdVQ3waq" role="3clF45" />
+      <node concept="37vLTG" id="7P_FdVQ3w8i" role="3clF46">
+        <property role="TrG5h" value="aspect" />
+        <node concept="3uibUv" id="7P_FdVQ3w8j" role="1tU5fm">
+          <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypeAspectDescriptor" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7P_FdVQ3w8k" role="3clF46">
+        <property role="TrG5h" value="lr" />
+        <node concept="3uibUv" id="7P_FdVQ3w8l" role="1tU5fm">
+          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="7P_FdVQ3w85" role="3clF47">
+        <node concept="3clFbJ" id="7P_FdVQ3w86" role="3cqZAp">
+          <node concept="3clFbS" id="7P_FdVQ3w87" role="3clFbx">
+            <node concept="3clFbF" id="7P_FdVQ3w88" role="3cqZAp">
+              <node concept="2OqwBi" id="7P_FdVQ3w89" role="3clFbG">
+                <node concept="37vLTw" id="7P_FdVQ3wal" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7P_FdVQ3w8i" resolve="aspect" />
+                </node>
+                <node concept="liA8E" id="7P_FdVQ3w8b" role="2OqNvi">
+                  <ref role="37wK5l" node="7P_FdVQ2EWw" resolve="setLanguageRuntime" />
+                  <node concept="37vLTw" id="7P_FdVQ3waj" role="37wK5m">
+                    <ref role="3cqZAo" node="7P_FdVQ3w8k" resolve="lr" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="7P_FdVQ3w8d" role="3clFbw">
+            <node concept="10Nm6u" id="7P_FdVQ3w8e" role="3uHU7w" />
+            <node concept="2OqwBi" id="7P_FdVQ3w8f" role="3uHU7B">
+              <node concept="37vLTw" id="7P_FdVQ3wak" role="2Oq$k0">
+                <ref role="3cqZAo" node="7P_FdVQ3w8i" resolve="aspect" />
+              </node>
+              <node concept="liA8E" id="7P_FdVQ3w8h" role="2OqNvi">
+                <ref role="37wK5l" node="7P_FdVQ2VEI" resolve="languageRuntime" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPW85u" role="jymVt" />
+    <node concept="312cEu" id="6UWSvq5b2YZ" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="Vtx" />
+      <node concept="3clFbW" id="6UWSvq5bnwr" role="jymVt">
+        <node concept="37vLTG" id="6UWSvq5bny4" role="3clF46">
+          <property role="TrG5h" value="langDesc" />
+          <node concept="3uibUv" id="6UWSvq5bnyg" role="1tU5fm">
+            <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="6UWSvq5bnwt" role="3clF45" />
+        <node concept="3Tm1VV" id="6UWSvq5bnwu" role="1B3o_S" />
+        <node concept="3clFbS" id="6UWSvq5bnwv" role="3clF47">
+          <node concept="3clFbF" id="6UWSvq5bn$q" role="3cqZAp">
+            <node concept="37vLTI" id="6UWSvq5bo16" role="3clFbG">
+              <node concept="37vLTw" id="6UWSvq5bo4H" role="37vLTx">
+                <ref role="3cqZAo" node="6UWSvq5bny4" resolve="langDesc" />
+              </node>
+              <node concept="2OqwBi" id="6UWSvq5bnE0" role="37vLTJ">
+                <node concept="Xjq3P" id="6UWSvq5bn$p" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6UWSvq5bnOZ" role="2OqNvi">
+                  <ref role="2Oxat5" node="6UWSvq5b30P" resolve="langDesc" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3clFb_" id="6UWSvq5bCMn" role="jymVt">
+        <property role="TrG5h" value="update" />
+        <node concept="37vLTG" id="6UWSvq5bCMP" role="3clF46">
+          <property role="TrG5h" value="graph" />
+          <node concept="3rvAFt" id="6UWSvq5bDiX" role="1tU5fm">
+            <node concept="3uibUv" id="6UWSvq5bDiY" role="3rvQeY">
+              <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+            </node>
+            <node concept="3uibUv" id="6UWSvq5bDiZ" role="3rvSg0">
+              <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="6UWSvq5bCMp" role="3clF45" />
+        <node concept="3Tm1VV" id="6UWSvq5bCMq" role="1B3o_S" />
+        <node concept="3clFbS" id="6UWSvq5bCMr" role="3clF47">
+          <node concept="3SKdUt" id="6UWSvq5bDkW" role="3cqZAp">
+            <node concept="3SKdUq" id="6UWSvq5bDkX" role="3SKWNk">
+              <property role="3SKdUp" value="update the graph" />
+            </node>
+          </node>
+          <node concept="1DcWWT" id="6UWSvq5bDkY" role="3cqZAp">
+            <node concept="3clFbS" id="6UWSvq5bDkZ" role="2LFqv$">
+              <node concept="3clFbJ" id="6UWSvq5bDl0" role="3cqZAp">
+                <node concept="2OqwBi" id="6UWSvq5bDl1" role="3clFbw">
+                  <node concept="37vLTw" id="6UWSvq5bDl2" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6UWSvq5bCMP" resolve="graph" />
+                  </node>
+                  <node concept="2Nt0df" id="6UWSvq5bDl3" role="2OqNvi">
+                    <node concept="37vLTw" id="6UWSvq5bDl4" role="38cxEo">
+                      <ref role="3cqZAo" node="6UWSvq5bDlf" resolve="extends_" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbS" id="6UWSvq5bDl5" role="3clFbx">
+                  <node concept="3clFbF" id="6UWSvq5bDl6" role="3cqZAp">
+                    <node concept="2OqwBi" id="6UWSvq5bDl7" role="3clFbG">
+                      <node concept="2OqwBi" id="6UWSvq5bDl8" role="2Oq$k0">
+                        <node concept="Xjq3P" id="6UWSvq5bDWo" role="2Oq$k0" />
+                        <node concept="2OwXpG" id="6UWSvq5bDla" role="2OqNvi">
+                          <ref role="2Oxat5" node="6UWSvq5brPb" resolve="extended" />
+                        </node>
+                      </node>
+                      <node concept="TSZUe" id="6UWSvq5bDlb" role="2OqNvi">
+                        <node concept="3EllGN" id="6UWSvq5bDlc" role="25WWJ7">
+                          <node concept="37vLTw" id="6UWSvq5bDld" role="3ElVtu">
+                            <ref role="3cqZAo" node="6UWSvq5bDlf" resolve="extends_" />
+                          </node>
+                          <node concept="37vLTw" id="6UWSvq5bDle" role="3ElQJh">
+                            <ref role="3cqZAo" node="6UWSvq5bCMP" resolve="graph" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWsn" id="6UWSvq5bDlf" role="1Duv9x">
+              <property role="TrG5h" value="extends_" />
+              <node concept="3uibUv" id="6UWSvq5bDlg" role="1tU5fm">
+                <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6UWSvq5bDlh" role="1DdaDG">
+              <node concept="37vLTw" id="6UWSvq5bDli" role="2Oq$k0">
+                <ref role="3cqZAo" node="6UWSvq5b30P" resolve="langDesc" />
+              </node>
+              <node concept="liA8E" id="6UWSvq5bDlj" role="2OqNvi">
+                <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages():java.util.Collection" resolve="getExtendedLanguages" />
+              </node>
+            </node>
+          </node>
+          <node concept="1DcWWT" id="6UWSvq5bDlk" role="3cqZAp">
+            <node concept="3clFbS" id="6UWSvq5bDll" role="2LFqv$">
+              <node concept="3clFbJ" id="6UWSvq5bDlm" role="3cqZAp">
+                <node concept="2OqwBi" id="6UWSvq5bDln" role="3clFbw">
+                  <node concept="37vLTw" id="6UWSvq5bDlo" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6UWSvq5bCMP" resolve="graph" />
+                  </node>
+                  <node concept="2Nt0df" id="6UWSvq5bDlp" role="2OqNvi">
+                    <node concept="37vLTw" id="6UWSvq5bDlq" role="38cxEo">
+                      <ref role="3cqZAo" node="6UWSvq5bDl_" resolve="extendedBy" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbS" id="6UWSvq5bDlr" role="3clFbx">
+                  <node concept="3clFbF" id="6UWSvq5bDls" role="3cqZAp">
+                    <node concept="2OqwBi" id="6UWSvq5bDlt" role="3clFbG">
+                      <node concept="2OqwBi" id="6UWSvq5bDlu" role="2Oq$k0">
+                        <node concept="3EllGN" id="6UWSvq5bDlv" role="2Oq$k0">
+                          <node concept="37vLTw" id="6UWSvq5bDlw" role="3ElVtu">
+                            <ref role="3cqZAo" node="6UWSvq5bDl_" resolve="extendedBy" />
+                          </node>
+                          <node concept="37vLTw" id="6UWSvq5bDlx" role="3ElQJh">
+                            <ref role="3cqZAo" node="6UWSvq5bCMP" resolve="graph" />
+                          </node>
+                        </node>
+                        <node concept="2OwXpG" id="6UWSvq5bDly" role="2OqNvi">
+                          <ref role="2Oxat5" node="6UWSvq5brPb" resolve="extended" />
+                        </node>
+                      </node>
+                      <node concept="TSZUe" id="6UWSvq5bDlz" role="2OqNvi">
+                        <node concept="Xjq3P" id="6UWSvq5bE6d" role="25WWJ7" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWsn" id="6UWSvq5bDl_" role="1Duv9x">
+              <property role="TrG5h" value="extendedBy" />
+              <node concept="3uibUv" id="6UWSvq5bDlA" role="1tU5fm">
+                <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="6UWSvq5bDlB" role="1DdaDG">
+              <node concept="37vLTw" id="6UWSvq5bDlC" role="2Oq$k0">
+                <ref role="3cqZAo" node="6UWSvq5b30P" resolve="langDesc" />
+              </node>
+              <node concept="liA8E" id="6UWSvq5bDlD" role="2OqNvi">
+                <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendingLanguages():java.lang.Iterable" resolve="getExtendingLanguages" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6UWSvq5bCxc" role="jymVt" />
+      <node concept="312cEg" id="6UWSvq5b30P" role="jymVt">
+        <property role="TrG5h" value="langDesc" />
+        <node concept="3Tm6S6" id="6UWSvq5b30Q" role="1B3o_S" />
+        <node concept="3uibUv" id="6UWSvq5bjln" role="1tU5fm">
+          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+        </node>
+      </node>
+      <node concept="312cEg" id="6UWSvq5brPb" role="jymVt">
+        <property role="TrG5h" value="extended" />
+        <node concept="3Tm6S6" id="6UWSvq5brPc" role="1B3o_S" />
+        <node concept="_YKpA" id="6UWSvq5bs2U" role="1tU5fm">
+          <node concept="3uibUv" id="6UWSvq5bs3c" role="_ZDj9">
+            <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+          </node>
+        </node>
+        <node concept="2ShNRf" id="6UWSvq5cmEt" role="33vP2m">
+          <node concept="Tc6Ow" id="6UWSvq5cmCP" role="2ShVmc">
+            <node concept="3uibUv" id="6UWSvq5cmCQ" role="HW$YZ">
+              <ref role="3uigEE" node="6UWSvq5b2YZ" resolve="TypeAspectDescriptor.Vtx" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="6UWSvq5cjOk" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7P_FdVPVubi" role="jymVt" />
+    <node concept="312cEg" id="7P_FdVQ2BHb" role="jymVt">
+      <property role="TrG5h" value="languageRuntime" />
+      <node concept="3Tm6S6" id="7P_FdVQ2BHc" role="1B3o_S" />
+      <node concept="3uibUv" id="7P_FdVQ4cOz" role="1tU5fm">
+        <ref role="3uigEE" to="i5cy:~AtomicReference" resolve="AtomicReference" />
+        <node concept="3uibUv" id="7P_FdVQ4d7k" role="11_B2D">
+          <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7P_FdVQ4diU" role="33vP2m">
+        <node concept="1pGfFk" id="7P_FdVQ4dhf" role="2ShVmc">
+          <ref role="37wK5l" to="i5cy:~AtomicReference.&lt;init&gt;(java.lang.Object)" resolve="AtomicReference" />
+          <node concept="10Nm6u" id="7P_FdVQ4du3" role="37wK5m" />
+          <node concept="3uibUv" id="7P_FdVQ4dhg" role="1pMfVU">
+            <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3Tm1VV" id="7km57Pkjxf5" role="1B3o_S" />
     <node concept="3uibUv" id="7km57PkjxgV" role="EKbjA">
       <ref role="3uigEE" to="ze1i:~ILanguageAspect" resolve="ILanguageAspect" />
     </node>
+    <node concept="3UR2Jj" id="7P_FdVPWD2k" role="lGtFl">
+      <node concept="TZ5HA" id="7P_FdVPWD2l" role="TZ5H$">
+        <node concept="1dT_AC" id="7P_FdVPWD2m" role="1dT_Ay">
+          <property role="1dT_AB" value="All allFor* methods return the list sorted in topological order, so that the extending" />
+        </node>
+      </node>
+      <node concept="TZ5HA" id="7P_FdVPWEBW" role="TZ5H$">
+        <node concept="1dT_AC" id="7P_FdVPWEBX" role="1dT_Ay">
+          <property role="1dT_AB" value="aspects come first. " />
+        </node>
+      </node>
+    </node>
   </node>
 </model>