From 1bb87638162cf437db3a8b0e481f69b9f848d376 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 14 May 2021 19:14:29 +0200
Subject: [PATCH] Refactor AspectLookup to depend on repository, cache results

---
 build.xml                                     |    2 +
 .../models/jetbrains.mps.coderules.build.mps  |    5 +
 .../jetbrains.mps.coderules.aspect@tests.mps  |   19 +
 ...ains.mps.coderules.testhelper.testutil.mps |   25 +-
 ...rains.mps.coderules.typechecking@tests.mps |   23 +-
 ...s.mps.coderules.typechecking.ui.plugin.mps |   79 +-
 ...ins.mps.coderules.typechecking.service.mps |   30 +-
 .../jetbrains.mps.coderules/models/plugin.mps |   25 +
 .../models/plugin.mps                         |   42 +-
 .../jetbrains.mps.lang.coderules.template.msd |    1 +
 .../jetbrains.mps.lang.coderules.aspect.mps   | 1009 +++++++++++++++--
 .../jetbrains.mps.lang.controlflow.aspect.mps |   68 +-
 ...jetbrains.mps.lang.typechecking.aspect.mps |   70 +-
 13 files changed, 1094 insertions(+), 304 deletions(-)

diff --git a/build.xml b/build.xml
index fdbce08c..d7669265 100644
--- a/build.xml
+++ b/build.xml
@@ -628,6 +628,7 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" kind="cl" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
@@ -1818,6 +1819,7 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
+          <module ref="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" kind="cl" />
           <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
           <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
           <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index 8704014d..2011020c 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -2655,6 +2655,11 @@
             <ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="IFW4V2Rmqp" role="3bR37C">
+          <node concept="3bR9La" id="IFW4V2Rmqq" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUxee" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps
index 8c46999e..27aed61d 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps
@@ -2228,6 +2228,25 @@
   <node concept="312cEu" id="6nx4rRkXZkf">
     <property role="TrG5h" value="MockAspectDiscoverable" />
     <node concept="2tJIrI" id="6nx4rRkXZmo" role="jymVt" />
+    <node concept="3clFb_" id="IFW4V2y54C" role="jymVt">
+      <property role="TrG5h" value="aspectClass" />
+      <node concept="3uibUv" id="IFW4V2y54D" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+        <node concept="3uibUv" id="IFW4V2y54H" role="11_B2D">
+          <ref role="3uigEE" node="6nx4rRkXZmQ" resolve="MockLanguageAspect" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="IFW4V2y54F" role="1B3o_S" />
+      <node concept="3clFbS" id="IFW4V2y54I" role="3clF47">
+        <node concept="3clFbF" id="IFW4V2y54L" role="3cqZAp">
+          <node concept="10Nm6u" id="IFW4V2y54K" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="IFW4V2y54J" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="IFW4V2y4M_" role="jymVt" />
     <node concept="3clFb_" id="6nx4rRkXZ$Y" role="jymVt">
       <property role="TrG5h" value="discover" />
       <node concept="37vLTG" id="6nx4rRkXZ$Z" role="3clF46">
diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
index 734d7f97..4457f827 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
@@ -1268,6 +1268,9 @@
                   <node concept="2YIFZM" id="5SC$dmozDc5" role="2Oq$k0">
                     <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
                     <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+                    <node concept="37vLTw" id="IFW4V2stHa" role="37wK5m">
+                      <ref role="3cqZAo" node="WJTIIoJUru" resolve="repo" />
+                    </node>
                   </node>
                   <node concept="liA8E" id="5SC$dmozDc6" role="2OqNvi">
                     <ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
@@ -1279,9 +1282,6 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="37vLTw" id="5SC$dmozDcb" role="37wK5m">
-                      <ref role="3cqZAo" node="WJTIIoJUru" resolve="repo" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -1398,14 +1398,19 @@
                   <node concept="37vLTw" id="5SC$dmozUZb" role="37vLTJ">
                     <ref role="3cqZAo" node="5SC$dmouktP" resolve="acs" />
                   </node>
-                  <node concept="2YIFZM" id="3KN3A4v4YzG" role="37vLTx">
-                    <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
-                    <ref role="37wK5l" to="u46i:7P_FdVPW9uU" resolve="allForModel" />
-                    <node concept="37vLTw" id="3KN3A4v4YzH" role="37wK5m">
-                      <ref role="3cqZAo" node="WJTIIoJU9x" resolve="model" />
+                  <node concept="2OqwBi" id="IFW4V2EfI2" role="37vLTx">
+                    <node concept="2YIFZM" id="IFW4V2E4Al" role="2Oq$k0">
+                      <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
+                      <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+                      <node concept="37vLTw" id="IFW4V2E4An" role="37wK5m">
+                        <ref role="3cqZAo" node="WJTIIoJUru" resolve="repo" />
+                      </node>
                     </node>
-                    <node concept="37vLTw" id="3KN3A4v4YzI" role="37wK5m">
-                      <ref role="3cqZAo" node="WJTIIoJUru" resolve="repo" />
+                    <node concept="liA8E" id="IFW4V2EiLE" role="2OqNvi">
+                      <ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
+                      <node concept="37vLTw" id="IFW4V2Ek49" role="37wK5m">
+                        <ref role="3cqZAo" node="WJTIIoJU9x" resolve="model" />
+                      </node>
                     </node>
                   </node>
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index e4b0d94c..274bf584 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -3083,17 +3083,22 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="2YIFZM" id="3KN3A4v4Q8U" role="33vP2m">
-                    <ref role="37wK5l" to="u46i:7P_FdVPW9uU" resolve="allForModel" />
-                    <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
-                    <node concept="2OqwBi" id="3KN3A4v4Q8V" role="37wK5m">
-                      <node concept="37vLTw" id="3KN3A4v4Q8W" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7mB3viLf32I" resolve="demo" />
+                  <node concept="2OqwBi" id="IFW4V2EoXu" role="33vP2m">
+                    <node concept="2YIFZM" id="IFW4V2Eovi" role="2Oq$k0">
+                      <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
+                      <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+                      <node concept="37vLTw" id="IFW4V2Eovj" role="37wK5m">
+                        <ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
                       </node>
-                      <node concept="I4A8Y" id="3KN3A4v4Q8X" role="2OqNvi" />
                     </node>
-                    <node concept="37vLTw" id="3KN3A4v4Q8Y" role="37wK5m">
-                      <ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
+                    <node concept="liA8E" id="IFW4V2EpHM" role="2OqNvi">
+                      <ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
+                      <node concept="2OqwBi" id="3KN3A4v4Q8V" role="37wK5m">
+                        <node concept="37vLTw" id="3KN3A4v4Q8W" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7mB3viLf32I" resolve="demo" />
+                        </node>
+                        <node concept="I4A8Y" id="3KN3A4v4Q8X" role="2OqNvi" />
+                      </node>
                     </node>
                   </node>
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index b37712a6..9b819250 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -1104,24 +1104,29 @@
                 </node>
               </node>
             </node>
-            <node concept="2YIFZM" id="3KN3A4v4yZV" role="33vP2m">
-              <ref role="37wK5l" to="u46i:7P_FdVPW9uU" resolve="allForModel" />
-              <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
-              <node concept="2OqwBi" id="3KN3A4v4yZW" role="37wK5m">
-                <node concept="37vLTw" id="3KN3A4v4yZX" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3YJ7yg2LDWz" resolve="containingRoot" />
-                </node>
-                <node concept="I4A8Y" id="3KN3A4v4yZY" role="2OqNvi" />
-              </node>
-              <node concept="2OqwBi" id="3KN3A4v4yZZ" role="37wK5m">
-                <node concept="2OqwBi" id="3KN3A4v4z00" role="2Oq$k0">
-                  <node concept="2WthIp" id="3KN3A4v4z01" role="2Oq$k0" />
-                  <node concept="1DTwFV" id="3KN3A4v4z02" role="2OqNvi">
-                    <ref role="2WH_rO" node="3YJ7yg2LgUn" resolve="mpsProject" />
+            <node concept="2OqwBi" id="IFW4V2ErZ7" role="33vP2m">
+              <node concept="2YIFZM" id="IFW4V2ErB$" role="2Oq$k0">
+                <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
+                <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+                <node concept="2OqwBi" id="IFW4V2ErB_" role="37wK5m">
+                  <node concept="2OqwBi" id="IFW4V2ErBA" role="2Oq$k0">
+                    <node concept="2WthIp" id="IFW4V2ErBB" role="2Oq$k0" />
+                    <node concept="1DTwFV" id="IFW4V2ErBC" role="2OqNvi">
+                      <ref role="2WH_rO" node="3YJ7yg2LgUn" resolve="mpsProject" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="IFW4V2ErBD" role="2OqNvi">
+                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                   </node>
                 </node>
-                <node concept="liA8E" id="3KN3A4v4z03" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+              </node>
+              <node concept="liA8E" id="IFW4V2EsEi" role="2OqNvi">
+                <ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
+                <node concept="2OqwBi" id="3KN3A4v4yZW" role="37wK5m">
+                  <node concept="37vLTw" id="3KN3A4v4yZX" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3YJ7yg2LDWz" resolve="containingRoot" />
+                  </node>
+                  <node concept="I4A8Y" id="3KN3A4v4yZY" role="2OqNvi" />
                 </node>
               </node>
             </node>
@@ -1899,21 +1904,26 @@
                 </node>
               </node>
             </node>
-            <node concept="2YIFZM" id="NKt6yomRVQ" role="33vP2m">
-              <ref role="37wK5l" to="u46i:7P_FdVPW9uU" resolve="allForModel" />
-              <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
-              <node concept="2OqwBi" id="7WKNeR8ULi3" role="37wK5m">
-                <node concept="37vLTw" id="7WKNeR8ULi4" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6hqFpWnfbDy" resolve="containingRoot" />
+            <node concept="2OqwBi" id="IFW4V2Exws" role="33vP2m">
+              <node concept="2YIFZM" id="IFW4V2Ewyh" role="2Oq$k0">
+                <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
+                <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+                <node concept="2OqwBi" id="IFW4V2Ewyi" role="37wK5m">
+                  <node concept="37vLTw" id="IFW4V2Ewyj" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
+                  </node>
+                  <node concept="liA8E" id="IFW4V2Ewyk" role="2OqNvi">
+                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                  </node>
                 </node>
-                <node concept="I4A8Y" id="7WKNeR8ULi5" role="2OqNvi" />
               </node>
-              <node concept="2OqwBi" id="7WKNeR8ULi6" role="37wK5m">
-                <node concept="37vLTw" id="7WKNeR8ULi7" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
-                </node>
-                <node concept="liA8E" id="7WKNeR8ULi8" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+              <node concept="liA8E" id="IFW4V2ExUQ" role="2OqNvi">
+                <ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
+                <node concept="2OqwBi" id="7WKNeR8ULi3" role="37wK5m">
+                  <node concept="37vLTw" id="7WKNeR8ULi4" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6hqFpWnfbDy" resolve="containingRoot" />
+                  </node>
+                  <node concept="I4A8Y" id="7WKNeR8ULi5" role="2OqNvi" />
                 </node>
               </node>
             </node>
@@ -3062,6 +3072,9 @@
               <node concept="2YIFZM" id="3KN3A4vDf1H" role="33vP2m">
                 <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
                 <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+                <node concept="37vLTw" id="IFW4V2ttEc" role="37wK5m">
