diff --git a/build.xml b/build.xml
index a78d51f4..eacaedc5 100644
--- a/build.xml
+++ b/build.xml
@@ -1466,6 +1466,7 @@
         <exclude name="**/checkpoints" />
         <exclude name="**/*.mps" />
       </fileset>
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source" />
       <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ideaplugin-models1" prefix="module/models" />
     </jar>
@@ -2608,6 +2609,7 @@
         <exclude name="**/checkpoints" />
         <exclude name="**/*.mps" />
       </fileset>
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source" />
       <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ideaplugin-models2" prefix="module/models" />
     </jar>
@@ -3120,7 +3122,6 @@
         <exclude name="**/checkpoints" />
         <exclude name="**/*.mps" />
       </fileset>
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source" />
       <zipfileset file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.coderules-languageModels1" prefix="module/languageModels" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.coderules-generator-template1" prefix="module/generator/template" />
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 3ba03e30..881b855f 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
@@ -3684,6 +3684,48 @@
           </node>
           <node concept="L2wRC" id="7Ant4WkHLmw" role="39821P">
             <ref role="L2wRA" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+            <node concept="3yLZsm" id="6YTH7uEOJpq" role="3yL2VB">
+              <property role="3yLZsk" value="../lib/collection-0.7.jar" />
+              <node concept="398BVA" id="6YTH7uEOJpr" role="3yLZsn">
+                <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                <node concept="2Ry0Ak" id="6YTH7uEOJps" role="iGT6I">
+                  <property role="2Ry0Am" value="coderules" />
+                  <node concept="2Ry0Ak" id="6YTH7uEOJpt" role="2Ry0An">
+                    <property role="2Ry0Am" value="solutions" />
+                    <node concept="2Ry0Ak" id="6YTH7uEOJpu" role="2Ry0An">
+                      <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
+                      <node concept="2Ry0Ak" id="6YTH7uEOJpv" role="2Ry0An">
+                        <property role="2Ry0Am" value="lib" />
+                        <node concept="2Ry0Ak" id="6YTH7uEOJpw" role="2Ry0An">
+                          <property role="2Ry0Am" value="collection-0.7.jar" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3yLZsm" id="6YTH7uEOJpx" role="3yL2VB">
+              <property role="3yLZsk" value="../lib/conreactor-core-0.9.16.jar" />
+              <node concept="398BVA" id="6YTH7uEOJpy" role="3yLZsn">
+                <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                <node concept="2Ry0Ak" id="6YTH7uEOJpz" role="iGT6I">
+                  <property role="2Ry0Am" value="coderules" />
+                  <node concept="2Ry0Ak" id="6YTH7uEOJp$" role="2Ry0An">
+                    <property role="2Ry0Am" value="solutions" />
+                    <node concept="2Ry0Ak" id="6YTH7uEOJp_" role="2Ry0An">
+                      <property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
+                      <node concept="2Ry0Ak" id="6YTH7uEOJpA" role="2Ry0An">
+                        <property role="2Ry0Am" value="lib" />
+                        <node concept="2Ry0Ak" id="6YTH7uEOJpB" role="2Ry0An">
+                          <property role="2Ry0Am" value="conreactor-core-0.9.16.jar" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
           <node concept="L2wRC" id="7Ant4WkHLmu" role="39821P">
             <ref role="L2wRA" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
@@ -3728,6 +3770,7 @@
             <ref role="L2wRA" node="5XWz8xxbp0o" resolve="jetbrains.mps.lang.types" />
           </node>
           <node concept="L2wRC" id="2MNGcFT262d" role="39821P">
+            <property role="3PtdQa" value="true" />
             <ref role="L2wRA" node="2CPBoDB0MbE" resolve="jetbrains.mps.coderules.ideaplugin" />
             <node concept="3yLZsm" id="2MNGcFT262e" role="3yL2VB">
               <property role="3yLZsk" value="../lib/jetbrains.mps.coderules.jar" />
