diff --git a/build.xml b/build.xml
index 39becda4..72d0a7b3 100644
--- a/build.xml
+++ b/build.xml
@@ -62,14 +62,14 @@
     </echoxml>
     <jar destfile="${build.layout}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.ideaplugin" />
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ideaplugin-models">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
     <jar destfile="${build.layout}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen">
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
         <exclude name="**/checkpoints" />
@@ -1461,14 +1461,14 @@
     </echoxml>
     <jar destfile="${build.layout}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.ideaplugin" />
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar1" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ideaplugin-models1">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
     <jar destfile="${build.layout}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen">
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
         <exclude name="**/checkpoints" />
@@ -2607,14 +2607,14 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/jetbrains.mps.coderules-_dl__lbrace_ci.mps.release_rbrace_-0.9-b_dl__lbrace_ci.build.tag_rbrace_.zip/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.ideaplugin" />
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar2" />
     </jar>
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ideaplugin-models2">
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models" includes="**/*.mps, **/*.mpsr, **/.model" />
     </copyModels>
     <jar destfile="${build.tmp}/default/jetbrains.mps.coderules-_dl__lbrace_ci.mps.release_rbrace_-0.9-b_dl__lbrace_ci.build.tag_rbrace_.zip/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin-src.jar" duplicate="preserve">
-      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen">
+      <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
         <exclude name="**/checkpoints" />
@@ -3751,12 +3751,12 @@
   </target>
   
   <target name="java.compile.jetbrains.mps.coderules.ideaplugin" depends="java.compile.coderules-ideaplugin, fetchDependencies">
-    <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen" />
+    <mkdir dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules.ideaplugin" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules.ideaplugin" fork="true" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen" />
+        <path location="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source" />
       </src>
       <classpath>
         <pathelement path="${build.tmp}/java/out/coderules-ideaplugin" />
@@ -5964,7 +5964,7 @@
   
   <target name="cleanSources">
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.build/source_gen" />
-    <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen" />
+    <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" />
     <delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd
index d69d184a..f497c7f7 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="jetbrains.mps.coderules.ideaplugin" uuid="66887915-4d9e-4e24-bd35-19eb55fb75c2" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="jetbrains.mps.coderules.ideaplugin" uuid="66887915-4d9e-4e24-bd35-19eb55fb75c2" moduleVersion="0" compileInMPS="true" generatorOutputPath="${module}/source">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
index 695bd105..183354cc 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
@@ -217,11 +217,6 @@
         <child id="1144231408325" name="iteration" index="1Dwrff" />
       </concept>
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
-      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
-        <child id="1163668914799" name="condition" index="3K4Cdx" />
-        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
-        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
-      </concept>
       <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
@@ -742,61 +737,207 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7e$2hwaAneS" role="jymVt" />
-    <node concept="2YIFZL" id="7e$2hwaPkPY" role="jymVt">
-      <property role="TrG5h" value="getParamConfig" />
-      <node concept="37vLTG" id="7e$2hwaPyht" role="3clF46">
-        <property role="TrG5h" value="paramMap" />
-        <node concept="3uibUv" id="7e$2hwaPyKP" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-          <node concept="3uibUv" id="7e$2hwaPzYo" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-          </node>
-          <node concept="3uibUv" id="7e$2hwaP_7C" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="7e$2hwaPwWW" role="3clF45">
+    <node concept="2tJIrI" id="2MNGcFT4T32" role="jymVt" />
+    <node concept="2YIFZL" id="2MNGcFT4ZOn" role="jymVt">
+      <property role="TrG5h" value="getUiConfig" />
+      <node concept="3uibUv" id="2MNGcFT4ZOo" role="3clF45">
         <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
       </node>
-      <node concept="3Tm1VV" id="7e$2hwaPkQ1" role="1B3o_S" />
-      <node concept="3clFbS" id="7e$2hwaPkQ2" role="3clF47">
-        <node concept="3cpWs8" id="7e$2hwaPBYX" role="3cqZAp">
-          <node concept="3cpWsn" id="7e$2hwaPBYY" role="3cpWs9">
+      <node concept="3Tm1VV" id="2MNGcFT4ZOp" role="1B3o_S" />
+      <node concept="3clFbS" id="2MNGcFT4ZOq" role="3clF47">
+        <node concept="3cpWs8" id="7e$2hwaCFhS" role="3cqZAp">
+          <node concept="3cpWsn" id="7e$2hwaCFhT" role="3cpWs9">
             <property role="TrG5h" value="config" />
-            <node concept="3uibUv" id="7e$2hwaPBYZ" role="1tU5fm">
+            <node concept="3uibUv" id="7e$2hwaCFaZ" role="1tU5fm">
               <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
             </node>
-            <node concept="2OqwBi" id="7e$2hwaPBZ0" role="33vP2m">
-              <node concept="1rXfSq" id="7e$2hwaSRAC" role="2Oq$k0">
+            <node concept="2OqwBi" id="7e$2hwaCFhU" role="33vP2m">
+              <node concept="2YIFZM" id="2CPBoDBX89s" role="2Oq$k0">
                 <ref role="37wK5l" node="7e$2hwaAfGb" resolve="getUserConfig" />
+                <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
               </node>
-              <node concept="liA8E" id="7e$2hwaPBZ1" role="2OqNvi">
+              <node concept="liA8E" id="7e$2hwaCFhW" role="2OqNvi">
                 <ref role="37wK5l" node="7e$2hwauJ33" resolve="copy" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7e$2hwaPBZ6" role="3cqZAp">
-          <node concept="1rXfSq" id="7e$2hwaPBZ7" role="3clFbG">
-            <ref role="37wK5l" node="7e$2hwaHyRo" resolve="registerParamMapProvider" />
-            <node concept="37vLTw" id="7e$2hwaPBZ8" role="37wK5m">
-              <ref role="3cqZAo" node="7e$2hwaPBYY" resolve="config" />
-            </node>
-            <node concept="37vLTw" id="7e$2hwaPBZ9" role="37wK5m">
-              <ref role="3cqZAo" node="7e$2hwaPyht" resolve="paramMap" />
+        <node concept="3clFbF" id="2MNGcFT5_YJ" role="3cqZAp">
+          <node concept="1rXfSq" id="2MNGcFT5_YH" role="3clFbG">
+            <ref role="37wK5l" node="7e$2hwaBRzy" resolve="registerUiProvider" />
+            <node concept="37vLTw" id="2MNGcFT5APn" role="37wK5m">
+              <ref role="3cqZAo" node="7e$2hwaCFhT" resolve="config" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7e$2hwaPBZa" role="3cqZAp">
-          <node concept="37vLTw" id="7e$2hwaPBZb" role="3clFbG">
-            <ref role="3cqZAo" node="7e$2hwaPBYY" resolve="config" />
+        <node concept="3clFbF" id="7e$2hwaCEGr" role="3cqZAp">
+          <node concept="37vLTw" id="7e$2hwaCFhX" role="3clFbG">
+            <ref role="3cqZAo" node="7e$2hwaCFhT" resolve="config" />
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7iCybvTy_Nr" role="jymVt" />
+    <node concept="2tJIrI" id="2MNGcFT4T8T" role="jymVt" />
+    <node concept="2YIFZL" id="7e$2hwaBRzy" role="jymVt">
+      <property role="TrG5h" value="registerUiProvider" />
+      <node concept="3clFbS" id="7iCybvTyEuB" role="3clF47">
+        <node concept="3clFbH" id="7e$2hwaHL2_" role="3cqZAp" />
+        <node concept="3clFbF" id="7iCybvTyAh$" role="3cqZAp">
+          <node concept="2OqwBi" id="7iCybvTyAvh" role="3clFbG">
+            <node concept="37vLTw" id="6hpwxwiqBEz" role="2Oq$k0">
+              <ref role="3cqZAo" node="6hpwxwiq_U$" resolve="config" />
+            </node>
+            <node concept="liA8E" id="7iCybvTyAAH" role="2OqNvi">
+              <ref role="37wK5l" node="7iCybvTszk9" resolve="registerProvider" />
+              <node concept="Rm8GO" id="7iCybvTyARZ" role="37wK5m">
+                <ref role="Rm8GQ" node="7iCybvToIZc" resolve="UI" />
+                <ref role="1Px2BO" node="7iCybvToD3Z" resolve="Level" />
+              </node>
+              <node concept="37vLTw" id="2MNGcFT5iZQ" role="37wK5m">
+                <ref role="3cqZAo" node="7iCybvTzJGv" resolve="PREFIX" />
+              </node>
+              <node concept="1bVj0M" id="7iCybvTyBsQ" role="37wK5m">
+                <node concept="37vLTG" id="7iCybvTyBuB" role="1bW2Oz">
+                  <property role="TrG5h" value="key" />
+                  <node concept="17QB3L" id="7iCybvTyBEM" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="7iCybvTyBsS" role="1bW5cS">
+                  <node concept="3clFbH" id="7iCybvTyBIw" role="3cqZAp" />
+                  <node concept="3cpWs8" id="2CPBoDC_cjy" role="3cqZAp">
+                    <node concept="3cpWsn" id="2CPBoDC_cjz" role="3cpWs9">
+                      <property role="TrG5h" value="settings" />
+                      <node concept="3uibUv" id="2CPBoDC_cb2" role="1tU5fm">
+                        <ref role="3uigEE" node="2CPBoDC$4yq" resolve="TypecheckingSettings" />
+                      </node>
+                      <node concept="2YIFZM" id="2CPBoDC_cj$" role="33vP2m">
+                        <ref role="37wK5l" node="2CPBoDC$fEe" resolve="getInstace" />
+                        <ref role="1Pybhc" node="2CPBoDC$4yq" resolve="TypecheckingSettings" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbJ" id="7iCybvTyBUS" role="3cqZAp">
+                    <node concept="3clFbS" id="7iCybvTyBUU" role="3clFbx">
+                      <node concept="3cpWs6" id="2CPBoDC_glm" role="3cqZAp">
+                        <node concept="2OqwBi" id="2CPBoDC_if6" role="3cqZAk">
+                          <node concept="37vLTw" id="2CPBoDC_cj_" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2CPBoDC_cjz" resolve="settings" />
+                          </node>
+                          <node concept="liA8E" id="2CPBoDC_iDX" role="2OqNvi">
+                            <ref role="37wK5l" node="2CPBoDC$H71" resolve="isTypecheckingEnabled" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="7iCybvTyCd5" role="3clFbw">
+                      <node concept="37vLTw" id="2MNGcFT5j04" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7iCybvTyUUs" resolve="OPTION_TYPECHECKING_ENABLED" />
+                      </node>
+                      <node concept="liA8E" id="7iCybvTyCAG" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                        <node concept="37vLTw" id="7iCybvTyCHb" role="37wK5m">
+                          <ref role="3cqZAo" node="7iCybvTyBuB" resolve="key" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="7iCybvTyG2a" role="3cqZAp" />
+                  <node concept="3clFbJ" id="5Qx6_65jK2f" role="3cqZAp">
+                    <node concept="3clFbS" id="5Qx6_65jK2g" role="3clFbx">
+                      <node concept="3cpWs6" id="2CPBoDC_jlx" role="3cqZAp">
+                        <node concept="2OqwBi" id="2CPBoDC_jly" role="3cqZAk">
+                          <node concept="37vLTw" id="2CPBoDC_jlz" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2CPBoDC_cjz" resolve="settings" />
+                          </node>
+                          <node concept="liA8E" id="2CPBoDC_jl$" role="2OqNvi">
+                            <ref role="37wK5l" node="2CPBoDC_kCy" resolve="isWatchingEnabled" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="5Qx6_65jK2l" role="3clFbw">
+                      <node concept="37vLTw" id="2MNGcFT5j0i" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5Qx6_65jytE" resolve="OPTION_TYPECHECKING_WATCHING" />
+                      </node>
+                      <node concept="liA8E" id="5Qx6_65jK2n" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                        <node concept="37vLTw" id="5Qx6_65jK2o" role="37wK5m">
+                          <ref role="3cqZAo" node="7iCybvTyBuB" resolve="key" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="1JkMMuhf$a7" role="3cqZAp" />
+                  <node concept="3clFbJ" id="1z4$59hOBBR" role="3cqZAp">
+                    <node concept="3clFbS" id="1z4$59hOBBS" role="3clFbx">
+                      <node concept="3cpWs6" id="2CPBoDC_nvV" role="3cqZAp">
+                        <node concept="2OqwBi" id="2CPBoDC_nvW" role="3cqZAk">
+                          <node concept="37vLTw" id="2CPBoDC_nvX" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2CPBoDC_cjz" resolve="settings" />
+                          </node>
+                          <node concept="liA8E" id="2CPBoDC_nvY" role="2OqNvi">
+                            <ref role="37wK5l" node="2CPBoDC_o9$" resolve="isReportingEnabled" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="1z4$59hOBBX" role="3clFbw">
+                      <node concept="37vLTw" id="2MNGcFT5j0w" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1z4$59hO85X" resolve="OPTION_TYPECHECKING_REPORTING" />
+                      </node>
+                      <node concept="liA8E" id="1z4$59hOBBZ" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                        <node concept="37vLTw" id="1z4$59hOBC0" role="37wK5m">
+                          <ref role="3cqZAo" node="7iCybvTyBuB" resolve="key" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="1z4$59hOCWg" role="3cqZAp" />
+                  <node concept="3clFbJ" id="7iCybvTyGA8" role="3cqZAp">
+                    <node concept="3clFbS" id="7iCybvTyGA9" role="3clFbx">
+                      <node concept="3cpWs6" id="2CPBoDC_rsr" role="3cqZAp">
+                        <node concept="2OqwBi" id="2CPBoDC_rss" role="3cqZAk">
+                          <node concept="37vLTw" id="2CPBoDC_rst" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2CPBoDC_cjz" resolve="settings" />
+                          </node>
+                          <node concept="liA8E" id="2CPBoDC_rsu" role="2OqNvi">
+                            <ref role="37wK5l" node="2CPBoDC_sJb" resolve="isTracingEnabled" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="7iCybvTyGAg" role="3clFbw">
+                      <node concept="37vLTw" id="2MNGcFT5j0I" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7iCybvTyWot" resolve="OPTION_TYPECHECKING_TRACE" />
+                      </node>
+                      <node concept="liA8E" id="7iCybvTyGAi" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                        <node concept="37vLTw" id="7iCybvTyGAj" role="37wK5m">
+                          <ref role="3cqZAo" node="7iCybvTyBuB" resolve="key" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="7iCybvTyBLJ" role="3cqZAp" />
+                  <node concept="3clFbF" id="7iCybvTzmU3" role="3cqZAp">
+                    <node concept="10Nm6u" id="7iCybvTzmU1" role="3clFbG" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6hpwxwiq_U$" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="6hpwxwiqBaG" role="1tU5fm">
+          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7iCybvTyEu_" role="3clF45" />
+      <node concept="3Tm6S6" id="7iCybvTyEx7" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="2MNGcFT5aPR" role="jymVt" />
     <node concept="2YIFZL" id="7DmawKu60xG" role="jymVt">
       <property role="TrG5h" value="registerDefaultProviders" />
       <node concept="37vLTG" id="2tFDlV2dY_r" role="3clF46">