+                  <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
+                </node>
               </node>
             </node>
           </node>
@@ -3077,14 +3090,6 @@
                   <node concept="37vLTw" id="3KN3A4vDlEm" role="37wK5m">
                     <ref role="3cqZAo" node="6hqFpWnfpcc" resolve="nodes" />
                   </node>
-                  <node concept="2OqwBi" id="3KN3A4vDlEo" role="37wK5m">
-                    <node concept="37vLTw" id="3KN3A4vDlEp" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
-                    </node>
-                    <node concept="liA8E" id="3KN3A4vDlEq" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                    </node>
-                  </node>
                 </node>
               </node>
               <node concept="3uibUv" id="3KN3A4vDl$Q" role="1tU5fm">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index ac91bde0..46744e23 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -11035,6 +11035,9 @@
               <node concept="2YIFZM" id="7i3KM7gwh3a" role="2Oq$k0">
                 <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
                 <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+                <node concept="37vLTw" id="IFW4V2s$Li" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
               </node>
               <node concept="liA8E" id="3KN3A4vFhfh" role="2OqNvi">
                 <ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
@@ -11044,9 +11047,6 @@
                   </node>
                   <node concept="I4A8Y" id="3KN3A4vFhfk" role="2OqNvi" />
                 </node>
-                <node concept="37vLTw" id="3KN3A4vFhfl" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-                </node>
               </node>
             </node>
           </node>
@@ -11134,6 +11134,9 @@
               <node concept="2YIFZM" id="2hQbw6I7Ego" role="2Oq$k0">
                 <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
                 <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+                <node concept="37vLTw" id="IFW4V2sJsw" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
               </node>
               <node concept="liA8E" id="2hQbw6I7Egp" role="2OqNvi">
                 <ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
@@ -11145,9 +11148,6 @@
                     </node>
                   </node>
                 </node>
-                <node concept="37vLTw" id="2hQbw6I7Egt" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-                </node>
               </node>
             </node>
           </node>
@@ -11231,15 +11231,15 @@
               <node concept="2YIFZM" id="156bt08TbiK" role="2Oq$k0">
                 <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
                 <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+                <node concept="37vLTw" id="IFW4V2sSWI" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
               </node>
               <node concept="liA8E" id="156bt08TbiL" role="2OqNvi">
                 <ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
                 <node concept="37vLTw" id="156bt08Qxmc" role="37wK5m">
                   <ref role="3cqZAo" node="156bt08QxlR" resolve="nodes" />
                 </node>
-                <node concept="37vLTw" id="156bt08TbiN" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-                </node>
               </node>
             </node>
           </node>
@@ -11318,15 +11318,15 @@
               <node concept="2YIFZM" id="7i3KM7gwmJg" role="2Oq$k0">
                 <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
                 <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
+                <node concept="37vLTw" id="IFW4V2tcXr" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
               </node>
               <node concept="liA8E" id="7i3KM7gvgs5" role="2OqNvi">
                 <ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
                 <node concept="37vLTw" id="7i3KM7gvgs6" role="37wK5m">
                   <ref role="3cqZAo" node="3KN3A4vEXnm" resolve="nodes" />
                 </node>
-                <node concept="37vLTw" id="7i3KM7gvgs7" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-                </node>
               </node>
             </node>
           </node>
@@ -11399,6 +11399,9 @@
               <node concept="2YIFZM" id="4XsNDZY9Lqt" role="2Oq$k0">
                 <ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
                 <ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
+                <node concept="37vLTw" id="IFW4V2tnJT" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
               </node>
               <node concept="liA8E" id="4XsNDZY9Lqu" role="2OqNvi">
                 <ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
@@ -11410,9 +11413,6 @@
                     </node>
                   </node>
                 </node>
-                <node concept="37vLTw" id="4XsNDZY9Lqz" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-                </node>
               </node>
             </node>
           </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
index 5ef395cc..e9ed39aa 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
@@ -34,6 +34,7 @@
     <import index="1yqb" ref="r:bd76f794-cfad-45dd-9c1c-e3203d1c5c7a(jetbrains.mps.coderules.service)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="i5cy" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.atomic(JDK/)" />
+    <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" implicit="true" />
   </imports>
   <registry>
@@ -8342,5 +8343,29 @@
     </node>
     <node concept="3Tm1VV" id="39eNUjm3TK_" role="1B3o_S" />
   </node>
+  <node concept="2uRRBC" id="IFW4V2uR81">
+    <property role="3GE5qa" value="lifecycle" />
+    <property role="TrG5h" value="AspectLookupLifecycle" />
+    <node concept="2uRRBj" id="IFW4V2uR82" role="2uRRBE">
+      <node concept="3clFbS" id="IFW4V2uR83" role="2VODD2">
+        <node concept="3clFbF" id="IFW4V2uR84" role="3cqZAp">
+          <node concept="2YIFZM" id="IFW4V2uR85" role="3clFbG">
+            <ref role="1Pybhc" to="fqlx:IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
+            <ref role="37wK5l" to="fqlx:IFW4V2uAhM" resolve="init" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2uRRBI" id="IFW4V2uR86" role="2uRRBF">
+      <node concept="3clFbS" id="IFW4V2uR87" role="2VODD2">
+        <node concept="3clFbF" id="IFW4V2uRwY" role="3cqZAp">
+          <node concept="2YIFZM" id="IFW4V2uRy4" role="3clFbG">
+            <ref role="37wK5l" to="fqlx:IFW4V2uCEF" resolve="dispose" />
+            <ref role="1Pybhc" to="fqlx:IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index 65210a88..36f3e4ee 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -452,21 +452,26 @@
                 </node>
               </node>
             </node>
-            <node concept="2YIFZM" id="78H58oetzW2" role="33vP2m">
-              <ref role="37wK5l" to="vrzs:7P_FdVPW9uU" resolve="allForModel" />
-              <ref role="1Pybhc" to="vrzs:7km57Pkjxf4" resolve="ControlflowAspect" />
-              <node concept="2OqwBi" id="78H58oetzW3" role="37wK5m">
-                <node concept="37vLTw" id="78H58oetzW4" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6hqFpWnfbDy" resolve="containingRoot" />
+            <node concept="2OqwBi" id="IFW4V2DCrd" role="33vP2m">
+              <node concept="2YIFZM" id="IFW4V2DBO6" role="2Oq$k0">
+                <ref role="37wK5l" to="vrzs:78H58oeCBNZ" resolve="aspectLookup" />
+                <ref role="1Pybhc" to="vrzs:7km57Pkjxf4" resolve="ControlflowAspect" />
+                <node concept="2OqwBi" id="IFW4V2DBOa" role="37wK5m">
+                  <node concept="37vLTw" id="IFW4V2DBOb" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
+                  </node>
+                  <node concept="liA8E" id="IFW4V2DBOc" role="2OqNvi">
+                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                  </node>
                 </node>
-                <node concept="I4A8Y" id="78H58oetzW5" role="2OqNvi" />
               </node>
-              <node concept="2OqwBi" id="78H58oetzW6" role="37wK5m">
-                <node concept="37vLTw" id="78H58oetzW7" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
-                </node>
-                <node concept="liA8E" id="78H58oetzW8" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+              <node concept="liA8E" id="IFW4V2DCTu" role="2OqNvi">
+                <ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
+                <node concept="2OqwBi" id="IFW4V2DBO7" role="37wK5m">
+                  <node concept="37vLTw" id="IFW4V2DBO8" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6hqFpWnfbDy" resolve="containingRoot" />
+                  </node>
+                  <node concept="I4A8Y" id="IFW4V2DBO9" role="2OqNvi" />
                 </node>
               </node>
             </node>
@@ -885,6 +890,9 @@
               <node concept="2YIFZM" id="3KN3A4vD2Js" role="33vP2m">
                 <ref role="37wK5l" to="vrzs:78H58oeCBNZ" resolve="aspectLookup" />
                 <ref role="1Pybhc" to="vrzs:7km57Pkjxf4" resolve="ControlflowAspect" />
+                <node concept="37vLTw" id="IFW4V2tyj5" role="37wK5m">
+                  <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
+                </node>
               </node>
             </node>
           </node>
@@ -908,14 +916,6 @@
                   <node concept="37vLTw" id="3KN3A4vD8om" role="37wK5m">
                     <ref role="3cqZAo" node="6hqFpWnfpcc" resolve="nodes" />
                   </node>
-                  <node concept="2OqwBi" id="3KN3A4vDcVU" role="37wK5m">
-                    <node concept="37vLTw" id="3KN3A4vDc5s" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
-                    </node>
-                    <node concept="liA8E" id="3KN3A4vDe3E" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                    </node>
-                  </node>
                 </node>
               </node>
             </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
index b56ccd08..86800da6 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
@@ -19,6 +19,7 @@
     <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
     <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
+    <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
index 59c79508..f43369ee 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -20,6 +20,9 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
+    <import index="mpcv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.ref(JDK/)" />
+    <import index="z8iw" ref="r:dfdf3542-dbcf-43df-870a-3c3504b3c840(jetbrains.mps.baseLanguage.collections.custom)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -163,6 +166,7 @@
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
+      <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
       <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" />
@@ -318,12 +322,16 @@
         <child id="1197687026896" name="keyType" index="3rHrn6" />
         <child id="1197687035757" name="valueType" index="3rHtpV" />
       </concept>
+      <concept id="1576845966386891367" name="jetbrains.mps.baseLanguage.collections.structure.CustomMapCreator" flags="nn" index="1u7pXE">
+        <reference id="1576845966386891370" name="containerDeclaration" index="1u7pXB" />
+      </concept>
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
         <child id="1240687658305" name="delimiter" index="3uJOhx" />
       </concept>
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
+      <concept id="1208542034276" name="jetbrains.mps.baseLanguage.collections.structure.MapClearOperation" flags="nn" index="1yHZxX" />
       <concept id="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" />
@@ -341,6 +349,18 @@
   <node concept="3HP615" id="NKt6ynom3d">
     <property role="TrG5h" value="AspectDiscoverable" />
     <node concept="2tJIrI" id="NKt6ynombm" role="jymVt" />
+    <node concept="3clFb_" id="IFW4V2y3RP" role="jymVt">
+      <property role="TrG5h" value="aspectClass" />
+      <node concept="3uibUv" id="IFW4V2y41p" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+        <node concept="16syzq" id="IFW4V2y42X" role="11_B2D">
+          <ref role="16sUi3" node="NKt6ynomvO" resolve="T" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="IFW4V2y3RS" role="1B3o_S" />
+      <node concept="3clFbS" id="IFW4V2y3RT" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="IFW4V2y3PN" role="jymVt" />
     <node concept="3clFb_" id="NKt6ynombB" role="jymVt">
       <property role="TrG5h" value="discover" />
       <node concept="37vLTG" id="NKt6ynomn_" role="3clF46">
@@ -448,6 +468,12 @@
     <node concept="2tJIrI" id="NKt6ynosjc" role="jymVt" />
     <node concept="2YIFZL" id="78H58oefSjC" role="jymVt">
       <property role="TrG5h" value="lookup" />