@@ -3748,6 +3791,25 @@
               </node>
             </node>
             <node concept="3PtdJl" id="2MNGcFT262k" role="3PtcVe" />
+            <node concept="3PtdJl" id="6YTH7uEKcJC" role="3PtdQn">
+              <node concept="2HvfSZ" id="6YTH7uEKcKW" role="39821P">
+                <node concept="398BVA" id="6YTH7uEKcKX" role="2HvfZ0">
+                  <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                  <node concept="2Ry0Ak" id="6YTH7uEKcKY" role="iGT6I">
+                    <property role="2Ry0Am" value="coderules" />
+                    <node concept="2Ry0Ak" id="6YTH7uEKcKZ" role="2Ry0An">
+                      <property role="2Ry0Am" value="solutions" />
+                      <node concept="2Ry0Ak" id="6YTH7uEKcL0" role="2Ry0An">
+                        <property role="2Ry0Am" value="jetbrains.mps.coderules.ideaplugin" />
+                        <node concept="2Ry0Ak" id="6YTH7uEKcL1" role="2Ry0An">
+                          <property role="2Ry0Am" value="source" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
           <node concept="L2wRC" id="7Ant4WkHLmq" role="39821P">
             <ref role="L2wRA" node="2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
@@ -3990,6 +4052,7 @@
               <ref role="L2wRA" node="5XWz8xxbp0o" resolve="jetbrains.mps.lang.types" />
             </node>
             <node concept="L2wRC" id="adIlSvFUuy" role="39821P">
+              <property role="3PtdQa" value="true" />
               <ref role="L2wRA" node="2CPBoDB0MbE" resolve="jetbrains.mps.coderules.ideaplugin" />
               <node concept="3yLZsm" id="adIlSvHzbx" role="3yL2VB">
                 <property role="3yLZsk" value="../lib/jetbrains.mps.coderules.jar" />
@@ -4010,6 +4073,25 @@
                 </node>
               </node>
               <node concept="3PtdJl" id="adIlSvFUzO" role="3PtcVe" />
+              <node concept="3PtdJl" id="6YTH7uEKcFE" role="3PtdQn">
+                <node concept="2HvfSZ" id="6YTH7uEw1Q7" role="39821P">
+                  <node concept="398BVA" id="6YTH7uEw1Rt" role="2HvfZ0">
+                    <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
+                    <node concept="2Ry0Ak" id="6YTH7uEw1SN" role="iGT6I">
+                      <property role="2Ry0Am" value="coderules" />
+                      <node concept="2Ry0Ak" id="6YTH7uEw1YE" role="2Ry0An">
+                        <property role="2Ry0Am" value="solutions" />
+                        <node concept="2Ry0Ak" id="6YTH7uEw1YJ" role="2Ry0An">
+                          <property role="2Ry0Am" value="jetbrains.mps.coderules.ideaplugin" />
+                          <node concept="2Ry0Ak" id="6YTH7uEw1YO" role="2Ry0An">
+                            <property role="2Ry0Am" value="source" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
             </node>
             <node concept="L2wRC" id="65DJywFj_1R" role="39821P">
               <ref role="L2wRA" node="2CPBoDB0Mtg" resolve="jetbrains.mps.coderules.typechecking" />
@@ -4049,25 +4131,7 @@
                   </node>
                 </node>
               </node>