@@ -981,222 +1122,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7e$2hwaHoFM" role="jymVt" />
-    <node concept="2YIFZL" id="7e$2hwaHyRo" role="jymVt">
-      <property role="TrG5h" value="registerParamMapProvider" />
-      <node concept="37vLTG" id="7e$2hwaHMTz" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="7e$2hwaHNLb" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="7e$2hwaHGqq" role="3clF46">
-        <property role="TrG5h" value="paramMap" />
-        <node concept="3rvAFt" id="7e$2hwaPHc5" role="1tU5fm">
-          <node concept="17QB3L" id="7e$2hwaPKFT" role="3rvQeY" />
-          <node concept="3uibUv" id="7e$2hwaPLN2" role="3rvSg0">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7e$2hwaHyRq" role="3clF45" />
-      <node concept="3Tm1VV" id="7e$2hwaHyRr" role="1B3o_S" />
-      <node concept="3clFbS" id="7e$2hwaHyRs" role="3clF47">
-        <node concept="3clFbF" id="7e$2hwaHOwl" role="3cqZAp">
-          <node concept="2OqwBi" id="7e$2hwaHOwm" role="3clFbG">
-            <node concept="37vLTw" id="7e$2hwaHOwn" role="2Oq$k0">
-              <ref role="3cqZAo" node="7e$2hwaHMTz" resolve="config" />
-            </node>
-            <node concept="liA8E" id="7e$2hwaHOwo" role="2OqNvi">
-              <ref role="37wK5l" node="7iCybvTszk9" resolve="registerProvider" />
-              <node concept="Rm8GO" id="7e$2hwaHPn_" role="37wK5m">
-                <ref role="Rm8GQ" node="7iCybvToIZc" resolve="UI" />
-                <ref role="1Px2BO" node="7iCybvToD3Z" resolve="Level" />
-              </node>
-              <node concept="37vLTw" id="7e$2hwaHOxf" role="37wK5m">
-                <ref role="3cqZAo" node="7iCybvTzJGv" resolve="PREFIX" />
-              </node>
-              <node concept="1bVj0M" id="7e$2hwaHOwq" role="37wK5m">
-                <node concept="37vLTG" id="7e$2hwaHOwr" role="1bW2Oz">
-                  <property role="TrG5h" value="key" />
-                  <node concept="17QB3L" id="7e$2hwaHOws" role="1tU5fm" />
-                </node>
-                <node concept="3clFbS" id="7e$2hwaHOwt" role="1bW5cS">
-                  <node concept="3clFbH" id="7e$2hwaHOwu" role="3cqZAp" />
-                  <node concept="3clFbJ" id="7e$2hwaHOwv" role="3cqZAp">
-                    <node concept="3clFbS" id="7e$2hwaHOww" role="3clFbx">
-                      <node concept="3clFbH" id="7e$2hwaQiV_" role="3cqZAp" />
-                      <node concept="3cpWs6" id="7e$2hwaQfAQ" role="3cqZAp">
-                        <node concept="3K4zz7" id="7e$2hwaQgOs" role="3cqZAk">
-                          <node concept="3clFbT" id="7e$2hwaQgOt" role="3K4GZi" />
-                          <node concept="3y3z36" id="7e$2hwaQgOu" role="3K4Cdx">
-                            <node concept="10Nm6u" id="7e$2hwaQgOv" role="3uHU7w" />
-                            <node concept="3EllGN" id="7e$2hwaQgOw" role="3uHU7B">
-                              <node concept="37vLTw" id="7e$2hwaQgOK" role="3ElVtu">
-                                <ref role="3cqZAo" node="7iCybvTyUUs" resolve="OPTION_TYPECHECKING_ENABLED" />
-                              </node>
-                              <node concept="37vLTw" id="7e$2hwaQgOx" role="3ElQJh">
-                                <ref role="3cqZAo" node="7e$2hwaHGqq" resolve="paramMap" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3EllGN" id="7e$2hwaQgOy" role="3K4E3e">
-                            <node concept="37vLTw" id="7e$2hwaQgOY" role="3ElVtu">
-                              <ref role="3cqZAo" node="7iCybvTyUUs" resolve="OPTION_TYPECHECKING_ENABLED" />
-                            </node>
-                            <node concept="37vLTw" id="7e$2hwaQgOz" role="3ElQJh">
-                              <ref role="3cqZAo" node="7e$2hwaHGqq" resolve="paramMap" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="7e$2hwaHOwA" role="3clFbw">
-                      <node concept="37vLTw" id="7e$2hwaHOxn" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7iCybvTyUUs" resolve="OPTION_TYPECHECKING_ENABLED" />
-                      </node>
-                      <node concept="liA8E" id="7e$2hwaHOwB" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                        <node concept="37vLTw" id="7e$2hwaHOwC" role="37wK5m">
-                          <ref role="3cqZAo" node="7e$2hwaHOwr" resolve="key" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="7e$2hwaHOwD" role="3cqZAp" />
-                  <node concept="3clFbJ" id="7e$2hwaHOwE" role="3cqZAp">
-                    <node concept="3clFbS" id="7e$2hwaHOwF" role="3clFbx">
-                      <node concept="3cpWs6" id="7e$2hwaQk6u" role="3cqZAp">
-                        <node concept="3K4zz7" id="7e$2hwaQk6v" role="3cqZAk">
-                          <node concept="3clFbT" id="7e$2hwaQk6w" role="3K4GZi" />
-                          <node concept="3y3z36" id="7e$2hwaQk6x" role="3K4Cdx">
-                            <node concept="10Nm6u" id="7e$2hwaQk6y" role="3uHU7w" />
-                            <node concept="3EllGN" id="7e$2hwaQk6z" role="3uHU7B">
-                              <node concept="37vLTw" id="7e$2hwaQk6$" role="3ElVtu">
-                                <ref role="3cqZAo" node="5Qx6_65jytE" resolve="OPTION_TYPECHECKING_WATCHING" />
-                              </node>
-                              <node concept="37vLTw" id="7e$2hwaQk6_" role="3ElQJh">
-                                <ref role="3cqZAo" node="7e$2hwaHGqq" resolve="paramMap" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3EllGN" id="7e$2hwaQk6A" role="3K4E3e">
-                            <node concept="37vLTw" id="7e$2hwaQk6B" role="3ElVtu">
-                              <ref role="3cqZAo" node="5Qx6_65jytE" resolve="OPTION_TYPECHECKING_WATCHING" />
-                            </node>
-                            <node concept="37vLTw" id="7e$2hwaQk6C" role="3ElQJh">
-                              <ref role="3cqZAo" node="7e$2hwaHGqq" resolve="paramMap" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="7e$2hwaHOwK" role="3cqZAp" />
-                    </node>
-                    <node concept="2OqwBi" id="7e$2hwaHOwL" role="3clFbw">
-                      <node concept="37vLTw" id="7e$2hwaHOxv" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5Qx6_65jytE" resolve="OPTION_TYPECHECKING_WATCHING" />
-                      </node>
-                      <node concept="liA8E" id="7e$2hwaHOwM" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                        <node concept="37vLTw" id="7e$2hwaHOwN" role="37wK5m">
-                          <ref role="3cqZAo" node="7e$2hwaHOwr" resolve="key" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="7e$2hwaHOwO" role="3cqZAp" />
-                  <node concept="3clFbJ" id="7e$2hwaHOwP" role="3cqZAp">
-                    <node concept="3clFbS" id="7e$2hwaHOwQ" role="3clFbx">
-                      <node concept="3cpWs6" id="7e$2hwaQrmf" role="3cqZAp">
-                        <node concept="3K4zz7" id="7e$2hwaQrmg" role="3cqZAk">
-                          <node concept="3clFbT" id="7e$2hwaQrmh" role="3K4GZi" />
-                          <node concept="3y3z36" id="7e$2hwaQrmi" role="3K4Cdx">
-                            <node concept="10Nm6u" id="7e$2hwaQrmj" role="3uHU7w" />
-                            <node concept="3EllGN" id="7e$2hwaQrmk" role="3uHU7B">
-                              <node concept="37vLTw" id="7e$2hwaQrml" role="3ElVtu">
-                                <ref role="3cqZAo" node="1z4$59hO85X" resolve="OPTION_TYPECHECKING_REPORTING" />
-                              </node>
-                              <node concept="37vLTw" id="7e$2hwaQrmm" role="3ElQJh">
-                                <ref role="3cqZAo" node="7e$2hwaHGqq" resolve="paramMap" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3EllGN" id="7e$2hwaQrmn" role="3K4E3e">
-                            <node concept="37vLTw" id="7e$2hwaQrmo" role="3ElVtu">
-                              <ref role="3cqZAo" node="1z4$59hO85X" resolve="OPTION_TYPECHECKING_REPORTING" />
-                            </node>
-                            <node concept="37vLTw" id="7e$2hwaQrmp" role="3ElQJh">
-                              <ref role="3cqZAo" node="7e$2hwaHGqq" resolve="paramMap" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="7e$2hwaHOwV" role="3cqZAp" />
-                    </node>
-                    <node concept="2OqwBi" id="7e$2hwaHOwW" role="3clFbw">
-                      <node concept="37vLTw" id="7e$2hwaHOxB" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1z4$59hO85X" resolve="OPTION_TYPECHECKING_REPORTING" />
-                      </node>
-                      <node concept="liA8E" id="7e$2hwaHOwX" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                        <node concept="37vLTw" id="7e$2hwaHOwY" role="37wK5m">
-                          <ref role="3cqZAo" node="7e$2hwaHOwr" resolve="key" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="7e$2hwaHOwZ" role="3cqZAp" />
-                  <node concept="3clFbJ" id="7e$2hwaHOx0" role="3cqZAp">
-                    <node concept="3clFbS" id="7e$2hwaHOx1" role="3clFbx">
-                      <node concept="3cpWs6" id="7e$2hwaQyem" role="3cqZAp">
-                        <node concept="3K4zz7" id="7e$2hwaQyen" role="3cqZAk">
-                          <node concept="3clFbT" id="7e$2hwaQyeo" role="3K4GZi" />
-                          <node concept="3y3z36" id="7e$2hwaQyep" role="3K4Cdx">
-                            <node concept="10Nm6u" id="7e$2hwaQyeq" role="3uHU7w" />
-                            <node concept="3EllGN" id="7e$2hwaQyer" role="3uHU7B">
-                              <node concept="37vLTw" id="7e$2hwaQyes" role="3ElVtu">
-                                <ref role="3cqZAo" node="7iCybvTyWot" resolve="OPTION_TYPECHECKING_TRACE" />
-                              </node>
-                              <node concept="37vLTw" id="7e$2hwaQyet" role="3ElQJh">
-                                <ref role="3cqZAo" node="7e$2hwaHGqq" resolve="paramMap" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3EllGN" id="7e$2hwaQyeu" role="3K4E3e">
-                            <node concept="37vLTw" id="7e$2hwaQyev" role="3ElVtu">
-                              <ref role="3cqZAo" node="7iCybvTyWot" resolve="OPTION_TYPECHECKING_TRACE" />
-                            </node>
-                            <node concept="37vLTw" id="7e$2hwaQyew" role="3ElQJh">
-                              <ref role="3cqZAo" node="7e$2hwaHGqq" resolve="paramMap" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="7e$2hwaHOx6" role="3cqZAp" />
-                    </node>
-                    <node concept="2OqwBi" id="7e$2hwaHOx7" role="3clFbw">
-                      <node concept="37vLTw" id="7e$2hwaHOxJ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7iCybvTyWot" resolve="OPTION_TYPECHECKING_TRACE" />
-                      </node>
-                      <node concept="liA8E" id="7e$2hwaHOx8" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                        <node concept="37vLTw" id="7e$2hwaHOx9" role="37wK5m">
-                          <ref role="3cqZAo" node="7e$2hwaHOwr" resolve="key" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="7e$2hwaHOxa" role="3cqZAp" />
-                  <node concept="3clFbF" id="7e$2hwaHOxb" role="3cqZAp">
-                    <node concept="10Nm6u" id="7e$2hwaHOxc" role="3clFbG" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3Tm1VV" id="7iCybvTy_Mc" role="1B3o_S" />
     <node concept="2tJIrI" id="7iCybvTyHA6" role="jymVt" />
   </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source.caches/deps.cp b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source.caches/deps.cp
