From b73a104b9156a84427efcbb6397676e712e01329 Mon Sep 17 00:00:00 2001
From: Artem Tikhomirov <tikhomirov.artem@gmail.com>
Date: Wed, 25 Jun 2025 18:33:06 +0300
Subject: [PATCH 1/2] grammarcells.DescriptorCache: use ModuleRuntime to manage
 instances

CLM+ReloadableModule is way too low-level runtime management mechanism,
 which drags repository access. Use modern ModuleRuntime instead

DeployListener in AppPlugin updated to remove code that checked for the current
module being unloaded. This code would never be invoked.
---
 .../mbeddr/mpsutil/grammarcells/runtime.mps   | 577 ++++++++++--------
 .../mpsutil/grammarcells/runtime/plugin.mps   | 121 +---
 2 files changed, 345 insertions(+), 353 deletions(-)

diff --git a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime.mps b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime.mps
index 23037dba60..0400983bc3 100644
--- a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime.mps
+++ b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime.mps
@@ -69,10 +69,13 @@
     <import index="i8bi" ref="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" />
     <import index="j809" ref="aaaaf3e2-decf-4e97-bf80-9109eab759ee/java:jetbrains.mps.core.aspects.feedback.messages(jetbrains.mps.lang.feedback.problem.legacy-constraints/)" />
     <import index="ykok" ref="8e98f4e2-decf-4e97-bf80-9109e8b759ee/java:jetbrains.mps.smodel.constraints(jetbrains.mps.lang.constraints.rules.runtime/)" />
+    <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
+    <import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" />
+    <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" />
+    <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
     <import index="lwvz" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.selection(MPS.Editor/)" implicit="true" />
     <import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" implicit="true" />
     <import index="z8iw" ref="r:dfdf3542-dbcf-43df-870a-3c3504b3c840(jetbrains.mps.baseLanguage.collections.custom)" implicit="true" />
-    <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" implicit="true" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -295,6 +298,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="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
         <child id="1171903916107" name="bound" index="3qUE_r" />
       </concept>
@@ -31247,25 +31251,18 @@
     <node concept="312cEg" id="4F4X830WaD9" role="jymVt">
       <property role="TrG5h" value="loadedDescriptors" />
       <property role="34CwA1" value="false" />
-      <property role="3TUv4t" value="false" />
+      <property role="3TUv4t" value="true" />
       <property role="eg7rD" value="false" />
       <node concept="3rvAFt" id="4F4X830WaDc" role="1tU5fm">
         <node concept="3uibUv" id="4F4X830WaDd" role="3rvQeY">
-          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+          <ref role="3uigEE" to="lui2:~SModuleReference" resolve="SModuleReference" />
         </node>
         <node concept="3uibUv" id="4F4X830WaDe" role="3rvSg0">
           <ref role="3uigEE" node="6oKG1kMyASU" resolve="IGrammarActionsDescriptor" />
         </node>
       </node>
       <node concept="2ShNRf" id="4F4X830WaDg" role="33vP2m">
-        <node concept="3rGOSV" id="4F4X830WaDh" role="2ShVmc">
-          <node concept="3uibUv" id="4F4X830WaDi" role="3rHrn6">
-            <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-          </node>
-          <node concept="3uibUv" id="4F4X830WaDj" role="3rHtpV">
-            <ref role="3uigEE" node="6oKG1kMyASU" resolve="IGrammarActionsDescriptor" />
-          </node>
-        </node>
+        <node concept="3rGOSV" id="4F4X830WaDh" role="2ShVmc" />
       </node>
       <node concept="3Tm6S6" id="4F4X830WaDf" role="1B3o_S" />
     </node>
@@ -31274,10 +31271,18 @@
       <property role="TrG5h" value="deployListener" />
       <node concept="3Tm6S6" id="4F4X830Wc_9" role="1B3o_S" />
       <node concept="3uibUv" id="4F4X830WcZX" role="1tU5fm">
-        <ref role="3uigEE" to="3qmy:~DeployListener" resolve="DeployListener" />
+        <ref role="3uigEE" to="ze1i:~ModuleDeploymentListener" resolve="ModuleDeploymentListener" />
       </node>
       <node concept="10Nm6u" id="4F4X830WJ71" role="33vP2m" />
     </node>
+    <node concept="2tJIrI" id="3SH_$P34sWo" role="jymVt" />
+    <node concept="312cEg" id="3SH_$P34uxL" role="jymVt">
+      <property role="TrG5h" value="languageRegistry" />
+      <node concept="3Tm6S6" id="3SH_$P34sX$" role="1B3o_S" />
+      <node concept="3uibUv" id="3SH_$P34tKz" role="1tU5fm">
+        <ref role="3uigEE" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="4F4X830Wcax" role="jymVt" />
     <node concept="3clFb_" id="4F4X830WBPc" role="jymVt">
       <property role="TrG5h" value="invalidate" />
@@ -31294,47 +31299,85 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="4e238oUPR4l" role="jymVt" />
+    <node concept="3clFb_" id="4e238oUPQDS" role="jymVt">
+      <property role="TrG5h" value="init" />
+      <node concept="37vLTG" id="4e238oUPSwS" role="3clF46">
+        <property role="TrG5h" value="mpsPlatform" />
+        <node concept="3uibUv" id="4e238oUPSwT" role="1tU5fm">
+          <ref role="3uigEE" to="wyuk:~ComponentHost" resolve="ComponentHost" />
+        </node>
+        <node concept="2AHcQZ" id="4e238oUQf9d" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="4e238oUPQDT" role="3clF45" />
+      <node concept="3Tm1VV" id="4e238oUPQDU" role="1B3o_S" />
+      <node concept="3clFbS" id="4e238oUPQDV" role="3clF47">
+        <node concept="3clFbF" id="3SH_$P34xx$" role="3cqZAp">
+          <node concept="37vLTI" id="3SH_$P34y_T" role="3clFbG">
+            <node concept="2OqwBi" id="3SH_$P34zZV" role="37vLTx">
+              <node concept="37vLTw" id="3SH_$P34zb4" role="2Oq$k0">
+                <ref role="3cqZAo" node="4e238oUPSwS" resolve="mpsPlatform" />
+              </node>
+              <node concept="liA8E" id="3SH_$P34_j$" role="2OqNvi">
+                <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
+                <node concept="3VsKOn" id="3SH_$P34AkT" role="37wK5m">
+                  <ref role="3VsUkX" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="3SH_$P34xxy" role="37vLTJ">
+              <ref role="3cqZAo" node="3SH_$P34uxL" resolve="languageRegistry" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="4F4X830WAOM" role="jymVt" />
     <node concept="3clFb_" id="4F4X830WXpi" role="jymVt">
       <property role="TrG5h" value="dispose" />
       <node concept="3cqZAl" id="4F4X830WXpk" role="3clF45" />
       <node concept="3Tm1VV" id="4F4X830WXpl" role="1B3o_S" />
       <node concept="3clFbS" id="4F4X830WXpm" role="3clF47">
-        <node concept="3clFbJ" id="4F4X830WYve" role="3cqZAp">
-          <node concept="3y3z36" id="4F4X830WYCh" role="3clFbw">
-            <node concept="10Nm6u" id="4F4X830WYCF" role="3uHU7w" />
-            <node concept="37vLTw" id="4F4X830WYw8" role="3uHU7B">
+        <node concept="3clFbJ" id="4e238oUQic3" role="3cqZAp">
+          <node concept="3y3z36" id="4e238oUQiUs" role="3clFbw">
+            <node concept="10Nm6u" id="4e238oUQjcL" role="3uHU7w" />
+            <node concept="37vLTw" id="4e238oUQi_a" role="3uHU7B">
               <ref role="3cqZAo" node="4F4X830Wc_8" resolve="deployListener" />
             </node>
           </node>
-          <node concept="3clFbS" id="4F4X830WYvg" role="3clFbx">
+          <node concept="3clFbS" id="4e238oUQic5" role="3clFbx">
             <node concept="3clFbF" id="4F4X830WYDX" role="3cqZAp">
               <node concept="2OqwBi" id="4F4X830WYDY" role="3clFbG">
-                <node concept="2OqwBi" id="4F4X830WYDZ" role="2Oq$k0">
-                  <node concept="2OqwBi" id="4F4X830WYE0" role="2Oq$k0">
-                    <node concept="2YIFZM" id="4F4X830WYE1" role="2Oq$k0">
-                      <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
-                      <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
-                    </node>
-                    <node concept="liA8E" id="4F4X830WYE2" role="2OqNvi">
-                      <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
-                      <node concept="3VsKOn" id="4F4X830WYE3" role="37wK5m">
-                        <ref role="3VsUkX" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="4F4X830WYE4" role="2OqNvi">
-                    <ref role="37wK5l" to="3a50:~MPSCoreComponents.getClassLoaderManager()" resolve="getClassLoaderManager" />
-                  </node>
-                </node>
                 <node concept="liA8E" id="4F4X830WYE5" role="2OqNvi">
-                  <ref role="37wK5l" to="3qmy:~ClassLoaderManager.removeListener(jetbrains.mps.classloading.DeployListener)" resolve="removeListener" />
+                  <ref role="37wK5l" to="vndm:~LanguageRegistry.removeRegistryListener(jetbrains.mps.smodel.runtime.ModuleDeploymentListener)" resolve="removeRegistryListener" />
                   <node concept="37vLTw" id="4F4X830WYE6" role="37wK5m">
                     <ref role="3cqZAo" node="4F4X830Wc_8" resolve="deployListener" />
                   </node>
                 </node>
+                <node concept="37vLTw" id="3SH_$P34Fe3" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3SH_$P34uxL" resolve="languageRegistry" />
+                </node>
               </node>
             </node>
+            <node concept="3clFbF" id="4e238oUQkhL" role="3cqZAp">
+              <node concept="37vLTI" id="4e238oUQkUB" role="3clFbG">
+                <node concept="10Nm6u" id="4e238oUQl9T" role="37vLTx" />
+                <node concept="37vLTw" id="4e238oUQkhJ" role="37vLTJ">
+                  <ref role="3cqZAo" node="4F4X830Wc_8" resolve="deployListener" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3SH_$P34Iun" role="3cqZAp" />
+        <node concept="3clFbF" id="3SH_$P34J$i" role="3cqZAp">
+          <node concept="37vLTI" id="3SH_$P34Kvc" role="3clFbG">
+            <node concept="10Nm6u" id="3SH_$P34KPx" role="37vLTx" />
+            <node concept="37vLTw" id="3SH_$P34J$g" role="37vLTJ">
+              <ref role="3cqZAo" node="3SH_$P34uxL" resolve="languageRegistry" />
+            </node>
           </node>
         </node>
       </node>
@@ -31352,9 +31395,9 @@
             <node concept="3uibUv" id="4F4X830Wb5q" role="1tU5fm">
               <ref role="3uigEE" node="6oKG1kMyASU" resolve="IGrammarActionsDescriptor" />
             </node>
-            <node concept="1rXfSq" id="4F4X830WNEu" role="33vP2m">
+            <node concept="1rXfSq" id="4e238oUQoNU" role="33vP2m">
               <ref role="37wK5l" node="4F4X830WKV8" resolve="doGetDescriptor" />
-              <node concept="37vLTw" id="4F4X830WOaL" role="37wK5m">
+              <node concept="37vLTw" id="4e238oUQoNT" role="37wK5m">
                 <ref role="3cqZAo" node="4F4X830Wb6b" resolve="module" />
               </node>
             </node>
@@ -31363,89 +31406,41 @@
         <node concept="3clFbJ" id="4F4X830WPbR" role="3cqZAp">
           <node concept="3clFbS" id="4F4X830WPbT" role="3clFbx">
             <node concept="3clFbJ" id="4F4X830WQT_" role="3cqZAp">
-              <node concept="3clFbC" id="4F4X830WS7K" role="3clFbw">
-                <node concept="10Nm6u" id="4F4X830WSay" role="3uHU7w" />
-                <node concept="37vLTw" id="4F4X830WQXb" role="3uHU7B">
-                  <ref role="3cqZAo" node="4F4X830Wc_8" resolve="deployListener" />
-                </node>
-              </node>
               <node concept="3clFbS" id="4F4X830WQTB" role="3clFbx">
-                <node concept="3clFbF" id="4F4X830WScl" role="3cqZAp">
-                  <node concept="37vLTI" id="4F4X830WSj6" role="3clFbG">
-                    <node concept="37vLTw" id="4F4X830WSck" role="37vLTJ">
+                <node concept="3clFbF" id="4e238oUQpo4" role="3cqZAp">
+                  <node concept="37vLTI" id="4e238oUQpo5" role="3clFbG">
+                    <node concept="37vLTw" id="4e238oUQpo6" role="37vLTJ">
                       <ref role="3cqZAo" node="4F4X830Wc_8" resolve="deployListener" />
                     </node>
-                    <node concept="2ShNRf" id="4F4X830Wdcx" role="37vLTx">
-                      <node concept="YeOm9" id="4F4X830Wug5" role="2ShVmc">
-                        <node concept="1Y3b0j" id="4F4X830Wug8" role="YeSDq">
+                    <node concept="2ShNRf" id="4e238oUQpo7" role="37vLTx">
+                      <node concept="YeOm9" id="4e238oUQpo8" role="2ShVmc">
+                        <node concept="1Y3b0j" id="4e238oUQpo9" role="YeSDq">
                           <property role="2bfB8j" value="true" />
-                          <ref role="1Y3XeK" to="3qmy:~DeployListener" resolve="DeployListener" />
+                          <ref role="1Y3XeK" to="ze1i:~ModuleDeploymentListener" resolve="ModuleDeploymentListener" />
                           <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                          <node concept="3Tm1VV" id="4F4X830Wug9" role="1B3o_S" />