-              <node concept="3PtdJl" id="6YTH7uEw1Md" role="3PtdQn">
-                <node concept="2HvfSZ" id="6YTH7uEw1Q7" role="39821P">
-                  <node concept="398BVA" id="6YTH7uEw1Rt" role="2HvfZ0">
-                    <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
-                    <node concept="2Ry0Ak" id="6YTH7uEw1SN" role="iGT6I">
-                      <property role="2Ry0Am" value="coderules" />
-                      <node concept="2Ry0Ak" id="6YTH7uEw1YE" role="2Ry0An">
-                        <property role="2Ry0Am" value="solutions" />
-                        <node concept="2Ry0Ak" id="6YTH7uEw1YJ" role="2Ry0An">
-                          <property role="2Ry0Am" value="jetbrains.mps.coderules.ideaplugin" />
-                          <node concept="2Ry0Ak" id="6YTH7uEw1YO" role="2Ry0An">
-                            <property role="2Ry0Am" value="source" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
+              <node concept="3PtdJl" id="6YTH7uEw1Md" role="3PtdQn" />
             </node>
             <node concept="L2wRC" id="C1f6iDF7KL" role="39821P">
               <ref role="L2wRA" node="C1f6iDDM8L" resolve="jetbrains.mps.devkit.aspect.types" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index 5cd13ea5..2c826440 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -3844,7 +3844,7 @@
                     <ref role="3uigEE" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
                   </node>
                   <node concept="2YIFZM" id="61G6TdBScAm" role="33vP2m">
-                    <ref role="37wK5l" to="tj24:1FOQehxzbI0" resolve="create" />
+                    <ref role="37wK5l" to="tj24:6YTH7uESh8y" resolve="create" />
                     <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
                     <node concept="2OqwBi" id="61G6TdBScAn" role="37wK5m">
                       <node concept="1jxXqW" id="61G6TdBScAo" role="2Oq$k0" />
@@ -3852,10 +3852,6 @@
                         <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                       </node>
                     </node>
-                    <node concept="2YIFZM" id="2MNGcFT5IT5" role="37wK5m">
-                      <ref role="1Pybhc" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                      <ref role="37wK5l" to="m7o5:2MNGcFT4ZOn" resolve="getUiConfig" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -4076,17 +4072,13 @@
                   </node>
                   <node concept="2YIFZM" id="61G6TdBSLy$" role="33vP2m">
                     <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                    <ref role="37wK5l" to="tj24:1FOQehxzbI0" resolve="create" />
+                    <ref role="37wK5l" to="tj24:6YTH7uESh8y" resolve="create" />
                     <node concept="2OqwBi" id="61G6TdBSLy_" role="37wK5m">
                       <node concept="1jxXqW" id="61G6TdBSLyA" role="2Oq$k0" />
                       <node concept="liA8E" id="61G6TdBSLyB" role="2OqNvi">
                         <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                       </node>
                     </node>
-                    <node concept="2YIFZM" id="2MNGcFT5Q9x" role="37wK5m">
-                      <ref role="1Pybhc" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                      <ref role="37wK5l" to="m7o5:2MNGcFT4ZOn" resolve="getUiConfig" />
-                    </node>
                   </node>
                 </node>
               </node>
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 738e0e1d..363c99b3 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
@@ -3874,6 +3874,13 @@
         <ref role="3uigEE" node="6gnqipLxPUE" resolve="ProviderInitToken" />
       </node>
     </node>
+    <node concept="2BZ0e9" id="6YTH7uERSL2" role="2uRRBG">
+      <property role="TrG5h" value="typecheckingOptions" />
+      <node concept="3Tm1VV" id="6YTH7uERTqc" role="1B3o_S" />
+      <node concept="3uibUv" id="6YTH7uERTFl" role="1tU5fm">
+        <ref role="3uigEE" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
+      </node>
+    </node>
     <node concept="2uRRBj" id="vVsDu9byG8" role="2uRRBE">
       <node concept="3clFbS" id="vVsDu9byG9" role="2VODD2">
         <node concept="3clFbF" id="6gnqipLy0oP" role="3cqZAp">
@@ -3902,6 +3909,10 @@
             </node>
             <node concept="liA8E" id="6gnqipLypT7" role="2OqNvi">
               <ref role="37wK5l" node="6gnqipLxUdr" resolve="init" />
