diff --git a/build.xml b/build.xml
index 66c4834e..87050cf0 100644
--- a/build.xml
+++ b/build.xml
@@ -6073,6 +6073,8 @@
       <plugin id="jetbrains.mps.core" path="${artifacts.mps}/plugins/mps-core" />
       <plugin id="jetbrains.mps.ide.java" path="${artifacts.mps}/plugins/mps-java" />
       <plugin id="jetbrains.mps.junit5" path="${artifacts.mps}/plugins/mps-junit5" />
+      <plugin id="jetbrains.mps.kotlin" path="${artifacts.mps}/plugins/mps-kotlin" />
+      <plugin id="jetbrains.mps.ide.make" path="${artifacts.mps}/plugins/mps-make" />
       <plugin id="jetbrains.mps.testing" path="${artifacts.mps}/plugins/mps-testing" />
       <plugin id="jetbrains.mps.coderules" path="${build.layout}/jetbrains.mps.coderules/lib/jetbrains.mps.coderules.jar" />
       <macro name="coderules_home" path="${basedir}" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index cff575d0..6ae6b9e4 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -45,8 +45,12 @@
       </concept>
       <concept id="6593674873639474400" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModules_Options" flags="ng" index="24cAiW">
         <child id="6593674873639478221" name="haltonfailure" index="24c_eh" />
+        <child id="6593674873635848987" name="requiredPlugins" index="24YFd7" />
         <child id="3609768169816292377" name="jvmArgs" index="1psgkv" />
       </concept>
+      <concept id="6593674873635848984" name="jetbrains.mps.build.mps.tests.structure.RequiredPlugin" flags="ng" index="24YFd4">
+        <reference id="6593674873635848985" name="plugin" index="24YFd5" />
+      </concept>
       <concept id="4005526075820600484" name="jetbrains.mps.build.mps.tests.structure.BuildModuleTestsPlugin" flags="ng" index="1gjT0q" />
     </language>
     <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
@@ -282,6 +286,9 @@
             <property role="3MwjfP" value="-Xss2048k -Xmx2048m --add-opens=java.desktop/com.apple.laf=ALL-UNNAMED --add-opens=java.desktop/com.apple.eawt=ALL-UNNAMED --add-opens=java.desktop/com.apple.eawt.event=ALL-UNNAMED" />
           </node>
         </node>
+        <node concept="24YFd4" id="2S7QRUbuMLf" role="24YFd7">
+          <ref role="24YFd5" to="ffeo:1diEraJ0skp" resolve="jetbrains.mps.kotlin" />
+        </node>
       </node>
     </node>
     <node concept="m$_wf" id="7BVjoXzUx67" role="3989C9">
diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
index 6804a7f9..fc2d3ac5 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
@@ -46,6 +46,8 @@
     <import index="rbkg" ref="63b449db-0918-4a4a-a891-2c430ab133e4/java:org.junit.jupiter.api.extension(org.junit.junit5/)" />
     <import index="yqm7" ref="63b449db-0918-4a4a-a891-2c430ab133e4/java:org.junit.jupiter.api(org.junit.junit5/)" />
     <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" />
+    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
+    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -808,6 +810,28 @@
                   </node>
                   <node concept="3clFbF" id="1Lr58WFTIH_" role="3cqZAp">
                     <node concept="2OqwBi" id="1Lr58WFTIHA" role="3clFbG">
+                      <node concept="liA8E" id="1Lr58WFTIHH" role="2OqNvi">
+                        <ref role="37wK5l" to="wsw7:4SGXHKgYYAZ" resolve="check" />
+                        <node concept="37vLTw" id="1Lr58WFTIHI" role="37wK5m">
+                          <ref role="3cqZAo" node="1Lr58WFTIHb" resolve="itemsToCheck" />
+                        </node>
+                        <node concept="2OqwBi" id="1Lr58WFTIHJ" role="37wK5m">
+                          <node concept="37vLTw" id="2r1jTXL$IJ_" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2r1jTXL$IJy" resolve="project" />
+                          </node>
+                          <node concept="liA8E" id="1Lr58WFTIHL" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="1Lr58WFTIHM" role="37wK5m">
+                          <ref role="3cqZAo" node="1Lr58WFTIHu" resolve="collectConsumer" />
+                        </node>
+                        <node concept="2ShNRf" id="1Lr58WFTIHN" role="37wK5m">
+                          <node concept="1pGfFk" id="1Lr58WFTIHO" role="2ShVmc">
+                            <ref role="37wK5l" to="mk8z:~EmptyProgressMonitor.&lt;init&gt;()" resolve="EmptyProgressMonitor" />
+                          </node>
+                        </node>
+                      </node>
                       <node concept="2OqwBi" id="1Lr58WFTIHB" role="2Oq$k0">
                         <node concept="2ShNRf" id="1Lr58WFTIHC" role="2Oq$k0">
                           <node concept="1pGfFk" id="1Lr58WFTIHD" role="2ShVmc">