+      <node concept="37vLTG" id="IFW4V2tz0u" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="IFW4V2tAju" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
       <node concept="37vLTG" id="78H58oefUc4" role="3clF46">
         <property role="TrG5h" value="discoverable" />
         <node concept="3uibUv" id="78H58oefUcY" role="1tU5fm">
@@ -468,16 +494,15 @@
       </node>
       <node concept="3Tm1VV" id="78H58oefSjF" role="1B3o_S" />
       <node concept="3clFbS" id="78H58oefSjG" role="3clF47">
-        <node concept="3clFbF" id="78H58oefUrm" role="3cqZAp">
-          <node concept="2ShNRf" id="78H58oefUrk" role="3clFbG">
-            <node concept="1pGfFk" id="78H58oefUNA" role="2ShVmc">
-              <ref role="37wK5l" node="NKt6yno$sR" resolve="AspectLookup" />
-              <node concept="37vLTw" id="78H58oefUXe" role="37wK5m">
-                <ref role="3cqZAo" node="78H58oefUc4" resolve="discoverable" />
-              </node>
-              <node concept="16syzq" id="78H58oefV3C" role="1pMfVU">
-                <ref role="16sUi3" node="78H58oefU3u" resolve="T" />
-              </node>
+        <node concept="3clFbF" id="IFW4V2wWY5" role="3cqZAp">
+          <node concept="2YIFZM" id="IFW4V2wXaa" role="3clFbG">
+            <ref role="37wK5l" node="IFW4V2wWnq" resolve="getLookup" />
+            <ref role="1Pybhc" node="IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
+            <node concept="37vLTw" id="IFW4V2uQ8k" role="37wK5m">
+              <ref role="3cqZAo" node="IFW4V2tz0u" resolve="repository" />
+            </node>
+            <node concept="37vLTw" id="IFW4V2uQID" role="37wK5m">
+              <ref role="3cqZAo" node="78H58oefUc4" resolve="discoverable" />
             </node>
           </node>
         </node>
@@ -490,7 +515,501 @@
       </node>
     </node>
     <node concept="2tJIrI" id="78H58oefOMp" role="jymVt" />