-                          <node concept="3clFb_" id="4F4X830Wuga" role="jymVt">
-                            <property role="1EzhhJ" value="false" />
-                            <property role="TrG5h" value="onUnloaded" />
-                            <property role="DiZV1" value="false" />
-                            <property role="od$2w" value="false" />
-                            <node concept="3Tm1VV" id="4F4X830Wugb" role="1B3o_S" />
-                            <node concept="3cqZAl" id="4F4X830Wugd" role="3clF45" />
-                            <node concept="37vLTG" id="4F4X830Wuge" role="3clF46">
-                              <property role="TrG5h" value="p0" />
-                              <node concept="3uibUv" id="4F4X830Wugf" role="1tU5fm">
-                                <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
-                                <node concept="3uibUv" id="4F4X830Wugg" role="11_B2D">
-                                  <ref role="3uigEE" to="j8aq:~ReloadableModule" resolve="ReloadableModule" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="37vLTG" id="4F4X830Wugh" role="3clF46">
-                              <property role="TrG5h" value="p1" />
-                              <node concept="3uibUv" id="4F4X830Wugi" role="1tU5fm">
-                                <ref role="3uigEE" to="yyf4:~ProgressMonitor" resolve="ProgressMonitor" />
+                          <node concept="3Tm1VV" id="4e238oUQpoa" role="1B3o_S" />
+                          <node concept="3clFb_" id="4e238oUPFhT" role="jymVt">
+                            <property role="TrG5h" value="deploymentStateChanged" />
+                            <node concept="3Tm1VV" id="4e238oUPFhU" role="1B3o_S" />
+                            <node concept="3cqZAl" id="4e238oUPFhW" role="3clF45" />
+                            <node concept="37vLTG" id="4e238oUPFhX" role="3clF46">
+                              <property role="TrG5h" value="change" />
+                              <node concept="3uibUv" id="4e238oUPFhY" role="1tU5fm">
+                                <ref role="3uigEE" to="ze1i:~ModuleDeploymentChange" resolve="ModuleDeploymentChange" />
                               </node>
-                              <node concept="2AHcQZ" id="4F4X830Wugj" role="2AJF6D">
+                              <node concept="2AHcQZ" id="4e238oUPFhZ" role="2AJF6D">
                                 <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
                               </node>
                             </node>
-                            <node concept="3clFbS" id="4F4X830Wugk" role="3clF47">
-                              <node concept="3clFbF" id="4F4X830WD64" role="3cqZAp">
-                                <node concept="1rXfSq" id="4F4X830WD63" role="3clFbG">
+                            <node concept="3clFbS" id="4e238oUPFi1" role="3clF47">
+                              <node concept="3clFbF" id="4e238oUQpob" role="3cqZAp">
+                                <node concept="1rXfSq" id="4e238oUQpoc" role="3clFbG">
                                   <ref role="37wK5l" node="4F4X830WBPc" resolve="invalidate" />
                                 </node>
                               </node>
                             </node>
-                          </node>
-                          <node concept="3clFb_" id="4F4X830Wugm" role="jymVt">
-                            <property role="1EzhhJ" value="false" />
-                            <property role="TrG5h" value="onLoaded" />
-                            <property role="DiZV1" value="false" />
-                            <property role="od$2w" value="false" />
-                            <node concept="3Tm1VV" id="4F4X830Wugn" role="1B3o_S" />
-                            <node concept="3cqZAl" id="4F4X830Wugp" role="3clF45" />
-                            <node concept="37vLTG" id="4F4X830Wugq" role="3clF46">
-                              <property role="TrG5h" value="p0" />
-                              <node concept="3uibUv" id="4F4X830Wugr" role="1tU5fm">
-                                <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
-                                <node concept="3uibUv" id="4F4X830Wugs" role="11_B2D">
-                                  <ref role="3uigEE" to="j8aq:~ReloadableModule" resolve="ReloadableModule" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="37vLTG" id="4F4X830Wugt" role="3clF46">
-                              <property role="TrG5h" value="p1" />
-                              <node concept="3uibUv" id="4F4X830Wugu" role="1tU5fm">
-                                <ref role="3uigEE" to="yyf4:~ProgressMonitor" resolve="ProgressMonitor" />
-                              </node>
-                              <node concept="2AHcQZ" id="4F4X830Wugv" role="2AJF6D">
-                                <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-                              </node>
-                            </node>
-                            <node concept="3clFbS" id="4F4X830Wugw" role="3clF47">
-                              <node concept="3clFbF" id="4F4X830WD0b" role="3cqZAp">
-                                <node concept="1rXfSq" id="4F4X830WD0a" role="3clFbG">
-                                  <ref role="37wK5l" node="4F4X830WBPc" resolve="invalidate" />
-                                </node>
-                              </node>
+                            <node concept="2AHcQZ" id="4e238oUPFi2" role="2AJF6D">
+                              <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                             </node>
                           </node>
                         </node>
@@ -31453,34 +31448,34 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbF" id="4F4X830WU3d" role="3cqZAp">
-                  <node concept="2OqwBi" id="4F4X830WW5$" role="3clFbG">
-                    <node concept="2OqwBi" id="4F4X830WVn8" role="2Oq$k0">
-                      <node concept="2OqwBi" id="4F4X830WUvn" role="2Oq$k0">
-                        <node concept="2YIFZM" id="4F4X830WUaa" role="2Oq$k0">
-                          <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
-                          <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
-                        </node>
-                        <node concept="liA8E" id="4F4X830WV16" role="2OqNvi">
-                          <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
-                          <node concept="3VsKOn" id="4F4X830WV4c" role="37wK5m">
-                            <ref role="3VsUkX" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="4F4X830WVG8" role="2OqNvi">
-                        <ref role="37wK5l" to="3a50:~MPSCoreComponents.getClassLoaderManager()" resolve="getClassLoaderManager" />
-                      </node>
+                <node concept="3clFbF" id="4e238oUPV3H" role="3cqZAp">
+                  <node concept="2OqwBi" id="4e238oUPV3I" role="3clFbG">
+                    <node concept="37vLTw" id="3SH_$P34MZS" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3SH_$P34uxL" resolve="languageRegistry" />
                     </node>
-                    <node concept="liA8E" id="4F4X830WWA0" role="2OqNvi">
-                      <ref role="37wK5l" to="3qmy:~ClassLoaderManager.addListener(jetbrains.mps.classloading.DeployListener)" resolve="addListener" />
-                      <node concept="37vLTw" id="4F4X830WWFj" role="37wK5m">
+                    <node concept="liA8E" id="4e238oUPV3N" role="2OqNvi">
+                      <ref role="37wK5l" to="vndm:~LanguageRegistry.addRegistryListener(jetbrains.mps.smodel.runtime.ModuleDeploymentListener)" resolve="addRegistryListener" />
+                      <node concept="37vLTw" id="4e238oUPV3O" role="37wK5m">
                         <ref role="3cqZAo" node="4F4X830Wc_8" resolve="deployListener" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="1Wc70l" id="4e238oUQrF1" role="3clFbw">
+                <node concept="3y3z36" id="4e238oUQsBh" role="3uHU7w">
+                  <node concept="10Nm6u" id="4e238oUQsWs" role="3uHU7w" />
+                  <node concept="37vLTw" id="4e238oUQs1K" role="3uHU7B">
+                    <ref role="3cqZAo" node="3SH_$P34uxL" resolve="languageRegistry" />
+                  </node>
+                </node>
+                <node concept="3clFbC" id="4F4X830WS7K" role="3uHU7B">
+                  <node concept="37vLTw" id="4F4X830WQXb" role="3uHU7B">
+                    <ref role="3cqZAo" node="4F4X830Wc_8" resolve="deployListener" />
+                  </node>
+                  <node concept="10Nm6u" id="4F4X830WSay" role="3uHU7w" />
+                </node>
+              </node>
             </node>
           </node>
           <node concept="3y3z36" id="4F4X830WQrT" role="3clFbw">
@@ -31526,58 +31521,51 @@
               <node concept="10Nm6u" id="4F4X830WKVd" role="3cqZAk" />
             </node>
           </node>
-          <node concept="3clFbC" id="4F4X830WKVe" role="3clFbw">
-            <node concept="10Nm6u" id="4F4X830WKVf" role="3uHU7w" />
-            <node concept="37vLTw" id="4F4X830WKVg" role="3uHU7B">
-              <ref role="3cqZAo" node="4F4X830WKWu" resolve="module" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="4F4X830WKVh" role="3cqZAp">
-          <node concept="3clFbS" id="4F4X830WKVi" role="3clFbx">
-            <node concept="3cpWs6" id="4F4X830WKVj" role="3cqZAp">
-              <node concept="10Nm6u" id="4F4X830WKVk" role="3cqZAk" />
-            </node>
-          </node>
-          <node concept="3fqX7Q" id="4F4X830WKVl" role="3clFbw">
-            <node concept="2ZW3vV" id="4F4X830WKVm" role="3fr31v">
-              <node concept="3uibUv" id="4F4X830WKVn" role="2ZW6by">
-                <ref role="3uigEE" to="j8aq:~ReloadableModule" resolve="ReloadableModule" />
+          <node concept="22lmx$" id="4e238oUQur$" role="3clFbw">
+            <node concept="3clFbC" id="4e238oUQvdk" role="3uHU7w">
+              <node concept="10Nm6u" id="4e238oUQvzb" role="3uHU7w" />
+              <node concept="37vLTw" id="4e238oUQuLG" role="3uHU7B">
+                <ref role="3cqZAo" node="3SH_$P34uxL" resolve="languageRegistry" />
               </node>
-              <node concept="37vLTw" id="4F4X830WKVo" role="2ZW6bz">
+            </node>
+            <node concept="3clFbC" id="4F4X830WKVe" role="3uHU7B">
+              <node concept="37vLTw" id="4F4X830WKVg" role="3uHU7B">
                 <ref role="3cqZAo" node="4F4X830WKWu" resolve="module" />
               </node>
+              <node concept="10Nm6u" id="4F4X830WKVf" role="3uHU7w" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="4F4X830WKVp" role="3cqZAp">
-          <node concept="3cpWsn" id="4F4X830WKVq" role="3cpWs9">
-            <property role="TrG5h" value="reloadableModule" />
-            <node concept="3uibUv" id="4F4X830WKVr" role="1tU5fm">
-              <ref role="3uigEE" to="j8aq:~ReloadableModule" resolve="ReloadableModule" />
+        <node concept="3cpWs8" id="4e238oUQ1bJ" role="3cqZAp">
+          <node concept="3cpWsn" id="4e238oUQ1bH" role="3cpWs9">
+            <property role="3TUv4t" value="true" />
+            <property role="TrG5h" value="mref" />
+            <node concept="3uibUv" id="4e238oUQ1Ak" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SModuleReference" resolve="SModuleReference" />
             </node>
-            <node concept="10QFUN" id="4F4X830WKVs" role="33vP2m">
-              <node concept="37vLTw" id="4F4X830WKVt" role="10QFUP">
+            <node concept="2OqwBi" id="4e238oUPYVo" role="33vP2m">
+              <node concept="37vLTw" id="4F4X830WKVC" role="2Oq$k0">
                 <ref role="3cqZAo" node="4F4X830WKWu" resolve="module" />
               </node>
-              <node concept="3uibUv" id="4F4X830WKVu" role="10QFUM">
-                <ref role="3uigEE" to="j8aq:~ReloadableModule" resolve="ReloadableModule" />
+              <node concept="liA8E" id="4e238oUPZn7" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~SModule.getModuleReference()" resolve="getModuleReference" />
               </node>
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="4e238oUQ0f7" role="3cqZAp" />
         <node concept="3clFbJ" id="4F4X830WKVv" role="3cqZAp">
           <property role="TyiWK" value="true" />
           <property role="TyiWL" value="false" />
           <node concept="3clFbS" id="4F4X830WKVw" role="3clFbx">
             <node concept="3cpWs6" id="4F4X830WKVx" role="3cqZAp">
               <node concept="3EllGN" id="4F4X830WKVy" role="3cqZAk">
-                <node concept="37vLTw" id="4F4X830WKVz" role="3ElVtu">
-                  <ref role="3cqZAo" node="4F4X830WKWu" resolve="module" />
-                </node>
                 <node concept="37vLTw" id="4F4X830WKV$" role="3ElQJh">
                   <ref role="3cqZAo" node="4F4X830WaD9" resolve="loadedDescriptors" />
                 </node>
+                <node concept="37vLTw" id="4e238oUQ3RJ" role="3ElVtu">
+                  <ref role="3cqZAo" node="4e238oUQ1bH" resolve="mref" />
+                </node>
               </node>
             </node>
           </node>
@@ -31586,8 +31574,50 @@
               <ref role="3cqZAo" node="4F4X830WaD9" resolve="loadedDescriptors" />
             </node>
             <node concept="2Nt0df" id="4F4X830WKVB" role="2OqNvi">
