diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
index 600479f1..3e3faf8b 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -1715,19 +1715,11 @@
                   <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelId" />
                 </node>
                 <node concept="kI3uX" id="3GJd70pleKK" role="2OqNvi">
-                  <node concept="2OqwBi" id="3GJd70plqos" role="kIiFs">
-                    <node concept="1eOMI4" id="3GJd70plkoO" role="2Oq$k0">
-                      <node concept="10QFUN" id="3GJd70plkoP" role="1eOMHV">
-                        <node concept="3uibUv" id="3GJd70plkoQ" role="10QFUM">
-                          <ref role="3uigEE" node="3GJd70paCjO" resolve="AspectLookup.UsedLanguagesCache" />
-                        </node>
-                        <node concept="37vLTw" id="3GJd70plkoR" role="10QFUP">
-                          <ref role="3cqZAo" node="3GJd70pfXD1" resolve="cached" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OwXpG" id="3GJd70plws8" role="2OqNvi">
-                      <ref role="2Oxat5" node="3GJd70phuUB" resolve="modelId" />
+                  <node concept="2YIFZM" id="55vERwjti0G" role="kIiFs">
+                    <ref role="37wK5l" to="wyt6:~System.identityHashCode(java.lang.Object)" resolve="identityHashCode" />
+                    <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                    <node concept="37vLTw" id="55vERwjtnHh" role="37wK5m">
+                      <ref role="3cqZAo" node="3GJd70pfXD1" resolve="cached" />
                     </node>
                   </node>
                 </node>
@@ -1760,14 +1752,11 @@
                 <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelId" />
               </node>
               <node concept="2Nt0df" id="3GJd70podFu" role="2OqNvi">
-                <node concept="2OqwBi" id="3GJd70podFv" role="38cxEo">
-                  <node concept="2JrnkZ" id="3GJd70podFw" role="2Oq$k0">
-                    <node concept="37vLTw" id="3GJd70podFx" role="2JrQYb">
-                      <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="3GJd70podFy" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SModel.getModelId()" resolve="getModelId" />
+                <node concept="2YIFZM" id="55vERwjttpC" role="38cxEo">
+                  <ref role="37wK5l" to="wyt6:~System.identityHashCode(java.lang.Object)" resolve="identityHashCode" />
+                  <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                  <node concept="37vLTw" id="55vERwjttpD" role="37wK5m">
+                    <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
                   </node>
                 </node>
               </node>
@@ -1910,19 +1899,16 @@
             <node concept="3clFbF" id="5Zr$fBYSFJd" role="3cqZAp">
               <node concept="37vLTI" id="5Zr$fBYTbPy" role="3clFbG">
                 <node concept="3EllGN" id="5Zr$fBYSSG6" role="37vLTJ">
-                  <node concept="2OqwBi" id="5Zr$fBYT2PJ" role="3ElVtu">
-                    <node concept="2JrnkZ" id="5Zr$fBYT0kW" role="2Oq$k0">
-                      <node concept="37vLTw" id="5Zr$fBYSWRR" role="2JrQYb">
-                        <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="5Zr$fBYT7zp" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SModel.getModelId()" resolve="getModelId" />
-                    </node>
-                  </node>
                   <node concept="37vLTw" id="5Zr$fBYSFJb" role="3ElQJh">
                     <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelId" />
                   </node>
+                  <node concept="2YIFZM" id="55vERwjtERu" role="3ElVtu">
+                    <ref role="37wK5l" to="wyt6:~System.identityHashCode(java.lang.Object)" resolve="identityHashCode" />
+                    <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                    <node concept="37vLTw" id="55vERwjtERv" role="37wK5m">
+                      <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
+                    </node>
+                  </node>
                 </node>
                 <node concept="2ShNRf" id="3GJd70powH9" role="37vLTx">
                   <node concept="1pGfFk" id="3GJd70poBzp" role="2ShVmc">
@@ -1949,19 +1935,16 @@
         <node concept="3clFbF" id="5Zr$fBYTxar" role="3cqZAp">
           <node concept="2OqwBi" id="3GJd70pnUQp" role="3clFbG">
             <node concept="3EllGN" id="5Zr$fBYTxat" role="2Oq$k0">
-              <node concept="2OqwBi" id="5Zr$fBYTxau" role="3ElVtu">
-                <node concept="2JrnkZ" id="5Zr$fBYTxav" role="2Oq$k0">
-                  <node concept="37vLTw" id="5Zr$fBYTxaw" role="2JrQYb">
-                    <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="5Zr$fBYTxax" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SModel.getModelId()" resolve="getModelId" />
-                </node>
-              </node>
               <node concept="37vLTw" id="5Zr$fBYTxay" role="3ElQJh">
                 <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelId" />
               </node>
+              <node concept="2YIFZM" id="55vERwjtKyI" role="3ElVtu">
+                <ref role="37wK5l" to="wyt6:~System.identityHashCode(java.lang.Object)" resolve="identityHashCode" />
+                <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                <node concept="37vLTw" id="55vERwjtKyJ" role="37wK5m">
+                  <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
+                </node>
+              </node>
             </node>
             <node concept="liA8E" id="3GJd70po2nC" role="2OqNvi">
               <ref role="37wK5l" to="mpcv:~SoftReference.get()" resolve="get" />
@@ -3022,11 +3005,11 @@
     </node>
     <node concept="2tJIrI" id="1AsznI2$pYI" role="jymVt" />
     <node concept="312cEg" id="5Zr$fBYRFKG" role="jymVt">
-      <property role="TrG5h" value="usedLanguagesBySModelId" />
+      <property role="TrG5h" value="usedLanguagesBySModelSystemId" />
       <node concept="3Tm6S6" id="5Zr$fBYRFKH" role="1B3o_S" />
       <node concept="3rvAFt" id="5Zr$fBYRJML" role="1tU5fm">
         <node concept="3uibUv" id="5Zr$fBYRLez" role="3rvQeY">
-          <ref role="3uigEE" to="mhbf:~SModelId" resolve="SModelId" />
+          <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
         </node>
         <node concept="3uibUv" id="3GJd70pmA9J" role="3rvSg0">
           <ref role="3uigEE" node="3GJd70paCjO" resolve="AspectLookup.UsedLanguagesCache" />
@@ -3035,7 +3018,7 @@
       <node concept="2ShNRf" id="5Zr$fBYRQSo" role="33vP2m">
         <node concept="3rGOSV" id="5Zr$fBYRQQi" role="2ShVmc">
           <node concept="3uibUv" id="5Zr$fBYRQQj" role="3rHrn6">
-            <ref role="3uigEE" to="mhbf:~SModelId" resolve="SModelId" />
+            <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
           </node>
           <node concept="3uibUv" id="3GJd70pmM3N" role="3rHtpV">
             <ref role="3uigEE" node="3GJd70paCjO" resolve="AspectLookup.UsedLanguagesCache" />