new file mode 100644
index 00000000..0280e3f4
--- /dev/null
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source.caches/deps.cp
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependenciesRoot>
+  <uses language="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
+  <uses language="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" />
+  <uses language="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
+  <uses language="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
+  <uses language="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
+  <uses language="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" />
+  <uses language="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
+  <uses module="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" kind="dp" />
+  <uses module="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt+dp" />
+  <uses module="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="dp" />
+  <uses module="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
+  <uses module="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt+dp" />
+  <uses module="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
+</dependenciesRoot>
+
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source.caches/jetbrains/mps/coderules/ideaplugin/dependencies b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source.caches/jetbrains/mps/coderules/ideaplugin/dependencies
new file mode 100644
index 00000000..0280e3f4
--- /dev/null
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source.caches/jetbrains/mps/coderules/ideaplugin/dependencies
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dependenciesRoot>
+  <uses language="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
+  <uses language="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" />
+  <uses language="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
+  <uses language="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
+  <uses language="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
+  <uses language="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" />
+  <uses language="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
+  <uses module="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" kind="dp" />
+  <uses module="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt+dp" />
+  <uses module="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="dp" />
+  <uses module="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
+  <uses module="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt+dp" />
+  <uses module="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
+</dependenciesRoot>
+
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source.caches/jetbrains/mps/coderules/ideaplugin/generated b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source.caches/jetbrains/mps/coderules/ideaplugin/generated
new file mode 100644
index 00000000..bd2f5ba1
--- /dev/null
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source.caches/jetbrains/mps/coderules/ideaplugin/generated
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<product version="3" modelHash="czt7bk2d2tvh5ds9gndimi0d11rtoi3" parametersHash="-7tds95dbq8eaoslqxf76114940s486g">
+  <files names="CoderulesOptions.java:Config.java:TypecheckingOptions.java:TypecheckingSettings.java:TypecheckingSettingsPage.java" />
+</product>
+
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source/jetbrains/mps/coderules/ideaplugin/TypecheckingOptions.java b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source/jetbrains/mps/coderules/ideaplugin/TypecheckingOptions.java
index 35bb32b1..0bac09af 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source/jetbrains/mps/coderules/ideaplugin/TypecheckingOptions.java
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source/jetbrains/mps/coderules/ideaplugin/TypecheckingOptions.java
@@ -2,8 +2,6 @@ package jetbrains.mps.coderules.ideaplugin;
 
 /*Generated by MPS */
 
-import java.util.Map;
-import jetbrains.mps.internal.collections.runtime.MapSequence;
 
 public class TypecheckingOptions {
   public static final String PREFIX = "mps.coderules.typechecking.";
@@ -60,12 +58,37 @@ public class TypecheckingOptions {
     return USER_CONFIG;
   }
 
-  public static Config getParamConfig(Map<String, Object> paramMap) {
-    Config config = getUserConfig().copy();
-    registerParamMapProvider(config, paramMap);
+  public static Config getUiConfig() {
+    Config config = TypecheckingOptions.getUserConfig().copy();
+    registerUiProvider(config);
     return config;
   }
 
+  private static void registerUiProvider(Config config) {
+
+    config.registerProvider(Config.Level.UI, PREFIX, (String key) -> {
+
+      TypecheckingSettings settings = TypecheckingSettings.getInstace();
+      if (OPTION_TYPECHECKING_ENABLED.equals(key)) {
+        return settings.isTypecheckingEnabled();
+      }
+
+      if (OPTION_TYPECHECKING_WATCHING.equals(key)) {
+        return settings.isWatchingEnabled();
+      }
+
+      if (OPTION_TYPECHECKING_REPORTING.equals(key)) {
+        return settings.isReportingEnabled();
+      }
+
+      if (OPTION_TYPECHECKING_TRACE.equals(key)) {
+        return settings.isTracingEnabled();
+      }
+
+      return null;
+    });
+  }
+
   private static void registerDefaultProviders(Config config) {
     CoderulesOptions.registerDefaultProviders(config);
 
@@ -95,31 +118,4 @@ public class TypecheckingOptions {
     });
   }
 
-  public static void registerParamMapProvider(Config config, final Map<String, Object> paramMap) {
-    config.registerProvider(Config.Level.UI, PREFIX, (String key) -> {
-
-      if (OPTION_TYPECHECKING_ENABLED.equals(key)) {
-
-        return (MapSequence.fromMap(paramMap).get(OPTION_TYPECHECKING_ENABLED) != null ? MapSequence.fromMap(paramMap).get(OPTION_TYPECHECKING_ENABLED) : false);
-      }
-
-      if (OPTION_TYPECHECKING_WATCHING.equals(key)) {
-        return (MapSequence.fromMap(paramMap).get(OPTION_TYPECHECKING_WATCHING) != null ? MapSequence.fromMap(paramMap).get(OPTION_TYPECHECKING_WATCHING) : false);
-
-      }
-
-      if (OPTION_TYPECHECKING_REPORTING.equals(key)) {
-        return (MapSequence.fromMap(paramMap).get(OPTION_TYPECHECKING_REPORTING) != null ? MapSequence.fromMap(paramMap).get(OPTION_TYPECHECKING_REPORTING) : false);
-
-      }
-
-      if (OPTION_TYPECHECKING_TRACE.equals(key)) {
-        return (MapSequence.fromMap(paramMap).get(OPTION_TYPECHECKING_TRACE) != null ? MapSequence.fromMap(paramMap).get(OPTION_TYPECHECKING_TRACE) : false);
-
-      }
-
-      return null;
-    });
-  }
-
 }
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source/jetbrains/mps/coderules/ideaplugin/trace.info b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source/jetbrains/mps/coderules/ideaplugin/trace.info
index 8796061e..a6fd5eb9 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source/jetbrains/mps/coderules/ideaplugin/trace.info
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source/jetbrains/mps/coderules/ideaplugin/trace.info
@@ -627,138 +627,135 @@
   </root>
   <root nodeRef="r:835f8ea3-a800-4588-a80b-1de6d47c2098(jetbrains.mps.coderules.ideaplugin)/8406119028234017931">
     <file name="TypecheckingOptions.java">