-              <node concept="37vLTw" id="4F4X830WKVC" role="38cxEo">
-                <ref role="3cqZAo" node="4F4X830WKWu" resolve="module" />
+              <node concept="37vLTw" id="4e238oUQ3vF" role="38cxEo">
+                <ref role="3cqZAo" node="4e238oUQ1bH" resolve="mref" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4F4X830WKVJ" role="3cqZAp">
+          <node concept="3cpWsn" id="4F4X830WKVK" role="3cpWs9">
+            <property role="TrG5h" value="descriptorClassName" />
+            <property role="3TUv4t" value="true" />
+            <node concept="17QB3L" id="4F4X830WKVL" role="1tU5fm" />
+            <node concept="3cpWs3" id="4F4X830WKVM" role="33vP2m">
+              <node concept="10M0yZ" id="4F4X830WKVN" role="3uHU7w">
+                <ref role="1PxDUh" node="6oKG1kMyASU" resolve="IGrammarActionsDescriptor" />
+                <ref role="3cqZAo" node="6oKG1kMyATa" resolve="CLASS_NAME" />
+              </node>
+              <node concept="3cpWs3" id="4F4X830WKVO" role="3uHU7B">
+                <node concept="3cpWs3" id="4F4X830WKVP" role="3uHU7B">
+                  <node concept="3cpWs3" id="4F4X830WKVQ" role="3uHU7B">
+                    <node concept="2OqwBi" id="4F4X830WKVR" role="3uHU7B">
+                      <node concept="37vLTw" id="4F4X830WKVS" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4e238oUQ1bH" resolve="mref" />
+                      </node>
+                      <node concept="liA8E" id="4F4X830WKVT" role="2OqNvi">
+                        <ref role="37wK5l" to="lui2:~SModuleReference.getModuleName()" resolve="getModuleName" />
+                      </node>
+                    </node>
+                    <node concept="Xl_RD" id="4F4X830WKVU" role="3uHU7w">
+                      <property role="Xl_RC" value="." />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="4F4X830WKVV" role="3uHU7w">
+                    <node concept="Rm8GO" id="4F4X830WKVW" role="2Oq$k0">
+                      <ref role="Rm8GQ" to="w1kc:~LanguageAspect.EDITOR" resolve="EDITOR" />
+                      <ref role="1Px2BO" to="w1kc:~LanguageAspect" resolve="LanguageAspect" />
+                    </node>
+                    <node concept="liA8E" id="4F4X830WKVX" role="2OqNvi">
+                      <ref role="37wK5l" to="w1kc:~LanguageAspect.getName()" resolve="getName" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="Xl_RD" id="4F4X830WKVY" role="3uHU7w">
+                  <property role="Xl_RC" value="." />
+                </node>
               </node>
             </node>
           </node>
@@ -31601,121 +31631,162 @@
             <node concept="10Nm6u" id="4F4X830WKVG" role="33vP2m" />
           </node>
         </node>
-        <node concept="3J1_TO" id="4F4X830WKVH" role="3cqZAp">
-          <node concept="3clFbS" id="4F4X830WKVI" role="1zxBo7">
-            <node concept="3cpWs8" id="4F4X830WKVJ" role="3cqZAp">
-              <node concept="3cpWsn" id="4F4X830WKVK" role="3cpWs9">
-                <property role="TrG5h" value="descriptorClassName" />
-                <node concept="17QB3L" id="4F4X830WKVL" role="1tU5fm" />
-                <node concept="3cpWs3" id="4F4X830WKVM" role="33vP2m">
-                  <node concept="10M0yZ" id="4F4X830WKVN" role="3uHU7w">
-                    <ref role="1PxDUh" node="6oKG1kMyASU" resolve="IGrammarActionsDescriptor" />
-                    <ref role="3cqZAo" node="6oKG1kMyATa" resolve="CLASS_NAME" />
-                  </node>
-                  <node concept="3cpWs3" id="4F4X830WKVO" role="3uHU7B">
-                    <node concept="3cpWs3" id="4F4X830WKVP" role="3uHU7B">
-                      <node concept="3cpWs3" id="4F4X830WKVQ" role="3uHU7B">
-                        <node concept="2OqwBi" id="4F4X830WKVR" role="3uHU7B">
-                          <node concept="37vLTw" id="4F4X830WKVS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4F4X830WKVq" resolve="reloadableModule" />
+        <node concept="3clFbH" id="7j4fMPwmvSq" role="3cqZAp" />
+        <node concept="3clFbF" id="4e238oUQtWM" role="3cqZAp">
+          <node concept="2OqwBi" id="4e238oUQxUg" role="3clFbG">
+            <node concept="37vLTw" id="3SH_$P34R2h" role="2Oq$k0">
+              <ref role="3cqZAo" node="3SH_$P34uxL" resolve="languageRegistry" />
+            </node>
+            <node concept="liA8E" id="4e238oUQy$M" role="2OqNvi">
+              <ref role="37wK5l" to="vndm:~LanguageRegistry.withModuleRuntime(java.util.stream.Stream,java.util.function.Consumer)" resolve="withModuleRuntime" />
+              <node concept="2YIFZM" id="4e238oUQ$nS" role="37wK5m">
+                <ref role="37wK5l" to="1ctc:~Stream.of(java.lang.Object...)" resolve="of" />
+                <ref role="1Pybhc" to="1ctc:~Stream" resolve="Stream" />
+                <node concept="37vLTw" id="4e238oUQ$Vg" role="37wK5m">
+                  <ref role="3cqZAo" node="4e238oUQ1bH" resolve="mref" />
+                </node>
+              </node>
+              <node concept="1bVj0M" id="4e238oUQA9B" role="37wK5m">
+                <node concept="gl6BB" id="4e238oUQA9M" role="1bW2Oz">
+                  <property role="TrG5h" value="mr" />
+                  <node concept="2jxLKc" id="4e238oUQA9N" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="4e238oUQA9Q" role="1bW5cS">
+                  <node concept="9aQIb" id="4e238oUQBo6" role="3cqZAp">
+                    <node concept="3clFbS" id="4e238oUQBo7" role="9aQI4">
+                      <node concept="3J1_TO" id="4F4X830WKVH" role="3cqZAp">
+                        <node concept="3clFbS" id="4F4X830WKVI" role="1zxBo7">
+                          <node concept="3cpWs8" id="4F4X830WKVZ" role="3cqZAp">
+                            <node concept="3cpWsn" id="4F4X830WKW0" role="3cpWs9">
+                              <property role="TrG5h" value="descriptorClass" />
+                              <node concept="3uibUv" id="4F4X830WKW1" role="1tU5fm">
+                                <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+                                <node concept="3qTvmN" id="4e238oUQV7T" role="11_B2D" />
+                              </node>
+                              <node concept="2OqwBi" id="4e238oUQCna" role="33vP2m">
+                                <node concept="37vLTw" id="4e238oUQBSS" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4e238oUQA9M" resolve="mr" />
+                                </node>
+                                <node concept="liA8E" id="4e238oUQD9N" role="2OqNvi">
+                                  <ref role="37wK5l" to="ze1i:~ModuleRuntime.getOwnClass(java.lang.String)" resolve="getOwnClass" />
+                                  <node concept="37vLTw" id="4e238oUQRAJ" role="37wK5m">
+                                    <ref role="3cqZAo" node="4F4X830WKVK" resolve="descriptorClassName" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
                           </node>
-                          <node concept="liA8E" id="4F4X830WKVT" role="2OqNvi">
-                            <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
+                          <node concept="3clFbF" id="4F4X830WKW6" role="3cqZAp">
+                            <node concept="37vLTI" id="4F4X830WKW7" role="3clFbG">
+                              <node concept="1eOMI4" id="4F4X830WKW8" role="37vLTx">
+                                <node concept="10QFUN" id="4F4X830WKW9" role="1eOMHV">
+                                  <node concept="2YIFZM" id="4F4X830WKWa" role="10QFUP">
+                                    <ref role="37wK5l" to="ycmz:7moa1g0RuMd" resolve="readField" />
+                                    <ref role="1Pybhc" to="ycmz:7moa1g0QL5J" resolve="ReflectionUtil" />
+                                    <node concept="37vLTw" id="4F4X830WKWb" role="37wK5m">
+                                      <ref role="3cqZAo" node="4F4X830WKW0" resolve="descriptorClass" />
+                                    </node>
+                                    <node concept="10Nm6u" id="4F4X830WKWc" role="37wK5m" />
+                                    <node concept="10M0yZ" id="4F4X830WKWd" role="37wK5m">
+                                      <ref role="1PxDUh" node="6oKG1kMyASU" resolve="IGrammarActionsDescriptor" />
+                                      <ref role="3cqZAo" node="6oKG1kMz1PG" resolve="INSTANCE_FIELD_NAME" />
+                                    </node>
+                                  </node>
+                                  <node concept="3uibUv" id="4F4X830WKWe" role="10QFUM">
+                                    <ref role="3uigEE" node="6oKG1kMyASU" resolve="IGrammarActionsDescriptor" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="37vLTw" id="4F4X830WKWf" role="37vLTJ">
+                                <ref role="3cqZAo" node="4F4X830WKVE" resolve="descriptor" />
+                              </node>
+                            </node>
                           </node>
                         </node>
-                        <node concept="Xl_RD" id="4F4X830WKVU" role="3uHU7w">
-                          <property role="Xl_RC" value="." />
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="4F4X830WKVV" role="3uHU7w">
-                        <node concept="Rm8GO" id="4F4X830WKVW" role="2Oq$k0">
-                          <ref role="Rm8GQ" to="w1kc:~LanguageAspect.EDITOR" resolve="EDITOR" />
-                          <ref role="1Px2BO" to="w1kc:~LanguageAspect" resolve="LanguageAspect" />
-                        </node>
-                        <node concept="liA8E" id="4F4X830WKVX" role="2OqNvi">
-                          <ref role="37wK5l" to="w1kc:~LanguageAspect.getName()" resolve="getName" />
+                        <node concept="3uVAMA" id="4F4X830WKWg" role="1zxBo5">
+                          <node concept="XOnhg" id="4F4X830WKWi" role="1zc67B">
+                            <property role="3TUv4t" value="false" />
+                            <property role="TrG5h" value="ex" />
+                            <node concept="nSUau" id="58HqyYC0lxy" role="1tU5fm">
+                              <node concept="3uibUv" id="4F4X830WKWj" role="nSUat">
+                                <ref role="3uigEE" to="wyt6:~ClassNotFoundException" resolve="ClassNotFoundException" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbS" id="4F4X830WKWh" role="1zc67A" />
                         </node>
                       </node>
                     </node>
-                    <node concept="Xl_RD" id="4F4X830WKVY" role="3uHU7w">
-                      <property role="Xl_RC" value="." />
-                    </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="4F4X830WKVZ" role="3cqZAp">
-              <node concept="3cpWsn" id="4F4X830WKW0" role="3cpWs9">
-                <property role="TrG5h" value="descriptorClass" />
-                <node concept="3uibUv" id="4F4X830WKW1" role="1tU5fm">
-                  <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="7j4fMPwmujl" role="3cqZAp" />
+        <node concept="3clFbJ" id="7j4fMPwmqm6" role="3cqZAp">
+          <node concept="3clFbS" id="7j4fMPwmqm8" role="3clFbx">
+            <node concept="3SKdUt" id="7j4fMPwmxqh" role="3cqZAp">
+              <node concept="1PaTwC" id="7j4fMPwmxqi" role="1aUNEU">
+                <node concept="3oM_SD" id="7j4fMPwmz1n" role="1PaTwD">
+                  <property role="3oM_SC" value="Module" />
                 </node>
-                <node concept="2OqwBi" id="4F4X830WKW2" role="33vP2m">
-                  <node concept="37vLTw" id="4F4X830WKW3" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4F4X830WKVq" resolve="reloadableModule" />
-                  </node>
-                  <node concept="liA8E" id="4F4X830WKW4" role="2OqNvi">
-                    <ref role="37wK5l" to="j8aq:~ReloadableModule.getOwnClass(java.lang.String)" resolve="getOwnClass" />
-                    <node concept="37vLTw" id="4F4X830WKW5" role="37wK5m">
-                      <ref role="3cqZAo" node="4F4X830WKVK" resolve="descriptorClassName" />
-                    </node>
-                  </node>
+                <node concept="3oM_SD" id="7j4fMPwmz4F" role="1PaTwD">
+                  <property role="3oM_SC" value="was" />
                 </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="4F4X830WKW6" role="3cqZAp">
-              <node concept="37vLTI" id="4F4X830WKW7" role="3clFbG">
-                <node concept="1eOMI4" id="4F4X830WKW8" role="37vLTx">
-                  <node concept="10QFUN" id="4F4X830WKW9" role="1eOMHV">
-                    <node concept="2YIFZM" id="4F4X830WKWa" role="10QFUP">
-                      <ref role="37wK5l" to="ycmz:7moa1g0RuMd" resolve="readField" />
-                      <ref role="1Pybhc" to="ycmz:7moa1g0QL5J" resolve="ReflectionUtil" />
-                      <node concept="37vLTw" id="4F4X830WKWb" role="37wK5m">
-                        <ref role="3cqZAo" node="4F4X830WKW0" resolve="descriptorClass" />
-                      </node>
-                      <node concept="10Nm6u" id="4F4X830WKWc" role="37wK5m" />
-                      <node concept="10M0yZ" id="4F4X830WKWd" role="37wK5m">
-                        <ref role="1PxDUh" node="6oKG1kMyASU" resolve="IGrammarActionsDescriptor" />
-                        <ref role="3cqZAo" node="6oKG1kMz1PG" resolve="INSTANCE_FIELD_NAME" />
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="4F4X830WKWe" role="10QFUM">
-                      <ref role="3uigEE" node="6oKG1kMyASU" resolve="IGrammarActionsDescriptor" />
-                    </node>
-                  </node>
+                <node concept="3oM_SD" id="7j4fMPwmz5Z" role="1PaTwD">
+                  <property role="3oM_SC" value="not" />
                 </node>