+    <node concept="312cEu" id="IFW4V2uswu" role="jymVt">
+      <property role="TrG5h" value="AspectLookupCoordinator" />
+      <node concept="2tJIrI" id="IFW4V2usAK" role="jymVt" />
+      <node concept="Wx3nA" id="IFW4V2wTPx" role="jymVt">
+        <property role="TrG5h" value="INSTANCES" />
+        <node concept="3rvAFt" id="IFW4V2wSvw" role="1tU5fm">
+          <node concept="3uibUv" id="IFW4V2wSyN" role="3rvQeY">
+            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+          </node>
+          <node concept="3uibUv" id="IFW4V2wU9F" role="3rvSg0">
+            <ref role="3uigEE" node="IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
+          </node>
+        </node>
+        <node concept="3Tm6S6" id="IFW4V2wSca" role="1B3o_S" />
+        <node concept="2ShNRf" id="IFW4V2wU_8" role="33vP2m">
+          <node concept="1pGfFk" id="IFW4V2wV36" role="2ShVmc">
+            <ref role="37wK5l" to="33ny:~IdentityHashMap.&lt;init&gt;()" resolve="IdentityHashMap" />
+            <node concept="3uibUv" id="IFW4V2wVl8" role="1pMfVU">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="3uibUv" id="IFW4V2wVGf" role="1pMfVU">
+              <ref role="3uigEE" node="IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="IFW4V2uzwA" role="jymVt" />
+      <node concept="2YIFZL" id="IFW4V2uAhM" role="jymVt">
+        <property role="TrG5h" value="init" />
+        <node concept="3clFbS" id="IFW4V2uA0L" role="3clF47">
+          <node concept="3clFbJ" id="IFW4V2uADS" role="3cqZAp">
+            <node concept="3clFbC" id="IFW4V2uAZv" role="3clFbw">
+              <node concept="10Nm6u" id="IFW4V2uB0R" role="3uHU7w" />
+              <node concept="37vLTw" id="IFW4V2wXOf" role="3uHU7B">
+                <ref role="3cqZAo" node="IFW4V2wTPx" resolve="INSTANCES" />
+              </node>
+            </node>
+            <node concept="3clFbS" id="IFW4V2uADU" role="3clFbx">
+              <node concept="3clFbF" id="IFW4V2uB4u" role="3cqZAp">
+                <node concept="37vLTI" id="IFW4V2uBbp" role="3clFbG">
+                  <node concept="37vLTw" id="IFW4V2wXQV" role="37vLTJ">
+                    <ref role="3cqZAo" node="IFW4V2wTPx" resolve="INSTANCES" />
+                  </node>
+                  <node concept="2ShNRf" id="IFW4V2wXUn" role="37vLTx">
+                    <node concept="1pGfFk" id="IFW4V2wXUo" role="2ShVmc">
+                      <ref role="37wK5l" to="33ny:~IdentityHashMap.&lt;init&gt;()" resolve="IdentityHashMap" />
+                      <node concept="3uibUv" id="IFW4V2wXUp" role="1pMfVU">
+                        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                      </node>
+                      <node concept="3uibUv" id="IFW4V2wXUq" role="1pMfVU">
+                        <ref role="3uigEE" node="IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="IFW4V2uA0J" role="3clF45" />
+        <node concept="3Tm1VV" id="IFW4V2uA0K" role="1B3o_S" />
+      </node>
+      <node concept="2tJIrI" id="IFW4V2uCai" role="jymVt" />
+      <node concept="2YIFZL" id="IFW4V2uCEF" role="jymVt">
+        <property role="TrG5h" value="dispose" />
+        <node concept="3clFbS" id="IFW4V2uCnP" role="3clF47">
+          <node concept="3clFbJ" id="IFW4V2uDix" role="3cqZAp">
+            <node concept="3y3z36" id="IFW4V2uDD_" role="3clFbw">
+              <node concept="10Nm6u" id="IFW4V2uDJN" role="3uHU7w" />
+              <node concept="37vLTw" id="IFW4V2wYhm" role="3uHU7B">
+                <ref role="3cqZAo" node="IFW4V2wTPx" resolve="INSTANCES" />
+              </node>
+            </node>
+            <node concept="3clFbS" id="IFW4V2uDiz" role="3clFbx">
+              <node concept="3clFbF" id="IFW4V2uDOs" role="3cqZAp">
+                <node concept="2OqwBi" id="IFW4V2wZMp" role="3clFbG">
+                  <node concept="2OqwBi" id="IFW4V2wYPe" role="2Oq$k0">
+                    <node concept="37vLTw" id="IFW4V2wYlf" role="2Oq$k0">
+                      <ref role="3cqZAo" node="IFW4V2wTPx" resolve="INSTANCES" />
+                    </node>
+                    <node concept="T8wYR" id="IFW4V2wZd_" role="2OqNvi" />
+                  </node>
+                  <node concept="2es0OD" id="IFW4V2x08e" role="2OqNvi">
+                    <node concept="1bVj0M" id="IFW4V2x08g" role="23t8la">
+                      <node concept="3clFbS" id="IFW4V2x08h" role="1bW5cS">
+                        <node concept="3clFbF" id="IFW4V2x0en" role="3cqZAp">
+                          <node concept="2OqwBi" id="IFW4V2x0jv" role="3clFbG">
+                            <node concept="37vLTw" id="IFW4V2x0em" role="2Oq$k0">
+                              <ref role="3cqZAo" node="IFW4V2x08i" resolve="it" />
+                            </node>
+                            <node concept="liA8E" id="IFW4V2x0ta" role="2OqNvi">
+                              <ref role="37wK5l" node="IFW4V2uEay" resolve="tearDown" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="IFW4V2x08i" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="IFW4V2x08j" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="IFW4V2uGnh" role="3cqZAp">
+                <node concept="37vLTI" id="IFW4V2uGxu" role="3clFbG">
+                  <node concept="10Nm6u" id="IFW4V2uGzn" role="37vLTx" />
+                  <node concept="37vLTw" id="IFW4V2x0Jy" role="37vLTJ">
+                    <ref role="3cqZAo" node="IFW4V2wTPx" resolve="INSTANCES" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="IFW4V2uCnN" role="3clF45" />
+        <node concept="3Tm1VV" id="IFW4V2uCnO" role="1B3o_S" />
+      </node>
+      <node concept="2tJIrI" id="IFW4V2uLfX" role="jymVt" />
+      <node concept="2YIFZL" id="IFW4V2wWnq" role="jymVt">
+        <property role="TrG5h" value="getLookup" />
+        <node concept="3clFbS" id="IFW4V2uLVh" role="3clF47">
+          <node concept="3clFbJ" id="IFW4V2xew6" role="3cqZAp">
+            <node concept="3clFbS" id="IFW4V2xew8" role="3clFbx">
+              <node concept="3clFbF" id="IFW4V2xhFI" role="3cqZAp">
+                <node concept="37vLTI" id="IFW4V2xjZ4" role="3clFbG">
+                  <node concept="2ShNRf" id="IFW4V2xkh5" role="37vLTx">
+                    <node concept="1pGfFk" id="IFW4V2xp$h" role="2ShVmc">
+                      <ref role="37wK5l" node="IFW4V2xp8z" resolve="AspectLookup.AspectLookupCoordinator" />
+                      <node concept="37vLTw" id="IFW4V2xz0n" role="37wK5m">
+                        <ref role="3cqZAo" node="IFW4V2uOjB" resolve="repository" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3EllGN" id="IFW4V2xid1" role="37vLTJ">
+                    <node concept="37vLTw" id="IFW4V2xiCn" role="3ElVtu">
+                      <ref role="3cqZAo" node="IFW4V2uOjB" resolve="repository" />
+                    </node>
+                    <node concept="37vLTw" id="IFW4V2xhFG" role="3ElQJh">
+                      <ref role="3cqZAo" node="IFW4V2wTPx" resolve="INSTANCES" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3fqX7Q" id="IFW4V2xhhj" role="3clFbw">
+              <node concept="2OqwBi" id="IFW4V2xhhl" role="3fr31v">
+                <node concept="37vLTw" id="IFW4V2xhhm" role="2Oq$k0">
+                  <ref role="3cqZAo" node="IFW4V2wTPx" resolve="INSTANCES" />
+                </node>
+                <node concept="2Nt0df" id="IFW4V2xhhn" role="2OqNvi">
+                  <node concept="37vLTw" id="IFW4V2xhho" role="38cxEo">
+                    <ref role="3cqZAo" node="IFW4V2uOjB" resolve="repository" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="IFW4V2xm2u" role="3cqZAp">
+            <node concept="2OqwBi" id="IFW4V2xnJx" role="3clFbG">
+              <node concept="3EllGN" id="IFW4V2xmHu" role="2Oq$k0">
+                <node concept="37vLTw" id="IFW4V2xn9Z" role="3ElVtu">
+                  <ref role="3cqZAo" node="IFW4V2uOjB" resolve="repository" />
+                </node>
+                <node concept="37vLTw" id="IFW4V2xm2s" role="3ElQJh">
+                  <ref role="3cqZAo" node="IFW4V2wTPx" resolve="INSTANCES" />
+                </node>
+              </node>
+              <node concept="liA8E" id="IFW4V2xvuQ" role="2OqNvi">
+                <ref role="37wK5l" node="IFW4V2xqPS" resolve="getLookup" />
+                <node concept="37vLTw" id="IFW4V2xwBF" role="37wK5m">
+                  <ref role="3cqZAo" node="IFW4V2uOjD" resolve="discoverable" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="IFW4V2uOjB" role="3clF46">
+          <property role="TrG5h" value="repository" />
+          <node concept="3uibUv" id="IFW4V2uOjC" role="1tU5fm">
+            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="IFW4V2uOjD" role="3clF46">
+          <property role="TrG5h" value="discoverable" />
+          <node concept="3uibUv" id="IFW4V2uOjE" role="1tU5fm">
+            <ref role="3uigEE" node="NKt6ynom3d" resolve="AspectDiscoverable" />
+            <node concept="3uibUv" id="IFW4V2uOjF" role="11_B2D">
+              <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+            </node>
+            <node concept="16syzq" id="IFW4V2uOjG" role="11_B2D">
+              <ref role="16sUi3" node="IFW4V2uNbu" resolve="T" />
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="IFW4V2uMk2" role="3clF45">
+          <ref role="3uigEE" node="NKt6ynorWQ" resolve="AspectLookup" />
+          <node concept="16syzq" id="IFW4V2uNIN" role="11_B2D">
+            <ref role="16sUi3" node="IFW4V2uNbu" resolve="T" />
+          </node>
+        </node>
+        <node concept="16euLQ" id="IFW4V2uNbu" role="16eVyc">
+          <property role="TrG5h" value="T" />
+          <node concept="3uibUv" id="IFW4V2uNbv" role="3ztrMU">
+            <ref role="3uigEE" to="ze1i:~ILanguageAspect" resolve="ILanguageAspect" />
+          </node>
+        </node>
+        <node concept="3Tmbuc" id="IFW4V2xo9M" role="1B3o_S" />
+      </node>
+      <node concept="2tJIrI" id="IFW4V2uO1v" role="jymVt" />
+      <node concept="3clFbW" id="IFW4V2xp8z" role="jymVt">
+        <node concept="37vLTG" id="IFW4V2xx4M" role="3clF46">
+          <property role="TrG5h" value="repository" />
+          <node concept="3uibUv" id="IFW4V2xx_R" role="1tU5fm">
+            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="IFW4V2xp8_" role="3clF45" />
+        <node concept="3Tm6S6" id="IFW4V2xpYm" role="1B3o_S" />
+        <node concept="3clFbS" id="IFW4V2xp8B" role="3clF47">
+          <node concept="3clFbF" id="IFW4V2xUSu" role="3cqZAp">
+            <node concept="37vLTI" id="IFW4V2xW3l" role="3clFbG">
+              <node concept="37vLTw" id="IFW4V2xWuq" role="37vLTx">
+                <ref role="3cqZAo" node="IFW4V2xx4M" resolve="repository" />
+              </node>
+              <node concept="2OqwBi" id="IFW4V2xV4l" role="37vLTJ">
+                <node concept="Xjq3P" id="IFW4V2xUSs" role="2Oq$k0" />
+                <node concept="2OwXpG" id="IFW4V2xV_u" role="2OqNvi">
+                  <ref role="2Oxat5" node="IFW4V2xTxd" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="IFW4V2xz__" role="3cqZAp">
+            <node concept="2OqwBi" id="IFW4V2x$6o" role="3clFbG">
+              <node concept="37vLTw" id="IFW4V2xz_$" role="2Oq$k0">
+                <ref role="3cqZAo" node="IFW4V2xx4M" resolve="repository" />
+              </node>
+              <node concept="liA8E" id="IFW4V2x$JO" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~SRepository.addRepositoryListener(org.jetbrains.mps.openapi.module.SRepositoryListener)" resolve="addRepositoryListener" />
+                <node concept="Xjq3P" id="IFW4V2x_CO" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="IFW4V2xo_m" role="jymVt" />
+      <node concept="3clFb_" id="IFW4V2uEay" role="jymVt">
+        <property role="TrG5h" value="tearDown" />
+        <node concept="3cqZAl" id="IFW4V2uEa$" role="3clF45" />
+        <node concept="3Tm6S6" id="IFW4V2uF6B" role="1B3o_S" />
+        <node concept="3clFbS" id="IFW4V2uEaA" role="3clF47">
+          <node concept="3clFbF" id="IFW4V2$gxz" role="3cqZAp">
+            <node concept="2OqwBi" id="IFW4V2$hk3" role="3clFbG">
+              <node concept="37vLTw" id="IFW4V2$gxx" role="2Oq$k0">
+                <ref role="3cqZAo" node="IFW4V2yf1o" resolve="lookups" />
+              </node>
+              <node concept="1yHZxX" id="IFW4V2$i5Q" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="IFW4V2xWTT" role="3cqZAp">
+            <node concept="2OqwBi" id="IFW4V2xXwO" role="3clFbG">
+              <node concept="37vLTw" id="IFW4V2xWTS" role="2Oq$k0">
+                <ref role="3cqZAo" node="IFW4V2xTxd" resolve="repository" />
+              </node>
+              <node concept="liA8E" id="IFW4V2xYb2" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~SRepository.removeRepositoryListener(org.jetbrains.mps.openapi.module.SRepositoryListener)" resolve="removeRepositoryListener" />
+                <node concept="Xjq3P" id="IFW4V2xYQ5" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="IFW4V2xZTi" role="3cqZAp">
+            <node concept="37vLTI" id="IFW4V2y1tO" role="3clFbG">
+              <node concept="10Nm6u" id="IFW4V2y1Gd" role="37vLTx" />
+              <node concept="2OqwBi" id="IFW4V2y0dA" role="37vLTJ">
+                <node concept="Xjq3P" id="IFW4V2xZTg" role="2Oq$k0" />
+                <node concept="2OwXpG" id="IFW4V2y0R$" role="2OqNvi">
+                  <ref role="2Oxat5" node="IFW4V2xTxd" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="IFW4V2xqos" role="jymVt" />
+      <node concept="3clFb_" id="IFW4V2xqPS" role="jymVt">
+        <property role="TrG5h" value="getLookup" />
+        <node concept="37vLTG" id="IFW4V2xsQi" role="3clF46">
+          <property role="TrG5h" value="discoverable" />
+          <node concept="3uibUv" id="IFW4V2xsQj" role="1tU5fm">
+            <ref role="3uigEE" node="NKt6ynom3d" resolve="AspectDiscoverable" />
+            <node concept="3uibUv" id="IFW4V2xsQk" role="11_B2D">
+              <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+            </node>
+            <node concept="16syzq" id="IFW4V2xvdv" role="11_B2D">
+              <ref role="16sUi3" node="IFW4V2xuoB" resolve="T" />
+            </node>
+          </node>
+        </node>
+        <node concept="3uibUv" id="IFW4V2yFkb" role="3clF45">
+          <ref role="3uigEE" node="NKt6ynorWQ" resolve="AspectLookup" />
+          <node concept="16syzq" id="IFW4V2yGRV" role="11_B2D">
+            <ref role="16sUi3" node="IFW4V2xuoB" resolve="T" />
+          </node>
+        </node>
+        <node concept="3Tm6S6" id="IFW4V2xBeX" role="1B3o_S" />
+        <node concept="3clFbS" id="IFW4V2xqPW" role="3clF47">
+          <node concept="3clFbJ" id="IFW4V2ynim" role="3cqZAp">
+            <node concept="3clFbS" id="IFW4V2ynio" role="3clFbx">
+              <node concept="3clFbF" id="IFW4V2yuRr" role="3cqZAp">
+                <node concept="37vLTI" id="IFW4V2yxWC" role="3clFbG">
+                  <node concept="2ShNRf" id="IFW4V2yyD6" role="37vLTx">
+                    <node concept="1pGfFk" id="IFW4V2yyBG" role="2ShVmc">
+                      <ref role="37wK5l" node="NKt6yno$sR" resolve="AspectLookup" />
+                      <node concept="16syzq" id="IFW4V2yAbr" role="1pMfVU">
+                        <ref role="16sUi3" node="IFW4V2xuoB" resolve="T" />
+                      </node>
+                      <node concept="37vLTw" id="IFW4V2yzXI" role="37wK5m">
+                        <ref role="3cqZAo" node="IFW4V2xTxd" resolve="repository" />
+                      </node>
+                      <node concept="37vLTw" id="IFW4V2y_wg" role="37wK5m">
+                        <ref role="3cqZAo" node="IFW4V2xsQi" resolve="discoverable" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3EllGN" id="IFW4V2ywxH" role="37vLTJ">
+                    <node concept="37vLTw" id="IFW4V2yuRp" role="3ElQJh">
+                      <ref role="3cqZAo" node="IFW4V2yf1o" resolve="lookups" />
+                    </node>
+                    <node concept="2OqwBi" id="IFW4V2yxb3" role="3ElVtu">
+                      <node concept="37vLTw" id="IFW4V2yxb4" role="2Oq$k0">
+                        <ref role="3cqZAo" node="IFW4V2xsQi" resolve="discoverable" />
+                      </node>
+                      <node concept="liA8E" id="IFW4V2yxb5" role="2OqNvi">
+                        <ref role="37wK5l" node="IFW4V2y3RP" resolve="aspectClass" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3fqX7Q" id="IFW4V2yu3Q" role="3clFbw">
+              <node concept="2OqwBi" id="IFW4V2yu3S" role="3fr31v">
+                <node concept="37vLTw" id="IFW4V2yu3T" role="2Oq$k0">
+                  <ref role="3cqZAo" node="IFW4V2yf1o" resolve="lookups" />
+                </node>
+                <node concept="2Nt0df" id="IFW4V2yu3U" role="2OqNvi">
+                  <node concept="2OqwBi" id="IFW4V2yu3V" role="38cxEo">
+                    <node concept="37vLTw" id="IFW4V2yu3W" role="2Oq$k0">
+                      <ref role="3cqZAo" node="IFW4V2xsQi" resolve="discoverable" />
+                    </node>
+                    <node concept="liA8E" id="IFW4V2yu3X" role="2OqNvi">
+                      <ref role="37wK5l" node="IFW4V2y3RP" resolve="aspectClass" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="IFW4V2yEAZ" role="3cqZAp">
+            <node concept="1eOMI4" id="IFW4V2yHyO" role="3clFbG">
+              <node concept="10QFUN" id="IFW4V2yHyP" role="1eOMHV">
+                <node concept="3EllGN" id="IFW4V2yHyQ" role="10QFUP">
+                  <node concept="2OqwBi" id="IFW4V2yHyR" role="3ElVtu">
+                    <node concept="37vLTw" id="IFW4V2yHyS" role="2Oq$k0">
+                      <ref role="3cqZAo" node="IFW4V2xsQi" resolve="discoverable" />
+                    </node>
+                    <node concept="liA8E" id="IFW4V2yHyT" role="2OqNvi">
+                      <ref role="37wK5l" node="IFW4V2y3RP" resolve="aspectClass" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="IFW4V2yHyU" role="3ElQJh">
+                    <ref role="3cqZAo" node="IFW4V2yf1o" resolve="lookups" />
+                  </node>
+                </node>
+                <node concept="3uibUv" id="IFW4V2yHyV" role="10QFUM">
+                  <ref role="3uigEE" node="NKt6ynorWQ" resolve="AspectLookup" />
+                  <node concept="16syzq" id="IFW4V2yHyW" role="11_B2D">
+                    <ref role="16sUi3" node="IFW4V2xuoB" resolve="T" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="16euLQ" id="IFW4V2xuoB" role="16eVyc">
+          <property role="TrG5h" value="T" />
+          <node concept="3uibUv" id="IFW4V2xuoC" role="3ztrMU">
+            <ref role="3uigEE" to="ze1i:~ILanguageAspect" resolve="ILanguageAspect" />
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="IFW4V2wRRS" role="jymVt" />
+      <node concept="3clFb_" id="IFW4V2xC9p" role="jymVt">
+        <property role="TrG5h" value="moduleAdded" />
+        <node concept="3Tm1VV" id="IFW4V2xC9r" role="1B3o_S" />
+        <node concept="3cqZAl" id="IFW4V2xC9t" role="3clF45" />
+        <node concept="37vLTG" id="IFW4V2xC9u" role="3clF46">
+          <property role="TrG5h" value="module" />
+          <node concept="3uibUv" id="IFW4V2xC9v" role="1tU5fm">
+            <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+          </node>
+          <node concept="2AHcQZ" id="IFW4V2xC9w" role="2AJF6D">
+            <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="IFW4V2xC9x" role="3clF47">
+          <node concept="3clFbF" id="IFW4V2$fd8" role="3cqZAp">
+            <node concept="2OqwBi" id="IFW4V2$j_H" role="3clFbG">
+              <node concept="37vLTw" id="IFW4V2$fd7" role="2Oq$k0">
+                <ref role="3cqZAo" node="IFW4V2yf1o" resolve="lookups" />
+              </node>
+              <node concept="1yHZxX" id="IFW4V2$k7h" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="IFW4V2xC9y" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="IFW4V2xR1C" role="jymVt" />
+      <node concept="3clFb_" id="IFW4V2xC9T" role="jymVt">
+        <property role="TrG5h" value="moduleRemoved" />
+        <node concept="3Tm1VV" id="IFW4V2xC9V" role="1B3o_S" />
+        <node concept="3cqZAl" id="IFW4V2xC9X" role="3clF45" />
+        <node concept="37vLTG" id="IFW4V2xC9Y" role="3clF46">
+          <property role="TrG5h" value="module" />
+          <node concept="3uibUv" id="IFW4V2xC9Z" role="1tU5fm">
+            <ref role="3uigEE" to="lui2:~SModuleReference" resolve="SModuleReference" />
+          </node>
+          <node concept="2AHcQZ" id="IFW4V2xCa0" role="2AJF6D">
+            <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="IFW4V2xCa1" role="3clF47">
+          <node concept="3clFbF" id="IFW4V2$lup" role="3cqZAp">
+            <node concept="2OqwBi" id="IFW4V2$mib" role="3clFbG">
+              <node concept="37vLTw" id="IFW4V2$luo" role="2Oq$k0">
+                <ref role="3cqZAo" node="IFW4V2yf1o" resolve="lookups" />
+              </node>
+              <node concept="1yHZxX" id="IFW4V2$nyW" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="IFW4V2xCa2" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="IFW4V2uDVL" role="jymVt" />
+      <node concept="312cEg" id="IFW4V2xTxd" role="jymVt">
+        <property role="TrG5h" value="repository" />
+        <node concept="3Tm6S6" id="IFW4V2xTxe" role="1B3o_S" />
+        <node concept="3uibUv" id="IFW4V2xU4V" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="312cEg" id="IFW4V2yf1o" role="jymVt">
+        <property role="TrG5h" value="lookups" />
+        <node concept="3Tm6S6" id="IFW4V2yf1p" role="1B3o_S" />
+        <node concept="3rvAFt" id="IFW4V2yf_S" role="1tU5fm">
+          <node concept="3uibUv" id="IFW4V2yfHG" role="3rvQeY">
+            <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+            <node concept="3qTvmN" id="IFW4V2yfPE" role="11_B2D" />
+          </node>
+          <node concept="3uibUv" id="IFW4V2yfXB" role="3rvSg0">
+            <ref role="3uigEE" node="NKt6ynorWQ" resolve="AspectLookup" />
+            <node concept="3qTvmN" id="IFW4V2ygYy" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="2ShNRf" id="IFW4V2yhKb" role="33vP2m">
+          <node concept="3rGOSV" id="IFW4V2yhI$" role="2ShVmc">
+            <node concept="3uibUv" id="IFW4V2yhI_" role="3rHrn6">
+              <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+              <node concept="3qTvmN" id="IFW4V2yhIA" role="11_B2D" />
+            </node>
+            <node concept="3uibUv" id="IFW4V2yhIB" role="3rHtpV">
+              <ref role="3uigEE" node="NKt6ynorWQ" resolve="AspectLookup" />
+              <node concept="3qTvmN" id="IFW4V2yhIC" role="11_B2D" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="IFW4V2uswv" role="1B3o_S" />
+      <node concept="3uibUv" id="IFW4V2xAHw" role="EKbjA">
+        <ref role="3uigEE" to="lui2:~SRepositoryListener" resolve="SRepositoryListener" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="IFW4V2uo3Y" role="jymVt" />
     <node concept="3clFbW" id="NKt6yno$sR" role="jymVt">
