diff --git a/build.xml b/build.xml
index 4739c3b9..77600845 100644
--- a/build.xml
+++ b/build.xml
@@ -1178,6 +1178,7 @@
           <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="cl" />
           <module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />
           <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
+          <module ref="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
@@ -1196,6 +1197,7 @@
           <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
           <language id="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" />
           <language id="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" />
+          <language id="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" />
           <language id="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
@@ -3103,6 +3105,7 @@
           <module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="cl" />
           <module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />
           <module ref="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" kind="cl" />
+          <module ref="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" kind="cl" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
           <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" kind="cl" />
           <module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
@@ -3121,6 +3124,7 @@
           <language id="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" />
           <language id="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" />
           <language id="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" />
+          <language id="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" />
           <language id="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" />
           <language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
           <language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index d3c07f59..bc3bb7a2 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -1197,6 +1197,11 @@
             <ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2Qsys8bEo8R" role="3bR37C">
+          <node concept="3bR9La" id="2Qsys8bEo8S" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbJt" resolve="jetbrains.mps.ide.platform" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="55Q$YFtvwQY" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
index 0132bfb3..2adbe741 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
@@ -26,6 +26,7 @@
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
     <dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
+    <dependency reexport="false">8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
@@ -64,6 +65,8 @@
     <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
     <module reference="f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)" version="0" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" version="0" />
+    <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
+    <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
@@ -79,6 +82,7 @@
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
+    <module reference="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" version="0" />
     <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
     <module reference="0b80a2e8-f9f1-47b3-823f-56eb115bca42(jetbrains.mps.typechecking.annotation)" version="0" />
   </dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index b6af7dfb..557bc51e 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -11,6 +11,7 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
   </languages>
   <imports>
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
@@ -56,6 +57,9 @@
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
     <import index="qqrq" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.components(MPS.IDEA/)" />
     <import index="mpcv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang.ref(JDK/)" />
+    <import index="2eq1" ref="r:383be79d-d39d-4dc4-9df3-57e57bcac2b5(jetbrains.mps.ide.platform.watching)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
+    <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" implicit="true" />
   </imports>
   <registry>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -90,6 +94,7 @@
       <concept id="481983775135178834" name="jetbrains.mps.lang.plugin.standalone.structure.ProjectPluginDeclaration" flags="ng" index="2uRRBy">
         <child id="481983775135178836" name="initBlock" index="2uRRB$" />
         <child id="481983775135178837" name="disposeBlock" index="2uRRB_" />
+        <child id="481983775135178838" name="fieldDeclaration" index="2uRRBA" />
       </concept>
       <concept id="481983775135178840" name="jetbrains.mps.lang.plugin.standalone.structure.ApplicationPluginDeclaration" flags="ng" index="2uRRBC">
         <child id="481983775135178842" name="initBlock" index="2uRRBE" />
@@ -412,16 +417,130 @@
   <node concept="2uRRBy" id="443LGHBoF4R">
     <property role="TrG5h" value="TypesIndexCacheLifecycle" />
     <property role="3GE5qa" value="lifecycle" />
+    <node concept="2BZ0e9" id="2Qsys8b5KCW" role="2uRRBA">
+      <property role="TrG5h" value="reloadListener" />
+      <node concept="3Tm6S6" id="2Qsys8b5KCX" role="1B3o_S" />
+      <node concept="3uibUv" id="2Qsys8b5KWz" role="1tU5fm">
+        <ref role="3uigEE" to="2eq1:491od_XHIv7" resolve="ReloadListener" />
+      </node>
+    </node>
     <node concept="2uRRBT" id="443LGHBoF4U" role="2uRRB$">
       <node concept="3clFbS" id="443LGHBoF4V" role="2VODD2">
+        <node concept="3cpWs8" id="2Qsys8b4161" role="3cqZAp">
+          <node concept="3cpWsn" id="2Qsys8b4162" role="3cpWs9">
+            <property role="TrG5h" value="repository" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3uibUv" id="2Qsys8b412R" role="1tU5fm">
+              <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+            </node>
+            <node concept="2OqwBi" id="2Qsys8b4163" role="33vP2m">
+              <node concept="1KvdUw" id="2Qsys8b4164" role="2Oq$k0" />
+              <node concept="liA8E" id="2Qsys8b4165" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="2Qsys8bCUjT" role="3cqZAp">
+          <node concept="1PaTwC" id="2Qsys8bCUjU" role="1aUNEU">
+            <node concept="3oM_SD" id="2Qsys8bCUjV" role="1PaTwD">
+              <property role="3oM_SC" value="initialize" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8bCUpX" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2Qsys8bCUq_" role="1PaTwD">
+              <property role="3oM_SC" value="cache" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="443LGHBoGH8" role="3cqZAp">
           <node concept="2YIFZM" id="6$gg4k_t5t4" role="3clFbG">
             <ref role="37wK5l" to="tj24:4Z$O9mrQIG1" resolve="get" />
             <ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