-                <node concept="37vLTw" id="4F4X830WKWf" role="37vLTJ">
-                  <ref role="3cqZAo" node="4F4X830WKVE" resolve="descriptor" />
+                <node concept="3oM_SD" id="7j4fMPwmzfe" role="1PaTwD">
+                  <property role="3oM_SC" value="loaded" />
+                </node>
+                <node concept="3oM_SD" id="7j4fMPwmz62" role="1PaTwD">
+                  <property role="3oM_SC" value="or" />
+                </node>
+                <node concept="3oM_SD" id="7j4fMPwmz6F" role="1PaTwD">
+                  <property role="3oM_SC" value="descriptor" />
+                </node>
+                <node concept="3oM_SD" id="7j4fMPwmz6G" role="1PaTwD">
+                  <property role="3oM_SC" value="could" />
+                </node>
+                <node concept="3oM_SD" id="7j4fMPwmz7o" role="1PaTwD">
+                  <property role="3oM_SC" value="not" />
+                </node>
+                <node concept="3oM_SD" id="7j4fMPwmz81" role="1PaTwD">
+                  <property role="3oM_SC" value="be" />
+                </node>
+                <node concept="3oM_SD" id="7j4fMPwmz82" role="1PaTwD">
+                  <property role="3oM_SC" value="loaded" />
+                </node>
+                <node concept="3oM_SD" id="7j4fMPwmz83" role="1PaTwD">
+                  <property role="3oM_SC" value="from" />
+                </node>
+                <node concept="3oM_SD" id="7j4fMPwmzaG" role="1PaTwD">
+                  <property role="3oM_SC" value="module" />
                 </node>
               </node>
             </node>
-          </node>
-          <node concept="3uVAMA" id="4F4X830WKWg" role="1zxBo5">
-            <node concept="XOnhg" id="4F4X830WKWi" role="1zc67B">
-              <property role="3TUv4t" value="false" />
-              <property role="TrG5h" value="ex" />
-              <node concept="nSUau" id="58HqyYC0lxy" role="1tU5fm">
-                <node concept="3uibUv" id="4F4X830WKWj" role="nSUat">
-                  <ref role="3uigEE" to="wyt6:~ClassNotFoundException" resolve="ClassNotFoundException" />
+            <node concept="3clFbF" id="4F4X830WKWk" role="3cqZAp">
+              <node concept="37vLTI" id="4F4X830WKWl" role="3clFbG">
+                <node concept="37vLTw" id="4F4X830WKWm" role="37vLTx">
+                  <ref role="3cqZAo" node="4F4X830WKVE" resolve="descriptor" />
+                </node>
+                <node concept="3EllGN" id="4F4X830WKWn" role="37vLTJ">
+                  <node concept="37vLTw" id="4F4X830WKWo" role="3ElVtu">
+                    <ref role="3cqZAo" node="4e238oUQ1bH" resolve="mref" />
+                  </node>
+                  <node concept="37vLTw" id="4F4X830WKWp" role="3ElQJh">
+                    <ref role="3cqZAo" node="4F4X830WaD9" resolve="loadedDescriptors" />
+                  </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbS" id="4F4X830WKWh" role="1zc67A" />
           </node>
-        </node>
-        <node concept="3clFbF" id="4F4X830WKWk" role="3cqZAp">
-          <node concept="37vLTI" id="4F4X830WKWl" role="3clFbG">
-            <node concept="37vLTw" id="4F4X830WKWm" role="37vLTx">
+          <node concept="3y3z36" id="7j4fMPwmrYK" role="3clFbw">
+            <node concept="10Nm6u" id="7j4fMPwms0z" role="3uHU7w" />
+            <node concept="37vLTw" id="7j4fMPwmric" role="3uHU7B">
               <ref role="3cqZAo" node="4F4X830WKVE" resolve="descriptor" />
             </node>
-            <node concept="3EllGN" id="4F4X830WKWn" role="37vLTJ">
-              <node concept="37vLTw" id="4F4X830WKWo" role="3ElVtu">
-                <ref role="3cqZAo" node="4F4X830WKWu" resolve="module" />
-              </node>
-              <node concept="37vLTw" id="4F4X830WKWp" role="3ElQJh">
-                <ref role="3cqZAo" node="4F4X830WaD9" resolve="loadedDescriptors" />
-              </node>
-            </node>
           </node>
         </node>
         <node concept="3cpWs6" id="4F4X830WKWq" role="3cqZAp">
diff --git a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime/plugin.mps b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime/plugin.mps
index 0fe7691065..39aa9a7330 100644
--- a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime/plugin.mps
+++ b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime/plugin.mps
@@ -32,6 +32,7 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="m9yn" ref="r:fa6df9a8-26a8-40dd-9b99-6ccc8d453556(com.mbeddr.mpsutil.grammarcells.runtime.insertpopup)" />
     <import index="878o" ref="r:46fddec3-0db9-4b86-8274-957463dd4499(com.mbeddr.mpsutil.grammarcells.runtimelang.structure)" implicit="true" />
+    <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" implicit="true" />
   </imports>
   <registry>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -75,6 +76,7 @@
       </concept>
       <concept id="481983775135178846" name="jetbrains.mps.lang.plugin.standalone.structure.ApplicationPluginDisposeBlock" flags="in" index="2uRRBI" />
       <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
+      <concept id="3418954410726344423" name="jetbrains.mps.lang.plugin.standalone.structure.PlatformAccessExpression" flags="ng" index="XUXob" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
@@ -448,22 +450,14 @@
         <node concept="3clFbH" id="77z0Sgz0hCr" role="3cqZAp" />
         <node concept="3clFbF" id="77z0Sgz0kaH" role="3cqZAp">
           <node concept="37vLTI" id="77z0Sgz0kaJ" role="3clFbG">
-            <node concept="2OqwBi" id="77z0Sgz0hYZ" role="37vLTx">
-              <node concept="2OqwBi" id="77z0Sgz0hZ0" role="2Oq$k0">
-                <node concept="2YIFZM" id="77z0Sgz0hZ1" role="2Oq$k0">
-                  <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
-                  <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
-                </node>
-                <node concept="liA8E" id="77z0Sgz0hZ2" role="2OqNvi">
-                  <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
-                  <node concept="3VsKOn" id="77z0Sgz0hZ3" role="37wK5m">
-                    <ref role="3VsUkX" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
-                  </node>
+            <node concept="2OqwBi" id="77z0Sgz0hZ0" role="37vLTx">
+              <node concept="XUXob" id="4e238oUQYxz" role="2Oq$k0" />
+              <node concept="liA8E" id="77z0Sgz0hZ2" role="2OqNvi">
+                <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
+                <node concept="3VsKOn" id="4e238oUQYNh" role="37wK5m">
+                  <ref role="3VsUkX" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
                 </node>
               </node>
-              <node concept="liA8E" id="77z0Sgz0hZ4" role="2OqNvi">
-                <ref role="37wK5l" to="3a50:~MPSCoreComponents.getClassLoaderManager()" resolve="getClassLoaderManager" />
-              </node>
             </node>
             <node concept="2OqwBi" id="77z0Sgz0kQf" role="37vLTJ">
               <node concept="2WthIp" id="77z0Sgz0kQi" role="2Oq$k0" />
@@ -610,92 +604,6 @@
                       </node>
                     </node>
                     <node concept="3clFbS" id="7JEoLgT_Ksb" role="3clF47">
-                      <node concept="2Gpval" id="77z0Sgz1GzJ" role="3cqZAp">
-                        <node concept="2GrKxI" id="77z0Sgz1GzK" role="2Gsz3X">
-                          <property role="TrG5h" value="module" />
-                        </node>
-                        <node concept="37vLTw" id="77z0Sgz1GzL" role="2GsD0m">
-                          <ref role="3cqZAo" node="7JEoLgT_Ks3" resolve="modules" />
-                        </node>
-                        <node concept="3clFbS" id="77z0Sgz1GzM" role="2LFqv$">
-                          <node concept="3clFbJ" id="77z0Sgz1GzN" role="3cqZAp">
-                            <node concept="17R0WA" id="77z0Sgz1GzO" role="3clFbw">
-                              <node concept="37shsh" id="77z0Sgz1GzP" role="3uHU7w">
-                                <node concept="1dCxOk" id="7WTFIQIcYxG" role="37shsm">
-                                  <property role="1XxBO9" value="com.mbeddr.mpsutil.grammarcells.runtime" />
-                                  <property role="1XweGW" value="7ac49bcb-77fb-4f0f-9036-e31b86b854b2" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="77z0Sgz1GzR" role="3uHU7B">
-                                <node concept="2GrUjf" id="77z0Sgz1GzS" role="2Oq$k0">
-                                  <ref role="2Gs0qQ" node="77z0Sgz1GzK" resolve="module" />
-                                </node>
-                                <node concept="liA8E" id="77z0Sgz1GzT" role="2OqNvi">
-                                  <ref role="37wK5l" to="j8aq:~ReloadableModule.getModuleReference()" resolve="getModuleReference" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3clFbS" id="77z0Sgz1GzU" role="3clFbx">
-                              <node concept="3clFbF" id="4jHuzb0ECuw" role="3cqZAp">
-                                <node concept="37vLTI" id="4jHuzb0ECy$" role="3clFbG">
-                                  <node concept="3clFbT" id="4jHuzb0EC$5" role="37vLTx">
-                                    <property role="3clFbU" value="true" />
-                                  </node>
-                                  <node concept="2OqwBi" id="4jHuzb0ECuq" role="37vLTJ">
-                                    <node concept="2WthIp" id="4jHuzb0ECut" role="2Oq$k0">
-                                      <ref role="32nkFo" node="4AjdlHqk3Vr" resolve="ApplicationPlugin" />
-                                    </node>
-                                    <node concept="2BZ7hE" id="4jHuzb0ECuv" role="2OqNvi">
-                                      <ref role="2WH_rO" node="4jHuzb0EBvd" resolve="myIsDisposed" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="4jHuzb0ECPt" role="3cqZAp">
-                                <node concept="2YIFZM" id="4jHuzb0ECPu" role="3clFbG">
-                                  <ref role="1Pybhc" to="tiy4:4AjdlHqjWA8" resolve="ArbitraryTextDeleteAction" />
-                                  <ref role="37wK5l" to="tiy4:3O7ZvCZIRNX" resolve="setHandler" />
-                                  <node concept="10Nm6u" id="4jHuzb0ECPv" role="37wK5m" />
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="4jHuzb0ECPw" role="3cqZAp">
-                                <node concept="2OqwBi" id="4jHuzb0ECPx" role="3clFbG">
-                                  <node concept="liA8E" id="4jHuzb0ECPz" role="2OqNvi">
-                                    <ref role="37wK5l" to="3qmy:~ClassLoaderManager.removeListener(jetbrains.mps.classloading.DeployListener)" resolve="removeListener" />
-                                    <node concept="2OqwBi" id="4jHuzb0ECP$" role="37wK5m">
-                                      <node concept="2WthIp" id="4jHuzb0ECP_" role="2Oq$k0" />
-                                      <node concept="2BZ7hE" id="4jHuzb0ECPA" role="2OqNvi">
-                                        <ref role="2WH_rO" node="6D5JhjDkoqA" resolve="classesListener" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="2OqwBi" id="77z0Sgz0kT4" role="2Oq$k0">
-                                    <node concept="2WthIp" id="77z0Sgz0kT7" role="2Oq$k0">
-                                      <ref role="32nkFo" node="4AjdlHqk3Vr" resolve="ApplicationPlugin" />
-                                    </node>
-                                    <node concept="2BZ7hE" id="77z0Sgz0kT9" role="2OqNvi">
-                                      <ref role="2WH_rO" node="77z0Sgz0jww" resolve="classLoaderManager" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="4jHuzb0ECPB" role="3cqZAp">
-                                <node concept="2OqwBi" id="4jHuzb0ECPC" role="3clFbG">
-                                  <node concept="2YIFZM" id="4jHuzb0ECPD" role="2Oq$k0">
-                                    <ref role="37wK5l" to="czm:5_y0OhSxtIA" resolve="getInstance" />
-                                    <ref role="1Pybhc" to="czm:5_y0OhSv6AE" resolve="VisibleLanguagesCache" />
-                                  </node>
-                                  <node concept="liA8E" id="4jHuzb0ECPE" role="2OqNvi">
-                                    <ref role="37wK5l" to="czm:5_y0OhSv7Zk" resolve="dispose" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3zACq4" id="77z0Sgz1GRt" role="3cqZAp" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="77z0Sgz1yyM" role="3cqZAp" />
                       <node concept="3clFbF" id="1q2ZuLRkvH$" role="3cqZAp">
                         <node concept="2YIFZM" id="1q2ZuLRkvH_" role="3clFbG">
                           <ref role="1Pybhc" to="czm:3VuMMxTwgbn" resolve="RulesCache" />
@@ -742,6 +650,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="4e238oUQ8UY" role="3cqZAp" />
+        <node concept="3clFbF" id="4e238oUQ8ac" role="3cqZAp">
+          <node concept="2OqwBi" id="4e238oUQ8ad" role="3clFbG">
+            <node concept="2YIFZM" id="4e238oUQ8ae" role="2Oq$k0">
+              <ref role="37wK5l" to="czm:4F4X830WI8n" resolve="getInstance" />
+              <ref role="1Pybhc" to="czm:4F4X830W9jd" resolve="DescriptorCache" />
+            </node>
+            <node concept="liA8E" id="4e238oUQ8af" role="2OqNvi">
+              <ref role="37wK5l" to="czm:4e238oUPQDS" resolve="init" />
+              <node concept="XUXob" id="4e238oUQa_9" role="37wK5m" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="6D5JhjDkt8_" role="3cqZAp" />
         <node concept="3clFbF" id="4AjdlHqk4hu" role="3cqZAp">
           <node concept="2YIFZM" id="3O7ZvCZJ12v" role="3clFbG">

From 7cca17da0569dd33e6317f852c433704c11524e2 Mon Sep 17 00:00:00 2001
From: Artem Tikhomirov <tikhomirov.artem@gmail.com>
Date: Tue, 10 Jun 2025 11:31:55 +0300
Subject: [PATCH 2/2] ProjectView: replace ReloadableModule w/ ModuleRuntime