+              <node concept="2YIFZM" id="6YTH7uESnl$" role="37wK5m">
+                <ref role="37wK5l" to="m7o5:2MNGcFT4ZOn" resolve="getUiConfig" />
+                <ref role="1Pybhc" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
+              </node>
             </node>
           </node>
         </node>
@@ -4229,6 +4240,12 @@
     <node concept="2tJIrI" id="6gnqipLxPWG" role="jymVt" />
     <node concept="3clFb_" id="6gnqipLxUdr" role="jymVt">
       <property role="TrG5h" value="init" />
+      <node concept="37vLTG" id="6YTH7uES0AH" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="6YTH7uES25c" role="1tU5fm">
+          <ref role="3uigEE" to="m7o5:7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
       <node concept="3cqZAl" id="6gnqipLxUdt" role="3clF45" />
       <node concept="3Tmbuc" id="6gnqipLyxJH" role="1B3o_S" />
       <node concept="3clFbS" id="6gnqipLxUdv" role="3clF47">
@@ -4320,6 +4337,9 @@
         <node concept="3clFbF" id="6gnqipLyvbs" role="3cqZAp">
           <node concept="1rXfSq" id="6gnqipLyvbq" role="3clFbG">
             <ref role="37wK5l" node="6gnqipLysuY" resolve="activate" />
+            <node concept="37vLTw" id="6YTH7uES3ic" role="37wK5m">
+              <ref role="3cqZAo" node="6YTH7uES0AH" resolve="config" />
+            </node>
           </node>
         </node>
       </node>
@@ -4340,6 +4360,12 @@
     <node concept="2tJIrI" id="6gnqipLz4WZ" role="jymVt" />
     <node concept="3clFb_" id="6gnqipLysuY" role="jymVt">
       <property role="TrG5h" value="activate" />
+      <node concept="37vLTG" id="6YTH7uES3yX" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="6YTH7uES4xt" role="1tU5fm">
+          <ref role="3uigEE" to="m7o5:7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
       <node concept="3cqZAl" id="6gnqipLysv0" role="3clF45" />
       <node concept="3Tm6S6" id="6gnqipLysOv" role="1B3o_S" />
       <node concept="3clFbS" id="6gnqipLysv2" role="3clF47">
@@ -4347,6 +4373,9 @@
           <node concept="2YIFZM" id="6gnqipLxUvU" role="3clFbG">
             <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
             <ref role="37wK5l" to="tj24:6hpwxwitVpF" resolve="initFactory" />
+            <node concept="37vLTw" id="6YTH7uES73L" role="37wK5m">
+              <ref role="3cqZAo" node="6YTH7uES3yX" resolve="config" />
+            </node>
           </node>
         </node>
         <node concept="3cpWs8" id="6gnqipLxUws" role="3cqZAp">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index c31b0c5e..30bdc764 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -6334,6 +6334,36 @@
     <node concept="312cEu" id="6hpwxwitoJO" role="jymVt">
       <property role="TrG5h" value="Factory" />
       <node concept="3Tm6S6" id="6hpwxwiuR3o" role="1B3o_S" />
+      <node concept="312cEg" id="6YTH7uESebd" role="jymVt">
+        <property role="TrG5h" value="myConfig" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3Tm6S6" id="6YTH7uESebe" role="1B3o_S" />
+        <node concept="3uibUv" id="6YTH7uESebg" role="1tU5fm">
+          <ref role="3uigEE" to="m7o5:7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
+      <node concept="3clFbW" id="6YTH7uESc4w" role="jymVt">
+        <node concept="37vLTG" id="6YTH7uEScR1" role="3clF46">
+          <property role="TrG5h" value="config" />
+          <node concept="3uibUv" id="6YTH7uESd81" role="1tU5fm">
+            <ref role="3uigEE" to="m7o5:7iCybvToiT5" resolve="Config" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="6YTH7uESc4y" role="3clF45" />
+        <node concept="3Tm6S6" id="6YTH7uESc4z" role="1B3o_S" />
+        <node concept="3clFbS" id="6YTH7uESc4$" role="3clF47">
+          <node concept="3clFbF" id="6YTH7uESebh" role="3cqZAp">
+            <node concept="37vLTI" id="6YTH7uESebj" role="3clFbG">
+              <node concept="37vLTw" id="6YTH7uESebm" role="37vLTJ">
+                <ref role="3cqZAo" node="6YTH7uESebd" resolve="myConfig" />
+              </node>
+              <node concept="37vLTw" id="6YTH7uESebn" role="37vLTx">
+                <ref role="3cqZAo" node="6YTH7uEScR1" resolve="config" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="3clFb_" id="1z4$59iGxMp" role="jymVt">
         <property role="TrG5h" value="doCreate" />
         <node concept="37vLTG" id="5cBWTAej899" role="3clF46">