-      <node id="8406119028234320671" at="9,0,10,0" concept="13" trace="PREFIX" />
-      <node id="8406119028234104476" at="11,0,12,0" concept="13" trace="OPTION_TYPECHECKING_ENABLED" />
-      <node id="6746702654208878442" at="12,0,13,0" concept="13" trace="OPTION_TYPECHECKING_WATCHING" />
-      <node id="1784710035579896189" at="13,0,14,0" concept="13" trace="OPTION_TYPECHECKING_REPORTING" />
-      <node id="8406119028234110493" at="14,0,15,0" concept="13" trace="OPTION_TYPECHECKING_TRACE" />
-      <node id="6003204171433302878" at="18,39,19,69" concept="10" />
-      <node id="6746702654208893308" at="24,39,25,70" concept="10" />
-      <node id="1784710035579971678" at="30,39,31,71" concept="10" />
-      <node id="6003204171433314039" at="36,39,37,67" concept="10" />
-      <node id="2181372126273438040" at="43,76,44,29" concept="10" />
-      <node id="2181372126273401909" at="45,7,46,67" concept="10" />
-      <node id="8332795209404278475" at="50,0,51,0" concept="13" trace="USER_CONFIG" />
-      <node id="8332795209404307471" at="56,30,57,36" concept="3" />
-      <node id="8332795209404322620" at="57,36,58,44" concept="3" />
-      <node id="8332795209404328774" at="59,5,60,23" concept="10" />
-      <node id="8332795209407954877" at="63,69,64,43" concept="9" />
-      <node id="8332795209407954886" at="64,43,65,47" concept="3" />
-      <node id="8332795209407954890" at="65,47,66,18" concept="10" />
-      <node id="1830252428089553468" at="69,63,70,54" concept="3" />
-      <node id="1830252428089557385" at="70,54,71,0" concept="12" />
-      <node id="8815279552157196282" at="72,72,73,0" concept="12" />
-      <node id="8815279552157196285" at="74,52,75,89" concept="10" />
-      <node id="6746702654209256862" at="75,89,76,0" concept="12" />
-      <node id="6746702654208928431" at="77,7,78,0" concept="12" />
-      <node id="6746702654208928421" at="79,53,80,90" concept="10" />
-      <node id="6746702654208928426" at="80,90,81,0" concept="12" />
-      <node id="8815279552157196304" at="82,7,83,0" concept="12" />
-      <node id="1784710035580018973" at="84,54,85,91" concept="10" />
-      <node id="1784710035580018978" at="85,91,86,0" concept="12" />
-      <node id="1784710035580018970" at="87,7,88,0" concept="12" />
-      <node id="8815279552157196307" at="89,50,90,87" concept="10" />
-      <node id="8815279552157196311" at="90,87,91,0" concept="12" />
-      <node id="8815279552157196315" at="92,7,93,0" concept="12" />
-      <node id="8815279552157196316" at="93,0,94,18" concept="10" />
-      <node id="8332795209405909022" at="99,70,100,0" concept="12" />
-      <node id="8332795209408130789" at="101,52,102,0" concept="12" />
-      <node id="8332795209408117174" at="102,0,103,161" concept="10" />
-      <node id="8332795209405909033" at="104,7,105,0" concept="12" />
-      <node id="8332795209408135582" at="106,53,107,163" concept="10" />
-      <node id="8332795209405909040" at="107,163,108,0" concept="12" />
-      <node id="8332795209405909044" at="109,7,110,0" concept="12" />
-      <node id="8332795209408165263" at="111,54,112,165" concept="10" />
-      <node id="8332795209405909051" at="112,165,113,0" concept="12" />
-      <node id="8332795209405909055" at="114,7,115,0" concept="12" />
-      <node id="8332795209408193430" at="116,50,117,157" concept="10" />
-      <node id="8332795209405909062" at="117,157,118,0" concept="12" />
-      <node id="8332795209405909066" at="119,7,120,0" concept="12" />
-      <node id="8332795209405909067" at="120,0,121,18" concept="10" />
-      <node id="8332795209404643304" at="52,0,54,0" concept="2" trace="TypecheckingOptions#()V" />
-      <node id="2181372126273426449" at="42,39,45,7" concept="7" />
-      <node id="8406119028234584334" at="17,0,21,0" concept="8" trace="get#(Ljetbrains/mps/coderules/ideaplugin/Config;)Ljava/lang/Boolean;" />
-      <node id="6746702654208893302" at="23,0,27,0" concept="8" trace="get#(Ljetbrains/mps/coderules/ideaplugin/Config;)Ljava/lang/Boolean;" />
-      <node id="1784710035579971672" at="29,0,33,0" concept="8" trace="get#(Ljetbrains/mps/coderules/ideaplugin/Config;)Ljava/lang/Boolean;" />
-      <node id="8406119028234719986" at="35,0,39,0" concept="8" trace="get#(Ljetbrains/mps/coderules/ideaplugin/Config;)Ljava/lang/Boolean;" />
-      <node id="8332795209404297941" at="55,40,59,5" concept="7" />
-      <node id="8815279552157196283" at="73,0,77,7" concept="7" />
-      <node id="6746702654208928419" at="78,0,82,7" concept="7" />
-      <node id="1784710035580018971" at="83,0,87,7" concept="7" />
-      <node id="8815279552157196305" at="88,0,92,7" concept="7" />
-      <node id="8332795209405909023" at="100,0,104,7" concept="7" />
-      <node id="8332795209405909034" at="105,0,109,7" concept="7" />
-      <node id="8332795209405909045" at="110,0,114,7" concept="7" />
-      <node id="8332795209405909056" at="115,0,119,7" concept="7" />
-      <node id="8332795209407876478" at="63,0,68,0" concept="14" trace="getParamConfig#(Ljava/util/Map;)Ljetbrains/mps/coderules/ideaplugin/Config;" />
-      <node id="8406119028234567449" at="16,0,22,0" concept="13" trace="TYPECHECKING_ENABLED" />
-      <node id="6746702654208893294" at="22,0,28,0" concept="13" trace="TYPECHECKING_WATCHING" />
-      <node id="1784710035579971664" at="28,0,34,0" concept="13" trace="TYPECHECKING_REPORTING" />
-      <node id="8406119028234719978" at="34,0,40,0" concept="13" trace="TYPECHECKING_TRACE" />
-      <node id="2181372126273401903" at="41,0,48,0" concept="8" trace="get#(Ljetbrains/mps/coderules/ideaplugin/Config;)Ljava/lang/Boolean;" />
-      <node id="8332795209403923211" at="55,0,62,0" concept="14" trace="getUserConfig#()Ljetbrains/mps/coderules/ideaplugin/Config;" />
-      <node id="2181372126273401895" at="40,0,49,0" concept="13" trace="COLLECT_TRACES" />
-      <node id="8815279552157196273" at="71,0,95,7" concept="3" />
-      <node id="8332795209405909013" at="98,98,122,7" concept="3" />
-      <node id="8332795209405836760" at="98,0,124,0" concept="14" trace="registerParamMapProvider#(Ljetbrains/mps/coderules/ideaplugin/Config;Ljava/util/Map;)V" />
-      <node id="8815279552157190252" at="69,0,97,0" concept="14" trace="registerDefaultProviders#(Ljetbrains/mps/coderules/ideaplugin/Config;)V" />
-      <scope id="8332795209404643308" at="52,33,52,33" />
-      <scope id="8406119028234584340" at="18,39,19,69" />
-      <scope id="6746702654208893307" at="24,39,25,70" />
-      <scope id="1784710035579971677" at="30,39,31,71" />
-      <scope id="8406119028234719991" at="36,39,37,67" />
-      <scope id="2181372126273426451" at="43,76,44,29" />
-      <scope id="8332795209404643304" at="52,0,54,0" />
-      <scope id="8332795209404297943" at="56,30,58,44" />
-      <scope id="8815279552157196284" at="74,52,76,0" />
-      <scope id="6746702654208928420" at="79,53,81,0" />
-      <scope id="1784710035580018972" at="84,54,86,0" />
-      <scope id="8815279552157196306" at="89,50,91,0" />
-      <scope id="8332795209405909024" at="101,52,103,161" />
-      <scope id="8332795209405909035" at="106,53,108,0" />
-      <scope id="8332795209405909046" at="111,54,113,0" />
-      <scope id="8332795209405909057" at="116,50,118,0" />
-      <scope id="8332795209407876482" at="63,69,66,18">
-        <var name="config" id="8332795209407954878" />
+      <node id="8406119028234320671" at="7,0,8,0" concept="13" trace="PREFIX" />
+      <node id="8406119028234104476" at="9,0,10,0" concept="13" trace="OPTION_TYPECHECKING_ENABLED" />
+      <node id="6746702654208878442" at="10,0,11,0" concept="13" trace="OPTION_TYPECHECKING_WATCHING" />
+      <node id="1784710035579896189" at="11,0,12,0" concept="13" trace="OPTION_TYPECHECKING_REPORTING" />
+      <node id="8406119028234110493" at="12,0,13,0" concept="13" trace="OPTION_TYPECHECKING_TRACE" />
+      <node id="6003204171433302878" at="16,39,17,69" concept="10" />
+      <node id="6746702654208893308" at="22,39,23,70" concept="10" />
+      <node id="1784710035579971678" at="28,39,29,71" concept="10" />
+      <node id="6003204171433314039" at="34,39,35,67" concept="10" />
+      <node id="2181372126273438040" at="41,76,42,29" concept="10" />
+      <node id="2181372126273401909" at="43,7,44,67" concept="10" />
+      <node id="8332795209404278475" at="48,0,49,0" concept="13" trace="USER_CONFIG" />
+      <node id="8332795209404307471" at="54,30,55,36" concept="3" />
+      <node id="8332795209404322620" at="55,36,56,44" concept="3" />
+      <node id="8332795209404328774" at="57,5,58,23" concept="10" />
+      <node id="8332795209404560504" at="61,38,62,63" concept="9" />
+      <node id="3221112544308912047" at="62,63,63,31" concept="3" />
+      <node id="8332795209404558107" at="63,31,64,18" concept="10" />
+      <node id="8332795209405894821" at="67,57,68,0" concept="12" />
+      <node id="8406119028234025888" at="69,70,70,0" concept="12" />
+      <node id="3041510341144265954" at="70,0,71,72" concept="9" />
+      <node id="3041510341144282454" at="72,52,73,48" concept="10" />
+      <node id="8406119028234043530" at="74,7,75,0" concept="12" />
+      <node id="3041510341144294753" at="76,53,77,44" concept="10" />
+      <node id="2005451104887652999" at="78,7,79,0" concept="12" />
+      <node id="3041510341144311803" at="80,54,81,45" concept="10" />
+      <node id="1784710035580030736" at="82,7,83,0" concept="12" />
+      <node id="3041510341144327963" at="84,50,85,43" concept="10" />
+      <node id="8406119028234026095" at="86,7,87,0" concept="12" />
+      <node id="8406119028234219139" at="87,0,88,18" concept="10" />
+      <node id="1830252428089553468" at="92,63,93,54" concept="3" />
+      <node id="1830252428089557385" at="93,54,94,0" concept="12" />
+      <node id="8815279552157196282" at="95,72,96,0" concept="12" />
+      <node id="8815279552157196285" at="97,52,98,89" concept="10" />
+      <node id="6746702654209256862" at="98,89,99,0" concept="12" />
+      <node id="6746702654208928431" at="100,7,101,0" concept="12" />
+      <node id="6746702654208928421" at="102,53,103,90" concept="10" />
+      <node id="6746702654208928426" at="103,90,104,0" concept="12" />
+      <node id="8815279552157196304" at="105,7,106,0" concept="12" />
+      <node id="1784710035580018973" at="107,54,108,91" concept="10" />
+      <node id="1784710035580018978" at="108,91,109,0" concept="12" />
+      <node id="1784710035580018970" at="110,7,111,0" concept="12" />
+      <node id="8815279552157196307" at="112,50,113,87" concept="10" />
+      <node id="8815279552157196311" at="113,87,114,0" concept="12" />
+      <node id="8815279552157196315" at="115,7,116,0" concept="12" />
+      <node id="8815279552157196316" at="116,0,117,18" concept="10" />
+      <node id="8332795209404643304" at="50,0,52,0" concept="2" trace="TypecheckingOptions#()V" />
+      <node id="2181372126273426449" at="40,39,43,7" concept="7" />
+      <node id="8406119028234026680" at="71,72,74,7" concept="7" />
+      <node id="6746702654208934031" at="75,0,78,7" concept="7" />
+      <node id="1784710035580025335" at="79,0,82,7" concept="7" />
+      <node id="8406119028234045832" at="83,0,86,7" concept="7" />
+      <node id="8406119028234584334" at="15,0,19,0" concept="8" trace="get#(Ljetbrains/mps/coderules/ideaplugin/Config;)Ljava/lang/Boolean;" />
+      <node id="6746702654208893302" at="21,0,25,0" concept="8" trace="get#(Ljetbrains/mps/coderules/ideaplugin/Config;)Ljava/lang/Boolean;" />
+      <node id="1784710035579971672" at="27,0,31,0" concept="8" trace="get#(Ljetbrains/mps/coderules/ideaplugin/Config;)Ljava/lang/Boolean;" />
+      <node id="8406119028234719986" at="33,0,37,0" concept="8" trace="get#(Ljetbrains/mps/coderules/ideaplugin/Config;)Ljava/lang/Boolean;" />
+      <node id="8332795209404297941" at="53,40,57,5" concept="7" />
+      <node id="8815279552157196283" at="96,0,100,7" concept="7" />
+      <node id="6746702654208928419" at="101,0,105,7" concept="7" />
+      <node id="1784710035580018971" at="106,0,110,7" concept="7" />
+      <node id="8815279552157196305" at="111,0,115,7" concept="7" />
+      <node id="3221112544308755735" at="61,0,66,0" concept="14" trace="getUiConfig#()Ljetbrains/mps/coderules/ideaplugin/Config;" />
+      <node id="8406119028234567449" at="14,0,20,0" concept="13" trace="TYPECHECKING_ENABLED" />
+      <node id="6746702654208893294" at="20,0,26,0" concept="13" trace="TYPECHECKING_WATCHING" />
+      <node id="1784710035579971664" at="26,0,32,0" concept="13" trace="TYPECHECKING_REPORTING" />
+      <node id="8406119028234719978" at="32,0,38,0" concept="13" trace="TYPECHECKING_TRACE" />
+      <node id="2181372126273401903" at="39,0,46,0" concept="8" trace="get#(Ljetbrains/mps/coderules/ideaplugin/Config;)Ljava/lang/Boolean;" />
+      <node id="8332795209403923211" at="53,0,60,0" concept="14" trace="getUserConfig#()Ljetbrains/mps/coderules/ideaplugin/Config;" />
+      <node id="2181372126273401895" at="38,0,47,0" concept="13" trace="COLLECT_TRACES" />
+      <node id="8406119028234019940" at="68,0,89,7" concept="3" />
+      <node id="8332795209404348642" at="67,0,91,0" concept="14" trace="registerUiProvider#(Ljetbrains/mps/coderules/ideaplugin/Config;)V" />
+      <node id="8815279552157196273" at="94,0,118,7" concept="3" />
+      <node id="8815279552157190252" at="92,0,120,0" concept="14" trace="registerDefaultProviders#(Ljetbrains/mps/coderules/ideaplugin/Config;)V" />
+      <scope id="8332795209404643308" at="50,33,50,33" />
+      <scope id="8406119028234584340" at="16,39,17,69" />
+      <scope id="6746702654208893307" at="22,39,23,70" />
+      <scope id="1784710035579971677" at="28,39,29,71" />
+      <scope id="8406119028234719991" at="34,39,35,67" />
+      <scope id="2181372126273426451" at="41,76,42,29" />
+      <scope id="8406119028234026682" at="72,52,73,48" />
+      <scope id="6746702654208934032" at="76,53,77,44" />
+      <scope id="1784710035580025336" at="80,54,81,45" />
+      <scope id="8406119028234045833" at="84,50,85,43" />
+      <scope id="8332795209404643304" at="50,0,52,0" />
+      <scope id="8332795209404297943" at="54,30,56,44" />
+      <scope id="8815279552157196284" at="97,52,99,0" />
+      <scope id="6746702654208928420" at="102,53,104,0" />
+      <scope id="1784710035580018972" at="107,54,109,0" />
+      <scope id="8815279552157196306" at="112,50,114,0" />
+      <scope id="3221112544308755738" at="61,38,64,18">
+        <var name="config" id="8332795209404560505" />
       </scope>