Besides, no need for unload hack to see if the module has been unloaded.
Now, MPS PluginManager is client of LanguageRegistry, like the code in ProjectViewManager, and
 load/unload notifications would get in proper order together with plugin app part events.
Before, mixing CLM code (notifications immediately on module injection into repo) with PluginManager code
 (notified with delay from LanguageRegistry) indeed lead to an improper class dispose ordering.
---
 ...com.mbeddr.mpsutil.projectview.runtime.msd |   1 +
 .../mbeddr/mpsutil/projectview/runtime.mps    | 940 ++++++++----------
 .../mpsutil/projectview/runtime/plugin.mps    |   3 +
 3 files changed, 421 insertions(+), 523 deletions(-)

diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd
index ab1eda42bd..0a812ea8ea 100644
--- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd
+++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd
@@ -34,6 +34,7 @@
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:acfc188d-d5d6-4598-b370-6f4a983f05b2:jetbrains.mps.baseLanguage.methodReferences" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps
index a55a042e6e..72bde56192 100644
--- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps
+++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps
@@ -7,6 +7,7 @@
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
+    <use id="acfc188d-d5d6-4598-b370-6f4a983f05b2" name="jetbrains.mps.baseLanguage.methodReferences" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -15,9 +16,7 @@
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
     <import index="bnjk" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.projectView(MPS.IDEA/)" />