@@ -833,28 +857,6 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="1Lr58WFTIHH" role="2OqNvi">
-                        <ref role="37wK5l" to="wsw7:4SGXHKgYYAZ" resolve="check" />
-                        <node concept="37vLTw" id="1Lr58WFTIHI" role="37wK5m">
-                          <ref role="3cqZAo" node="1Lr58WFTIHb" resolve="itemsToCheck" />
-                        </node>
-                        <node concept="2OqwBi" id="1Lr58WFTIHJ" role="37wK5m">
-                          <node concept="37vLTw" id="2r1jTXL$IJ_" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2r1jTXL$IJy" resolve="project" />
-                          </node>
-                          <node concept="liA8E" id="1Lr58WFTIHL" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                          </node>
-                        </node>
-                        <node concept="37vLTw" id="1Lr58WFTIHM" role="37wK5m">
-                          <ref role="3cqZAo" node="1Lr58WFTIHu" resolve="collectConsumer" />
-                        </node>
-                        <node concept="2ShNRf" id="1Lr58WFTIHN" role="37wK5m">
-                          <node concept="1pGfFk" id="1Lr58WFTIHO" role="2ShVmc">
-                            <ref role="37wK5l" to="mk8z:~EmptyProgressMonitor.&lt;init&gt;()" resolve="EmptyProgressMonitor" />
-                          </node>
-                        </node>
-                      </node>
                     </node>
                   </node>
                   <node concept="3clFbH" id="1Lr58WFTIHP" role="3cqZAp" />
@@ -1061,9 +1063,9 @@
       <node concept="3clFbS" id="xqbf82oxMc" role="2VODD2">
         <node concept="3clFbF" id="1a$$29AvYGM" role="3cqZAp">
           <node concept="2OqwBi" id="1a$$29AvYN5" role="3clFbG">
-            <node concept="2YIFZM" id="1QxYy7KdHPS" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7iCybvTs3lI" resolve="getInstance" />
-              <ref role="1Pybhc" to="tj24:7iCybvToiT5" resolve="Config" />
+            <node concept="2YIFZM" id="4cRooo742TX" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:7e$2hwaAfGb" resolve="getUserConfig" />
+              <ref role="1Pybhc" to="tj24:7iCybvTy_Mb" resolve="TypecheckingOptions" />
             </node>
             <node concept="liA8E" id="1a$$29AvYUx" role="2OqNvi">
               <ref role="37wK5l" to="tj24:7iCybvTszk9" resolve="registerProvider" />
@@ -1112,9 +1114,9 @@
       <node concept="3clFbS" id="xqbf82oyCQ" role="2VODD2">
         <node concept="3clFbF" id="xqbf82l6BV" role="3cqZAp">
           <node concept="2OqwBi" id="xqbf82l6Qn" role="3clFbG">
-            <node concept="2YIFZM" id="1QxYy7KdHPT" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:7iCybvTs3lI" resolve="getInstance" />
-              <ref role="1Pybhc" to="tj24:7iCybvToiT5" resolve="Config" />
+            <node concept="2YIFZM" id="4cRooo743lI" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:7e$2hwaAfGb" resolve="getUserConfig" />
+              <ref role="1Pybhc" to="tj24:7iCybvTy_Mb" resolve="TypecheckingOptions" />
             </node>
             <node concept="liA8E" id="xqbf82l6Yd" role="2OqNvi">
               <ref role="37wK5l" to="tj24:xqbf82kuzw" resolve="reset" />