diff --git a/build.gradle b/build.gradle
index ff61197db..e251cc5bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,7 +95,7 @@ configurations {
 dependencies {
     // For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency:
     // mps "com.jetbrains:mps:$mpsVersion"
-    mps "com.jetbrains.mps:mps-prerelease:241.18034.10078"
+    mps "com.jetbrains.mps:mps-prerelease:241.18034.10104"
 }
 
 repositories {
diff --git a/code/apache-commons/solutions/org.apache.commons/org.apache.commons.msd b/code/apache-commons/solutions/org.apache.commons/org.apache.commons.msd
index 7bcefa0e3..b53ee2303 100644
--- a/code/apache-commons/solutions/org.apache.commons/org.apache.commons.msd
+++ b/code/apache-commons/solutions/org.apache.commons/org.apache.commons.msd
@@ -12,7 +12,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java" compile="mps" classes="mps" ext="yes">
+    <facet type="java" compile="off" classes="mps" ext="yes" languageLevel="JAVA_8">
       <classes generated="true" path="${module}/classes_gen" />
       <library location="${module}/lib/commons-math3-3.3/commons-math3-3.3.jar" />
       <library location="${module}/lib/commons-csv-1.0/commons-csv-1.0.jar" />
diff --git a/code/batik/solutions/de.itemis.stubs.batik.msd b/code/batik/solutions/de.itemis.stubs.batik.msd
index c24ebc237..fc4acf120 100644
--- a/code/batik/solutions/de.itemis.stubs.batik.msd
+++ b/code/batik/solutions/de.itemis.stubs.batik.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="de.itemis.stubs.batik" uuid="563a0770-eb88-4f4f-83ed-f708776fc2fe" moduleVersion="0">
   <models>
-    <modelRoot type="java_classes" contentPath="${module}/lib">
+    <modelRoot contentPath="${module}/lib" type="java_classes">
       <sourceRoot location="batik-awt-util.jar" />
       <sourceRoot location="batik-constants.jar" />
       <sourceRoot location="batik-css.jar" />
@@ -16,7 +16,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java" compile="mps" classes="mps" ext="no">
+    <facet type="java" compile="off" classes="mps" ext="yes" languageLevel="JAVA_8">
       <classes generated="true" path="${module}/classes_gen" />
       <library location="${module}/lib/batik-awt-util.jar" />
       <library location="${module}/lib/batik-constants.jar" />
diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index 4f9fe3e76..a15623cb5 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -180,7 +180,9 @@
       <concept id="8971171305100238972" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyTargetLanguage" flags="ng" index="Rbm2T">
         <reference id="3189788309731922643" name="language" index="1E1Vl2" />
       </concept>
-      <concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
+      <concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6">
+        <property id="4571516170012626612" name="useMakeTask" index="1DZWs8" />
+      </concept>
       <concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
         <property id="2928402740576877067" name="javaCode" index="3vZFNd" />
         <child id="5253498789149547825" name="sources" index="3bR31x" />
@@ -668,6 +670,7 @@
         <property role="3LESm3" value="b0f8641f-bd77-4421-8425-30d9088a82f7" />
         <property role="TrG5h" value="org.apache.commons" />
         <property role="aoJFB" value="eYcmk9QOli/sources" />
+        <property role="3vZFNd" value="3kCd1ud3JDF/none" />
         <node concept="398BVA" id="PE3B26QCyu" role="3LF7KH">
           <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
           <node concept="2Ry0Ak" id="PE3B26QCyv" role="iGT6I">
@@ -10001,6 +10004,8 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="de.q60.mps.shadowmodels.genplan" />
         <property role="3LESm3" value="f5997610-4d27-40a3-872c-d06cf404755b" />
+        <property role="3vZFNd" value="3kCd1ud3JDF/none" />
+        <property role="aoJFB" value="77WRb6jODAF/none" />
         <node concept="398BVA" id="1RCZH7X6p$k" role="3LF7KH">
           <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
           <node concept="2Ry0Ak" id="1RCZH7X6pQP" role="iGT6I">
@@ -12282,6 +12287,8 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="de.q60.mps.virtualinterfaces.genplan" />
         <property role="3LESm3" value="4c0d9543-a1b0-4384-8a5d-1cb92075413c" />
+        <property role="3vZFNd" value="3kCd1ud3JDF/none" />
+        <property role="aoJFB" value="77WRb6jODAF/none" />
         <node concept="398BVA" id="4hqUO9aIgA1" role="3LF7KH">
           <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
           <node concept="2Ry0Ak" id="4hqUO9aIgGT" role="iGT6I">
@@ -12527,6 +12534,8 @@
       <node concept="1E1JtA" id="6fQhGuklQWU" role="2G$12L">
         <property role="TrG5h" value="de.q60.mps.collections.libs" />
         <property role="3LESm3" value="ecfb9949-7433-4db5-85de-0f84d172e4ce" />
+        <property role="3vZFNd" value="3kCd1ud3JDF/none" />
+        <property role="aoJFB" value="77WRb6jODAF/none" />
         <node concept="398BVA" id="6fQhGuklR81" role="3LF7KH">
           <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
           <node concept="2Ry0Ak" id="42yR2aTbyNG" role="iGT6I">
@@ -12661,6 +12670,8 @@
       <node concept="1E1JtA" id="6bkzxtWPDx1" role="2G$12L">
         <property role="TrG5h" value="de.itemis.stubs.batik" />
         <property role="3LESm3" value="563a0770-eb88-4f4f-83ed-f708776fc2fe" />
+        <property role="3vZFNd" value="3kCd1ud3JDF/none" />
+        <property role="aoJFB" value="77WRb6jODAF/none" />
         <node concept="398BVA" id="6bkzxtWPDx2" role="3LF7KH">
           <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
           <node concept="2Ry0Ak" id="6bkzxtWPDx3" role="iGT6I">
@@ -13339,6 +13350,7 @@
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="org.modelix.model.api" />
         <property role="3LESm3" value="cc99dce1-49f3-4392-8dbf-e22ca47bd0af" />
+        <property role="3vZFNd" value="3kCd1ud3JDF/none" />
         <node concept="398BVA" id="5U8hsWC70GO" role="3LF7KH">
           <ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
           <node concept="2Ry0Ak" id="5U8hsWC71b5" role="iGT6I">
@@ -15963,7 +15975,9 @@
       <property role="3Ej$Sc" value="true" />
     </node>
     <node concept="10PD9b" id="2Xjt3l56m0W" role="10PD9s" />
-    <node concept="3b7kt6" id="2Xjt3l56m0X" role="10PD9s" />
+    <node concept="3b7kt6" id="2Xjt3l56m0X" role="10PD9s">
+      <property role="1DZWs8" value="true" />
+    </node>
     <node concept="398rNT" id="2Xjt3l56m0Y" role="1l3spd">
       <property role="TrG5h" value="mps.home" />
       <node concept="55IIr" id="4be$WTb2x9Y" role="398pKh" />
diff --git a/code/model-api/org.modelix.model.api/org.modelix.model.api.msd b/code/model-api/org.modelix.model.api/org.modelix.model.api.msd
index 9b4cd9e04..82f7c65ef 100644
--- a/code/model-api/org.modelix.model.api/org.modelix.model.api.msd
+++ b/code/model-api/org.modelix.model.api/org.modelix.model.api.msd
@@ -13,7 +13,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java" compile="mps" classes="mps" ext="yes">
+    <facet type="java" compile="off" classes="mps" ext="no" languageLevel="JAVA_8">
       <classes generated="true" path="${module}/classes_gen" />
       <library location="${module}/lib/kotlin-logging-jvm.jar" />
       <library location="${module}/lib/kotlin-stdlib-common.jar" />
diff --git a/code/shadowmodels/solutions/de.q60.mps.collections.libs/de.q60.mps.collections.libs.msd b/code/shadowmodels/solutions/de.q60.mps.collections.libs/de.q60.mps.collections.libs.msd
index 673ce2a20..b2a4f73ab 100644
--- a/code/shadowmodels/solutions/de.q60.mps.collections.libs/de.q60.mps.collections.libs.msd
+++ b/code/shadowmodels/solutions/de.q60.mps.collections.libs/de.q60.mps.collections.libs.msd
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="de.q60.mps.collections.libs" uuid="ecfb9949-7433-4db5-85de-0f84d172e4ce" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default" />
     <modelRoot contentPath="${module}/lib" type="java_classes">
       <sourceRoot location="trove4j-3.0.3.jar" />
       <sourceRoot location="vavr-0.9.3.jar" />
@@ -10,7 +9,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java" compile="mps" classes="mps" ext="no">
+    <facet type="java" compile="off" classes="mps" ext="yes" languageLevel="JAVA_8">
       <classes generated="true" path="${module}/classes_gen" />
       <library location="${module}/lib/trove4j-3.0.3.jar" />
       <library location="${module}/lib/vavr-0.9.3.jar" />
diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.genplan/de.q60.mps.shadowmodels.genplan.msd b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.genplan/de.q60.mps.shadowmodels.genplan.msd
index a7ad370a8..96c5cbb33 100644
--- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.genplan/de.q60.mps.shadowmodels.genplan.msd
+++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.genplan/de.q60.mps.shadowmodels.genplan.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java" compile="mps" classes="mps" ext="no">
+    <facet type="java" compile="off" classes="mps" ext="no" languageLevel="JAVA_8">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>
diff --git a/code/shadowmodels/solutions/de.q60.mps.virtualinterfaces.genplan/de.q60.mps.virtualinterfaces.genplan.msd b/code/shadowmodels/solutions/de.q60.mps.virtualinterfaces.genplan/de.q60.mps.virtualinterfaces.genplan.msd
index 491808ff3..65bc78d55 100644
--- a/code/shadowmodels/solutions/de.q60.mps.virtualinterfaces.genplan/de.q60.mps.virtualinterfaces.genplan.msd
+++ b/code/shadowmodels/solutions/de.q60.mps.virtualinterfaces.genplan/de.q60.mps.virtualinterfaces.genplan.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet type="java" compile="mps" classes="mps" ext="no">
+    <facet type="java" compile="off" classes="mps" ext="no" languageLevel="JAVA_8">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>