-            <node concept="2OqwBi" id="443LGHBoGJY" role="37wK5m">
-              <node concept="1KvdUw" id="443LGHBoGJZ" role="2Oq$k0" />
-              <node concept="liA8E" id="443LGHBoGK0" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+            <node concept="37vLTw" id="2Qsys8b4166" role="37wK5m">
+              <ref role="3cqZAo" node="2Qsys8b4162" resolve="repository" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2Qsys8b5SWt" role="3cqZAp">
+          <node concept="37vLTI" id="2Qsys8b5Tj5" role="3clFbG">
+            <node concept="2ShNRf" id="2Qsys8b5TkY" role="37vLTx">
+              <node concept="YeOm9" id="2Qsys8b5U4E" role="2ShVmc">
+                <node concept="1Y3b0j" id="2Qsys8b5U4H" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <ref role="1Y3XeK" to="2eq1:491od_XHIv7" resolve="ReloadListener" />
+                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                  <node concept="3Tm1VV" id="2Qsys8b5U4I" role="1B3o_S" />
+                  <node concept="3clFb_" id="2Qsys8b5U4N" role="jymVt">
+                    <property role="TrG5h" value="reloadStarted" />
+                    <node concept="3Tm1VV" id="2Qsys8b5U4O" role="1B3o_S" />
+                    <node concept="3cqZAl" id="2Qsys8b5U4P" role="3clF45" />
+                    <node concept="3clFbS" id="2Qsys8b5U4R" role="3clF47">
+                      <node concept="3clFbF" id="2Qsys8b5UbH" role="3cqZAp">
+                        <node concept="2YIFZM" id="2Qsys8b5UbI" role="3clFbG">
+                          <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="dispose" />
+                          <ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
+                          <node concept="37vLTw" id="2Qsys8b5UbJ" role="37wK5m">
+                            <ref role="3cqZAo" node="2Qsys8b4162" resolve="repository" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="2Qsys8b5U4T" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                  <node concept="2tJIrI" id="2Qsys8b5U4U" role="jymVt" />
+                  <node concept="3clFb_" id="2Qsys8b5U4V" role="jymVt">
+                    <property role="TrG5h" value="reloadFinished" />
+                    <node concept="3Tm1VV" id="2Qsys8b5U4W" role="1B3o_S" />
+                    <node concept="3cqZAl" id="2Qsys8b5U4X" role="3clF45" />
+                    <node concept="3clFbS" id="2Qsys8b5U4Z" role="3clF47">
+                      <node concept="3SKdUt" id="2Qsys8b5UoN" role="3cqZAp">
+                        <node concept="1PaTwC" id="2Qsys8b5UoO" role="1aUNEU">
+                          <node concept="3oM_SD" id="2Qsys8b5UoP" role="1PaTwD">
+                            <property role="3oM_SC" value="NOP" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="2Qsys8b5U51" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2Qsys8b5SWn" role="37vLTJ">
+              <node concept="2WthIp" id="2Qsys8b5SWq" role="2Oq$k0" />
+              <node concept="2BZ7hE" id="2Qsys8b5SWs" role="2OqNvi">
+                <ref role="2WH_rO" node="2Qsys8b5KCW" resolve="reloadListener" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2Qsys8b5QHR" role="3cqZAp">
+          <node concept="2OqwBi" id="2Qsys8b5SjJ" role="3clFbG">
+            <node concept="2OqwBi" id="2Qsys8b5Rc1" role="2Oq$k0">
+              <node concept="2YIFZM" id="2Qsys8b5QVZ" 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="2Qsys8b5ROc" role="2OqNvi">
+                <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
+                <node concept="3VsKOn" id="2Qsys8b5RT6" role="37wK5m">
+                  <ref role="3VsUkX" to="2eq1:491od_XJZeq" resolve="ReloadManager" />
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="2Qsys8b5SEj" role="2OqNvi">
+              <ref role="37wK5l" to="2eq1:491od_YVjMw" resolve="addReloadListener" />
+              <node concept="2OqwBi" id="2Qsys8b5SGK" role="37wK5m">
+                <node concept="2WthIp" id="2Qsys8b5SGN" role="2Oq$k0" />
+                <node concept="2BZ7hE" id="2Qsys8b5SGP" role="2OqNvi">
+                  <ref role="2WH_rO" node="2Qsys8b5KCW" resolve="reloadListener" />
+                </node>
               </node>
             </node>
           </node>
@@ -430,6 +549,31 @@
     </node>
     <node concept="2uRRBN" id="443LGHBoGMS" role="2uRRB_">
       <node concept="3clFbS" id="443LGHBoGMT" role="2VODD2">
+        <node concept="3clFbF" id="2Qsys8b5UOj" role="3cqZAp">
+          <node concept="2OqwBi" id="2Qsys8b5UOk" role="3clFbG">
+            <node concept="2OqwBi" id="2Qsys8b5UOl" role="2Oq$k0">
+              <node concept="2YIFZM" id="2Qsys8b5UOm" role="2Oq$k0">
+                <ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
+                <ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
+              </node>
+              <node concept="liA8E" id="2Qsys8b5UOn" role="2OqNvi">
+                <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
+                <node concept="3VsKOn" id="2Qsys8b5UOo" role="37wK5m">
+                  <ref role="3VsUkX" to="2eq1:491od_XJZeq" resolve="ReloadManager" />
+                </node>
+              </node>
+            </node>
+            <node concept="liA8E" id="2Qsys8b5UOp" role="2OqNvi">
+              <ref role="37wK5l" to="2eq1:491od_YVk7k" resolve="removeReloadListener" />
+              <node concept="2OqwBi" id="2Qsys8b5UOq" role="37wK5m">
+                <node concept="2WthIp" id="2Qsys8b5UOr" role="2Oq$k0" />
+                <node concept="2BZ7hE" id="2Qsys8b5UOs" role="2OqNvi">
+                  <ref role="2WH_rO" node="2Qsys8b5KCW" resolve="reloadListener" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="443LGHBoGNh" role="3cqZAp">
           <node concept="2YIFZM" id="6$gg4k_t5t6" role="3clFbG">
             <ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="dispose" />