+      <node concept="37vLTG" id="IFW4V2tCWi" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="IFW4V2tDgX" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
       <node concept="37vLTG" id="NKt6yno_xa" role="3clF46">
         <property role="TrG5h" value="discoverable" />
         <node concept="3uibUv" id="NKt6yno_y0" role="1tU5fm">
@@ -504,7 +1023,7 @@
         </node>
       </node>
       <node concept="3cqZAl" id="NKt6yno$sT" role="3clF45" />
-      <node concept="3Tm1VV" id="NKt6yno$sU" role="1B3o_S" />
+      <node concept="3Tm6S6" id="IFW4V2tFJm" role="1B3o_S" />
       <node concept="3clFbS" id="NKt6yno$sV" role="3clF47">
         <node concept="3clFbF" id="NKt6yno_yQ" role="3cqZAp">
           <node concept="37vLTI" id="NKt6yno_yS" role="3clFbG">
@@ -519,6 +1038,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="IFW4V2$oei" role="3cqZAp">
+          <node concept="37vLTI" id="IFW4V2$oek" role="3clFbG">
+            <node concept="2OqwBi" id="IFW4V2$umT" role="37vLTJ">
+              <node concept="Xjq3P" id="IFW4V2$uMn" role="2Oq$k0" />
+              <node concept="2OwXpG" id="IFW4V2$umW" role="2OqNvi">
+                <ref role="2Oxat5" node="IFW4V2$oee" resolve="repository" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="IFW4V2$oeo" role="37vLTx">
+              <ref role="3cqZAo" node="IFW4V2tCWi" resolve="repository" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7W7Inqm5MLC" role="jymVt" />
@@ -541,9 +1073,6 @@
               <node concept="37vLTw" id="7W7Inqm5OL$" role="37wK5m">
                 <ref role="3cqZAo" node="7W7Inqm5Hg_" resolve="nodes" />
               </node>
-              <node concept="37vLTw" id="7W7Inqm5P9R" role="37wK5m">
-                <ref role="3cqZAo" node="7W7Inqm5I4g" resolve="repository" />
-              </node>
             </node>
           </node>
         </node>
@@ -593,8 +1122,8 @@
               <node concept="2YIFZM" id="7W7Inqm7k2d" role="2Oq$k0">
                 <ref role="1Pybhc" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
                 <ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository)" resolve="getInstance" />
-                <node concept="37vLTw" id="7W7Inqm7k2e" role="37wK5m">
-                  <ref role="3cqZAo" node="7W7Inqm5I4g" resolve="repository" />
+                <node concept="37vLTw" id="IFW4V2A0DM" role="37wK5m">
+                  <ref role="3cqZAo" node="IFW4V2$oee" resolve="repository" />
                 </node>
               </node>
               <node concept="liA8E" id="7W7Inqm7k2f" role="2OqNvi">
@@ -708,12 +1237,6 @@
           <node concept="3Tqbb2" id="7W7Inqm5HYd" role="A3Ik2" />
         </node>
       </node>
-      <node concept="37vLTG" id="7W7Inqm5I4g" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="7W7Inqm5Jba" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
       <node concept="P$JXv" id="7W7Inqm7ErJ" role="lGtFl">
         <node concept="TZ5HA" id="7W7Inqm7ErK" role="TZ5H$">
           <node concept="1dT_AC" id="7W7Inqm7ErL" role="1dT_Ay">
@@ -774,9 +1297,6 @@
                     <node concept="37vLTw" id="500mE4_sGHu" role="37wK5m">
                       <ref role="3cqZAo" node="2jWRpjTyIYv" resolve="representativeModel" />
                     </node>
-                    <node concept="37vLTw" id="500mE4_sI20" role="37wK5m">
-                      <ref role="3cqZAo" node="7mB3viLmii_" resolve="repository" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -927,9 +1447,6 @@
                               <node concept="37vLTw" id="6zber0NEL2t" role="37wK5m">
                                 <ref role="3cqZAo" node="6zber0NEB$j" resolve="m" />
                               </node>
-                              <node concept="37vLTw" id="6zber0NEB$i" role="37wK5m">
-                                <ref role="3cqZAo" node="7mB3viLmii_" resolve="repository" />
-                              </node>
                             </node>
                           </node>
                         </node>
@@ -953,21 +1470,14 @@
           </node>
         </node>
         <node concept="3clFbH" id="500mE4_sx1n" role="3cqZAp" />
-        <node concept="3clFbF" id="500mE4_sylT" role="3cqZAp">
-          <node concept="2YIFZM" id="3KN3A4v5e$m" role="3clFbG">
-            <ref role="1Pybhc" node="3KN3A4uUhmW" resolve="AspectClique" />
-            <ref role="37wK5l" node="3KN3A4uV0IR" resolve="discoverAspects" />
-            <node concept="1rXfSq" id="3KN3A4v5e$n" role="37wK5m">
+        <node concept="3clFbF" id="IFW4V2XGwi" role="3cqZAp">
+          <node concept="1rXfSq" id="IFW4V2XGwg" role="3clFbG">
+            <ref role="37wK5l" node="IFW4V2Svjj" resolve="getAspectClique" />
+            <node concept="1rXfSq" id="IFW4V2XMym" role="37wK5m">
               <ref role="37wK5l" node="4pwDyRBwQ_v" resolve="languages" />
-              <node concept="37vLTw" id="3KN3A4v5glt" role="37wK5m">
+              <node concept="37vLTw" id="IFW4V2XMyn" role="37wK5m">
                 <ref role="3cqZAo" node="7mB3viLmGMp" resolve="imports" />
               </node>
-              <node concept="37vLTw" id="3KN3A4v5e$p" role="37wK5m">
-                <ref role="3cqZAo" node="7mB3viLmii_" resolve="repository" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="3KN3A4v5e$r" role="37wK5m">
-              <ref role="3cqZAo" node="NKt6yno_yM" resolve="discoverable" />
             </node>
           </node>
         </node>
@@ -978,12 +1488,6 @@
           <node concept="3Tqbb2" id="3KN3A4vEFRD" role="A3Ik2" />
         </node>
       </node>