-    <import index="3qmy" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.classloading(MPS.Core/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="j8aq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.module(MPS.Core/)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -26,13 +25,12 @@
     <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="uhdf" ref="r:30978237-741d-4b0b-ac0b-6600a1c5c14f(com.mbeddr.mpsutil.projectview.runtime.tree)" />
-    <import index="yyf4" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.util(MPS.OpenAPI/)" />
     <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
     <import index="mmaq" ref="f647e48e-4568-4f4c-b48a-1546492c6a2e/java:org.jdom(org.jdom/)" />
     <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" />
-    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
-    <import index="4o98" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.core.platform(MPS.Core/)" />
     <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
+    <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
+    <import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
     <import index="9ti4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.extensions(MPS.IDEA/)" implicit="true" />
   </imports>
   <registry>
@@ -79,12 +77,17 @@
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
       <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
-      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P">
+        <reference id="1182955020723" name="classConcept" index="1HBi2w" />
+      </concept>
       <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
       <concept id="4952749571008284462" name="jetbrains.mps.baseLanguage.structure.CatchVariable" flags="ng" index="XOnhg" />
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </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" />
@@ -92,10 +95,6 @@
       <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
         <child id="1164991057263" name="throwable" index="YScLw" />
       </concept>
-      <concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
-        <child id="1081256993305" name="classType" index="2ZW6by" />
-        <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
-      </concept>
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
@@ -116,6 +115,9 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
       <concept id="1109279851642" name="jetbrains.mps.baseLanguage.structure.GenericDeclaration" flags="ng" index="16eOlS">
         <child id="1109279881614" name="typeVariableDeclaration" index="16eVyc" />
@@ -188,6 +190,7 @@
         <child id="1212687122400" name="typeParameter" index="1pMfVU" />
       </concept>
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
@@ -231,6 +234,9 @@
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </concept>
     </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
       <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
@@ -250,15 +256,11 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
-    <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
-      <concept id="361130699826193249" name="jetbrains.mps.lang.modelapi.structure.ModulePointer" flags="ng" index="1dCxOk">
-        <property id="1863527487546097500" name="moduleId" index="1XweGW" />
-        <property id="1863527487545993577" name="moduleName" index="1XxBO9" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1678062499342629858" name="jetbrains.mps.lang.smodel.structure.ModuleRefExpression" flags="ng" index="37shsh">
-        <child id="1678062499342629861" name="moduleId" index="37shsm" />
+    <language id="acfc188d-d5d6-4598-b370-6f4a983f05b2" name="jetbrains.mps.baseLanguage.methodReferences">
+      <concept id="237887375562511215" name="jetbrains.mps.baseLanguage.methodReferences.structure.MethodReference" flags="ng" index="37Ijox" />
+      <concept id="3507059745126391419" name="jetbrains.mps.baseLanguage.methodReferences.structure.IMethodReference" flags="ngI" index="3UZKCU">
+        <reference id="237887375562511297" name="method" index="37Ijqf" />
+        <child id="962278442658307079" name="target" index="wWaWy" />
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -6180,351 +6182,122 @@
       </node>
     </node>
     <node concept="2tJIrI" id="VPgi8ehHnJ" role="jymVt" />
-    <node concept="3clFb_" id="7JEoLgTCJnG" role="jymVt">
-      <property role="TrG5h" value="onLoaded" />
-      <node concept="3Tm1VV" id="7JEoLgTCJnI" role="1B3o_S" />
-      <node concept="3cqZAl" id="7JEoLgTCJnK" role="3clF45" />
-      <node concept="37vLTG" id="7JEoLgTCJnL" role="3clF46">
-        <property role="TrG5h" value="loadedModules" />
-        <node concept="3uibUv" id="7JEoLgTCJnM" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
-          <node concept="3uibUv" id="7JEoLgTCJnN" role="11_B2D">
-            <ref role="3uigEE" to="j8aq:~ReloadableModule" resolve="ReloadableModule" />
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="7JEoLgTCJnO" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="7JEoLgTCJnP" role="3clF46">
-        <property role="TrG5h" value="monitor" />
-        <node concept="3uibUv" id="7JEoLgTCJnQ" role="1tU5fm">
-          <ref role="3uigEE" to="yyf4:~ProgressMonitor" resolve="ProgressMonitor" />
-        </node>
-        <node concept="2AHcQZ" id="7JEoLgTCJnR" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="7JEoLgTCJnS" role="3clF47">
-        <node concept="2Gpval" id="VPgi8egiRc" role="3cqZAp">
-          <node concept="2GrKxI" id="VPgi8egiRd" role="2Gsz3X">
-            <property role="TrG5h" value="module" />
-          </node>
-          <node concept="3clFbS" id="VPgi8egiRe" role="2LFqv$">
-            <node concept="3clFbF" id="VPgi8egiV_" role="3cqZAp">
-              <node concept="1rXfSq" id="VPgi8egiV$" role="3clFbG">
-                <ref role="37wK5l" node="VPgi8egic3" resolve="loadModule" />
-                <node concept="2GrUjf" id="VPgi8egj7Q" role="37wK5m">
-                  <ref role="2Gs0qQ" node="VPgi8egiRd" resolve="module" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="7JEoLgTD4Uk" role="2GsD0m">
-            <ref role="3cqZAo" node="7JEoLgTCJnL" resolve="loadedModules" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="7eKnO66oBqC" role="3cqZAp">
-          <node concept="1rXfSq" id="7eKnO66oBqA" role="3clFbG">
-            <ref role="37wK5l" node="7eKnO66ousy" resolve="syncViews" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="7JEoLgTCJnT" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7JEoLgTCWQ9" role="jymVt" />
-    <node concept="3clFb_" id="7JEoLgTCJo1" role="jymVt">
-      <property role="TrG5h" value="onUnloaded" />
-      <node concept="3Tm1VV" id="7JEoLgTCJo3" role="1B3o_S" />
-      <node concept="3cqZAl" id="7JEoLgTCJo5" role="3clF45" />
-      <node concept="37vLTG" id="7JEoLgTCJo6" role="3clF46">
-        <property role="TrG5h" value="unloadedModules" />
-        <node concept="3uibUv" id="7JEoLgTCJo7" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
-          <node concept="3uibUv" id="7JEoLgTCJo8" role="11_B2D">
-            <ref role="3uigEE" to="j8aq:~ReloadableModule" resolve="ReloadableModule" />
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="7JEoLgTCJo9" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="7JEoLgTCJoa" role="3clF46">
-        <property role="TrG5h" value="monitor" />
-        <node concept="3uibUv" id="7JEoLgTCJob" role="1tU5fm">
-          <ref role="3uigEE" to="yyf4:~ProgressMonitor" resolve="ProgressMonitor" />
-        </node>
-        <node concept="2AHcQZ" id="7JEoLgTCJoc" role="2AJF6D">
-          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="7JEoLgTCJod" role="3clF47">
-        <node concept="2Gpval" id="VPgi8egj9e" role="3cqZAp">
-          <node concept="2GrKxI" id="VPgi8egj9f" role="2Gsz3X">
-            <property role="TrG5h" value="module" />
-          </node>
-          <node concept="3clFbS" id="VPgi8egj9g" role="2LFqv$">
-            <node concept="3SKdUt" id="4jHuzb0Dok$" role="3cqZAp">
-              <node concept="1PaTwC" id="17qUVvSZlDZ" role="1aUNEU">
-                <node concept="3oM_SD" id="17qUVvSZlE0" role="1PaTwD">
-                  <property role="3oM_SC" value="In" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlE1" role="1PaTwD">
-                  <property role="3oM_SC" value="PluginLoaderRegistry.unloadPlugins/loadPlugins" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlE2" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlE3" role="1PaTwD">
-                  <property role="3oM_SC" value="plugin" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlE4" role="1PaTwD">
-                  <property role="3oM_SC" value="are" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlE5" role="1PaTwD">
-                  <property role="3oM_SC" value="unloaded/loaded" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlE6" role="1PaTwD">
-                  <property role="3oM_SC" value="asynchronously." />
-                </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="4jHuzb0DozH" role="3cqZAp">
-              <node concept="1PaTwC" id="17qUVvSZlE7" role="1aUNEU">
-                <node concept="3oM_SD" id="17qUVvSZlE8" role="1PaTwD">
-                  <property role="3oM_SC" value="That" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlE9" role="1PaTwD">
-                  <property role="3oM_SC" value="means," />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEa" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEb" role="1PaTwD">
-                  <property role="3oM_SC" value="dispose" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEc" role="1PaTwD">
-                  <property role="3oM_SC" value="method" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEd" role="1PaTwD">
-                  <property role="3oM_SC" value="if" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEe" role="1PaTwD">
-                  <property role="3oM_SC" value="this" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEf" role="1PaTwD">
-                  <property role="3oM_SC" value="class" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEg" role="1PaTwD">
-                  <property role="3oM_SC" value="is" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEh" role="1PaTwD">
-                  <property role="3oM_SC" value="called" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEi" role="1PaTwD">
-                  <property role="3oM_SC" value="after" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEj" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEk" role="1PaTwD">
-                  <property role="3oM_SC" value="modules" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEl" role="1PaTwD">
-                  <property role="3oM_SC" value="are" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEm" role="1PaTwD">
-                  <property role="3oM_SC" value="reloaded" />
-                </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="4jHuzb0DoLy" role="3cqZAp">
-              <node concept="1PaTwC" id="17qUVvSZlEn" role="1aUNEU">
-                <node concept="3oM_SD" id="17qUVvSZlEo" role="1PaTwD">
-                  <property role="3oM_SC" value="(afterClassLoaded" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEp" role="1PaTwD">
-                  <property role="3oM_SC" value="is" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEq" role="1PaTwD">
-                  <property role="3oM_SC" value="called)." />
-                </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="4jHuzb0DplO" role="3cqZAp">
-              <node concept="1PaTwC" id="17qUVvSZlEr" role="1aUNEU">
-                <node concept="3oM_SD" id="17qUVvSZlEs" role="1PaTwD">
-                  <property role="3oM_SC" value="While" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEt" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEu" role="1PaTwD">
-                  <property role="3oM_SC" value="new" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEv" role="1PaTwD">
-                  <property role="3oM_SC" value="descriptors" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEw" role="1PaTwD">
-                  <property role="3oM_SC" value="already" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEx" role="1PaTwD">
-                  <property role="3oM_SC" value="use" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEy" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEz" role="1PaTwD">
-                  <property role="3oM_SC" value="new" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlE$" role="1PaTwD">
-                  <property role="3oM_SC" value="classes" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlE_" role="1PaTwD">
-                  <property role="3oM_SC" value="from" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEA" role="1PaTwD">
-                  <property role="3oM_SC" value="this" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEB" role="1PaTwD">
-                  <property role="3oM_SC" value="module," />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEC" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlED" role="1PaTwD">
-                  <property role="3oM_SC" value="listener" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEE" role="1PaTwD">
-                  <property role="3oM_SC" value="is" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEF" role="1PaTwD">
-                  <property role="3oM_SC" value="still" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEG" role="1PaTwD">
-                  <property role="3oM_SC" value="an" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEH" role="1PaTwD">
-                  <property role="3oM_SC" value="old" />
-                </node>
-              </node>
-            </node>
-            <node concept="3SKdUt" id="4jHuzb0DpUG" role="3cqZAp">
-              <node concept="1PaTwC" id="17qUVvSZlEI" role="1aUNEU">
-                <node concept="3oM_SD" id="17qUVvSZlEJ" role="1PaTwD">
-                  <property role="3oM_SC" value="class." />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEK" role="1PaTwD">
-                  <property role="3oM_SC" value="This" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEL" role="1PaTwD">
-                  <property role="3oM_SC" value="causes" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEM" role="1PaTwD">
-                  <property role="3oM_SC" value="ClassCastExceptions." />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEN" role="1PaTwD">
-                  <property role="3oM_SC" value="To" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEO" role="1PaTwD">
-                  <property role="3oM_SC" value="fix" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEP" role="1PaTwD">
-                  <property role="3oM_SC" value="this," />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEQ" role="1PaTwD">
-                  <property role="3oM_SC" value="we" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlER" role="1PaTwD">
-                  <property role="3oM_SC" value="detect" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlES" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlET" role="1PaTwD">
-                  <property role="3oM_SC" value="reload" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEU" role="1PaTwD">
-                  <property role="3oM_SC" value="of" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEV" role="1PaTwD">
-                  <property role="3oM_SC" value="this" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEW" role="1PaTwD">
-                  <property role="3oM_SC" value="module" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEX" role="1PaTwD">
-                  <property role="3oM_SC" value="on" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEY" role="1PaTwD">
-                  <property role="3oM_SC" value="our" />
-                </node>
-                <node concept="3oM_SD" id="17qUVvSZlEZ" role="1PaTwD">
-                  <property role="3oM_SC" value="own." />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="4jHuzb0CHB_" role="3cqZAp">
-              <node concept="3clFbS" id="4jHuzb0CHBB" role="3clFbx">
-                <node concept="3clFbF" id="28Tw7wfqwXO" role="3cqZAp">
-                  <node concept="1rXfSq" id="28Tw7wfqwXM" role="3clFbG">
-                    <ref role="37wK5l" node="VPgi8egh6x" resolve="dispose" />
+    <node concept="312cEg" id="76V6N7UsX_E" role="jymVt">
+      <property role="TrG5h" value="moduleRegistryListener" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="76V6N7UsX_F" role="1B3o_S" />
+      <node concept="3uibUv" id="76V6N7UsX_G" role="1tU5fm">
+        <ref role="3uigEE" to="ze1i:~ModuleDeploymentListener" resolve="ModuleDeploymentListener" />
+      </node>
+      <node concept="2ShNRf" id="76V6N7UundW" role="33vP2m">
+        <node concept="YeOm9" id="76V6N7UuziS" role="2ShVmc">
+          <node concept="1Y3b0j" id="76V6N7UuziV" role="YeSDq">
+            <property role="2bfB8j" value="true" />
+            <property role="373rjd" value="true" />
+            <ref role="1Y3XeK" to="ze1i:~ModuleDeploymentListener" resolve="ModuleDeploymentListener" />
+            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+            <node concept="3Tm1VV" id="76V6N7UuziW" role="1B3o_S" />
+            <node concept="3clFb_" id="76V6N7Uuzja" role="jymVt">
+              <property role="TrG5h" value="deploymentStateChanged" />
+              <node concept="3Tm1VV" id="76V6N7Uuzjb" role="1B3o_S" />
+              <node concept="3cqZAl" id="76V6N7Uuzjd" role="3clF45" />
+              <node concept="37vLTG" id="76V6N7Uuzje" role="3clF46">
+                <property role="TrG5h" value="mdc" />
+                <node concept="3uibUv" id="76V6N7Uuzjf" role="1tU5fm">
+                  <ref role="3uigEE" to="ze1i:~ModuleDeploymentChange" resolve="ModuleDeploymentChange" />
+                </node>
+                <node concept="2AHcQZ" id="76V6N7Uuzjg" role="2AJF6D">
+                  <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="76V6N7Uuzjh" role="3clF47">
+                <node concept="3clFbF" id="76V6N7UxcAj" role="3cqZAp">
+                  <node concept="2OqwBi" id="76V6N7UxeS8" role="3clFbG">
+                    <node concept="37vLTw" id="76V6N7UxcAh" role="2Oq$k0">
+                      <ref role="3cqZAo" node="76V6N7Uuzje" resolve="mdc" />
+                    </node>
+                    <node concept="liA8E" id="76V6N7UxhYU" role="2OqNvi">
+                      <ref role="37wK5l" to="ze1i:~ModuleDeploymentChange.forEachRemoved(java.util.function.Consumer)" resolve="forEachRemoved" />
+                      <node concept="37Ijox" id="76V6N7UxO81" role="37wK5m">
+                        <ref role="37Ijqf" node="VPgi8eginJ" resolve="unloadModule" />
+                        <node concept="Xjq3P" id="76V6N7UxKYx" role="wWaWy">
+                          <ref role="1HBi2w" node="VPgi8efWms" resolve="ProjectViewManager" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="3cpWs6" id="4jHuzb0Dm$g" role="3cqZAp" />
-              </node>
-              <node concept="17R0WA" id="4jHuzb0CQ$R" role="3clFbw">
-                <node concept="2OqwBi" id="4jHuzb0CKio" role="3uHU7B">
-                  <node concept="2GrUjf" id="4jHuzb0DmFu" role="2Oq$k0">
-                    <ref role="2Gs0qQ" node="VPgi8egj9f" resolve="module" />
-                  </node>
-                  <node concept="liA8E" id="4jHuzb0CKm$" role="2OqNvi">
-                    <ref role="37wK5l" to="j8aq:~ReloadableModule.getModuleReference()" resolve="getModuleReference" />
+                <node concept="3clFbF" id="76V6N7UxY$e" role="3cqZAp">
+                  <node concept="2OqwBi" id="76V6N7UxY$f" role="3clFbG">
+                    <node concept="37vLTw" id="76V6N7UxY$g" role="2Oq$k0">
+                      <ref role="3cqZAo" node="76V6N7Uuzje" resolve="mdc" />
+                    </node>
+                    <node concept="liA8E" id="76V6N7UxY$h" role="2OqNvi">
+                      <ref role="37wK5l" to="ze1i:~ModuleDeploymentChange.forEachReloaded(java.util.function.Consumer)" resolve="forEachReloaded" />
+                      <node concept="37Ijox" id="76V6N7UxY$i" role="37wK5m">
+                        <ref role="37Ijqf" node="VPgi8eginJ" resolve="unloadModule" />
+                        <node concept="Xjq3P" id="76V6N7UxY$j" role="wWaWy">
+                          <ref role="1HBi2w" node="VPgi8efWms" resolve="ProjectViewManager" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="37shsh" id="4jHuzb0CKHK" role="3uHU7w">
-                  <node concept="1dCxOk" id="17qUVvSZmF7" role="37shsm">
-                    <property role="1XxBO9" value="com.mbeddr.mpsutil.projectview.runtime" />
-                    <property role="1XweGW" value="732373f1-0d48-4122-bb43-c1606db4baca" />
+                <node concept="3clFbF" id="76V6N7Uy2mQ" role="3cqZAp">
+                  <node concept="2OqwBi" id="76V6N7Uy2mR" role="3clFbG">
+                    <node concept="37vLTw" id="76V6N7Uy2mS" role="2Oq$k0">
+                      <ref role="3cqZAo" node="76V6N7Uuzje" resolve="mdc" />
+                    </node>
+                    <node concept="liA8E" id="76V6N7Uy2mT" role="2OqNvi">
+                      <ref role="37wK5l" to="ze1i:~ModuleDeploymentChange.forEachReloaded(java.util.function.Consumer)" resolve="forEachReloaded" />
+                      <node concept="37Ijox" id="76V6N7Uy2mU" role="37wK5m">
+                        <ref role="37Ijqf" node="VPgi8egic3" resolve="loadModule" />
+                        <node concept="Xjq3P" id="76V6N7Uy2mV" role="wWaWy">
+                          <ref role="1HBi2w" node="VPgi8efWms" resolve="ProjectViewManager" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="4jHuzb0Dm2v" role="3cqZAp" />
-            <node concept="3clFbF" id="VPgi8egj9h" role="3cqZAp">
-              <node concept="1rXfSq" id="VPgi8egj9i" role="3clFbG">
-                <ref role="37wK5l" node="VPgi8eginJ" resolve="unloadModule" />
-                <node concept="2GrUjf" id="VPgi8egj9j" role="37wK5m">
-                  <ref role="2Gs0qQ" node="VPgi8egj9f" resolve="module" />
+                <node concept="3clFbF" id="76V6N7Uy9pn" role="3cqZAp">
+                  <node concept="2OqwBi" id="76V6N7Uy9po" role="3clFbG">
+                    <node concept="37vLTw" id="76V6N7Uy9pp" role="2Oq$k0">
+                      <ref role="3cqZAo" node="76V6N7Uuzje" resolve="mdc" />
+                    </node>
+                    <node concept="liA8E" id="76V6N7Uy9pq" role="2OqNvi">
+                      <ref role="37wK5l" to="ze1i:~ModuleDeploymentChange.forEachAdded(java.util.function.Consumer)" resolve="forEachAdded" />
+                      <node concept="37Ijox" id="76V6N7Uy9pr" role="37wK5m">
+                        <ref role="37Ijqf" node="VPgi8egic3" resolve="loadModule" />
+                        <node concept="Xjq3P" id="76V6N7Uy9ps" role="wWaWy">
+                          <ref role="1HBi2w" node="VPgi8efWms" resolve="ProjectViewManager" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
-              </node>
-            </node>
-          </node>
-          <node concept="37vLTw" id="7JEoLgTDd4c" role="2GsD0m">
-            <ref role="3cqZAo" node="7JEoLgTCJo6" resolve="unloadedModules" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="Mi95F9jgTV" role="3cqZAp">
-          <node concept="2YIFZM" id="Mi95F9jjCn" role="3clFbG">
-            <ref role="37wK5l" to="3a50:~ThreadUtils.runInUIThreadNoWait(java.lang.Runnable)" resolve="runInUIThreadNoWait" />
-            <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
-            <node concept="1bVj0M" id="Mi95F9jmYA" role="37wK5m">
-              <node concept="3clFbS" id="Mi95F9jmYB" role="1bW5cS">
-                <node concept="3clFbF" id="Mi95F9jp5N" role="3cqZAp">
-                  <node concept="1rXfSq" id="Mi95F9jp5M" role="3clFbG">
-                    <ref role="37wK5l" node="7eKnO66ousy" resolve="syncViews" />
+                <node concept="3clFbF" id="Mi95F9jgTV" role="3cqZAp">
+                  <node concept="2YIFZM" id="Mi95F9jjCn" role="3clFbG">
+                    <ref role="37wK5l" to="3a50:~ThreadUtils.runInUIThreadNoWait(java.lang.Runnable)" resolve="runInUIThreadNoWait" />
+                    <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
+                    <node concept="1bVj0M" id="Mi95F9jmYA" role="37wK5m">
+                      <node concept="3clFbS" id="Mi95F9jmYB" role="1bW5cS">
+                        <node concept="3clFbF" id="Mi95F9jp5N" role="3cqZAp">
+                          <node concept="1rXfSq" id="Mi95F9jp5M" role="3clFbG">
+                            <ref role="37wK5l" node="7eKnO66ousy" resolve="syncViews" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="2AHcQZ" id="76V6N7Uuzjj" role="2AJF6D">
+                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+              </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="2AHcQZ" id="7JEoLgTCJoe" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
     </node>
     <node concept="2tJIrI" id="7JEoLgTCTS0" role="jymVt" />
     <node concept="3clFb_" id="VPgi8ehJjN" role="jymVt">
@@ -6572,21 +6345,9 @@
               <ref role="3cqZAo" node="VPgi8ehEDO" resolve="myProjects" />
             </node>
             <node concept="2es0OD" id="7eKnO66oB3d" role="2OqNvi">
-              <node concept="1bVj0M" id="7eKnO66oB3f" role="23t8la">
-                <node concept="3clFbS" id="7eKnO66oB3g" role="1bW5cS">
-                  <node concept="3clFbF" id="7eKnO66oB7f" role="3cqZAp">
-                    <node concept="1rXfSq" id="7eKnO66oB7e" role="3clFbG">
-                      <ref role="37wK5l" node="VPgi8etBDM" resolve="syncViews" />
-                      <node concept="37vLTw" id="7eKnO66oBfE" role="37wK5m">
-                        <ref role="3cqZAo" node="7Z$RfkF7J1J" resolve="it" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="gl6BB" id="7Z$RfkF7J1J" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="7Z$RfkF7J1K" role="1tU5fm" />
-                </node>
+              <node concept="37Ijox" id="76V6N7U$aLJ" role="23t8la">
+                <ref role="37Ijqf" node="VPgi8etBDM" resolve="syncViews" />
+                <node concept="Xjq3P" id="76V6N7U$94t" role="wWaWy" />
               </node>
             </node>
           </node>
@@ -7391,75 +7152,204 @@
       <node concept="3cqZAl" id="VPgi8egh2A" role="3clF45" />
       <node concept="3Tm1VV" id="VPgi8egh2B" role="1B3o_S" />
       <node concept="3clFbS" id="VPgi8egh2C" role="3clF47">
-        <node concept="3cpWs8" id="7xHPclqQt$y" role="3cqZAp">
-          <node concept="3cpWsn" id="7xHPclqQt$z" role="3cpWs9">
-            <property role="TrG5h" value="platform" />
-            <node concept="3uibUv" id="7xHPclqQtay" role="1tU5fm">
-              <ref role="3uigEE" to="4o98:~Platform" resolve="Platform" />
+        <node concept="3cpWs8" id="76V6N7UyLVt" role="3cqZAp">
+          <node concept="3cpWsn" id="76V6N7UyLVu" role="3cpWs9">
+            <property role="TrG5h" value="moduleRegistry" />
+            <node concept="3uibUv" id="76V6N7UyLVv" role="1tU5fm">
+              <ref role="3uigEE" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
             </node>
-            <node concept="2OqwBi" id="7xHPclqQt$$" role="33vP2m">
-              <node concept="2YIFZM" id="7xHPclqQt$_" role="2Oq$k0">
-                <ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
-                <ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
+            <node concept="2OqwBi" id="76V6N7UsR5F" role="33vP2m">
+              <node concept="37vLTw" id="76V6N7UsR5G" role="2Oq$k0">
+                <ref role="3cqZAo" node="76V6N7UrM3l" resolve="mpsPlatform" />
               </node>
-              <node concept="liA8E" id="7xHPclqQt$A" role="2OqNvi">
-                <ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
+              <node concept="liA8E" id="76V6N7UsR5H" role="2OqNvi">
+                <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
+                <node concept="3VsKOn" id="76V6N7UsR5I" role="37wK5m">
+                  <ref role="3VsUkX" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
+                </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="7xHPclqPg_j" role="3cqZAp">
-          <node concept="3cpWsn" id="7xHPclqPg_k" role="3cpWs9">
-            <property role="TrG5h" value="clsLoaderManager" />
-            <node concept="2OqwBi" id="7xHPclqPg_l" role="33vP2m">
-              <node concept="37vLTw" id="7xHPclqQt$B" role="2Oq$k0">
-                <ref role="3cqZAo" node="7xHPclqQt$z" resolve="platform" />
-              </node>
-              <node concept="liA8E" id="7xHPclqPg_p" role="2OqNvi">
-                <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
-                <node concept="3VsKOn" id="7xHPclqPmmm" role="37wK5m">
-                  <ref role="3VsUkX" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
-                </node>
+        <node concept="3clFbF" id="1Tx15ZbTG$" role="3cqZAp">
+          <node concept="2OqwBi" id="1Tx15ZbXvI" role="3clFbG">
+            <node concept="liA8E" id="1Tx15ZbZKM" role="2OqNvi">
+              <ref role="37wK5l" to="vndm:~LanguageRegistry.addRegistryListener(jetbrains.mps.smodel.runtime.ModuleDeploymentListener)" resolve="addRegistryListener" />
+              <node concept="37vLTw" id="76V6N7UuTmi" role="37wK5m">
+                <ref role="3cqZAo" node="76V6N7UsX_E" resolve="moduleRegistryListener" />
               </node>
             </node>
-            <node concept="3uibUv" id="7xHPclqPsKE" role="1tU5fm">
-              <ref role="3uigEE" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
+            <node concept="37vLTw" id="76V6N7Uz1Yd" role="2Oq$k0">
+              <ref role="3cqZAo" node="76V6N7UyLVu" resolve="moduleRegistry" />
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="7xHPclqPRtV" role="3cqZAp">
-          <node concept="3clFbS" id="7xHPclqPRtX" role="3clFbx">
-            <node concept="3cpWs6" id="7xHPclqQ5xQ" role="3cqZAp" />
+        <node concept="3clFbH" id="76V6N7Uz4py" role="3cqZAp" />
+        <node concept="3SKdUt" id="76V6N7Uv0qR" role="3cqZAp">
+          <node concept="1PaTwC" id="76V6N7Uv0qS" role="1aUNEU">
+            <node concept="3oM_SD" id="76V6N7Uv3k5" role="1PaTwD">
+              <property role="3oM_SC" value="FIXME" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3k6" role="1PaTwD">
+              <property role="3oM_SC" value="next" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3kC" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3kD" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3kU" role="1PaTwD">
+              <property role="3oM_SC" value="hack," />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3lb" role="1PaTwD">
+              <property role="3oM_SC" value="just" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3ls" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3lt" role="1PaTwD">
+              <property role="3oM_SC" value="access" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3lY" role="1PaTwD">
+              <property role="3oM_SC" value="identities" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3mf" role="1PaTwD">
+              <property role="3oM_SC" value="of" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3mg" role="1PaTwD">
+              <property role="3oM_SC" value="all" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3mh" role="1PaTwD">
+              <property role="3oM_SC" value="known" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3my" role="1PaTwD">
+              <property role="3oM_SC" value="modules." />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3nj" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
           </node>
-          <node concept="3clFbC" id="7xHPclqPYf1" role="3clFbw">
-            <node concept="10Nm6u" id="7xHPclqQ1qP" role="3uHU7w" />
-            <node concept="37vLTw" id="7xHPclqPUEF" role="3uHU7B">
-              <ref role="3cqZAo" node="7xHPclqPg_k" resolve="clsLoaderManager" />
+        </node>
+        <node concept="3SKdUt" id="76V6N7Uv3rD" role="3cqZAp">
+          <node concept="1PaTwC" id="76V6N7Uv3rf" role="1aUNEU">
+            <node concept="3oM_SD" id="76V6N7Uv3re" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv5N5" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv5Nn" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv5NC" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv5ND" role="1PaTwD">
+              <property role="3oM_SC" value="Either" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv5Ob" role="1PaTwD">
+              <property role="3oM_SC" value="MPS" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv5Os" role="1PaTwD">
+              <property role="3oM_SC" value="has" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3o6" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3n_" role="1PaTwD">
+              <property role="3oM_SC" value="provide" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3on" role="1PaTwD">
+              <property role="3oM_SC" value="mechanism" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3oC" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3oD" role="1PaTwD">
+              <property role="3oM_SC" value="access" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3pa" role="1PaTwD">
+              <property role="3oM_SC" value="ModuleRuntime" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3pF" role="1PaTwD">
+              <property role="3oM_SC" value="for" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3qc" role="1PaTwD">
+              <property role="3oM_SC" value="all" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv3qt" role="1PaTwD">
+              <property role="3oM_SC" value="available" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv5OH" role="1PaTwD">
+              <property role="3oM_SC" value="modules" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uv5OY" role="1PaTwD">
+              <property role="3oM_SC" value="or" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="1Tx15ZbTG$" role="3cqZAp">
-          <node concept="2OqwBi" id="1Tx15ZbXvI" role="3clFbG">
-            <node concept="liA8E" id="1Tx15ZbZKM" role="2OqNvi">
-              <ref role="37wK5l" to="3qmy:~ClassLoaderManager.addListener(jetbrains.mps.classloading.DeployListener)" resolve="addListener" />
-              <node concept="Xjq3P" id="1Tx15Zc1ZD" role="37wK5m" />
+        <node concept="3SKdUt" id="76V6N7Uv7VZ" role="3cqZAp">
+          <node concept="1PaTwC" id="76V6N7Uv7W0" role="1aUNEU">
+            <node concept="3oM_SD" id="76V6N7Uv7W1" role="1PaTwD">
+              <property role="3oM_SC" value="" />
             </node>
-            <node concept="2OqwBi" id="1Tx15ZbTGA" role="2Oq$k0">
-              <node concept="2OqwBi" id="1Tx15ZbTGB" role="2Oq$k0">
-                <node concept="2YIFZM" id="1Tx15ZbTGC" role="2Oq$k0">
-                  <ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
-                  <ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
-                </node>
-                <node concept="liA8E" id="1Tx15ZbTGD" role="2OqNvi">
-                  <ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
-                </node>
-              </node>
-              <node concept="liA8E" id="1Tx15ZbTGE" role="2OqNvi">
-                <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
-                <node concept="3VsKOn" id="1Tx15ZbTGF" role="37wK5m">
-                  <ref role="3VsUkX" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
-                </node>
-              </node>
+            <node concept="3oM_SD" id="76V6N7Uv7W4" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uvak9" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uvaka" role="1PaTwD">
+              <property role="3oM_SC" value="" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uvakb" role="1PaTwD">
+              <property role="3oM_SC" value="this" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uvaks" role="1PaTwD">
+              <property role="3oM_SC" value="code" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uvakt" role="1PaTwD">
+              <property role="3oM_SC" value="has" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7UvakI" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7UvakJ" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uval0" role="1PaTwD">
+              <property role="3oM_SC" value="changed" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uvalx" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uvaly" role="1PaTwD">
+              <property role="3oM_SC" value="use" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uvalz" role="1PaTwD">
+              <property role="3oM_SC" value="language" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uvanq" role="1PaTwD">
+              <property role="3oM_SC" value="aspect," />
+            </node>
+            <node concept="3oM_SD" id="76V6N7UvanF" role="1PaTwD">
+              <property role="3oM_SC" value="language" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uvaos" role="1PaTwD">
+              <property role="3oM_SC" value="extension" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7UvaoX" role="1PaTwD">
+              <property role="3oM_SC" value="or" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7UvaoY" role="1PaTwD">
+              <property role="3oM_SC" value="module" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uvapf" role="1PaTwD">
+              <property role="3oM_SC" value="extensions" />
+            </node>
+            <node concept="3oM_SD" id="76V6N7Uvapg" role="1PaTwD">
+              <property role="3oM_SC" value="mechanism" />
             </node>
           </node>
         </node>
@@ -7470,14 +7360,8 @@
               <ref role="3uigEE" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
             </node>
             <node concept="2OqwBi" id="45KItpiJOGz" role="33vP2m">
-              <node concept="2OqwBi" id="45KItpiJOij" role="2Oq$k0">
-                <node concept="2YIFZM" id="45KItpiJO6S" role="2Oq$k0">
-                  <ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
-                  <ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
-                </node>
-                <node concept="liA8E" id="45KItpiJOyO" role="2OqNvi">
-                  <ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
-                </node>
+              <node concept="37vLTw" id="76V6N7UsBtX" role="2Oq$k0">
+                <ref role="3cqZAo" node="76V6N7UrM3l" resolve="mpsPlatform" />
               </node>
               <node concept="liA8E" id="45KItpiJOXp" role="2OqNvi">
                 <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
@@ -7500,6 +7384,24 @@
           </node>
         </node>
         <node concept="3clFbH" id="7xHPclqQVxB" role="3cqZAp" />
+        <node concept="3cpWs8" id="76V6N7UvdpD" role="3cqZAp">
+          <node concept="3cpWsn" id="76V6N7UvdpJ" role="3cpWs9">
+            <property role="TrG5h" value="attemptLoad" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3uibUv" id="76V6N7UvdpL" role="1tU5fm">
+              <ref role="3uigEE" to="33ny:~ArrayList" resolve="ArrayList" />
+              <node concept="3uibUv" id="76V6N7Uvg$G" role="11_B2D">
+                <ref role="3uigEE" to="lui2:~SModuleReference" resolve="SModuleReference" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="76V6N7UvmCu" role="33vP2m">
+              <node concept="1pGfFk" id="76V6N7UvuSp" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="1QHqEK" id="55UUbH_65Hc" role="3cqZAp">
           <node concept="1QHqEC" id="55UUbH_65He" role="1QHqEI">
             <node concept="3clFbS" id="55UUbH_65Hg" role="1bW5cS">
@@ -7508,30 +7410,23 @@
                   <property role="TrG5h" value="module" />
                 </node>
                 <node concept="3clFbS" id="52ZF9D3g4Gv" role="2LFqv$">
-                  <node concept="3clFbJ" id="52ZF9D3g5jC" role="3cqZAp">
-                    <node concept="3clFbS" id="52ZF9D3g5jE" role="3clFbx">
-                      <node concept="3clFbF" id="52ZF9D3g4TN" role="3cqZAp">
-                        <node concept="1rXfSq" id="52ZF9D3g4TM" role="3clFbG">
-                          <ref role="37wK5l" node="VPgi8egic3" resolve="loadModule" />
-                          <node concept="10QFUN" id="52ZF9D3g5Xp" role="37wK5m">
-                            <node concept="3uibUv" id="52ZF9D3g61I" role="10QFUM">
-                              <ref role="3uigEE" to="j8aq:~ReloadableModule" resolve="ReloadableModule" />
-                            </node>
-                            <node concept="2GrUjf" id="52ZF9D3g5aW" role="10QFUP">
-                              <ref role="2Gs0qQ" node="52ZF9D3g4Gt" resolve="module" />
-                            </node>
+                  <node concept="3clFbF" id="76V6N7UvzAh" role="3cqZAp">
+                    <node concept="2OqwBi" id="76V6N7UvCp7" role="3clFbG">
+                      <node concept="37vLTw" id="76V6N7UvzAf" role="2Oq$k0">
+                        <ref role="3cqZAo" node="76V6N7UvdpJ" resolve="attemptLoad" />
+                      </node>
+                      <node concept="liA8E" id="76V6N7UvKDh" role="2OqNvi">
+                        <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
+                        <node concept="2OqwBi" id="76V6N7UvPKi" role="37wK5m">
+                          <node concept="2GrUjf" id="76V6N7UvNAi" role="2Oq$k0">
+                            <ref role="2Gs0qQ" node="52ZF9D3g4Gt" resolve="module" />
+                          </node>
+                          <node concept="liA8E" id="76V6N7UvTfs" role="2OqNvi">
+                            <ref role="37wK5l" to="lui2:~SModule.getModuleReference()" resolve="getModuleReference" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="2ZW3vV" id="52ZF9D3g5vW" role="3clFbw">
-                      <node concept="3uibUv" id="52ZF9D3g5z0" role="2ZW6by">
-                        <ref role="3uigEE" to="j8aq:~ReloadableModule" resolve="ReloadableModule" />
-                      </node>
-                      <node concept="2GrUjf" id="52ZF9D3g5t6" role="2ZW6bz">
-                        <ref role="2Gs0qQ" node="52ZF9D3g4Gt" resolve="module" />
-                      </node>
-                    </node>
                   </node>
                 </node>
                 <node concept="2OqwBi" id="52ZF9D3g4gR" role="2GsD0m">
@@ -7549,11 +7444,51 @@
             <ref role="3cqZAo" node="45KItpiJNhm" resolve="moduleRepository" />
           </node>
         </node>
+        <node concept="3clFbF" id="76V6N7UzawG" role="3cqZAp">
+          <node concept="2OqwBi" id="76V6N7Uze3v" role="3clFbG">
+            <node concept="37vLTw" id="76V6N7UzawE" role="2Oq$k0">
+              <ref role="3cqZAo" node="76V6N7UyLVu" resolve="moduleRegistry" />
+            </node>
+            <node concept="liA8E" id="76V6N7Uzg7y" role="2OqNvi">
+              <ref role="37wK5l" to="vndm:~LanguageRegistry.withModuleRuntime(java.util.stream.Stream,java.util.function.Consumer)" resolve="withModuleRuntime" />
+              <node concept="2OqwBi" id="76V6N7UzmV0" role="37wK5m">
+                <node concept="37vLTw" id="76V6N7Uzi$z" role="2Oq$k0">
+                  <ref role="3cqZAo" node="76V6N7UvdpJ" resolve="attemptLoad" />
+                </node>
+                <node concept="liA8E" id="76V6N7Uzr6c" role="2OqNvi">
+                  <ref role="37wK5l" to="33ny:~Collection.stream()" resolve="stream" />
+                </node>
+              </node>
+              <node concept="37Ijox" id="76V6N7Uwp7T" role="37wK5m">
+                <ref role="37Ijqf" node="VPgi8egic3" resolve="loadModule" />
+                <node concept="Xjq3P" id="76V6N7Uwn1h" role="wWaWy" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="76V6N7UrM3l" role="3clF46">
+        <property role="TrG5h" value="mpsPlatform" />
+        <node concept="3uibUv" id="76V6N7UrM3m" role="1tU5fm">
+          <ref role="3uigEE" to="wyuk:~ComponentHost" resolve="ComponentHost" />
+        </node>
+        <node concept="2AHcQZ" id="76V6N7UseTn" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="VPgi8egh4r" role="jymVt" />
     <node concept="3clFb_" id="VPgi8egh6x" role="jymVt">
       <property role="TrG5h" value="dispose" />
+      <node concept="37vLTG" id="76V6N7UsfhX" role="3clF46">
+        <property role="TrG5h" value="mpsPlatform" />
+        <node concept="3uibUv" id="76V6N7UsfhY" role="1tU5fm">
+          <ref role="3uigEE" to="wyuk:~ComponentHost" resolve="ComponentHost" />
+        </node>
+        <node concept="2AHcQZ" id="76V6N7UsfhZ" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
       <node concept="3cqZAl" id="VPgi8egh6z" role="3clF45" />
       <node concept="3Tm1VV" id="VPgi8egh6$" role="1B3o_S" />
       <node concept="3clFbS" id="VPgi8egh6_" role="3clF47">
@@ -7566,63 +7501,22 @@
           </node>
         </node>
         <node concept="3clFbH" id="7xHPclqQ91d" role="3cqZAp" />
-        <node concept="3cpWs8" id="7xHPclqQck0" role="3cqZAp">
-          <node concept="3cpWsn" id="7xHPclqQck1" role="3cpWs9">
-            <property role="TrG5h" value="clsLoaderManager" />
-            <node concept="2OqwBi" id="7xHPclqQck2" role="33vP2m">
-              <node concept="2OqwBi" id="7xHPclqQck3" role="2Oq$k0">
-                <node concept="2YIFZM" id="7xHPclqQck4" role="2Oq$k0">
-                  <ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
-                  <ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
-                </node>
-                <node concept="liA8E" id="7xHPclqQck5" role="2OqNvi">
-                  <ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
-                </node>
-              </node>
-              <node concept="liA8E" id="7xHPclqQck6" role="2OqNvi">
-                <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
-                <node concept="3VsKOn" id="7xHPclqQck7" role="37wK5m">
-                  <ref role="3VsUkX" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
-                </node>
-              </node>
-            </node>
-            <node concept="3uibUv" id="7xHPclqQck8" role="1tU5fm">
-              <ref role="3uigEE" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="7xHPclqQck9" role="3cqZAp">
-          <node concept="3clFbS" id="7xHPclqQcka" role="3clFbx">
-            <node concept="3cpWs6" id="7xHPclqQckb" role="3cqZAp" />
-          </node>
-          <node concept="3clFbC" id="7xHPclqQckc" role="3clFbw">
-            <node concept="10Nm6u" id="7xHPclqQckd" role="3uHU7w" />
-            <node concept="37vLTw" id="7xHPclqQcke" role="3uHU7B">
-              <ref role="3cqZAo" node="7xHPclqQck1" resolve="clsLoaderManager" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7xHPclqQcjk" role="3cqZAp" />
         <node concept="3clFbF" id="VPgi8eghQA" role="3cqZAp">
           <node concept="2OqwBi" id="VPgi8eghRK" role="3clFbG">
             <node concept="liA8E" id="VPgi8egi4v" role="2OqNvi">
-              <ref role="37wK5l" to="3qmy:~ClassLoaderManager.removeListener(jetbrains.mps.classloading.DeployListener)" resolve="removeListener" />
-              <node concept="Xjq3P" id="VPgi8egi5o" role="37wK5m" />
+              <ref role="37wK5l" to="vndm:~LanguageRegistry.removeRegistryListener(jetbrains.mps.smodel.runtime.ModuleDeploymentListener)" resolve="removeRegistryListener" />
+              <node concept="37vLTw" id="76V6N7UwJZb" role="37wK5m">
+                <ref role="3cqZAo" node="76V6N7UsX_E" resolve="moduleRegistryListener" />
+              </node>
             </node>
-            <node concept="2OqwBi" id="1Tx15ZclZI" role="2Oq$k0">
-              <node concept="2OqwBi" id="1Tx15ZclZJ" role="2Oq$k0">
-                <node concept="2YIFZM" id="1Tx15ZclZK" role="2Oq$k0">
-                  <ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
-                  <ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
-                </node>
-                <node concept="liA8E" id="1Tx15ZclZL" role="2OqNvi">
-                  <ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
-                </node>
+            <node concept="2OqwBi" id="76V6N7UyyKy" role="2Oq$k0">
+              <node concept="37vLTw" id="76V6N7UyyKz" role="2Oq$k0">
+                <ref role="3cqZAo" node="76V6N7UsfhX" resolve="mpsPlatform" />
               </node>
-              <node concept="liA8E" id="1Tx15ZclZM" role="2OqNvi">
+              <node concept="liA8E" id="76V6N7UyyK$" role="2OqNvi">
                 <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
-                <node concept="3VsKOn" id="1Tx15ZclZN" role="37wK5m">
-                  <ref role="3VsUkX" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
+                <node concept="3VsKOn" id="76V6N7UyyK_" role="37wK5m">
+                  <ref role="3VsUkX" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
                 </node>
               </node>
             </node>
@@ -7705,7 +7599,7 @@
       <node concept="37vLTG" id="VPgi8egiX1" role="3clF46">
         <property role="TrG5h" value="module" />
         <node concept="3uibUv" id="VPgi8eviOq" role="1tU5fm">
-          <ref role="3uigEE" to="j8aq:~ReloadableModule" resolve="ReloadableModule" />
+          <ref role="3uigEE" to="ze1i:~ModuleRuntime" resolve="ModuleRuntime" />
         </node>
       </node>
       <node concept="3cqZAl" id="VPgi8egic5" role="3clF45" />
@@ -7751,7 +7645,7 @@
       <node concept="37vLTG" id="VPgi8egj2C" role="3clF46">
         <property role="TrG5h" value="module" />
         <node concept="3uibUv" id="VPgi8evo8b" role="1tU5fm">
-          <ref role="3uigEE" to="j8aq:~ReloadableModule" resolve="ReloadableModule" />
+          <ref role="3uigEE" to="ze1i:~ModuleRuntime" resolve="ModuleRuntime" />
         </node>
       </node>
       <node concept="3cqZAl" id="VPgi8eginL" role="3clF45" />
@@ -7813,11 +7707,16 @@
               </node>
               <node concept="3cpWs3" id="VPgi8egvHh" role="3uHU7B">
                 <node concept="2OqwBi" id="VPgi8egvHi" role="3uHU7B">
-                  <node concept="37vLTw" id="VPgi8egvHj" role="2Oq$k0">
-                    <ref role="3cqZAo" node="VPgi8egvzc" resolve="module" />
+                  <node concept="2OqwBi" id="76V6N7UzNOL" role="2Oq$k0">
+                    <node concept="37vLTw" id="VPgi8egvHj" role="2Oq$k0">
+                      <ref role="3cqZAo" node="VPgi8egvzc" resolve="module" />
+                    </node>
+                    <node concept="liA8E" id="76V6N7UzPMB" role="2OqNvi">
+                      <ref role="37wK5l" to="ze1i:~ModuleRuntime.getSourceModule()" resolve="getSourceModule" />
+                    </node>
                   </node>
                   <node concept="liA8E" id="VPgi8egvHk" role="2OqNvi">
-                    <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
+                    <ref role="37wK5l" to="lui2:~SModuleReference.getModuleName()" resolve="getModuleName" />
                   </node>
                 </node>
                 <node concept="Xl_RD" id="VPgi8egvHl" role="3uHU7w">
@@ -7842,26 +7741,24 @@
           </node>
           <node concept="3clFbS" id="VPgi8egvHp" role="1zxBo7">
             <node concept="3cpWs6" id="VPgi8egw4x" role="3cqZAp">
-              <node concept="1eOMI4" id="VPgi8egwc5" role="3cqZAk">
-                <node concept="10QFUN" id="VPgi8egwc6" role="1eOMHV">
-                  <node concept="2OqwBi" id="VPgi8egwc1" role="10QFUP">
-                    <node concept="37vLTw" id="VPgi8egwc2" role="2Oq$k0">
-                      <ref role="3cqZAo" node="VPgi8egvzc" resolve="module" />
-                    </node>
-                    <node concept="liA8E" id="VPgi8egwc3" role="2OqNvi">
-                      <ref role="37wK5l" to="j8aq:~ReloadableModule.getOwnClass(java.lang.String)" resolve="getOwnClass" />
-                      <node concept="37vLTw" id="VPgi8egwc4" role="37wK5m">
-                        <ref role="3cqZAo" node="VPgi8egvHd" resolve="className" />
-                      </node>
-                    </node>
+              <node concept="10QFUN" id="VPgi8egwc6" role="3cqZAk">
+                <node concept="2OqwBi" id="VPgi8egwc1" role="10QFUP">
+                  <node concept="37vLTw" id="VPgi8egwc2" role="2Oq$k0">
+                    <ref role="3cqZAo" node="VPgi8egvzc" resolve="module" />
                   </node>
-                  <node concept="3uibUv" id="VPgi8ew0rw" role="10QFUM">
-                    <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
-                    <node concept="3uibUv" id="VPgi8ew2x4" role="11_B2D">
-                      <ref role="3uigEE" node="3ZnFyBjuWBZ" resolve="IProjectViewDescriptor" />
+                  <node concept="liA8E" id="VPgi8egwc3" role="2OqNvi">
+                    <ref role="37wK5l" to="ze1i:~ModuleRuntime.getOwnClass(java.lang.String)" resolve="getOwnClass" />
+                    <node concept="37vLTw" id="VPgi8egwc4" role="37wK5m">
+                      <ref role="3cqZAo" node="VPgi8egvHd" resolve="className" />
                     </node>
                   </node>
                 </node>
+                <node concept="3uibUv" id="VPgi8ew0rw" role="10QFUM">
+                  <ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
+                  <node concept="3uibUv" id="VPgi8ew2x4" role="11_B2D">
+                    <ref role="3uigEE" node="3ZnFyBjuWBZ" resolve="IProjectViewDescriptor" />
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -7873,7 +7770,7 @@
       <node concept="37vLTG" id="VPgi8egvzc" role="3clF46">
         <property role="TrG5h" value="module" />
         <node concept="3uibUv" id="VPgi8evkjL" role="1tU5fm">
-          <ref role="3uigEE" to="j8aq:~ReloadableModule" resolve="ReloadableModule" />
+          <ref role="3uigEE" to="ze1i:~ModuleRuntime" resolve="ModuleRuntime" />
         </node>
       </node>
     </node>
@@ -7939,7 +7836,7 @@
       <node concept="37vLTG" id="VPgi8ewlsv" role="3clF46">
         <property role="TrG5h" value="module" />
         <node concept="3uibUv" id="VPgi8ewlsw" role="1tU5fm">
-          <ref role="3uigEE" to="j8aq:~ReloadableModule" resolve="ReloadableModule" />
+          <ref role="3uigEE" to="ze1i:~ModuleRuntime" resolve="ModuleRuntime" />
         </node>
       </node>
     </node>
@@ -8043,9 +7940,6 @@
         </node>
       </node>
     </node>
-    <node concept="3uibUv" id="7JEoLgTCGFK" role="EKbjA">
-      <ref role="3uigEE" to="3qmy:~DeployListener" resolve="DeployListener" />
-    </node>
   </node>
   <node concept="312cEu" id="nR2eIyDftY">
     <property role="TrG5h" value="RootViewElement" />
diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/plugin.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/plugin.mps
index c9311d3711..d22b354d8f 100644
--- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/plugin.mps
+++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/plugin.mps
@@ -27,6 +27,7 @@
       <concept id="481983775135178819" name="jetbrains.mps.lang.plugin.standalone.structure.ProjectPluginDisposeBlock" flags="in" index="2uRRBN" />
       <concept id="481983775135178825" name="jetbrains.mps.lang.plugin.standalone.structure.ProjectPluginInitBlock" flags="in" index="2uRRBT" />
       <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
+      <concept id="3418954410726344423" name="jetbrains.mps.lang.plugin.standalone.structure.PlatformAccessExpression" flags="ng" index="XUXob" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
@@ -105,6 +106,7 @@
             </node>
             <node concept="liA8E" id="VPgi8egDwD" role="2OqNvi">
               <ref role="37wK5l" to="imq3:VPgi8egh2$" resolve="install" />
+              <node concept="XUXob" id="76V6N7UrM0T" role="37wK5m" />
             </node>
           </node>
         </node>
@@ -120,6 +122,7 @@
             </node>
             <node concept="liA8E" id="VPgi8egDxI" role="2OqNvi">
               <ref role="37wK5l" to="imq3:VPgi8egh6x" resolve="dispose" />
+              <node concept="XUXob" id="76V6N7UrM4Y" role="37wK5m" />
             </node>
           </node>
         </node>