@@ -6386,6 +6416,52 @@
           </node>
         </node>
       </node>
+      <node concept="3clFb_" id="6YTH7uESeFt" role="jymVt">
+        <property role="TrG5h" value="doCreate" />
+        <node concept="37vLTG" id="6YTH7uESeFu" role="3clF46">
+          <property role="TrG5h" value="state" />
+          <node concept="3uibUv" id="6YTH7uESeFv" role="1tU5fm">
+            <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="6YTH7uESeFw" role="3clF46">
+          <property role="TrG5h" value="repository" />
+          <node concept="3uibUv" id="6YTH7uESeFx" role="1tU5fm">
+            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="6YTH7uESeF$" role="3clF46">
+          <property role="TrG5h" value="messageHandler" />
+          <node concept="3uibUv" id="6YTH7uESeF_" role="1tU5fm">
+            <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="6YTH7uESeFA" role="3clF45">
+          <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+        </node>
+        <node concept="3Tm6S6" id="6YTH7uESeFB" role="1B3o_S" />
+        <node concept="3clFbS" id="6YTH7uESeFC" role="3clF47">
+          <node concept="3clFbF" id="6YTH7uESeFD" role="3cqZAp">
+            <node concept="2ShNRf" id="6YTH7uESeFE" role="3clFbG">
+              <node concept="1pGfFk" id="6YTH7uESeFF" role="2ShVmc">
+                <ref role="37wK5l" node="7kaxm0sEBCn" resolve="TypecheckingService" />
+                <node concept="37vLTw" id="6YTH7uESeFG" role="37wK5m">
+                  <ref role="3cqZAo" node="6YTH7uESeFu" resolve="state" />
+                </node>
+                <node concept="37vLTw" id="6YTH7uESeFH" role="37wK5m">
+                  <ref role="3cqZAo" node="6YTH7uESeFw" resolve="repository" />
+                </node>
+                <node concept="37vLTw" id="6YTH7uESeFI" role="37wK5m">
+                  <ref role="3cqZAo" node="6YTH7uESebd" resolve="myConfig" />
+                </node>
+                <node concept="37vLTw" id="6YTH7uESeFJ" role="37wK5m">
+                  <ref role="3cqZAo" node="6YTH7uESeF$" resolve="messageHandler" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="6hpwxwiti8G" role="jymVt" />
     <node concept="Wx3nA" id="6hpwxwitD9W" role="jymVt">
@@ -6415,14 +6491,23 @@
     <node concept="2tJIrI" id="6hpwxwixBLI" role="jymVt" />
     <node concept="2YIFZL" id="6hpwxwitVpF" role="jymVt">
       <property role="TrG5h" value="initFactory" />
+      <node concept="37vLTG" id="6YTH7uES8pU" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="6YTH7uES9du" role="1tU5fm">
+          <ref role="3uigEE" to="m7o5:7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
       <node concept="3cqZAl" id="6hpwxwitVpH" role="3clF45" />
       <node concept="3Tm1VV" id="6hpwxwitVpI" role="1B3o_S" />
       <node concept="3clFbS" id="6hpwxwitVpJ" role="3clF47">
         <node concept="3clFbF" id="6hpwxwiu6W5" role="3cqZAp">
           <node concept="37vLTI" id="6hpwxwiu8Qe" role="3clFbG">
             <node concept="2ShNRf" id="6hpwxwiuaLx" role="37vLTx">