-      <scope id="8406119028234584334" at="17,0,21,0">
+      <scope id="8406119028234584334" at="15,0,19,0">
         <var name="config" id="8406119028234584335" />
       </scope>
-      <scope id="6746702654208893302" at="23,0,27,0">
+      <scope id="6746702654208893302" at="21,0,25,0">
         <var name="config" id="6746702654208893303" />
       </scope>
-      <scope id="1784710035579971672" at="29,0,33,0">
+      <scope id="1784710035579971672" at="27,0,31,0">
         <var name="config" id="1784710035579971673" />
       </scope>
-      <scope id="8406119028234719986" at="35,0,39,0">
+      <scope id="8406119028234719986" at="33,0,37,0">
         <var name="config" id="8406119028234719987" />
       </scope>
-      <scope id="2181372126273401908" at="42,39,46,67" />
-      <scope id="8332795209403923215" at="55,40,60,23" />
-      <scope id="8332795209407876478" at="63,0,68,0">
-        <var name="paramMap" id="8332795209407931485" />
-      </scope>
-      <scope id="2181372126273401903" at="41,0,48,0">
+      <scope id="2181372126273401908" at="40,39,44,67" />
+      <scope id="8332795209403923215" at="53,40,58,23" />
+      <scope id="3221112544308755735" at="61,0,66,0" />
+      <scope id="2181372126273401903" at="39,0,46,0">
         <var name="config" id="2181372126273401904" />
       </scope>
-      <scope id="8332795209403923211" at="55,0,62,0" />
-      <scope id="8815279552157196281" at="72,72,94,18" />
-      <scope id="8332795209405909021" at="99,70,121,18" />
-      <scope id="8332795209405836764" at="98,98,122,7" />
-      <scope id="8815279552157190256" at="69,63,95,7" />
-      <scope id="8332795209405836760" at="98,0,124,0">
-        <var name="config" id="8332795209405902435" />
-        <var name="paramMap" id="8332795209405875866" />
+      <scope id="8332795209403923211" at="53,0,60,0" />
+      <scope id="8406119028234024760" at="69,70,88,18">
+        <var name="settings" id="3041510341144265955" />
       </scope>
-      <scope id="8815279552157190252" at="69,0,97,0">
+      <scope id="8406119028234037159" at="67,57,89,7" />
+      <scope id="8815279552157196281" at="95,72,117,18" />
+      <scope id="8332795209404348642" at="67,0,91,0">
+        <var name="config" id="7230953716619828900" />
+      </scope>
+      <scope id="8815279552157190256" at="92,63,118,7" />
+      <scope id="8815279552157190252" at="92,0,120,0">
         <var name="config" id="2840545816391182683" />
       </scope>
-      <unit id="8406119028234584328" at="16,72,21,3" name="jetbrains.mps.coderules.ideaplugin.TypecheckingOptions$1" />
-      <unit id="6746702654208893300" at="22,73,27,3" name="jetbrains.mps.coderules.ideaplugin.TypecheckingOptions$2" />
-      <unit id="1784710035579971670" at="28,74,33,3" name="jetbrains.mps.coderules.ideaplugin.TypecheckingOptions$3" />
-      <unit id="8406119028234719984" at="34,70,39,3" name="jetbrains.mps.coderules.ideaplugin.TypecheckingOptions$4" />
-      <unit id="2181372126273401901" at="40,66,48,3" name="jetbrains.mps.coderules.ideaplugin.TypecheckingOptions$5" />
-      <unit id="8406119028234017931" at="8,0,126,0" name="jetbrains.mps.coderules.ideaplugin.TypecheckingOptions" />
+      <unit id="8406119028234584328" at="14,72,19,3" name="jetbrains.mps.coderules.ideaplugin.TypecheckingOptions$1" />
+      <unit id="6746702654208893300" at="20,73,25,3" name="jetbrains.mps.coderules.ideaplugin.TypecheckingOptions$2" />
+      <unit id="1784710035579971670" at="26,74,31,3" name="jetbrains.mps.coderules.ideaplugin.TypecheckingOptions$3" />
+      <unit id="8406119028234719984" at="32,70,37,3" name="jetbrains.mps.coderules.ideaplugin.TypecheckingOptions$4" />
+      <unit id="2181372126273401901" at="38,66,46,3" name="jetbrains.mps.coderules.ideaplugin.TypecheckingOptions$5" />
+      <unit id="8406119028234017931" at="6,0,122,0" name="jetbrains.mps.coderules.ideaplugin.TypecheckingOptions" />
     </file>
   </root>
 </debug-info>
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 b72ad67d..5cd13ea5 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
@@ -3852,10 +3852,9 @@
                         <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                       </node>
                     </node>
-                    <node concept="2YIFZM" id="adIlSu82Xp" role="37wK5m">
-                      <ref role="37wK5l" to="qox2:7e$2hwaAjW0" resolve="getProjectConfig" />
-                      <ref role="1Pybhc" to="qox2:2CPBoDBWRHZ" resolve="TypecheckingUiOptions" />
-                      <node concept="1jxXqW" id="7e$2hwaBwrz" role="37wK5m" />
+                    <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>
@@ -4084,10 +4083,9 @@
                         <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                       </node>
                     </node>
-                    <node concept="2YIFZM" id="adIlSu82Xq" role="37wK5m">
-                      <ref role="37wK5l" to="qox2:7e$2hwaAjW0" resolve="getProjectConfig" />
-                      <ref role="1Pybhc" to="qox2:2CPBoDBWRHZ" resolve="TypecheckingUiOptions" />
-                      <node concept="1jxXqW" id="7e$2hwaBwCr" role="37wK5m" />
+                    <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>
@@ -4328,10 +4326,9 @@
                         <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                       </node>
                     </node>
-                    <node concept="2YIFZM" id="adIlSu82Xr" role="37wK5m">
-                      <ref role="37wK5l" to="qox2:7e$2hwaAjW0" resolve="getProjectConfig" />
-                      <ref role="1Pybhc" to="qox2:2CPBoDBWRHZ" resolve="TypecheckingUiOptions" />
-                      <node concept="1jxXqW" id="7e$2hwaBwRB" role="37wK5m" />
+                    <node concept="2YIFZM" id="2MNGcFT5QlU" role="37wK5m">
+                      <ref role="1Pybhc" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
+                      <ref role="37wK5l" to="m7o5:2MNGcFT4ZOn" resolve="getUiConfig" />
                     </node>
                     <node concept="37vLTw" id="9UUIHNe9hG" role="37wK5m">
                       <ref role="3cqZAo" node="9UUIHNe9hD" resolve="collector" />
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 14e0a181..738e0e1d 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
@@ -657,100 +657,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="2ceN1hCD$TM" role="jymVt" />
-    <node concept="3clFb_" id="4ot3PHQZkoY" role="jymVt">
-      <property role="TrG5h" value="configure" />
-      <node concept="3Tm1VV" id="4ot3PHQZkp0" role="1B3o_S" />
-      <node concept="3uibUv" id="4ot3PHQZkp2" role="3clF45">
-        <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-        <node concept="3uibUv" id="4ot3PHQZkp3" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-        </node>
-        <node concept="3uibUv" id="4ot3PHQZkp4" role="11_B2D">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="4ot3PHQZkp5" role="3clF46">
-        <property role="TrG5h" value="project" />
-        <node concept="3uibUv" id="4ot3PHQZkp6" role="1tU5fm">
-          <ref role="3uigEE" to="jtsr:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="3clFbS" id="4ot3PHQZkpe" role="3clF47">
-        <node concept="3clFbJ" id="7e$2hwaInMv" role="3cqZAp">
-          <node concept="3clFbS" id="7e$2hwaInMx" role="3clFbx">
-            <node concept="3cpWs8" id="7e$2hwaKUQ_" role="3cqZAp">
-              <node concept="3cpWsn" id="7e$2hwaKUQA" role="3cpWs9">
-                <property role="TrG5h" value="map" />
-                <node concept="3uibUv" id="7e$2hwaKUQy" role="1tU5fm">
-                  <ref role="3uigEE" to="33ny:~HashMap" resolve="HashMap" />
-                  <node concept="3uibUv" id="7e$2hwaKUQz" role="11_B2D">
-                    <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                  </node>
-                  <node concept="3uibUv" id="7e$2hwaKUQ$" role="11_B2D">
-                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                  </node>
-                </node>
-                <node concept="2ShNRf" id="7e$2hwaKUQB" role="33vP2m">
-                  <node concept="1pGfFk" id="7e$2hwaKUQC" role="2ShVmc">
-                    <property role="373rjd" value="true" />
-                    <ref role="37wK5l" to="33ny:~HashMap.&lt;init&gt;()" resolve="HashMap" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="7e$2hwaLkNH" role="3cqZAp">
-              <node concept="2YIFZM" id="adIlSu82Xs" role="3clFbG">
-                <ref role="37wK5l" node="7e$2hwaJpO6" resolve="populateParametersMap" />
-                <ref role="1Pybhc" node="2CPBoDBWRHZ" resolve="TypecheckingUiOptions" />
-                <node concept="37vLTw" id="7e$2hwaLQq$" role="37wK5m">
-                  <ref role="3cqZAo" node="7e$2hwaKUQA" resolve="map" />
-                </node>
-                <node concept="1eOMI4" id="7e$2hwaMhYg" role="37wK5m">
-                  <node concept="10QFUN" id="7e$2hwaMhYf" role="1eOMHV">
-                    <node concept="37vLTw" id="7e$2hwaMhYe" role="10QFUP">
-                      <ref role="3cqZAo" node="4ot3PHQZkp5" resolve="project" />
-                    </node>
-                    <node concept="3uibUv" id="7e$2hwaMhYd" role="10QFUM">
-                      <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs6" id="7e$2hwaMrTn" role="3cqZAp">
-              <node concept="37vLTw" id="7e$2hwaKUQD" role="3cqZAk">
-                <ref role="3cqZAo" node="7e$2hwaKUQA" resolve="map" />
-              </node>
-            </node>
-          </node>
-          <node concept="2ZW3vV" id="7e$2hwaICTO" role="3clFbw">
-            <node concept="3uibUv" id="7e$2hwaIMQR" role="2ZW6by">
-              <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-            </node>
-            <node concept="37vLTw" id="7e$2hwaIxz6" role="2ZW6bz">
-              <ref role="3cqZAo" node="4ot3PHQZkp5" resolve="project" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7e$2hwaIY22" role="3cqZAp">
-          <node concept="2YIFZM" id="7e$2hwaJ6hc" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Collections.emptyMap()" resolve="emptyMap" />
-            <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-          </node>
-        </node>
-        <node concept="3SKdUt" id="7e$2hwaHYQ6" role="3cqZAp">
-          <node concept="1PaTwC" id="7e$2hwaHYQ7" role="1aUNEU">
-            <node concept="3oM_SD" id="7e$2hwaHYQe" role="1PaTwD">
-              <property role="3oM_SC" value="FIXME" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="4ot3PHQZkpf" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4ot3PHQZE4R" role="jymVt" />
     <node concept="3clFb_" id="4ot3PHQY0cu" role="jymVt">
       <property role="TrG5h" value="isRelevant" />
       <node concept="3Tm1VV" id="4ot3PHQY0cv" role="1B3o_S" />