-      <node concept="37vLTG" id="7mB3viLmii_" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="7mB3viLmiiA" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
       <node concept="3vKaQO" id="7mB3viLmiiB" role="3clF45">
         <node concept="3uibUv" id="3KN3A4v5gxH" role="3O5elw">
           <ref role="3uigEE" node="3KN3A4uUhmW" resolve="AspectClique" />
@@ -1017,27 +1521,17 @@
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="NKt6ynoWQg" role="3clF47">
-        <node concept="3clFbF" id="3KN3A4v3NmM" role="3cqZAp">
-          <node concept="2YIFZM" id="3KN3A4v3NEw" role="3clFbG">
-            <ref role="37wK5l" node="3KN3A4uV0IR" resolve="discoverAspects" />
-            <ref role="1Pybhc" node="3KN3A4uUhmW" resolve="AspectClique" />
-            <node concept="1rXfSq" id="3KN3A4v4bsC" role="37wK5m">
+        <node concept="3clFbF" id="IFW4V2Y7Q2" role="3cqZAp">
+          <node concept="1rXfSq" id="IFW4V2Y7Q3" role="3clFbG">
+            <ref role="37wK5l" node="IFW4V2Svjj" resolve="getAspectClique" />
+            <node concept="1rXfSq" id="IFW4V2YgnQ" role="37wK5m">
               <ref role="37wK5l" node="4pwDyRBwQ_v" resolve="languages" />
-              <node concept="1rXfSq" id="500mE4_ssum" role="37wK5m">
+              <node concept="1rXfSq" id="IFW4V2YgnR" role="37wK5m">
                 <ref role="37wK5l" node="500mE4_soZN" resolve="usedLanguages" />
-                <node concept="37vLTw" id="500mE4_stuL" role="37wK5m">
+                <node concept="37vLTw" id="IFW4V2YgnS" role="37wK5m">
                   <ref role="3cqZAo" node="NKt6ynoWQ9" resolve="model" />
                 </node>
-                <node concept="37vLTw" id="500mE4_stNT" role="37wK5m">
-                  <ref role="3cqZAo" node="NKt6ynoWQb" resolve="repository" />
-                </node>
               </node>
-              <node concept="37vLTw" id="3KN3A4v4dbc" role="37wK5m">
-                <ref role="3cqZAo" node="NKt6ynoWQb" resolve="repository" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="3KN3A4v3Pk3" role="37wK5m">
-              <ref role="3cqZAo" node="NKt6yno_yM" resolve="discoverable" />
             </node>
           </node>
         </node>
@@ -1046,12 +1540,6 @@
         <property role="TrG5h" value="model" />
         <node concept="H_c77" id="NKt6ynoWQa" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="NKt6ynoWQb" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="NKt6ynoWQc" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
       <node concept="3vKaQO" id="NKt6ynoWQd" role="3clF45">
         <node concept="3uibUv" id="3KN3A4v3Dpo" role="3O5elw">
           <ref role="3uigEE" node="3KN3A4uUhmW" resolve="AspectClique" />
@@ -1069,6 +1557,97 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="IFW4V2SjZP" role="jymVt" />
+    <node concept="3clFb_" id="IFW4V2Svjj" role="jymVt">
+      <property role="TrG5h" value="getAspectClique" />
+      <node concept="37vLTG" id="IFW4V2T3Lc" role="3clF46">
+        <property role="TrG5h" value="runtimes" />
+        <node concept="2hMVRd" id="IFW4V2T8VX" role="1tU5fm">
+          <node concept="3uibUv" id="IFW4V2T94s" role="2hN53Y">
+            <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="IFW4V2Svjl" role="1B3o_S" />
+      <node concept="3clFbS" id="IFW4V2Svjn" role="3clF47">
+        <node concept="3clFbJ" id="IFW4V2TtXt" role="3cqZAp">
+          <node concept="2OqwBi" id="IFW4V2TCLE" role="3clFbw">
+            <node concept="37vLTw" id="IFW4V2Tzfx" role="2Oq$k0">
+              <ref role="3cqZAo" node="IFW4V2Te8B" resolve="aspectCliqueCache" />
+            </node>
+            <node concept="2Nt0df" id="IFW4V2TI_2" role="2OqNvi">
+              <node concept="37vLTw" id="IFW4V2TNDh" role="38cxEo">
+                <ref role="3cqZAo" node="IFW4V2T3Lc" resolve="runtimes" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbS" id="IFW4V2TtXv" role="3clFbx">
+            <node concept="3cpWs6" id="IFW4V2TSAc" role="3cqZAp">
+              <node concept="3EllGN" id="IFW4V2WFFA" role="3cqZAk">
+                <node concept="37vLTw" id="IFW4V2WFFB" role="3ElVtu">
+                  <ref role="3cqZAo" node="IFW4V2T3Lc" resolve="runtimes" />
+                </node>
+                <node concept="37vLTw" id="IFW4V2WFFC" role="3ElQJh">
+                  <ref role="3cqZAo" node="IFW4V2Te8B" resolve="aspectCliqueCache" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="IFW4V2Ux6$" role="3cqZAp" />
+        <node concept="3cpWs8" id="IFW4V2V7vi" role="3cqZAp">
+          <node concept="3cpWsn" id="IFW4V2V7vj" role="3cpWs9">
+            <property role="TrG5h" value="aspects" />
+            <node concept="3vKaQO" id="IFW4V2XoEq" role="1tU5fm">
+              <node concept="3uibUv" id="IFW4V2XoEs" role="3O5elw">
+                <ref role="3uigEE" node="3KN3A4uUhmW" resolve="AspectClique" />
+                <node concept="16syzq" id="IFW4V2XoEt" role="11_B2D">
+                  <ref role="16sUi3" node="NKt6ynoBYL" resolve="T" />
+                </node>
+              </node>
+            </node>
+            <node concept="2YIFZM" id="IFW4V2V7vk" role="33vP2m">
+              <ref role="37wK5l" node="3KN3A4uV0IR" resolve="discoverAspects" />
+              <ref role="1Pybhc" node="3KN3A4uUhmW" resolve="AspectClique" />
+              <node concept="37vLTw" id="IFW4V2V7vl" role="37wK5m">
+                <ref role="3cqZAo" node="IFW4V2T3Lc" resolve="runtimes" />
+              </node>
+              <node concept="37vLTw" id="IFW4V2V7vm" role="37wK5m">
+                <ref role="3cqZAo" node="NKt6yno_yM" resolve="discoverable" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="IFW4V2WPmX" role="3cqZAp">
+          <node concept="37vLTI" id="IFW4V2XdAo" role="3clFbG">
+            <node concept="37vLTw" id="IFW4V2XiVT" role="37vLTx">
+              <ref role="3cqZAo" node="IFW4V2V7vj" resolve="aspects" />
+            </node>
+            <node concept="3EllGN" id="IFW4V2X2B8" role="37vLTJ">
+              <node concept="37vLTw" id="IFW4V2X7BO" role="3ElVtu">
+                <ref role="3cqZAo" node="IFW4V2T3Lc" resolve="runtimes" />
+              </node>
+              <node concept="37vLTw" id="IFW4V2WPmV" role="3ElQJh">
+                <ref role="3cqZAo" node="IFW4V2Te8B" resolve="aspectCliqueCache" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="IFW4V2UB5q" role="3cqZAp">
+          <node concept="37vLTw" id="IFW4V2V7vn" role="3clFbG">
+            <ref role="3cqZAo" node="IFW4V2V7vj" resolve="aspects" />
+          </node>
+        </node>
+      </node>
+      <node concept="3vKaQO" id="IFW4V2WgsJ" role="3clF45">
+        <node concept="3uibUv" id="IFW4V2WgsK" role="3O5elw">
+          <ref role="3uigEE" node="3KN3A4uUhmW" resolve="AspectClique" />
+          <node concept="16syzq" id="IFW4V2WgsL" role="11_B2D">
+            <ref role="16sUi3" node="NKt6ynoBYL" resolve="T" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="500mE4_sngf" role="jymVt" />
     <node concept="3clFb_" id="500mE4_soZN" role="jymVt">
       <property role="TrG5h" value="usedLanguages" />
@@ -1076,13 +1655,79 @@
         <property role="TrG5h" value="model" />
         <node concept="H_c77" id="500mE4_srzT" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="500mE4_srHu" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="500mE4_ss16" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
       <node concept="3clFbS" id="500mE4_soZQ" role="3clF47">
+        <node concept="3clFbJ" id="IFW4V2LhLD" role="3cqZAp">
+          <node concept="3clFbS" id="IFW4V2LhLF" role="3clFbx">
+            <node concept="3cpWs8" id="IFW4V2MggW" role="3cqZAp">
+              <node concept="3cpWsn" id="IFW4V2MggX" role="3cpWs9">
+                <property role="TrG5h" value="ref" />
+                <node concept="3uibUv" id="IFW4V2MfEL" role="1tU5fm">
+                  <ref role="3uigEE" to="mpcv:~Reference" resolve="Reference" />
+                  <node concept="3qTvmN" id="IFW4V2MfEO" role="11_B2D" />
+                </node>
+                <node concept="3EllGN" id="IFW4V2MggY" role="33vP2m">
+                  <node concept="37vLTw" id="IFW4V2MggZ" role="3ElVtu">
+                    <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
+                  </node>
+                  <node concept="37vLTw" id="IFW4V2Mgh0" role="3ElQJh">
+                    <ref role="3cqZAo" node="IFW4V2KUG4" resolve="usedLanguagesCache" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="IFW4V2M_zV" role="3cqZAp">
+              <node concept="3cpWsn" id="IFW4V2M_zW" role="3cpWs9">
+                <property role="TrG5h" value="cachedValue" />
+                <node concept="3uibUv" id="IFW4V2M_zU" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                </node>
+                <node concept="2OqwBi" id="IFW4V2M_zX" role="33vP2m">
+                  <node concept="37vLTw" id="IFW4V2M_zY" role="2Oq$k0">
+                    <ref role="3cqZAo" node="IFW4V2MggX" resolve="ref" />
+                  </node>
+                  <node concept="liA8E" id="IFW4V2M_zZ" role="2OqNvi">
+                    <ref role="37wK5l" to="mpcv:~Reference.get()" resolve="get" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="IFW4V2MZZm" role="3cqZAp">
+              <node concept="3clFbS" id="IFW4V2MZZo" role="3clFbx">
+                <node concept="3cpWs6" id="IFW4V2NeIo" role="3cqZAp">
+                  <node concept="1eOMI4" id="IFW4V2Nv2b" role="3cqZAk">
+                    <node concept="10QFUN" id="IFW4V2Nv2a" role="1eOMHV">
+                      <node concept="37vLTw" id="IFW4V2Nv29" role="10QFUP">
+                        <ref role="3cqZAo" node="IFW4V2M_zW" resolve="cachedValue" />
+                      </node>
+                      <node concept="2hMVRd" id="IFW4V2Nv27" role="10QFUM">
+                        <node concept="3uibUv" id="IFW4V2Nv28" role="2hN53Y">
+                          <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3y3z36" id="IFW4V2Nabl" role="3clFbw">
+                <node concept="10Nm6u" id="IFW4V2NacT" role="3uHU7w" />
+                <node concept="37vLTw" id="IFW4V2N5OI" role="3uHU7B">
+                  <ref role="3cqZAo" node="IFW4V2M_zW" resolve="cachedValue" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="IFW4V2LrP8" role="3clFbw">
+            <node concept="37vLTw" id="IFW4V2Lnax" role="2Oq$k0">
+              <ref role="3cqZAo" node="IFW4V2KUG4" resolve="usedLanguagesCache" />
+            </node>
+            <node concept="2Nt0df" id="IFW4V2LyRO" role="2OqNvi">
+              <node concept="37vLTw" id="IFW4V2LC$I" role="38cxEo">
+                <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="IFW4V2Ldxi" role="3cqZAp" />
         <node concept="3cpWs8" id="3KN3A4v3Kac" role="3cqZAp">
           <node concept="3cpWsn" id="3KN3A4v3Kad" role="3cpWs9">
             <property role="TrG5h" value="resolver" />