-              <node concept="HV5vD" id="4ot3PHR9QlG" role="2ShVmc">
-                <ref role="HV5vE" node="6hpwxwitoJO" resolve="Factory" />
+              <node concept="1pGfFk" id="6YTH7uEScto" role="2ShVmc">
+                <ref role="37wK5l" node="6YTH7uESc4w" resolve="Factory" />
+                <node concept="37vLTw" id="6YTH7uESgK4" role="37wK5m">
+                  <ref role="3cqZAo" node="6YTH7uES8pU" resolve="config" />
+                </node>
               </node>
             </node>
             <node concept="37vLTw" id="6hpwxwiu6W4" role="37vLTJ">
@@ -6640,6 +6725,56 @@
       </node>
     </node>
     <node concept="2tJIrI" id="9UUIHNe1ns" role="jymVt" />
+    <node concept="2YIFZL" id="6YTH7uESh8y" role="jymVt">
+      <property role="TrG5h" value="create" />
+      <node concept="37vLTG" id="6YTH7uESh8z" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="6YTH7uESh8$" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="6YTH7uESh8B" role="3clF45">
+        <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+      </node>
+      <node concept="3clFbS" id="6YTH7uESh8C" role="3clF47">
+        <node concept="3clFbF" id="6YTH7uESh8D" role="3cqZAp">
+          <node concept="2OqwBi" id="6YTH7uESh8E" role="3clFbG">
+            <node concept="1rXfSq" id="6YTH7uESh8F" role="2Oq$k0">
+              <ref role="37wK5l" node="6hpwxwiwZuc" resolve="factory" />
+            </node>
+            <node concept="liA8E" id="6YTH7uESh8G" role="2OqNvi">
+              <ref role="37wK5l" node="6YTH7uESeFt" resolve="doCreate" />
+              <node concept="2ShNRf" id="6YTH7uESh8H" role="37wK5m">
+                <node concept="1pGfFk" id="6YTH7uESh8I" role="2ShVmc">
+                  <ref role="37wK5l" node="5cBWTAehvV3" resolve="TypecheckingState" />
+                  <node concept="37vLTw" id="6YTH7uESh8J" role="37wK5m">
+                    <ref role="3cqZAo" node="6YTH7uESh8z" resolve="repository" />
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTw" id="6YTH7uESh8K" role="37wK5m">
+                <ref role="3cqZAo" node="6YTH7uESh8z" resolve="repository" />
+              </node>
+              <node concept="2ShNRf" id="6YTH7uESh8M" role="37wK5m">
+                <node concept="1pGfFk" id="6YTH7uESh8N" role="2ShVmc">
+                  <property role="373rjd" value="true" />
+                  <ref role="37wK5l" to="et5u:~MessageCollector.&lt;init&gt;()" resolve="MessageCollector" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6YTH7uESh8O" role="1B3o_S" />
+      <node concept="P$JXv" id="6YTH7uESh8P" role="lGtFl">
+        <node concept="TZ5HA" id="6YTH7uESh8Q" role="TZ5H$">
+          <node concept="1dT_AC" id="6YTH7uESh8R" role="1dT_Ay">
+            <property role="1dT_AB" value="Used from tests." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6YTH7uESh8x" role="jymVt" />
     <node concept="2YIFZL" id="1z4$59iHmYH" role="jymVt">
       <property role="TrG5h" value="create" />
       <node concept="37vLTG" id="1z4$59iHBaC" role="3clF46">
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index b4c1f229..2c71fd48 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -10519,10 +10519,8 @@
       </classpath>
       
       <env key="NO_FS_ROOTS_ACCESS_CHECK" value="true" />