@@ -890,12 +796,9 @@
             <node concept="3uibUv" id="7e$2hwaRjR3" role="1tU5fm">
               <ref role="3uigEE" to="m7o5:7iCybvToiT5" resolve="Config" />
             </node>
-            <node concept="2YIFZM" id="2CPBoDAVqag" role="33vP2m">
-              <ref role="37wK5l" to="m7o5:7e$2hwaPkPY" resolve="getParamConfig" />
+            <node concept="2YIFZM" id="67v_dotGrhO" role="33vP2m">
+              <ref role="37wK5l" to="m7o5:2MNGcFT4ZOn" resolve="getUiConfig" />
               <ref role="1Pybhc" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-              <node concept="37vLTw" id="7e$2hwaRm5F" role="37wK5m">
-                <ref role="3cqZAo" node="7e$2hwaN3C_" resolve="paramsMap" />
-              </node>
             </node>
           </node>
         </node>
@@ -1328,73 +1231,15 @@
         </node>
       </node>
       <node concept="3clFbS" id="lvX$8VFrSg" role="3clF47">
-        <node concept="3cpWs8" id="7e$2hwaS6EI" role="3cqZAp">
-          <node concept="3cpWsn" id="7e$2hwaS6EJ" role="3cpWs9">
-            <property role="TrG5h" value="paramsMap" />
-            <node concept="3uibUv" id="7e$2hwaS6EK" role="1tU5fm">
-              <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-              <node concept="3uibUv" id="7e$2hwaS6EL" role="11_B2D">
-                <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-              </node>
-              <node concept="3uibUv" id="7e$2hwaS6EM" role="11_B2D">
-                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-              </node>
-            </node>
-            <node concept="10QFUN" id="7e$2hwaS6EN" role="33vP2m">
-              <node concept="2OqwBi" id="7e$2hwaS6EO" role="10QFUP">
-                <node concept="37vLTw" id="7e$2hwaS6EP" role="2Oq$k0">
-                  <ref role="3cqZAo" node="lvX$8VFrSd" resolve="flags" />
-                </node>
-                <node concept="liA8E" id="7e$2hwaS6EQ" role="2OqNvi">
-                  <ref role="37wK5l" to="1ka:~TypecheckingSession$Flags.getParamsMap()" resolve="getParamsMap" />
-                </node>
-              </node>
-              <node concept="3uibUv" id="7e$2hwaS6ER" role="10QFUM">
-                <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-                <node concept="3uibUv" id="7e$2hwaS6ES" role="11_B2D">
-                  <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                </node>
-                <node concept="3uibUv" id="7e$2hwaS6ET" role="11_B2D">
-                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="7e$2hwaS6EU" role="3cqZAp">
-          <node concept="3clFbS" id="7e$2hwaS6EV" role="3clFbx">
-            <node concept="3clFbF" id="7e$2hwaS6EW" role="3cqZAp">
-              <node concept="37vLTI" id="7e$2hwaS6EX" role="3clFbG">
-                <node concept="2YIFZM" id="7e$2hwaS6EY" role="37vLTx">
-                  <ref role="37wK5l" to="33ny:~Collections.emptyMap()" resolve="emptyMap" />
-                  <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                </node>
-                <node concept="37vLTw" id="7e$2hwaS6EZ" role="37vLTJ">
-                  <ref role="3cqZAo" node="7e$2hwaS6EJ" resolve="paramsMap" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="7e$2hwaS6F0" role="3clFbw">
-            <node concept="10Nm6u" id="7e$2hwaS6F1" role="3uHU7w" />
-            <node concept="37vLTw" id="7e$2hwaS6F2" role="3uHU7B">
-              <ref role="3cqZAo" node="7e$2hwaS6EJ" resolve="paramsMap" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7e$2hwaS6F3" role="3cqZAp" />
         <node concept="3cpWs8" id="7e$2hwaS6F4" role="3cqZAp">
           <node concept="3cpWsn" id="7e$2hwaS6F5" role="3cpWs9">
             <property role="TrG5h" value="config" />
             <node concept="3uibUv" id="7e$2hwaS6F6" role="1tU5fm">
               <ref role="3uigEE" to="m7o5:7iCybvToiT5" resolve="Config" />
             </node>
-            <node concept="2YIFZM" id="2CPBoDAVqah" role="33vP2m">
-              <ref role="37wK5l" to="m7o5:7e$2hwaPkPY" resolve="getParamConfig" />
+            <node concept="2YIFZM" id="67v_dotGJg3" role="33vP2m">
+              <ref role="37wK5l" to="m7o5:2MNGcFT4ZOn" resolve="getUiConfig" />
               <ref role="1Pybhc" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-              <node concept="37vLTw" id="7e$2hwaS6F8" role="37wK5m">
-                <ref role="3cqZAo" node="7e$2hwaS6EJ" resolve="paramsMap" />
-              </node>
             </node>
           </node>
         </node>
@@ -1408,7 +1253,16 @@
               <property role="3oM_SC" value="temporary" />
             </node>
             <node concept="3oM_SD" id="7e$2hwaXYr3" role="1PaTwD">
-              <property role="3oM_SC" value="workaround" />
+              <property role="3oM_SC" value="workaround," />
+            </node>
+            <node concept="3oM_SD" id="1bwQX1ETf92" role="1PaTwD">
+              <property role="3oM_SC" value="get" />
+            </node>
+            <node concept="3oM_SD" id="1bwQX1ETfab" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="1bwQX1ETfaF" role="1PaTwD">
+              <property role="3oM_SC" value="repo" />
             </node>
           </node>
         </node>
@@ -1418,39 +1272,18 @@
             <node concept="3uibUv" id="7e$2hwaU_pg" role="1tU5fm">
               <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
             </node>
-            <node concept="10QFUN" id="7e$2hwaViv9" role="33vP2m">
-              <node concept="2OqwBi" id="7e$2hwaViv5" role="10QFUP">
-                <node concept="37vLTw" id="7e$2hwaViv6" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7e$2hwaS6EJ" resolve="paramsMap" />
-                </node>
-                <node concept="liA8E" id="7e$2hwaViv7" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
-                  <node concept="Xl_RD" id="7e$2hwaViv8" role="37wK5m">
-                    <property role="Xl_RC" value="__REPOSITORY__" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3uibUv" id="7e$2hwaViv4" role="10QFUM">
-                <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-              </node>
+            <node concept="2YIFZM" id="67v_dotMhEv" role="33vP2m">
+              <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance()" resolve="getInstance" />
+              <ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
             </node>
           </node>
         </node>
         <node concept="3clFbH" id="17DrR$SXQqe" role="3cqZAp" />
         <node concept="3SKdUt" id="7e$2hwaXOuX" role="3cqZAp">
           <node concept="1PaTwC" id="7e$2hwaXOuY" role="1aUNEU">
-            <node concept="3oM_SD" id="7e$2hwaXYhU" role="1PaTwD">
+            <node concept="3oM_SD" id="1bwQX1ETf4Y" role="1PaTwD">
               <property role="3oM_SC" value="FIXME" />
             </node>
-            <node concept="3oM_SD" id="7e$2hwaXYhW" role="1PaTwD">
-              <property role="3oM_SC" value="a" />
-            </node>
-            <node concept="3oM_SD" id="7e$2hwaXYhZ" role="1PaTwD">
-              <property role="3oM_SC" value="hack" />
-            </node>
-            <node concept="3oM_SD" id="7e$2hwaXYi3" role="1PaTwD">
-              <property role="3oM_SC" value="to" />
-            </node>
             <node concept="3oM_SD" id="7e$2hwaXYi8" role="1PaTwD">
               <property role="3oM_SC" value="get" />
             </node>
@@ -1483,26 +1316,7 @@
             <node concept="3uibUv" id="7e$2hwaXi4V" role="1tU5fm">
               <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
             </node>
-            <node concept="10QFUN" id="7e$2hwaXjQ5" role="33vP2m">
-              <node concept="2OqwBi" id="7e$2hwaXjQ6" role="10QFUP">
-                <node concept="1eOMI4" id="7e$2hwaXjQ7" role="2Oq$k0">
-                  <node concept="10QFUN" id="7e$2hwaXjQ8" role="1eOMHV">
-                    <node concept="37vLTw" id="7e$2hwaXjQ9" role="10QFUP">
-                      <ref role="3cqZAo" node="7e$2hwaUBIc" resolve="repository" />
-                    </node>
-                    <node concept="3uibUv" id="7e$2hwaXjQa" role="10QFUM">
-                      <ref role="3uigEE" to="z1c3:~ProjectRepository" resolve="ProjectRepository" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="7e$2hwaXjQb" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~ProjectRepository.getProject()" resolve="getProject" />
-                </node>
-              </node>
-              <node concept="3uibUv" id="7e$2hwaXjQc" role="10QFUM">
-                <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-              </node>
-            </node>
+            <node concept="10Nm6u" id="1bwQX1ESWAc" role="33vP2m" />
           </node>
         </node>
         <node concept="3clFbH" id="7e$2hwaVz9S" role="3cqZAp" />
@@ -6517,12 +6331,9 @@
                       <node concept="37vLTw" id="1z4$59iLRGo" role="37wK5m">
                         <ref role="3cqZAo" node="2cnGCY$rO2g" resolve="repository" />
                       </node>
-                      <node concept="2YIFZM" id="2CPBoDBX4xs" role="37wK5m">
-                        <ref role="37wK5l" node="7e$2hwaAjW0" />
-                        <ref role="1Pybhc" node="2CPBoDBWRHZ" />
-                        <node concept="37vLTw" id="7e$2hwaALml" role="37wK5m">
-                          <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
-                        </node>
+                      <node concept="2YIFZM" id="2MNGcFT5KYw" role="37wK5m">
+                        <ref role="1Pybhc" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
+                        <ref role="37wK5l" to="m7o5:2MNGcFT4ZOn" resolve="getUiConfig" />
                       </node>
                       <node concept="2YIFZM" id="1z4$59iLPYY" role="37wK5m">
                         <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