@@ -1095,12 +1740,12 @@
                 <node concept="2YIFZM" id="3KN3A4v3Kag" role="37wK5m">
                   <ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository)" resolve="getInstance" />
                   <ref role="1Pybhc" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
-                  <node concept="37vLTw" id="3KN3A4v3Kah" role="37wK5m">
-                    <ref role="3cqZAo" node="500mE4_srHu" resolve="repository" />
+                  <node concept="37vLTw" id="IFW4V2F0hA" role="37wK5m">
+                    <ref role="3cqZAo" node="IFW4V2$oee" resolve="repository" />
                   </node>
                 </node>
-                <node concept="37vLTw" id="3KN3A4v3Kai" role="37wK5m">
-                  <ref role="3cqZAo" node="500mE4_srHu" resolve="repository" />
+                <node concept="37vLTw" id="IFW4V2F0jc" role="37wK5m">
+                  <ref role="3cqZAo" node="IFW4V2$oee" resolve="repository" />
                 </node>
               </node>
             </node>
@@ -1216,6 +1861,32 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="IFW4V2NBtY" role="3cqZAp" />
+        <node concept="3clFbF" id="IFW4V2Olke" role="3cqZAp">
+          <node concept="37vLTI" id="IFW4V2OBkW" role="3clFbG">
+            <node concept="2ShNRf" id="IFW4V2OGYk" role="37vLTx">
+              <node concept="1pGfFk" id="IFW4V2OMJB" role="2ShVmc">
+                <ref role="37wK5l" to="mpcv:~SoftReference.&lt;init&gt;(java.lang.Object)" resolve="SoftReference" />
+                <node concept="2hMVRd" id="IFW4V2OVko" role="1pMfVU">
+                  <node concept="3uibUv" id="IFW4V2P0y0" role="2hN53Y">
+                    <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="IFW4V2P4WW" role="37wK5m">
+                  <ref role="3cqZAo" node="5lR$kylkWw7" resolve="result" />
+                </node>
+              </node>
+            </node>
+            <node concept="3EllGN" id="IFW4V2Oqs4" role="37vLTJ">
+              <node concept="37vLTw" id="IFW4V2OwHO" role="3ElVtu">
+                <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
+              </node>
+              <node concept="37vLTw" id="IFW4V2Olkc" role="3ElQJh">
+                <ref role="3cqZAo" node="IFW4V2KUG4" resolve="usedLanguagesCache" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="5lR$kylkR0f" role="3cqZAp">
           <node concept="37vLTw" id="5lR$kylkWwf" role="3clFbG">
             <ref role="3cqZAo" node="5lR$kylkWw7" resolve="result" />
@@ -1223,8 +1894,8 @@
         </node>
       </node>
       <node concept="3Tm6S6" id="500mE4_somr" role="1B3o_S" />
-      <node concept="3vKaQO" id="500mE4_soVb" role="3clF45">
-        <node concept="3uibUv" id="500mE4_sr8u" role="3O5elw">
+      <node concept="2hMVRd" id="IFW4V2CS1w" role="3clF45">
+        <node concept="3uibUv" id="IFW4V2CS1y" role="2hN53Y">
           <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
         </node>
       </node>
@@ -1234,20 +1905,39 @@
       <property role="TrG5h" value="languages" />
       <node concept="37vLTG" id="4pwDyRBx4tZ" role="3clF46">
         <property role="TrG5h" value="slanguages" />
-        <node concept="A3Dl8" id="4pwDyRBx4u0" role="1tU5fm">
-          <node concept="3uibUv" id="4pwDyRBx4u1" role="A3Ik2">
+        <node concept="2hMVRd" id="IFW4V2CLPb" role="1tU5fm">
+          <node concept="3uibUv" id="IFW4V2CLPd" role="2hN53Y">
             <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="4pwDyRBwQOt" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="4pwDyRBx8d3" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
       <node concept="3Tm6S6" id="4pwDyRBwWaj" role="1B3o_S" />
       <node concept="3clFbS" id="4pwDyRBwQ_z" role="3clF47">
+        <node concept="3clFbJ" id="IFW4V2IyCh" role="3cqZAp">
+          <node concept="3clFbS" id="IFW4V2IyCj" role="3clFbx">
+            <node concept="3cpWs6" id="IFW4V2IVJq" role="3cqZAp">
+              <node concept="3EllGN" id="IFW4V2J9N$" role="3cqZAk">
+                <node concept="37vLTw" id="IFW4V2JfTn" role="3ElVtu">
+                  <ref role="3cqZAo" node="4pwDyRBx4tZ" resolve="slanguages" />
+                </node>
+                <node concept="37vLTw" id="IFW4V2J5n9" role="3ElQJh">
+                  <ref role="3cqZAo" node="IFW4V2Ie2D" resolve="langRuntimeCache" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="IFW4V2IFWj" role="3clFbw">
+            <node concept="37vLTw" id="IFW4V2ICg1" role="2Oq$k0">
+              <ref role="3cqZAo" node="IFW4V2Ie2D" resolve="langRuntimeCache" />
+            </node>
+            <node concept="2Nt0df" id="IFW4V2ILfL" role="2OqNvi">
+              <node concept="37vLTw" id="IFW4V2IQOS" role="38cxEo">
+                <ref role="3cqZAo" node="4pwDyRBx4tZ" resolve="slanguages" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="IFW4V2JjhB" role="3cqZAp" />
         <node concept="3cpWs8" id="4pwDyRBxhgL" role="3cqZAp">
           <node concept="3cpWsn" id="4pwDyRBxhgM" role="3cpWs9">
             <property role="TrG5h" value="result" />
@@ -1277,8 +1967,8 @@
                   <node concept="2YIFZM" id="4pwDyRBxlY6" role="2Oq$k0">
                     <ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository)" resolve="getInstance" />
                     <ref role="1Pybhc" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
-                    <node concept="37vLTw" id="4pwDyRBxlY7" role="37wK5m">
-                      <ref role="3cqZAo" node="4pwDyRBwQOt" resolve="repository" />
+                    <node concept="37vLTw" id="IFW4V2FpoS" role="37wK5m">
+                      <ref role="3cqZAo" node="IFW4V2$oee" resolve="repository" />
                     </node>
                   </node>
                   <node concept="liA8E" id="4pwDyRBxlY8" role="2OqNvi">
@@ -1349,20 +2039,123 @@
             <ref role="3cqZAo" node="4pwDyRBx4tZ" resolve="slanguages" />
           </node>
         </node>
+        <node concept="3clFbH" id="IFW4V2NHuq" role="3cqZAp" />
+        <node concept="3clFbF" id="IFW4V2NMWG" role="3cqZAp">
+          <node concept="37vLTI" id="IFW4V2O5oV" role="3clFbG">
+            <node concept="37vLTw" id="IFW4V2O9zP" role="37vLTx">
+              <ref role="3cqZAo" node="4pwDyRBxhgM" resolve="result" />
+            </node>
+            <node concept="3EllGN" id="IFW4V2NRIW" role="37vLTJ">
+              <node concept="37vLTw" id="IFW4V2NYaf" role="3ElVtu">
+                <ref role="3cqZAo" node="4pwDyRBx4tZ" resolve="slanguages" />
+              </node>
+              <node concept="37vLTw" id="IFW4V2NMWE" role="3ElQJh">
+                <ref role="3cqZAo" node="IFW4V2Ie2D" resolve="langRuntimeCache" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="4pwDyRBxlUf" role="3cqZAp">
           <node concept="37vLTw" id="4pwDyRBxlUd" role="3clFbG">
             <ref role="3cqZAo" node="4pwDyRBxhgM" resolve="result" />
           </node>
         </node>
       </node>
-      <node concept="3vKaQO" id="4pwDyRBxi7F" role="3clF45">
-        <node concept="3uibUv" id="4pwDyRBxi7G" role="3O5elw">
+      <node concept="2hMVRd" id="IFW4V2Dcqr" role="3clF45">
+        <node concept="3uibUv" id="IFW4V2Dcqt" role="2hN53Y">
           <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="NKt6ynosjl" role="jymVt" />
     <node concept="3Tm1VV" id="NKt6ynorWR" role="1B3o_S" />