+      <env key="JAVA_TOOL_OPTIONS" value="-Dplugin.path=&quot;${mps.plugins.path.string}&quot; -Dmps.libraries=&quot;${mps.libraries.path.string}&quot; -Dmps.test.modules=&quot;${mps.tests.path.string}&quot;" />
       
-      <sysproperty key="plugin.path" value="${mps.plugins.path.string}" />
-      <sysproperty key="mps.libraries" value="${mps.libraries.path.string}" />
-      <sysproperty key="mps.test.modules" value="${mps.tests.path.string}" />
       
       <sysproperty key="mps.macro.mpscore_home" value="${basedir}" />
       
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
index cd9f2bc8..93ce3a04 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
@@ -458,7 +458,7 @@
                     <ref role="3uigEE" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
                   </node>
                   <node concept="2YIFZM" id="61G6TdBScAm" role="33vP2m">
-                    <ref role="37wK5l" to="tj24:1FOQehxzbI0" resolve="create" />
+                    <ref role="37wK5l" to="tj24:6YTH7uESh8y" resolve="create" />
                     <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
                     <node concept="2OqwBi" id="61G6TdBScAn" role="37wK5m">
                       <node concept="1jxXqW" id="61G6TdBScAo" role="2Oq$k0" />
@@ -466,10 +466,6 @@
                         <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                       </node>
                     </node>
-                    <node concept="2YIFZM" id="2MNGcFT5Fdw" role="37wK5m">
-                      <ref role="37wK5l" to="m7o5:2MNGcFT4ZOn" resolve="getUiConfig" />
-                      <ref role="1Pybhc" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                    </node>
                   </node>
                 </node>
               </node>
diff --git a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
index 356ba867..c7e02b19 100644
--- a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
+++ b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
@@ -45,8 +45,13 @@
       </concept>
       <concept id="6593674873639474400" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModules_Options" flags="ng" index="24cAiW">
         <child id="6593674873639478221" name="haltonfailure" index="24c_eh" />
+        <child id="6593674873635848987" name="requiredPlugins" index="24YFd7" />
+        <child id="1688667350638517006" name="compressArgs" index="XX84c" />
         <child id="3609768169816292377" name="jvmArgs" index="1psgkv" />
       </concept>
+      <concept id="6593674873635848984" name="jetbrains.mps.build.mps.tests.structure.RequiredPlugin" flags="ng" index="24YFd4">
+        <reference id="6593674873635848985" name="plugin" index="24YFd5" />
+      </concept>
       <concept id="4005526075820600484" name="jetbrains.mps.build.mps.tests.structure.BuildModuleTestsPlugin" flags="ng" index="1gjT0q" />
     </language>
     <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
@@ -3300,10 +3305,18 @@
           </node>
         </node>
         <node concept="NbPM2" id="3mytCjZmOcC" role="1psgkv">
-          <node concept="3Mxwew" id="3mytCjZo1OL" role="3MwsjC">
+          <node concept="3Mxwew" id="6YTH7uEApkl" role="3MwsjC">
             <property role="3MwjfP" value="-Xss2048k -Xmx2048m --add-opens=java.desktop/com.apple.laf=ALL-UNNAMED --add-opens=java.desktop/com.apple.eawt=ALL-UNNAMED --add-opens=java.desktop/com.apple.eawt.event=ALL-UNNAMED" />
           </node>
         </node>
+        <node concept="24YFd4" id="6YTH7uEFZqQ" role="24YFd7">
+          <ref role="24YFd5" to="zqd8:7BVjoXzUx67" resolve="jetbrains.mps.coderules" />
+        </node>
+        <node concept="NbPM2" id="6YTH7uEIMqG" role="XX84c">
+          <node concept="3Mxwew" id="6YTH7uEIMqF" role="3MwsjC">
+            <property role="3MwjfP" value="true" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7LI_gNMBoD8" role="3989C9">