@@ -8211,410 +8022,6 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="2CPBoDBWRHZ">
-    <property role="TrG5h" value="TypecheckingUiOptions" />
-    <node concept="3Tm1VV" id="2CPBoDBWRI0" role="1B3o_S" />
-    <node concept="2tJIrI" id="2CPBoDBX8_y" role="jymVt" />
-    <node concept="2YIFZL" id="7e$2hwaAjW0" role="jymVt">
-      <property role="TrG5h" value="getProjectConfig" />
-      <node concept="37vLTG" id="7e$2hwaApTs" role="3clF46">
-        <property role="TrG5h" value="mpsProject" />
-        <node concept="3uibUv" id="7e$2hwaAqK6" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="7e$2hwaAjW1" role="3clF45">
-        <ref role="3uigEE" to="m7o5:7iCybvToiT5" resolve="Config" />
-      </node>
-      <node concept="3Tm1VV" id="7e$2hwaAjW2" role="1B3o_S" />
-      <node concept="3clFbS" id="7e$2hwaAjW3" role="3clF47">
-        <node concept="3cpWs8" id="7e$2hwaCFhS" role="3cqZAp">
-          <node concept="3cpWsn" id="7e$2hwaCFhT" role="3cpWs9">
-            <property role="TrG5h" value="config" />
-            <node concept="3uibUv" id="7e$2hwaCFaZ" role="1tU5fm">
-              <ref role="3uigEE" to="m7o5:7iCybvToiT5" resolve="Config" />
-            </node>
-            <node concept="2OqwBi" id="7e$2hwaCFhU" role="33vP2m">
-              <node concept="2YIFZM" id="2CPBoDBX89s" role="2Oq$k0">
-                <ref role="1Pybhc" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                <ref role="37wK5l" to="m7o5:7e$2hwaAfGb" resolve="getUserConfig" />
-              </node>
-              <node concept="liA8E" id="7e$2hwaCFhW" role="2OqNvi">
-                <ref role="37wK5l" to="m7o5:7e$2hwauJ33" resolve="copy" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7e$2hwaCHbL" role="3cqZAp">
-          <node concept="1rXfSq" id="7e$2hwaCHbJ" role="3clFbG">
-            <ref role="37wK5l" node="7e$2hwaBRzy" resolve="registerProjectProvider" />
-            <node concept="37vLTw" id="7e$2hwaCHTa" role="37wK5m">
-              <ref role="3cqZAo" node="7e$2hwaCFhT" resolve="config" />
-            </node>
-            <node concept="37vLTw" id="7e$2hwaCJN9" role="37wK5m">
-              <ref role="3cqZAo" node="7e$2hwaApTs" resolve="mpsProject" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7e$2hwaCEGr" role="3cqZAp">
-          <node concept="37vLTw" id="7e$2hwaCFhX" role="3clFbG">
-            <ref role="3cqZAo" node="7e$2hwaCFhT" resolve="config" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="2CPBoDBX8J8" role="jymVt" />
-    <node concept="2YIFZL" id="7e$2hwaBRzy" role="jymVt">
-      <property role="TrG5h" value="registerProjectProvider" />
-      <node concept="3clFbS" id="7iCybvTyEuB" role="3clF47">
-        <node concept="3clFbH" id="7e$2hwaHL2_" role="3cqZAp" />
-        <node concept="3clFbJ" id="7e$2hwaCmWI" role="3cqZAp">
-          <node concept="3clFbS" id="7e$2hwaCmWK" role="3clFbx">
-            <node concept="3clFbF" id="7iCybvTyAh$" role="3cqZAp">
-              <node concept="2OqwBi" id="7iCybvTyAvh" role="3clFbG">
-                <node concept="37vLTw" id="6hpwxwiqBEz" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6hpwxwiq_U$" resolve="config" />
-                </node>
-                <node concept="liA8E" id="7iCybvTyAAH" role="2OqNvi">
-                  <ref role="37wK5l" to="m7o5:7iCybvTszk9" resolve="registerProvider" />
-                  <node concept="Rm8GO" id="7iCybvTyARZ" role="37wK5m">
-                    <ref role="1Px2BO" to="m7o5:7iCybvToD3Z" resolve="Level" />
-                    <ref role="Rm8GQ" to="m7o5:7iCybvToIZc" resolve="UI" />
-                  </node>
-                  <node concept="10M0yZ" id="2CPBoDBX871" role="37wK5m">
-                    <ref role="1PxDUh" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                    <ref role="3cqZAo" to="m7o5:7iCybvTzJGv" resolve="PREFIX" />
-                  </node>
-                  <node concept="1bVj0M" id="7iCybvTyBsQ" role="37wK5m">
-                    <node concept="37vLTG" id="7iCybvTyBuB" role="1bW2Oz">
-                      <property role="TrG5h" value="key" />
-                      <node concept="17QB3L" id="7iCybvTyBEM" role="1tU5fm" />
-                    </node>
-                    <node concept="3clFbS" id="7iCybvTyBsS" role="1bW5cS">
-                      <node concept="3clFbH" id="7iCybvTyBIw" role="3cqZAp" />
-                      <node concept="3cpWs8" id="2CPBoDC_cjy" role="3cqZAp">
-                        <node concept="3cpWsn" id="2CPBoDC_cjz" role="3cpWs9">
-                          <property role="TrG5h" value="settings" />
-                          <node concept="3uibUv" id="2CPBoDC_cb2" role="1tU5fm">
-                            <ref role="3uigEE" to="m7o5:2CPBoDC$4yq" resolve="TypecheckingSettings" />
-                          </node>
-                          <node concept="2YIFZM" id="2CPBoDC_cj$" role="33vP2m">
-                            <ref role="37wK5l" to="m7o5:2CPBoDC$fEe" resolve="getInstace" />
-                            <ref role="1Pybhc" to="m7o5:2CPBoDC$4yq" resolve="TypecheckingSettings" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbJ" id="7iCybvTyBUS" role="3cqZAp">
-                        <node concept="3clFbS" id="7iCybvTyBUU" role="3clFbx">
-                          <node concept="3cpWs6" id="2CPBoDC_glm" role="3cqZAp">
-                            <node concept="2OqwBi" id="2CPBoDC_if6" role="3cqZAk">
-                              <node concept="37vLTw" id="2CPBoDC_cj_" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2CPBoDC_cjz" resolve="settings" />
-                              </node>
-                              <node concept="liA8E" id="2CPBoDC_iDX" role="2OqNvi">
-                                <ref role="37wK5l" to="m7o5:2CPBoDC$H71" resolve="isTypecheckingEnabled" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="7iCybvTyCd5" role="3clFbw">
-                          <node concept="10M0yZ" id="2CPBoDBX87x" role="2Oq$k0">
-                            <ref role="1PxDUh" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                            <ref role="3cqZAo" to="m7o5:7iCybvTyUUs" resolve="OPTION_TYPECHECKING_ENABLED" />
-                          </node>
-                          <node concept="liA8E" id="7iCybvTyCAG" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                            <node concept="37vLTw" id="7iCybvTyCHb" role="37wK5m">
-                              <ref role="3cqZAo" node="7iCybvTyBuB" resolve="key" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="7iCybvTyG2a" role="3cqZAp" />
-                      <node concept="3clFbJ" id="5Qx6_65jK2f" role="3cqZAp">
-                        <node concept="3clFbS" id="5Qx6_65jK2g" role="3clFbx">
-                          <node concept="3cpWs6" id="2CPBoDC_jlx" role="3cqZAp">
-                            <node concept="2OqwBi" id="2CPBoDC_jly" role="3cqZAk">
-                              <node concept="37vLTw" id="2CPBoDC_jlz" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2CPBoDC_cjz" resolve="settings" />
-                              </node>
-                              <node concept="liA8E" id="2CPBoDC_jl$" role="2OqNvi">
-                                <ref role="37wK5l" to="m7o5:2CPBoDC_kCy" resolve="isWatchingEnabled" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="5Qx6_65jK2l" role="3clFbw">
-                          <node concept="10M0yZ" id="2CPBoDBX87G" role="2Oq$k0">
-                            <ref role="1PxDUh" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                            <ref role="3cqZAo" to="m7o5:5Qx6_65jytE" resolve="OPTION_TYPECHECKING_WATCHING" />
-                          </node>
-                          <node concept="liA8E" id="5Qx6_65jK2n" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                            <node concept="37vLTw" id="5Qx6_65jK2o" role="37wK5m">
-                              <ref role="3cqZAo" node="7iCybvTyBuB" resolve="key" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="1JkMMuhf$a7" role="3cqZAp" />
-                      <node concept="3clFbJ" id="1z4$59hOBBR" role="3cqZAp">
-                        <node concept="3clFbS" id="1z4$59hOBBS" role="3clFbx">
-                          <node concept="3cpWs6" id="2CPBoDC_nvV" role="3cqZAp">
-                            <node concept="2OqwBi" id="2CPBoDC_nvW" role="3cqZAk">
-                              <node concept="37vLTw" id="2CPBoDC_nvX" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2CPBoDC_cjz" resolve="settings" />
-                              </node>
-                              <node concept="liA8E" id="2CPBoDC_nvY" role="2OqNvi">
-                                <ref role="37wK5l" to="m7o5:2CPBoDC_o9$" resolve="isReportingEnabled" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="1z4$59hOBBX" role="3clFbw">
-                          <node concept="10M0yZ" id="2CPBoDBX87R" role="2Oq$k0">
-                            <ref role="1PxDUh" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                            <ref role="3cqZAo" to="m7o5:1z4$59hO85X" resolve="OPTION_TYPECHECKING_REPORTING" />
-                          </node>
-                          <node concept="liA8E" id="1z4$59hOBBZ" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                            <node concept="37vLTw" id="1z4$59hOBC0" role="37wK5m">
-                              <ref role="3cqZAo" node="7iCybvTyBuB" resolve="key" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="1z4$59hOCWg" role="3cqZAp" />
-                      <node concept="3clFbJ" id="7iCybvTyGA8" role="3cqZAp">
-                        <node concept="3clFbS" id="7iCybvTyGA9" role="3clFbx">
-                          <node concept="3cpWs6" id="2CPBoDC_rsr" role="3cqZAp">
-                            <node concept="2OqwBi" id="2CPBoDC_rss" role="3cqZAk">
-                              <node concept="37vLTw" id="2CPBoDC_rst" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2CPBoDC_cjz" resolve="settings" />
-                              </node>
-                              <node concept="liA8E" id="2CPBoDC_rsu" role="2OqNvi">
-                                <ref role="37wK5l" to="m7o5:2CPBoDC_sJb" resolve="isTracingEnabled" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="7iCybvTyGAg" role="3clFbw">
-                          <node concept="10M0yZ" id="2CPBoDBX882" role="2Oq$k0">
-                            <ref role="1PxDUh" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                            <ref role="3cqZAo" to="m7o5:7iCybvTyWot" resolve="OPTION_TYPECHECKING_TRACE" />
-                          </node>
-                          <node concept="liA8E" id="7iCybvTyGAi" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
-                            <node concept="37vLTw" id="7iCybvTyGAj" role="37wK5m">
-                              <ref role="3cqZAo" node="7iCybvTyBuB" resolve="key" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="7iCybvTyBLJ" role="3cqZAp" />
-                      <node concept="3clFbF" id="7iCybvTzmU3" role="3cqZAp">
-                        <node concept="10Nm6u" id="7iCybvTzmU1" role="3clFbG" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="1_Anebx_roc" role="3cqZAp" />
-          </node>
-          <node concept="2ZW3vV" id="7e$2hwaCs1y" role="3clFbw">
-            <node concept="3uibUv" id="7e$2hwaCtKw" role="2ZW6by">
-              <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-            </node>
-            <node concept="37vLTw" id="7e$2hwaCpTn" role="2ZW6bz">
-              <ref role="3cqZAo" node="7e$2hwaBMNF" resolve="mpsProject" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="6hpwxwiq_U$" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="6hpwxwiqBaG" role="1tU5fm">
-          <ref role="3uigEE" to="m7o5:7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="7e$2hwaBMNF" role="3clF46">
-        <property role="TrG5h" value="mpsProject" />
-        <node concept="3uibUv" id="7e$2hwaBPa$" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7iCybvTyEu_" role="3clF45" />
-      <node concept="3Tm6S6" id="7iCybvTyEx7" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="2CPBoDC_yko" role="jymVt" />
-    <node concept="2YIFZL" id="7e$2hwaJpO6" role="jymVt">
-      <property role="TrG5h" value="populateParametersMap" />
-      <node concept="37vLTG" id="7e$2hwaJ_Ta" role="3clF46">
-        <property role="TrG5h" value="paramMap" />
-        <node concept="3uibUv" id="7e$2hwaJAoe" role="1tU5fm">
-          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-          <node concept="3uibUv" id="7e$2hwaJBoR" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-          </node>
-          <node concept="3uibUv" id="7e$2hwaJCC2" role="11_B2D">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7e$2hwaJF69" role="3clF46">
-        <property role="TrG5h" value="mpsProject" />
-        <node concept="3uibUv" id="7e$2hwaJFZx" role="1tU5fm">
-          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7e$2hwaJpO8" role="3clF45" />
-      <node concept="3Tm1VV" id="7e$2hwaJpO9" role="1B3o_S" />
-      <node concept="3clFbS" id="7e$2hwaJpOa" role="3clF47">
-        <node concept="3cpWs8" id="2CPBoDC_z3R" role="3cqZAp">
-          <node concept="3cpWsn" id="2CPBoDC_z3S" role="3cpWs9">
-            <property role="TrG5h" value="settings" />
-            <node concept="3uibUv" id="2CPBoDC_z3T" role="1tU5fm">
-              <ref role="3uigEE" to="m7o5:2CPBoDC$4yq" resolve="TypecheckingSettings" />
-            </node>
-            <node concept="2YIFZM" id="2CPBoDC_z3U" role="33vP2m">
-              <ref role="37wK5l" to="m7o5:2CPBoDC$fEe" resolve="getInstace" />
-              <ref role="1Pybhc" to="m7o5:2CPBoDC$4yq" resolve="TypecheckingSettings" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7e$2hwaJMIb" role="3cqZAp">
-          <node concept="2OqwBi" id="7e$2hwaJOdN" role="3clFbG">
-            <node concept="37vLTw" id="7e$2hwaJMI9" role="2Oq$k0">
-              <ref role="3cqZAo" node="7e$2hwaJ_Ta" resolve="paramMap" />
-            </node>
-            <node concept="liA8E" id="7e$2hwaJQwK" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
-              <node concept="10M0yZ" id="2CPBoDBXmw2" role="37wK5m">
-                <ref role="1PxDUh" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                <ref role="3cqZAo" to="m7o5:7iCybvTyUUs" resolve="OPTION_TYPECHECKING_ENABLED" />
-              </node>
-              <node concept="2OqwBi" id="2CPBoDC__Wl" role="37wK5m">
-                <node concept="37vLTw" id="2CPBoDC__Wm" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2CPBoDC_z3S" resolve="settings" />
-                </node>
-                <node concept="liA8E" id="2CPBoDC__Wn" role="2OqNvi">
-                  <ref role="37wK5l" to="m7o5:2CPBoDC$H71" resolve="isTypecheckingEnabled" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7e$2hwaJWHQ" role="3cqZAp">
-          <node concept="2OqwBi" id="7e$2hwaJWHR" role="3clFbG">
-            <node concept="37vLTw" id="7e$2hwaJWHS" role="2Oq$k0">
-              <ref role="3cqZAo" node="7e$2hwaJ_Ta" resolve="paramMap" />
-            </node>
-            <node concept="liA8E" id="7e$2hwaJWHT" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
-              <node concept="10M0yZ" id="2CPBoDBXmw3" role="37wK5m">
-                <ref role="1PxDUh" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                <ref role="3cqZAo" to="m7o5:5Qx6_65jytE" resolve="OPTION_TYPECHECKING_WATCHING" />
-              </node>
-              <node concept="2OqwBi" id="2CPBoDC_ElK" role="37wK5m">
-                <node concept="37vLTw" id="2CPBoDC_ElL" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2CPBoDC_z3S" resolve="settings" />
-                </node>
-                <node concept="liA8E" id="2CPBoDC_ElM" role="2OqNvi">
-                  <ref role="37wK5l" to="m7o5:2CPBoDC_kCy" resolve="isWatchingEnabled" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7e$2hwaK1AZ" role="3cqZAp">
-          <node concept="2OqwBi" id="7e$2hwaK1B0" role="3clFbG">
-            <node concept="37vLTw" id="7e$2hwaK1B1" role="2Oq$k0">
-              <ref role="3cqZAo" node="7e$2hwaJ_Ta" resolve="paramMap" />
-            </node>
-            <node concept="liA8E" id="7e$2hwaK1B2" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
-              <node concept="10M0yZ" id="2CPBoDBXmw4" role="37wK5m">
-                <ref role="1PxDUh" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                <ref role="3cqZAo" to="m7o5:1z4$59hO85X" resolve="OPTION_TYPECHECKING_REPORTING" />
-              </node>
-              <node concept="2OqwBi" id="2CPBoDC_F_v" role="37wK5m">
-                <node concept="37vLTw" id="2CPBoDC_F_w" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2CPBoDC_z3S" resolve="settings" />
-                </node>
-                <node concept="liA8E" id="2CPBoDC_F_x" role="2OqNvi">
-                  <ref role="37wK5l" to="m7o5:2CPBoDC_o9$" resolve="isReportingEnabled" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7e$2hwaK7hH" role="3cqZAp">
-          <node concept="2OqwBi" id="7e$2hwaK7hI" role="3clFbG">
-            <node concept="37vLTw" id="7e$2hwaK7hJ" role="2Oq$k0">
-              <ref role="3cqZAo" node="7e$2hwaJ_Ta" resolve="paramMap" />
-            </node>
-            <node concept="liA8E" id="7e$2hwaK7hK" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
-              <node concept="10M0yZ" id="2CPBoDBXmw5" role="37wK5m">
-                <ref role="1PxDUh" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                <ref role="3cqZAo" to="m7o5:7iCybvTyWot" resolve="OPTION_TYPECHECKING_TRACE" />
-              </node>
-              <node concept="2OqwBi" id="2CPBoDC_GAz" role="37wK5m">
-                <node concept="37vLTw" id="2CPBoDC_GA$" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2CPBoDC_z3S" resolve="settings" />
-                </node>
-                <node concept="liA8E" id="2CPBoDC_GA_" role="2OqNvi">
-                  <ref role="37wK5l" to="m7o5:2CPBoDC_sJb" resolve="isTracingEnabled" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3SKdUt" id="7e$2hwaSU5z" role="3cqZAp">
-          <node concept="1PaTwC" id="7e$2hwaSU5$" role="1aUNEU">
-            <node concept="3oM_SD" id="7e$2hwaSU6q" role="1PaTwD">
-              <property role="3oM_SC" value="FIXME" />
-            </node>
-            <node concept="3oM_SD" id="7e$2hwaSU6s" role="1PaTwD">
-              <property role="3oM_SC" value="temporary" />
-            </node>
-            <node concept="3oM_SD" id="7e$2hwaSVPg" role="1PaTwD">
-              <property role="3oM_SC" value="workaround" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7e$2hwaSYut" role="3cqZAp">
-          <node concept="2OqwBi" id="7e$2hwaT02K" role="3clFbG">
-            <node concept="37vLTw" id="7e$2hwaSYur" role="2Oq$k0">
-              <ref role="3cqZAo" node="7e$2hwaJ_Ta" resolve="paramMap" />
-            </node>
-            <node concept="liA8E" id="7e$2hwaT3nS" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
-              <node concept="Xl_RD" id="7e$2hwaT4SF" role="37wK5m">
-                <property role="Xl_RC" value="__REPOSITORY__" />
-              </node>
-              <node concept="2OqwBi" id="7e$2hwaTcyQ" role="37wK5m">
-                <node concept="1eOMI4" id="7e$2hwaTcyR" role="2Oq$k0">
-                  <node concept="10QFUN" id="7e$2hwaTcyS" role="1eOMHV">
-                    <node concept="37vLTw" id="7e$2hwaTcyT" role="10QFUP">
-                      <ref role="3cqZAo" node="7e$2hwaJF69" resolve="mpsProject" />
-                    </node>
-                    <node concept="3uibUv" id="7e$2hwaTcyU" role="10QFUM">
-                      <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="7e$2hwaTi3e" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="312cEu" id="4n$QnzZQkF9">
     <property role="TrG5h" value="ApplicableTemplatesFinder" />
     <property role="3GE5qa" value="action" />
@@ -9187,15 +8594,9 @@
               <node concept="37vLTw" id="4XsNDZYjiYF" role="37wK5m">
                 <ref role="3cqZAo" node="6nFpYlun1LV" resolve="repository" />
               </node>
-              <node concept="2YIFZM" id="2CPBoDBX4xr" role="37wK5m">
-                <ref role="37wK5l" node="7e$2hwaAjW0" resolve="getProjectConfig" />
-                <ref role="1Pybhc" node="2CPBoDBWRHZ" resolve="TypecheckingUiOptions" />
-                <node concept="2OqwBi" id="7e$2hwaARIH" role="37wK5m">
-                  <node concept="2WthIp" id="7e$2hwaARIK" role="2Oq$k0" />
-                  <node concept="1DTwFV" id="7e$2hwaARIM" role="2OqNvi">
-                    <ref role="2WH_rO" node="3YJ7yg2LgUn" resolve="mpsProject" />
-                  </node>
-                </node>
+              <node concept="2YIFZM" id="2MNGcFT5IT5" role="37wK5m">
+                <ref role="37wK5l" to="m7o5:2MNGcFT4ZOn" resolve="getUiConfig" />
+                <ref role="1Pybhc" to="m7o5:7iCybvTy_Mb" resolve="TypecheckingOptions" />
               </node>
               <node concept="2YIFZM" id="4XsNDZYjiYH" role="37wK5m">
                 <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
index e4add28b..9b7fc334 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -192,6 +192,11 @@
       <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
         <child id="1107797138135" name="extendedInterface" index="3HQHJm" />
       </concept>
+      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
+        <child id="1163668914799" name="condition" index="3K4Cdx" />
+        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
+        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
+      </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
@@ -721,32 +726,41 @@
       </node>
       <node concept="2tJIrI" id="IFW4V2uO1v" role="jymVt" />
       <node concept="3clFbW" id="IFW4V2xp8z" role="jymVt">
-        <node concept="37vLTG" id="IFW4V2xx4M" role="3clF46">
-          <property role="TrG5h" value="repository" />
-          <node concept="3uibUv" id="IFW4V2xx_R" role="1tU5fm">
-            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-          </node>
-        </node>
         <node concept="3cqZAl" id="IFW4V2xp8_" role="3clF45" />
         <node concept="3Tm6S6" id="IFW4V2xpYm" role="1B3o_S" />
         <node concept="3clFbS" id="IFW4V2xp8B" role="3clF47">
           <node concept="3clFbF" id="IFW4V2xUSu" role="3cqZAp">
             <node concept="37vLTI" id="IFW4V2xW3l" role="3clFbG">
-              <node concept="37vLTw" id="IFW4V2xWuq" role="37vLTx">
-                <ref role="3cqZAo" node="IFW4V2xx4M" resolve="repository" />
-              </node>
               <node concept="2OqwBi" id="IFW4V2xV4l" role="37vLTJ">
                 <node concept="Xjq3P" id="IFW4V2xUSs" role="2Oq$k0" />
                 <node concept="2OwXpG" id="IFW4V2xV_u" role="2OqNvi">
                   <ref role="2Oxat5" node="IFW4V2xTxd" resolve="repository" />
                 </node>
               </node>
+              <node concept="3K4zz7" id="1bwQX1EP1rC" role="37vLTx">
+                <node concept="37vLTw" id="1bwQX1EP2x7" role="3K4E3e">
+                  <ref role="3cqZAo" node="1bwQX1EOWJ7" resolve="repository" />
+                </node>
+                <node concept="3y3z36" id="1bwQX1EOZT2" role="3K4Cdx">
+                  <node concept="10Nm6u" id="1bwQX1EP13k" role="3uHU7w" />
+                  <node concept="37vLTw" id="1bwQX1EOYQS" role="3uHU7B">
+                    <ref role="3cqZAo" node="1bwQX1EOWJ7" resolve="repository" />
+                  </node>
+                </node>
+                <node concept="2YIFZM" id="67v_dotJ$k7" role="3K4GZi">
+                  <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance()" resolve="getInstance" />
+                  <ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
+                </node>
+              </node>
             </node>
           </node>
           <node concept="3clFbF" id="IFW4V2xz__" role="3cqZAp">
             <node concept="2OqwBi" id="IFW4V2x$6o" role="3clFbG">
-              <node concept="37vLTw" id="IFW4V2xz_$" role="2Oq$k0">
-                <ref role="3cqZAo" node="IFW4V2xx4M" resolve="repository" />
+              <node concept="2OqwBi" id="67v_dotJ_J3" role="2Oq$k0">
+                <node concept="Xjq3P" id="67v_dotJ_qP" role="2Oq$k0" />
+                <node concept="2OwXpG" id="67v_dotJAP4" role="2OqNvi">
+                  <ref role="2Oxat5" node="IFW4V2xTxd" resolve="repository" />
+                </node>
               </node>
               <node concept="liA8E" id="IFW4V2x$JO" role="2OqNvi">
                 <ref role="37wK5l" to="lui2:~SRepository.addRepositoryListener(org.jetbrains.mps.openapi.module.SRepositoryListener)" resolve="addRepositoryListener" />
@@ -755,6 +769,12 @@
             </node>
           </node>
         </node>
+        <node concept="37vLTG" id="1bwQX1EOWJ7" role="3clF46">
+          <property role="TrG5h" value="repository" />
+          <node concept="3uibUv" id="1bwQX1EOWJ6" role="1tU5fm">
+            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="IFW4V2xo_m" role="jymVt" />
       <node concept="3clFb_" id="IFW4V2uEay" role="jymVt">
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 5d8462af..cd9f2bc8 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
@@ -466,10 +466,9 @@
                         <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                       </node>
                     </node>
-                    <node concept="2YIFZM" id="adIlSu82Xo" role="37wK5m">
-                      <ref role="37wK5l" to="qox2:7e$2hwaAjW0" resolve="getProjectConfig" />
-                      <ref role="1Pybhc" to="qox2:2CPBoDBWRHZ" resolve="TypecheckingUiOptions" />
-                      <node concept="1jxXqW" id="7e$2hwaBuHD" role="37wK5m" />
+                    <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>