+    <node concept="2tJIrI" id="IFW4V2I1jy" role="jymVt" />
+    <node concept="312cEg" id="IFW4V2KUG4" role="jymVt">
+      <property role="TrG5h" value="usedLanguagesCache" />
+      <node concept="3Tm6S6" id="IFW4V2KUG5" role="1B3o_S" />
+      <node concept="3rvAFt" id="IFW4V2L4Qb" role="1tU5fm">
+        <node concept="H_c77" id="IFW4V2LMpc" role="3rvQeY" />
+        <node concept="3uibUv" id="IFW4V2L5Kj" role="3rvSg0">
+          <ref role="3uigEE" to="mpcv:~Reference" resolve="Reference" />
+          <node concept="3qTvmN" id="IFW4V2L6fh" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="IFW4V2L81M" role="33vP2m">
+        <node concept="1u7pXE" id="IFW4V2L80g" role="2ShVmc">
+          <ref role="1u7pXB" to="z8iw:3TJnG96iD$S" resolve="weakHashMap" />
+          <node concept="H_c77" id="IFW4V2LWoR" role="3rHrn6" />
+          <node concept="3uibUv" id="IFW4V2L80j" role="3rHtpV">
+            <ref role="3uigEE" to="mpcv:~Reference" resolve="Reference" />
+            <node concept="3qTvmN" id="IFW4V2L80k" role="11_B2D" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="IFW4V2Ie2D" role="jymVt">
+      <property role="TrG5h" value="langRuntimeCache" />
+      <node concept="3Tm6S6" id="IFW4V2Ie2E" role="1B3o_S" />
+      <node concept="3rvAFt" id="IFW4V2Iqno" role="1tU5fm">
+        <node concept="2hMVRd" id="IFW4V2IqWW" role="3rvQeY">
+          <node concept="3uibUv" id="IFW4V2Ircs" role="2hN53Y">
+            <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+          </node>
+        </node>
+        <node concept="2hMVRd" id="IFW4V2Irsr" role="3rvSg0">
+          <node concept="3uibUv" id="IFW4V2Iscf" role="2hN53Y">
+            <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+          </node>
+        </node>
+      </node>
+      <node concept="2ShNRf" id="IFW4V2ItCY" role="33vP2m">
+        <node concept="3rGOSV" id="IFW4V2ItBi" role="2ShVmc">
+          <node concept="2hMVRd" id="IFW4V2ItBj" role="3rHrn6">
+            <node concept="3uibUv" id="IFW4V2ItBk" role="2hN53Y">
+              <ref role="3uigEE" to="c17a:~SLanguage" resolve="SLanguage" />
+            </node>
+          </node>
+          <node concept="2hMVRd" id="IFW4V2ItBl" role="3rHtpV">
+            <node concept="3uibUv" id="IFW4V2ItBm" role="2hN53Y">
+              <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="IFW4V2Te8B" role="jymVt">
+      <property role="TrG5h" value="aspectCliqueCache" />
+      <node concept="3Tm6S6" id="IFW4V2Te8C" role="1B3o_S" />
+      <node concept="3rvAFt" id="IFW4V2Tkkg" role="1tU5fm">
+        <node concept="2hMVRd" id="IFW4V2TkDD" role="3rvQeY">
+          <node concept="3uibUv" id="IFW4V2TkZ5" role="2hN53Y">
+            <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+          </node>
+        </node>
+        <node concept="3vKaQO" id="IFW4V2Vi2g" role="3rvSg0">
+          <node concept="3uibUv" id="IFW4V2Vi2h" role="3O5elw">
+            <ref role="3uigEE" node="3KN3A4uUhmW" resolve="AspectClique" />
+            <node concept="16syzq" id="IFW4V2YOqo" role="11_B2D">
+              <ref role="16sUi3" node="NKt6ynoBYL" resolve="T" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2ShNRf" id="IFW4V2Ttzx" role="33vP2m">
+        <node concept="3rGOSV" id="IFW4V2Ttxn" role="2ShVmc">
+          <node concept="2hMVRd" id="IFW4V2Ttxo" role="3rHrn6">
+            <node concept="3uibUv" id="IFW4V2Ttxp" role="2hN53Y">
+              <ref role="3uigEE" to="vndm:~LanguageRuntime" resolve="LanguageRuntime" />
+            </node>
+          </node>
+          <node concept="3vKaQO" id="IFW4V2VozB" role="3rHtpV">
+            <node concept="3uibUv" id="IFW4V2VozC" role="3O5elw">
+              <ref role="3uigEE" node="3KN3A4uUhmW" resolve="AspectClique" />
+              <node concept="16syzq" id="IFW4V2YTiF" role="11_B2D">
+                <ref role="16sUi3" node="NKt6ynoBYL" resolve="T" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="312cEg" id="NKt6yno_yM" role="jymVt">
       <property role="TrG5h" value="discoverable" />
       <node concept="3Tm6S6" id="NKt6yno_yN" role="1B3o_S" />
@@ -1382,6 +2175,14 @@
         <ref role="3uigEE" to="ze1i:~ILanguageAspect" resolve="ILanguageAspect" />
       </node>
     </node>
+    <node concept="312cEg" id="IFW4V2$oee" role="jymVt">
+      <property role="TrG5h" value="repository" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="IFW4V2$oef" role="1B3o_S" />
+      <node concept="3uibUv" id="IFW4V2$oeh" role="1tU5fm">
+        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+      </node>
+    </node>
   </node>
   <node concept="3HP615" id="NKt6yomNZE">
     <property role="TrG5h" value="CoderulesAspect" />
@@ -1428,6 +2229,28 @@
                 <ref role="1Y3XeK" node="NKt6ynom3d" resolve="AspectDiscoverable" />
                 <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <node concept="3Tm1VV" id="78H58oefpDK" role="1B3o_S" />
+                <node concept="2tJIrI" id="IFW4V2y6qE" role="jymVt" />
+                <node concept="3clFb_" id="IFW4V2y7jR" role="jymVt">
+                  <property role="TrG5h" value="aspectClass" />
+                  <node concept="3uibUv" id="IFW4V2y7jS" role="3clF45">
+                    <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+                    <node concept="16syzq" id="IFW4V2y7jZ" role="11_B2D">
+                      <ref role="16sUi3" node="78H58oefoAe" resolve="T" />
+                    </node>
+                  </node>
+                  <node concept="3Tm1VV" id="IFW4V2y7jU" role="1B3o_S" />
+                  <node concept="3clFbS" id="IFW4V2y7k0" role="3clF47">
+                    <node concept="3clFbF" id="IFW4V2y7k3" role="3cqZAp">
+                      <node concept="37vLTw" id="IFW4V2y8yu" role="3clFbG">
+                        <ref role="3cqZAo" node="78H58oefoFj" resolve="aspectClass" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2AHcQZ" id="IFW4V2y7k1" role="2AJF6D">
+                    <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                  </node>
+                </node>
+                <node concept="2tJIrI" id="IFW4V2y6st" role="jymVt" />
                 <node concept="3clFb_" id="78H58oefpDL" role="jymVt">
                   <property role="1EzhhJ" value="false" />
                   <property role="TrG5h" value="discover" />
diff --git a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
index 2f516909..73fb07b6 100644
--- a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
@@ -18,12 +18,7 @@
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <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="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" />
@@ -45,9 +40,6 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
@@ -85,9 +77,6 @@
       </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </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" />
@@ -96,12 +85,6 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
-      <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="ControlflowAspect" />
@@ -109,6 +92,12 @@
     <node concept="2tJIrI" id="78H58oefMK4" role="jymVt" />
     <node concept="2YIFZL" id="78H58oeCBNZ" role="jymVt">
       <property role="TrG5h" value="aspectLookup" />
+      <node concept="37vLTG" id="IFW4V2twrI" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="IFW4V2tw$f" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
       <node concept="3Tm1VV" id="78H58oeCCgW" role="1B3o_S" />
       <node concept="3uibUv" id="78H58oeCBO1" role="3clF45">
         <ref role="3uigEE" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
@@ -121,6 +110,9 @@
           <node concept="2YIFZM" id="3KN3A4v3zEA" role="3cqZAk">
             <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
             <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
+            <node concept="37vLTw" id="IFW4V2tCja" role="37wK5m">
+              <ref role="3cqZAo" node="IFW4V2twrI" resolve="repository" />
+            </node>
             <node concept="2YIFZM" id="3KN3A4v3zEB" role="37wK5m">
               <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
               <ref role="37wK5l" to="fqlx:78H58oefoaA" resolve="discoverable" />
@@ -133,48 +125,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6UWSvq5bjXg" role="jymVt" />
-    <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="3vKaQO" id="7P_FdVPWaUF" role="3clF45">
-        <node concept="3uibUv" id="3KN3A4v3$yu" role="3O5elw">
-          <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
-          <node concept="3uibUv" id="3KN3A4v4FNQ" role="11_B2D">
-            <ref role="3uigEE" node="7km57Pkjxf4" resolve="ControlflowAspect" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7P_FdVPW9uX" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVPW9uY" role="3clF47">
-        <node concept="3clFbF" id="NKt6ynqt5n" role="3cqZAp">
-          <node concept="2OqwBi" id="NKt6ynqt5o" role="3clFbG">
-            <node concept="liA8E" id="NKt6ynqt5u" role="2OqNvi">
-              <ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
-              <node concept="37vLTw" id="NKt6ynqtVi" role="37wK5m">
-                <ref role="3cqZAo" node="7P_FdVPWb2y" resolve="model" />
-              </node>
-              <node concept="37vLTw" id="NKt6ynqt5w" role="37wK5m">
-                <ref role="3cqZAo" node="7P_FdVPWb2$" resolve="repository" />
-              </node>
-            </node>
-            <node concept="2YIFZM" id="78H58oeCC1f" role="2Oq$k0">
-              <ref role="1Pybhc" node="7km57Pkjxf4" resolve="ControlflowAspect" />
-              <ref role="37wK5l" node="78H58oeCBNZ" resolve="aspectLookup" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="78H58oefMKa" role="jymVt" />
     <node concept="3Tm1VV" id="7km57Pkjxf5" role="1B3o_S" />
     <node concept="3uibUv" id="NKt6yomOJv" role="EKbjA">
       <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
index d19bfc60..0a4acf25 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
@@ -19,12 +19,7 @@
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <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="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" />
@@ -46,9 +41,6 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
@@ -86,9 +78,6 @@
       </concept>
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </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" />
@@ -97,12 +86,6 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
-    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
-      <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
-      <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="TypecheckingAspect" />
@@ -110,6 +93,12 @@
     <node concept="2tJIrI" id="2hteS6CndfK" role="jymVt" />
     <node concept="2YIFZL" id="78H58oeCAQS" role="jymVt">
       <property role="TrG5h" value="aspectLookup" />
+      <node concept="37vLTG" id="IFW4V2s0Zk" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="IFW4V2s8pA" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
       <node concept="3Tm1VV" id="78H58oeCBjF" role="1B3o_S" />
       <node concept="3uibUv" id="78H58oeCAQU" role="3clF45">
         <ref role="3uigEE" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
@@ -122,6 +111,9 @@
           <node concept="2YIFZM" id="3KN3A4v4kbD" role="3cqZAk">
             <ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
             <ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
+            <node concept="37vLTw" id="IFW4V2tCCQ" role="37wK5m">
+              <ref role="3cqZAo" node="IFW4V2s0Zk" resolve="repository" />
+            </node>
             <node concept="2YIFZM" id="3KN3A4v4kbE" role="37wK5m">
               <ref role="37wK5l" to="fqlx:78H58oefoaA" resolve="discoverable" />
               <ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
@@ -133,49 +125,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="6UWSvq5bjXg" role="jymVt" />
-    <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="3vKaQO" id="7P_FdVPWaUF" role="3clF45">
-        <node concept="3uibUv" id="3KN3A4v4ne1" role="3O5elw">
-          <ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
-          <node concept="3uibUv" id="3KN3A4v4nj3" role="11_B2D">
-            <ref role="3uigEE" node="7km57Pkjxf4" resolve="TypecheckingAspect" />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7P_FdVPW9uX" role="1B3o_S" />
-      <node concept="3clFbS" id="7P_FdVPW9uY" role="3clF47">
-        <node concept="3clFbF" id="NKt6ynqt5n" role="3cqZAp">
-          <node concept="2OqwBi" id="NKt6ynqt5o" role="3clFbG">
-            <node concept="liA8E" id="NKt6ynqt5u" role="2OqNvi">
-              <ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
-              <node concept="37vLTw" id="NKt6ynqtVi" role="37wK5m">
-                <ref role="3cqZAo" node="7P_FdVPWb2y" resolve="model" />
-              </node>
-              <node concept="37vLTw" id="NKt6ynqt5w" role="37wK5m">
-                <ref role="3cqZAo" node="7P_FdVPWb2$" resolve="repository" />
-              </node>
-            </node>
-            <node concept="2YIFZM" id="78H58oeCB43" role="2Oq$k0">
-              <ref role="1Pybhc" node="7km57Pkjxf4" resolve="TypecheckingAspect" />
-              <ref role="37wK5l" node="78H58oeCAQS" resolve="aspectLookup" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7P_FdVQ35vN" role="jymVt" />
+    <node concept="2tJIrI" id="IFW4V2EC2j" role="jymVt" />
     <node concept="3Tm1VV" id="7km57Pkjxf5" role="1B3o_S" />
     <node concept="3uibUv" id="NKt6yomOJv" role="EKbjA">
       <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />