diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
index 083f610bb6..059aee9987 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
@@ -2169,6 +2169,18 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6LgV" resolve="jetbrains.mps.make.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="77nuVWJbMwb" role="3bR37C">
+          <node concept="3bR9La" id="77nuVWJbMwc" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6Lg2" resolve="jetbrains.mps.smodel.resources" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="77nuVWJbMwd" role="3bR37C">
+          <node concept="3bR9La" id="77nuVWJbMwe" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7uZw0yZ43L$" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3929,6 +3941,12 @@
               <ref role="3bR37D" to="al5i:$bJ0jguQfr" resolve="com.mbeddr.core.base" />
             </node>
           </node>
+          <node concept="1SiIV0" id="77nuVWJbN3x" role="3bR37C">
+            <node concept="3bR9La" id="77nuVWJbN3y" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="90a9:31bAEZ0srt5" resolve="org.apache.commons" />
+            </node>
+          </node>
         </node>
         <node concept="1SiIV0" id="x1qBlxFjS" role="3bR37C">
           <node concept="3bR9La" id="x1qBlxFjT" role="1SiIV1">
@@ -3978,6 +3996,12 @@
             <ref role="3bR37D" node="WadEn6CWbr" resolve="com.mbeddr.core.buildconfig" />
           </node>
         </node>
+        <node concept="1SiIV0" id="77nuVWJbN3v" role="3bR37C">
+          <node concept="3bR9La" id="77nuVWJbN3w" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="90a9:31bAEZ0srt5" resolve="org.apache.commons" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7uZw0yZ43JW" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/models/com/mbeddr/core/runconfiguration/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/models/com/mbeddr/core/runconfiguration/pluginSolution/plugin.mps
index de9409e5b4..5147654932 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/models/com/mbeddr/core/runconfiguration/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/models/com/mbeddr/core/runconfiguration/pluginSolution/plugin.mps
@@ -74,6 +74,12 @@
     <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
     <import index="uu3z" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.execution.process(MPS.IDEA/)" />
     <import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
+    <import index="fn29" ref="r:6ba2667b-185e-45cd-ac65-e4b9d66da28e(jetbrains.mps.smodel.resources)" />
+    <import index="ap4t" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.generator(MPS.Core/)" />
+    <import index="3uhc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.generator.generationTypes(MPS.Core/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="mk8z" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.progress(MPS.Core/)" />
+    <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="exl8" ref="r:9058158e-0926-42f8-8d00-d1d86f1ff722(com.mbeddr.core.debug.behavior)" implicit="true" />
     <import index="lvdd" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.generator.cache(MPS.Core/)" implicit="true" />
     <import index="vog7" ref="r:eaa106c6-4c8f-4807-a686-9c6a09ced82c(com.mbeddr.core.make.behavior)" implicit="true" />
@@ -168,6 +174,9 @@
         <child id="1153952429843" name="finallyBody" index="2GVbov" />
         <child id="1164903700860" name="catchClause" index="TEXxN" />
       </concept>
+      <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
+        <reference id="2820489544401957798" name="classifier" index="HV5vE" />
+      </concept>
       <concept id="1224848483129" name="jetbrains.mps.baseLanguage.structure.IBLDeprecatable" flags="ng" index="IEa8$">
         <property id="1224848525476" name="isDeprecated" index="IEkAT" />
       </concept>
@@ -242,6 +251,8 @@
         <property id="1240249534625" name="isVolatile" index="34CwA1" />
       </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
+        <property id="1221565133444" name="isFinal" index="1EXbeo" />
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
@@ -326,6 +337,7 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1073063089578" name="jetbrains.mps.baseLanguage.structure.SuperMethodCall" flags="nn" index="3nyPlj" />
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
         <child id="1212687122400" name="typeParameter" index="1pMfVU" />
       </concept>
@@ -372,6 +384,9 @@
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
@@ -382,6 +397,10 @@
       <concept id="3693790620639876318" name="com.mbeddr.mpsutil.blutil.structure.BLDoc" flags="ng" index="2aEySx">
         <child id="3693790620639876319" name="text" index="2aEySw" />
       </concept>
+      <concept id="6451706574537082687" name="com.mbeddr.mpsutil.blutil.structure.ShortStaticMethodCall" flags="ng" index="NRdvd" />
+      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
+        <property id="6451706574539345425" name="text" index="NWlVz" />
+      </concept>
     </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
       <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
@@ -390,6 +409,7 @@
         <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
       </concept>
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
+      <concept id="8974276187400348183" name="jetbrains.mps.lang.access.structure.ExecuteWriteActionStatement" flags="nn" index="1QHqEM" />
       <concept id="8974276187400348179" name="jetbrains.mps.lang.access.structure.ExecuteEDTCommandStatement" flags="nn" index="1QHqEQ" />
     </language>
     <language id="aa6a62c5-a61c-4ec5-94a7-61bc8b137d79" name="com.mbeddr.mpsutil.runconfiguration">
@@ -604,9 +624,6 @@
       <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
         <reference id="1171315804605" name="concept" index="2RRcyH" />
       </concept>
-      <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
-        <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
-      </concept>
       <concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
         <child id="1145567471833" name="createdType" index="2T96Bj" />
       </concept>
@@ -693,19 +710,31 @@
         <child id="1197683466920" name="keyType" index="3rvQeY" />
         <child id="1197683475734" name="valueType" index="3rvSg0" />
       </concept>
-      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1197686869805" name="jetbrains.mps.baseLanguage.collections.structure.HashMapCreator" flags="nn" index="3rGOSV">
+        <child id="1197687026896" name="keyType" index="3rHrn6" />
+        <child id="1197687035757" name="valueType" index="3rHtpV" />
+        <child id="1206655950512" name="initializer" index="3Mj9YC" />
+      </concept>
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
       <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
       <concept id="1240824834947" name="jetbrains.mps.baseLanguage.collections.structure.ValueAccessOperation" flags="nn" index="3AV6Ez" />
+      <concept id="1240825616499" name="jetbrains.mps.baseLanguage.collections.structure.KeyAccessOperation" flags="nn" index="3AY5_j" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
         <child id="1197932525128" name="key" index="3ElVtu" />
       </concept>
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
       <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
+      <concept id="1206655653991" name="jetbrains.mps.baseLanguage.collections.structure.MapInitializer" flags="ng" index="3Mi1_Z">
+        <child id="1206655902276" name="entries" index="3MiYds" />
+      </concept>
+      <concept id="1206655735055" name="jetbrains.mps.baseLanguage.collections.structure.MapEntry" flags="ng" index="3Milgn">
+        <child id="1206655844556" name="key" index="3MiK7k" />
+        <child id="1206655853135" name="value" index="3MiMdn" />
+      </concept>
     </language>
   </registry>
   <node concept="3wDVqV" id="1ptFCtLqsnp">
@@ -10294,73 +10323,6 @@
                   </node>
                 </node>
               </node>
-              <node concept="3clFbJ" id="38aMGlgubSb" role="3cqZAp">
-                <node concept="3clFbS" id="38aMGlgubSd" role="3clFbx">
-                  <node concept="3clFbF" id="38aMGlgxBx5" role="3cqZAp">
-                    <node concept="37vLTI" id="38aMGlgxBDJ" role="3clFbG">
-                      <node concept="3clFbT" id="38aMGlgxBMn" role="37vLTx">
-                        <property role="3clFbU" value="false" />
-                      </node>
-                      <node concept="37vLTw" id="38aMGlgxBx3" role="37vLTJ">
-                        <ref role="3cqZAo" node="38aMGlgs$Ow" resolve="canDebug" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3cpWs8" id="38aMGlgsXo1" role="3cqZAp">
-                    <node concept="3cpWsn" id="38aMGlgsXo2" role="3cpWs9">
-                      <property role="TrG5h" value="msg" />
-                      <property role="3TUv4t" value="true" />
-                      <node concept="17QB3L" id="38aMGlgsXo3" role="1tU5fm" />
-                      <node concept="2OqwBi" id="38aMGlgvypP" role="33vP2m">
-                        <node concept="2OqwBi" id="38aMGlgvw5f" role="2Oq$k0">
-                          <node concept="2OqwBi" id="38aMGlgvvEs" role="2Oq$k0">
-                            <node concept="2OqwBi" id="38aMGlgvvEt" role="2Oq$k0">
-                              <node concept="37vLTw" id="38aMGlgvvEu" role="2Oq$k0">
-                                <ref role="3cqZAo" node="38aMGlgszXm" resolve="binary" />
-                              </node>
-                              <node concept="I4A8Y" id="38aMGlgvvEv" role="2OqNvi" />
-                            </node>
-                            <node concept="2SmgA7" id="38aMGlgvvEw" role="2OqNvi">
-                              <node concept="chp4Y" id="38aMGlgvvEx" role="1dBWTz">
-                                <ref role="cht4Q" to="2gv2:38aMGlgu7TQ" resolve="INoDebugSupport" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="1uHKPH" id="38aMGlgvxeC" role="2OqNvi" />
-                        </node>
-                        <node concept="2qgKlT" id="38aMGlgvyCt" role="2OqNvi">
-                          <ref role="37wK5l" to="exl8:38aMGlgvvq$" resolve="errorMessage" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbF" id="38aMGlgsXo5" role="3cqZAp">
-                    <node concept="2YIFZM" id="38aMGlgsXo6" role="3clFbG">
-                      <ref role="1Pybhc" node="2s7Bv57QFWd" resolve="ErrorReporter" />
-                      <ref role="37wK5l" node="2s7Bv57QFWj" resolve="showErrorDialog" />
-                      <node concept="37vLTw" id="38aMGlgsXo7" role="37wK5m">
-                        <ref role="3cqZAo" node="38aMGlgsXo2" resolve="msg" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="38aMGlgu8od" role="3clFbw">
-                  <node concept="2OqwBi" id="38aMGlgu7e5" role="2Oq$k0">
-                    <node concept="2OqwBi" id="38aMGlgu6pi" role="2Oq$k0">
-                      <node concept="37vLTw" id="38aMGlgu6e6" role="2Oq$k0">
-                        <ref role="3cqZAo" node="38aMGlgszXm" resolve="binary" />
-                      </node>
-                      <node concept="I4A8Y" id="38aMGlgub2Y" role="2OqNvi" />
-                    </node>
-                    <node concept="2SmgA7" id="38aMGlgubmy" role="2OqNvi">
-                      <node concept="chp4Y" id="38aMGlgubuT" role="1dBWTz">
-                        <ref role="cht4Q" to="2gv2:38aMGlgu7TQ" resolve="INoDebugSupport" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3GX2aA" id="38aMGlguaAS" role="2OqNvi" />
-                </node>
-              </node>
             </node>
           </node>
         </node>
@@ -10440,137 +10402,119 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="7nsdmC8vnpi" role="3cqZAp">
-          <node concept="3clFbS" id="7nsdmC8vnpj" role="3clFbx">
-            <node concept="3cpWs8" id="7nsdmC8vzqw" role="3cqZAp">
-              <node concept="3cpWsn" id="7nsdmC8vzqx" role="3cpWs9">
-                <property role="TrG5h" value="future" />
-                <node concept="3uibUv" id="7nsdmC8vzqy" role="1tU5fm">
-                  <ref role="3uigEE" to="5zyv:~Future" resolve="Future" />
-                  <node concept="3uibUv" id="3gaTARFf3Z5" role="11_B2D">
-                    <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="7nsdmC8vzq$" role="33vP2m">
-                  <node concept="2YIFZM" id="3gaTARFf5VD" role="2Oq$k0">
-                    <ref role="1Pybhc" to="hfuk:7yGn3z4MRqM" resolve="IMakeService.INSTANCE" />
-                    <ref role="37wK5l" to="hfuk:7yGn3z4MRr2" resolve="get" />
-                  </node>
-                  <node concept="liA8E" id="7nsdmC8vzqA" role="2OqNvi">
-                    <ref role="37wK5l" to="hfuk:7yGn3z4N64K" resolve="make" />
-                    <node concept="37vLTw" id="3GM_nagTuLR" role="37wK5m">
-                      <ref role="3cqZAo" node="7nsdmC8vnp8" resolve="session" />
-                    </node>
-                    <node concept="2OqwBi" id="7nsdmC8vzqC" role="37wK5m">
-                      <node concept="2ShNRf" id="7nsdmC8vzqD" role="2Oq$k0">
-                        <node concept="1pGfFk" id="7nsdmC8vzqE" role="2ShVmc">
-                          <ref role="37wK5l" to="m0f7:~ModelsToResources.&lt;init&gt;(java.lang.Iterable)" resolve="ModelsToResources" />
-                          <node concept="37vLTw" id="7Mz_zRJxRqI" role="37wK5m">
-                            <ref role="3cqZAo" node="7Mz_zRJxtbc" resolve="models" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="7nsdmC8vzqI" role="2OqNvi">
-                        <ref role="37wK5l" to="m0f7:~ModelsToResources.resources(boolean):java.lang.Iterable" resolve="resources" />
-                        <node concept="3clFbT" id="7nsdmC8vzqJ" role="37wK5m">
-                          <property role="3clFbU" value="false" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
+        <node concept="3cpWs8" id="7nsdmC8vzqw" role="3cqZAp">
+          <node concept="3cpWsn" id="7nsdmC8vzqx" role="3cpWs9">
+            <property role="TrG5h" value="future" />
+            <node concept="3uibUv" id="7nsdmC8vzqy" role="1tU5fm">
+              <ref role="3uigEE" to="5zyv:~Future" resolve="Future" />
+              <node concept="3uibUv" id="3gaTARFf3Z5" role="11_B2D">
+                <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
               </node>
             </node>
-            <node concept="3cpWs8" id="506QX5GcrGG" role="3cqZAp">
-              <node concept="3cpWsn" id="506QX5GcrGH" role="3cpWs9">
-                <property role="TrG5h" value="result" />
-                <node concept="3uibUv" id="3gaTARFf4wI" role="1tU5fm">
-                  <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
-                </node>
-                <node concept="10Nm6u" id="506QX5GcrH6" role="33vP2m" />
+            <node concept="2YIFZM" id="77nuVWJ57DA" role="33vP2m">
+              <ref role="37wK5l" node="77nuVWJ45kW" resolve="makeProject" />
+              <ref role="1Pybhc" node="6SYIklyM6Mg" resolve="MakeUtils" />
+              <node concept="37vLTw" id="77nuVWJ57DB" role="37wK5m">
+                <ref role="3cqZAo" node="7JDtVAB8xQS" resolve="mpsProject" />
               </node>
-            </node>
-            <node concept="SfApY" id="506QX5GcrGf" role="3cqZAp">
-              <node concept="3clFbS" id="506QX5GcrGg" role="SfCbr">
-                <node concept="3clFbF" id="506QX5GcrGO" role="3cqZAp">
-                  <node concept="37vLTI" id="506QX5GcrGP" role="3clFbG">
-                    <node concept="2OqwBi" id="506QX5GcrGJ" role="37vLTx">
-                      <node concept="37vLTw" id="3GM_nagTz15" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7nsdmC8vzqx" resolve="future" />
+              <node concept="37vLTw" id="77nuVWJ57DC" role="37wK5m">
+                <ref role="3cqZAo" node="1OjiRUTLVUD" resolve="mainModel" />
+              </node>
+              <node concept="3clFbT" id="77nuVWJ57DD" role="37wK5m">
+                <property role="3clFbU" value="true" />
+              </node>
+              <node concept="2ShNRf" id="77nuVWJ57DE" role="37wK5m">
+                <node concept="3rGOSV" id="77nuVWJ57DF" role="2ShVmc">
+                  <node concept="17QB3L" id="77nuVWJ57DG" role="3rHrn6" />
+                  <node concept="3uibUv" id="77nuVWJ57DH" role="3rHtpV">
+                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                  </node>
+                  <node concept="3Mi1_Z" id="77nuVWJ57DI" role="3Mj9YC">
+                    <node concept="3Milgn" id="77nuVWJ57DJ" role="3MiYds">
+                      <node concept="3clFbT" id="77nuVWJ57DK" role="3MiMdn">
+                        <property role="3clFbU" value="true" />
                       </node>
-                      <node concept="liA8E" id="506QX5GcrGL" role="2OqNvi">
-                        <ref role="37wK5l" to="5zyv:~Future.get():java.lang.Object" resolve="get" />
+                      <node concept="Xl_RD" id="77nuVWJ57DL" role="3MiK7k">
+                        <property role="Xl_RC" value="force_no_isolation" />
                       </node>
                     </node>
-                    <node concept="37vLTw" id="3GM_nagTrmQ" role="37vLTJ">
-                      <ref role="3cqZAo" node="506QX5GcrGH" resolve="result" />
-                    </node>
                   </node>
                 </node>
               </node>
-              <node concept="TDmWw" id="506QX5GcrGi" role="TEbGg">
-                <node concept="3cpWsn" id="506QX5GcrGj" role="TDEfY">
-                  <property role="TrG5h" value="ignore" />
-                  <node concept="3uibUv" id="506QX5GcrGt" role="1tU5fm">
-                    <ref role="3uigEE" to="5zyv:~CancellationException" resolve="CancellationException" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="506QX5GcrGG" role="3cqZAp">
+          <node concept="3cpWsn" id="506QX5GcrGH" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="3uibUv" id="3gaTARFf4wI" role="1tU5fm">
+              <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
+            </node>
+            <node concept="10Nm6u" id="506QX5GcrH6" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="SfApY" id="506QX5GcrGf" role="3cqZAp">
+          <node concept="3clFbS" id="506QX5GcrGg" role="SfCbr">
+            <node concept="3clFbF" id="506QX5GcrGO" role="3cqZAp">
+              <node concept="37vLTI" id="506QX5GcrGP" role="3clFbG">
+                <node concept="2OqwBi" id="506QX5GcrGJ" role="37vLTx">
+                  <node concept="37vLTw" id="3GM_nagTz15" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7nsdmC8vzqx" resolve="future" />
                   </node>
-                </node>
-                <node concept="3clFbS" id="506QX5GcrGl" role="TDEfX" />
-              </node>
-              <node concept="TDmWw" id="506QX5GcrGu" role="TEbGg">
-                <node concept="3cpWsn" id="506QX5GcrGv" role="TDEfY">
-                  <property role="TrG5h" value="ignore" />
-                  <node concept="3uibUv" id="506QX5GcrGy" role="1tU5fm">
-                    <ref role="3uigEE" to="wyt6:~InterruptedException" resolve="InterruptedException" />
+                  <node concept="liA8E" id="506QX5GcrGL" role="2OqNvi">
+                    <ref role="37wK5l" to="5zyv:~Future.get():java.lang.Object" resolve="get" />
                   </node>
                 </node>
-                <node concept="3clFbS" id="506QX5GcrGx" role="TDEfX" />
-              </node>
-              <node concept="TDmWw" id="506QX5GcrGz" role="TEbGg">
-                <node concept="3cpWsn" id="506QX5GcrG$" role="TDEfY">
-                  <property role="TrG5h" value="ignore" />
-                  <node concept="3uibUv" id="506QX5GcrGB" role="1tU5fm">
-                    <ref role="3uigEE" to="5zyv:~ExecutionException" resolve="ExecutionException" />
-                  </node>
+                <node concept="37vLTw" id="3GM_nagTrmQ" role="37vLTJ">
+                  <ref role="3cqZAo" node="506QX5GcrGH" resolve="result" />
                 </node>
-                <node concept="3clFbS" id="506QX5GcrGA" role="TDEfX" />
               </node>
             </node>
-            <node concept="3cpWs6" id="506QX5GcrGM" role="3cqZAp">
-              <node concept="1Wc70l" id="506QX5GcrGW" role="3cqZAk">
-                <node concept="2OqwBi" id="506QX5GcrH0" role="3uHU7w">
-                  <node concept="37vLTw" id="3GM_nagTyDB" role="2Oq$k0">
-                    <ref role="3cqZAo" node="506QX5GcrGH" resolve="result" />
-                  </node>
-                  <node concept="liA8E" id="506QX5GcrH4" role="2OqNvi">
-                    <ref role="37wK5l" to="i9so:17I1R__cQ6v" resolve="isSucessful" />
-                  </node>
-                </node>
-                <node concept="3y3z36" id="506QX5GcrGS" role="3uHU7B">
-                  <node concept="37vLTw" id="3GM_nagT$yA" role="3uHU7B">
-                    <ref role="3cqZAo" node="506QX5GcrGH" resolve="result" />
-                  </node>
-                  <node concept="10Nm6u" id="506QX5GcrGV" role="3uHU7w" />
-                </node>
+          </node>
+          <node concept="TDmWw" id="506QX5GcrGi" role="TEbGg">
+            <node concept="3cpWsn" id="506QX5GcrGj" role="TDEfY">
+              <property role="TrG5h" value="ignore" />
+              <node concept="3uibUv" id="506QX5GcrGt" role="1tU5fm">
+                <ref role="3uigEE" to="5zyv:~CancellationException" resolve="CancellationException" />
               </node>
             </node>
+            <node concept="3clFbS" id="506QX5GcrGl" role="TDEfX" />
           </node>
-          <node concept="2OqwBi" id="7nsdmC8vnpr" role="3clFbw">
-            <node concept="2YIFZM" id="3gaTARFfado" role="2Oq$k0">
-              <ref role="37wK5l" to="hfuk:7yGn3z4MRr2" resolve="get" />
-              <ref role="1Pybhc" to="hfuk:7yGn3z4MRqM" resolve="IMakeService.INSTANCE" />
+          <node concept="TDmWw" id="506QX5GcrGu" role="TEbGg">
+            <node concept="3cpWsn" id="506QX5GcrGv" role="TDEfY">
+              <property role="TrG5h" value="ignore" />
+              <node concept="3uibUv" id="506QX5GcrGy" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~InterruptedException" resolve="InterruptedException" />
+              </node>
             </node>
-            <node concept="liA8E" id="7nsdmC8vnpv" role="2OqNvi">
-              <ref role="37wK5l" to="hfuk:7yGn3z4N63W" resolve="openNewSession" />
-              <node concept="37vLTw" id="3GM_nagTvPg" role="37wK5m">
-                <ref role="3cqZAo" node="7nsdmC8vnp8" resolve="session" />
+            <node concept="3clFbS" id="506QX5GcrGx" role="TDEfX" />
+          </node>
+          <node concept="TDmWw" id="506QX5GcrGz" role="TEbGg">
+            <node concept="3cpWsn" id="506QX5GcrG$" role="TDEfY">
+              <property role="TrG5h" value="ignore" />
+              <node concept="3uibUv" id="506QX5GcrGB" role="1tU5fm">
+                <ref role="3uigEE" to="5zyv:~ExecutionException" resolve="ExecutionException" />
               </node>
             </node>
+            <node concept="3clFbS" id="506QX5GcrGA" role="TDEfX" />
           </node>
         </node>
-        <node concept="3cpWs6" id="7nsdmC8vzqM" role="3cqZAp">
-          <node concept="3clFbT" id="7nsdmC8vzqO" role="3cqZAk">
-            <property role="3clFbU" value="true" />
+        <node concept="3cpWs6" id="506QX5GcrGM" role="3cqZAp">
+          <node concept="1Wc70l" id="506QX5GcrGW" role="3cqZAk">
+            <node concept="2OqwBi" id="506QX5GcrH0" role="3uHU7w">
+              <node concept="37vLTw" id="3GM_nagTyDB" role="2Oq$k0">
+                <ref role="3cqZAo" node="506QX5GcrGH" resolve="result" />
+              </node>
+              <node concept="liA8E" id="506QX5GcrH4" role="2OqNvi">
+                <ref role="37wK5l" to="i9so:17I1R__cQ6v" resolve="isSucessful" />
+              </node>
+            </node>
+            <node concept="3y3z36" id="506QX5GcrGS" role="3uHU7B">
+              <node concept="37vLTw" id="3GM_nagT$yA" role="3uHU7B">
+                <ref role="3cqZAo" node="506QX5GcrGH" resolve="result" />
+              </node>
+              <node concept="10Nm6u" id="506QX5GcrGV" role="3uHU7w" />
+            </node>
           </node>
         </node>
       </node>
@@ -12211,5 +12155,1587 @@
     <node concept="2tJIrI" id="62Nyq0g79ty" role="jymVt" />
     <node concept="3Tm1VV" id="4a0ow32tChs" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="6SYIklyM6Mg">
+    <property role="TrG5h" value="MakeUtils" />
+    <property role="3GE5qa" value="make" />
+    <node concept="2tJIrI" id="7F8$WoVHejd" role="jymVt" />
+    <node concept="Wx3nA" id="15d7XIo_3VJ" role="jymVt">
+      <property role="2dlcS1" value="false" />
+      <property role="2dld4O" value="false" />
+      <property role="TrG5h" value="MAKE_PROCESS_ACTIVE" />
+      <property role="3TUv4t" value="false" />
+      <node concept="10P_77" id="15d7XIo_3VL" role="1tU5fm" />
+      <node concept="3clFbT" id="15d7XIo_3VM" role="33vP2m">
+        <property role="3clFbU" value="false" />
+      </node>
+      <node concept="NWlO9" id="15d7XIo_3VN" role="lGtFl">
+        <property role="NWlVz" value="Is the make process active?" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="15d7XIo_3k$" role="jymVt" />
+    <node concept="Wx3nA" id="7Z4mKjkuL6D" role="jymVt">
+      <property role="2dlcS1" value="false" />
+      <property role="2dld4O" value="false" />
+      <property role="TrG5h" value="DEBUG" />
+      <property role="3TUv4t" value="false" />
+      <node concept="3Tm6S6" id="7Z4mKjkuKfs" role="1B3o_S" />
+      <node concept="10P_77" id="7Z4mKjkuL6_" role="1tU5fm" />
+      <node concept="3clFbT" id="7Z4mKjkuMh3" role="33vP2m">
+        <property role="3clFbU" value="false" />
+      </node>
+      <node concept="NWlO9" id="505H3_WOIav" role="lGtFl">
+        <property role="NWlVz" value="Should we debug?" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="47xghtTLgLK" role="jymVt" />
+    <node concept="2YIFZL" id="5dSPU6qaBCP" role="jymVt">
+      <property role="TrG5h" value="makeProject" />
+      <node concept="3uibUv" id="5dSPU6qaBCQ" role="3clF45">
+        <ref role="3uigEE" to="5zyv:~Future" resolve="Future" />
+        <node concept="3uibUv" id="6nns7dDd3a5" role="11_B2D">
+          <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="5dSPU6qaBCR" role="1B3o_S" />
+      <node concept="3clFbS" id="5dSPU6qaBCS" role="3clF47">
+        <node concept="1QHqEM" id="6DZK4Biu$5c" role="3cqZAp">
+          <node concept="1QHqEC" id="6DZK4Biu$5e" role="1QHqEI">
+            <node concept="3clFbS" id="6DZK4Biu$5g" role="1bW5cS">
+              <node concept="3clFbF" id="5dSPU6qaBD4" role="3cqZAp">
+                <node concept="2OqwBi" id="5dSPU6qaBD5" role="3clFbG">
+                  <node concept="2YIFZM" id="5dSPU6qaBD6" role="2Oq$k0">
+                    <ref role="37wK5l" to="w1kc:~SModelRepository.getInstance():jetbrains.mps.smodel.SModelRepository" resolve="getInstance" />
+                    <ref role="1Pybhc" to="w1kc:~SModelRepository" resolve="SModelRepository" />
+                  </node>
+                  <node concept="liA8E" id="5dSPU6qaBD7" role="2OqNvi">
+                    <ref role="37wK5l" to="w1kc:~SModelRepository.saveAll():void" resolve="saveAll" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="5dSPU6qaBDZ" role="3cqZAp">
+          <node concept="1rXfSq" id="4FpLBMtUL7c" role="3cqZAk">
+            <ref role="37wK5l" node="4FpLBMtUK3m" resolve="makeProject" />
+            <node concept="37vLTw" id="7uk5GW4M6zf" role="37wK5m">
+              <ref role="3cqZAo" node="7uk5GW4LVT0" resolve="proj" />
+            </node>
+            <node concept="37vLTw" id="4FpLBMtULaj" role="37wK5m">
+              <ref role="3cqZAo" node="5dSPU6qaBE3" resolve="model" />
+            </node>
+            <node concept="3clFbT" id="4FpLBMtULdY" role="37wK5m">
+              <property role="3clFbU" value="true" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7uk5GW4LVT0" role="3clF46">
+        <property role="TrG5h" value="proj" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="7uk5GW4LVT1" role="1tU5fm">
+          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5dSPU6qaBE3" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="3uibUv" id="5dSPU6qaBE4" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+        </node>
+      </node>
+      <node concept="NWlO9" id="41thbhvrpPG" role="lGtFl">
+        <property role="NWlVz" value="Returns a future that makes the project." />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2AZbPfOSPxe" role="jymVt" />
+    <node concept="2YIFZL" id="4FpLBMtUK3m" role="jymVt">
+      <property role="TrG5h" value="makeProject" />
+      <node concept="3uibUv" id="4FpLBMtUK3n" role="3clF45">
+        <ref role="3uigEE" to="5zyv:~Future" resolve="Future" />
+        <node concept="3uibUv" id="6nns7dDd3iJ" role="11_B2D">
+          <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4FpLBMtUK3o" role="1B3o_S" />
+      <node concept="3clFbS" id="4FpLBMtUK3p" role="3clF47">
+        <node concept="1QHqEM" id="4FpLBMtUK3q" role="3cqZAp">
+          <node concept="1QHqEC" id="4FpLBMtUK3r" role="1QHqEI">
+            <node concept="3clFbS" id="4FpLBMtUK3s" role="1bW5cS">
+              <node concept="3clFbF" id="4FpLBMtUK3t" role="3cqZAp">
+                <node concept="2OqwBi" id="4FpLBMtUK3u" role="3clFbG">
+                  <node concept="2YIFZM" id="4FpLBMtUK3v" role="2Oq$k0">
+                    <ref role="1Pybhc" to="w1kc:~SModelRepository" resolve="SModelRepository" />
+                    <ref role="37wK5l" to="w1kc:~SModelRepository.getInstance():jetbrains.mps.smodel.SModelRepository" resolve="getInstance" />
+                  </node>
+                  <node concept="liA8E" id="4FpLBMtUK3w" role="2OqNvi">
+                    <ref role="37wK5l" to="w1kc:~SModelRepository.saveAll():void" resolve="saveAll" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="4FpLBMtUK3x" role="3cqZAp">
+          <node concept="2ShNRf" id="4FpLBMtUK3y" role="3cqZAk">
+            <node concept="1pGfFk" id="4FpLBMtUK3z" role="2ShVmc">
+              <ref role="37wK5l" node="7LK0SI3UtR" resolve="MakeUtils.MakeFuture" />
+              <node concept="37vLTw" id="7uk5GW4M6Gp" role="37wK5m">
+                <ref role="3cqZAo" node="7uk5GW4LVxx" resolve="proj" />
+              </node>
+              <node concept="37vLTw" id="4FpLBMtUK3$" role="37wK5m">
+                <ref role="3cqZAo" node="4FpLBMtUK3B" resolve="model" />
+              </node>
+              <node concept="37vLTw" id="4FpLBMtUOWB" role="37wK5m">
+                <ref role="3cqZAo" node="4FpLBMtUKXN" resolve="shouldRebuild" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7uk5GW4LVxx" role="3clF46">
+        <property role="TrG5h" value="proj" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="7uk5GW4LVxy" role="1tU5fm">
+          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4FpLBMtUK3B" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="3uibUv" id="4FpLBMtUK3C" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4FpLBMtUKXN" role="3clF46">
+        <property role="TrG5h" value="shouldRebuild" />
+        <node concept="10P_77" id="4FpLBMtUL0s" role="1tU5fm" />
+      </node>
+      <node concept="NWlO9" id="4FpLBMtUK3D" role="lGtFl">
+        <property role="NWlVz" value="Returns a future that makes the project. If we run from tests then we should not rebuild." />
+      </node>
+    </node>
+    <node concept="2YIFZL" id="77nuVWJ45kW" role="jymVt">
+      <property role="TrG5h" value="makeProject" />
+      <node concept="3uibUv" id="77nuVWJ45kX" role="3clF45">
+        <ref role="3uigEE" to="5zyv:~Future" resolve="Future" />
+        <node concept="3uibUv" id="77nuVWJ45kY" role="11_B2D">
+          <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="77nuVWJ45kZ" role="1B3o_S" />
+      <node concept="3clFbS" id="77nuVWJ45l0" role="3clF47">
+        <node concept="1QHqEM" id="77nuVWJ45l1" role="3cqZAp">
+          <node concept="1QHqEC" id="77nuVWJ45l2" role="1QHqEI">
+            <node concept="3clFbS" id="77nuVWJ45l3" role="1bW5cS">
+              <node concept="3clFbF" id="77nuVWJ45l4" role="3cqZAp">
+                <node concept="2OqwBi" id="77nuVWJ45l5" role="3clFbG">
+                  <node concept="2YIFZM" id="77nuVWJ45l6" role="2Oq$k0">
+                    <ref role="1Pybhc" to="w1kc:~SModelRepository" resolve="SModelRepository" />
+                    <ref role="37wK5l" to="w1kc:~SModelRepository.getInstance():jetbrains.mps.smodel.SModelRepository" resolve="getInstance" />
+                  </node>
+                  <node concept="liA8E" id="77nuVWJ45l7" role="2OqNvi">
+                    <ref role="37wK5l" to="w1kc:~SModelRepository.saveAll():void" resolve="saveAll" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="77nuVWJ45l8" role="3cqZAp">
+          <node concept="2ShNRf" id="77nuVWJ45l9" role="3cqZAk">
+            <node concept="1pGfFk" id="77nuVWJ45la" role="2ShVmc">
+              <ref role="37wK5l" node="77nuVWJ49WL" resolve="MakeUtils.MakeFuture" />
+              <node concept="37vLTw" id="77nuVWJ45lb" role="37wK5m">
+                <ref role="3cqZAo" node="77nuVWJ45le" resolve="proj" />
+              </node>
+              <node concept="37vLTw" id="77nuVWJ45lc" role="37wK5m">
+                <ref role="3cqZAo" node="77nuVWJ45lg" resolve="model" />
+              </node>
+              <node concept="37vLTw" id="77nuVWJ45ld" role="37wK5m">
+                <ref role="3cqZAo" node="77nuVWJ45li" resolve="shouldRebuild" />
+              </node>
+              <node concept="37vLTw" id="77nuVWJ49UV" role="37wK5m">
+                <ref role="3cqZAo" node="77nuVWJ45Tx" resolve="parameters" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="77nuVWJ45le" role="3clF46">
+        <property role="TrG5h" value="proj" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="77nuVWJ45lf" role="1tU5fm">
+          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="77nuVWJ45lg" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="3uibUv" id="77nuVWJ45lh" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="77nuVWJ45li" role="3clF46">
+        <property role="TrG5h" value="shouldRebuild" />
+        <node concept="10P_77" id="77nuVWJ45lj" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="77nuVWJ45Tx" role="3clF46">
+        <property role="TrG5h" value="parameters" />
+        <node concept="3rvAFt" id="77nuVWJ49fp" role="1tU5fm">
+          <node concept="3uibUv" id="77nuVWJ49ze" role="3rvSg0">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+          <node concept="17QB3L" id="77nuVWJ49n1" role="3rvQeY" />
+        </node>
+      </node>
+      <node concept="NWlO9" id="77nuVWJ45lk" role="lGtFl">
+        <property role="NWlVz" value="Returns a future that makes the project. If we run from tests then we should not rebuild." />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4FpLBMtUJiQ" role="jymVt" />
+    <node concept="2YIFZL" id="4Uw4Kib5evV" role="jymVt">
+      <property role="TrG5h" value="makeLastGeneratedModelsAvailable" />
+      <node concept="3uibUv" id="4Uw4Kib5evW" role="3clF45">
+        <ref role="3uigEE" to="5zyv:~Future" resolve="Future" />
+        <node concept="3uibUv" id="4Uw4Kib5evX" role="11_B2D">
+          <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4Uw4Kib5evY" role="1B3o_S" />
+      <node concept="3clFbS" id="4Uw4Kib5evZ" role="3clF47">
+        <node concept="1QHqEM" id="4Uw4Kib5ew0" role="3cqZAp">
+          <node concept="1QHqEC" id="4Uw4Kib5ew1" role="1QHqEI">
+            <node concept="3clFbS" id="4Uw4Kib5ew2" role="1bW5cS">
+              <node concept="3clFbF" id="4Uw4Kib5ew3" role="3cqZAp">
+                <node concept="2OqwBi" id="4Uw4Kib5ew4" role="3clFbG">
+                  <node concept="2YIFZM" id="4Uw4Kib5ew5" role="2Oq$k0">
+                    <ref role="1Pybhc" to="w1kc:~SModelRepository" resolve="SModelRepository" />
+                    <ref role="37wK5l" to="w1kc:~SModelRepository.getInstance():jetbrains.mps.smodel.SModelRepository" resolve="getInstance" />
+                  </node>
+                  <node concept="liA8E" id="4Uw4Kib5ew6" role="2OqNvi">
+                    <ref role="37wK5l" to="w1kc:~SModelRepository.saveAll():void" resolve="saveAll" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4Uw4Kib5kHs" role="3cqZAp" />
+        <node concept="3SKdUt" id="4Uw4Kib5kMS" role="3cqZAp">
+          <node concept="3SKdUq" id="4Uw4Kib5kQv" role="3SKWNk">
+            <property role="3SKdUp" value="Returns a future that makes available the last generated models without any make/rebuild." />
+          </node>
+        </node>
+        <node concept="3cpWs6" id="4Uw4Kib5ew7" role="3cqZAp">
+          <node concept="2ShNRf" id="4Uw4Kib5ew8" role="3cqZAk">
+            <node concept="1pGfFk" id="4Uw4Kib5ew9" role="2ShVmc">
+              <ref role="37wK5l" node="4Uw4Kib5ipC" resolve="MakeUtils.MakeFuture" />
+              <node concept="37vLTw" id="7uk5GW4M8b9" role="37wK5m">
+                <ref role="3cqZAo" node="7uk5GW4LVI6" resolve="proj" />
+              </node>
+              <node concept="37vLTw" id="4Uw4Kib5ewa" role="37wK5m">
+                <ref role="3cqZAo" node="4Uw4Kib5ewe" resolve="model" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7uk5GW4LVI6" role="3clF46">
+        <property role="TrG5h" value="proj" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="7uk5GW4LVI7" role="1tU5fm">
+          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4Uw4Kib5ewe" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="3uibUv" id="4Uw4Kib5ewf" role="1tU5fm">
+          <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+        </node>
+      </node>
+      <node concept="NWlO9" id="4Uw4Kib5ewi" role="lGtFl">
+        <property role="NWlVz" value="This method is used from tests where from we we should not rebuild or make on the build server." />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4Uw4Kib5dr8" role="jymVt" />
+    <node concept="312cEu" id="7LK0SI3yP8" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="1sVAO0" value="false" />
+      <property role="1EXbeo" value="false" />
+      <property role="TrG5h" value="MakeFuture" />
+      <node concept="2tJIrI" id="7kEiJU7Cciy" role="jymVt" />
+      <node concept="312cEg" id="4FpLBMtUMdh" role="jymVt">
+        <property role="34CwA1" value="false" />
+        <property role="eg7rD" value="false" />
+        <property role="TrG5h" value="shouldRebuild" />
+        <property role="3TUv4t" value="false" />
+        <node concept="3Tm6S6" id="4FpLBMtUMdj" role="1B3o_S" />
+        <node concept="NWlO9" id="4FpLBMtUMdk" role="lGtFl">
+          <property role="NWlVz" value="Flag if we should rebuild." />
+        </node>
+        <node concept="10P_77" id="4FpLBMtUMQz" role="1tU5fm" />
+      </node>
+      <node concept="2tJIrI" id="4FpLBMtULO$" role="jymVt" />
+      <node concept="312cEg" id="4Uw4Kib5aZf" role="jymVt">
+        <property role="34CwA1" value="false" />
+        <property role="eg7rD" value="false" />
+        <property role="TrG5h" value="onlyLastGeneratedModels" />
+        <property role="3TUv4t" value="false" />
+        <node concept="3Tm6S6" id="4Uw4Kib5aZg" role="1B3o_S" />
+        <node concept="NWlO9" id="4Uw4Kib5aZh" role="lGtFl">
+          <property role="NWlVz" value="Flag if we should only make available the last generated models without make/rebuild." />
+        </node>
+        <node concept="10P_77" id="4Uw4Kib5aZi" role="1tU5fm" />
+      </node>
+      <node concept="2tJIrI" id="4Uw4Kib5ab8" role="jymVt" />
+      <node concept="312cEg" id="7LK0SI3XjY" role="jymVt">
+        <property role="34CwA1" value="false" />
+        <property role="eg7rD" value="false" />
+        <property role="TrG5h" value="model" />
+        <property role="3TUv4t" value="false" />
+        <node concept="H_c77" id="7LK0SI4cgl" role="1tU5fm" />
+        <node concept="3Tm6S6" id="7kEiJU7CbGn" role="1B3o_S" />
+        <node concept="NWlO9" id="7kEiJU7CbZ$" role="lGtFl">
+          <property role="NWlVz" value="The model to make." />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7uk5GW4LX0X" role="jymVt" />
+      <node concept="312cEg" id="7uk5GW4LZcY" role="jymVt">
+        <property role="34CwA1" value="false" />
+        <property role="eg7rD" value="false" />
+        <property role="TrG5h" value="proj" />
+        <property role="3TUv4t" value="false" />
+        <node concept="3Tm6S6" id="7uk5GW4LZd0" role="1B3o_S" />
+        <node concept="NWlO9" id="7uk5GW4LZd1" role="lGtFl">
+          <property role="NWlVz" value="The current project." />
+        </node>
+        <node concept="3uibUv" id="7uk5GW4M0oS" role="1tU5fm">
+          <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+        </node>
+      </node>
+      <node concept="312cEg" id="77nuVWJ4dv0" role="jymVt">
+        <property role="34CwA1" value="false" />
+        <property role="eg7rD" value="false" />
+        <property role="TrG5h" value="parameters" />
+        <property role="3TUv4t" value="false" />
+        <node concept="3Tm6S6" id="77nuVWJ4c1a" role="1B3o_S" />
+        <node concept="3rvAFt" id="77nuVWJ4cOB" role="1tU5fm">
+          <node concept="3uibUv" id="77nuVWJ4do4" role="3rvSg0">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+          <node concept="17QB3L" id="77nuVWJ4d7Q" role="3rvQeY" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7uk5GW4LY6h" role="jymVt" />
+      <node concept="3clFbW" id="7LK0SI3UtR" role="jymVt">
+        <node concept="3cqZAl" id="7LK0SI3UtS" role="3clF45" />
+        <node concept="3clFbS" id="7LK0SI3UtU" role="3clF47">
+          <node concept="3clFbF" id="7uk5GW4M1Z5" role="3cqZAp">
+            <node concept="37vLTI" id="7uk5GW4M4fR" role="3clFbG">
+              <node concept="37vLTw" id="7uk5GW4M4nX" role="37vLTx">
+                <ref role="3cqZAo" node="7uk5GW4LW31" resolve="proj" />
+              </node>
+              <node concept="2OqwBi" id="7uk5GW4M3Cs" role="37vLTJ">
+                <node concept="Xjq3P" id="7uk5GW4M1Z3" role="2Oq$k0" />
+                <node concept="2OwXpG" id="7uk5GW4M3UO" role="2OqNvi">
+                  <ref role="2Oxat5" node="7uk5GW4LZcY" resolve="proj" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7LK0SI40Fc" role="3cqZAp">
+            <node concept="37vLTI" id="7LK0SI42b7" role="3clFbG">
+              <node concept="37vLTw" id="7LK0SI42bQ" role="37vLTx">
+                <ref role="3cqZAo" node="7LK0SI40Bm" resolve="model" />
+              </node>
+              <node concept="2OqwBi" id="7LK0SI40Gj" role="37vLTJ">
+                <node concept="Xjq3P" id="7LK0SI40Fb" role="2Oq$k0" />
+                <node concept="2OwXpG" id="7LK0SI40ZT" role="2OqNvi">
+                  <ref role="2Oxat5" node="7LK0SI3XjY" resolve="model" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4FpLBMtUNky" role="3cqZAp">
+            <node concept="37vLTI" id="4FpLBMtUObt" role="3clFbG">
+              <node concept="37vLTw" id="4FpLBMtUOh$" role="37vLTx">
+                <ref role="3cqZAo" node="4FpLBMtUMZj" resolve="shouldRebuild" />
+              </node>
+              <node concept="2OqwBi" id="4FpLBMtUNpv" role="37vLTJ">
+                <node concept="Xjq3P" id="4FpLBMtUNkw" role="2Oq$k0" />
+                <node concept="2OwXpG" id="4FpLBMtUNSb" role="2OqNvi">
+                  <ref role="2Oxat5" node="4FpLBMtUMdh" resolve="shouldRebuild" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4Uw4Kib5cAc" role="3cqZAp">
+            <node concept="37vLTI" id="4Uw4Kib5deR" role="3clFbG">
+              <node concept="3clFbT" id="4Uw4Kib5jIi" role="37vLTx">
+                <property role="3clFbU" value="false" />
+              </node>
+              <node concept="2OqwBi" id="4Uw4Kib5cC_" role="37vLTJ">
+                <node concept="Xjq3P" id="4Uw4Kib5cAa" role="2Oq$k0" />
+                <node concept="2OwXpG" id="4Uw4Kib5cPX" role="2OqNvi">
+                  <ref role="2Oxat5" node="4Uw4Kib5aZf" resolve="onlyLastGeneratedModels" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="7LK0SI3Tkj" role="1B3o_S" />
+        <node concept="37vLTG" id="7uk5GW4LW31" role="3clF46">
+          <property role="TrG5h" value="proj" />
+          <node concept="3uibUv" id="7uk5GW4LWmZ" role="1tU5fm">
+            <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="7LK0SI40Bm" role="3clF46">
+          <property role="TrG5h" value="model" />
+          <node concept="H_c77" id="7LK0SI4drg" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="4FpLBMtUMZj" role="3clF46">
+          <property role="TrG5h" value="shouldRebuild" />
+          <node concept="10P_77" id="4FpLBMtUN3X" role="1tU5fm" />
+        </node>
+        <node concept="NWlO9" id="7kEiJU7CcQp" role="lGtFl">
+          <property role="NWlVz" value="Constructor." />
+        </node>
+      </node>
+      <node concept="3clFbW" id="77nuVWJ49WL" role="jymVt">
+        <node concept="3cqZAl" id="77nuVWJ49WM" role="3clF45" />
+        <node concept="3clFbS" id="77nuVWJ49WN" role="3clF47">
+          <node concept="3clFbF" id="77nuVWJ49WO" role="3cqZAp">
+            <node concept="37vLTI" id="77nuVWJ49WP" role="3clFbG">
+              <node concept="37vLTw" id="77nuVWJ49WQ" role="37vLTx">
+                <ref role="3cqZAo" node="77nuVWJ49Xd" resolve="proj" />
+              </node>
+              <node concept="2OqwBi" id="77nuVWJ49WR" role="37vLTJ">
+                <node concept="Xjq3P" id="77nuVWJ49WS" role="2Oq$k0" />
+                <node concept="2OwXpG" id="77nuVWJ49WT" role="2OqNvi">
+                  <ref role="2Oxat5" node="7uk5GW4LZcY" resolve="proj" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="77nuVWJ49WU" role="3cqZAp">
+            <node concept="37vLTI" id="77nuVWJ49WV" role="3clFbG">
+              <node concept="37vLTw" id="77nuVWJ49WW" role="37vLTx">
+                <ref role="3cqZAo" node="77nuVWJ49Xf" resolve="model" />
+              </node>
+              <node concept="2OqwBi" id="77nuVWJ49WX" role="37vLTJ">
+                <node concept="Xjq3P" id="77nuVWJ49WY" role="2Oq$k0" />
+                <node concept="2OwXpG" id="77nuVWJ49WZ" role="2OqNvi">
+                  <ref role="2Oxat5" node="7LK0SI3XjY" resolve="model" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="77nuVWJ49X0" role="3cqZAp">
+            <node concept="37vLTI" id="77nuVWJ49X1" role="3clFbG">
+              <node concept="37vLTw" id="77nuVWJ49X2" role="37vLTx">
+                <ref role="3cqZAo" node="77nuVWJ49Xh" resolve="shouldRebuild" />
+              </node>
+              <node concept="2OqwBi" id="77nuVWJ49X3" role="37vLTJ">
+                <node concept="Xjq3P" id="77nuVWJ49X4" role="2Oq$k0" />
+                <node concept="2OwXpG" id="77nuVWJ49X5" role="2OqNvi">
+                  <ref role="2Oxat5" node="4FpLBMtUMdh" resolve="shouldRebuild" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="77nuVWJ49X6" role="3cqZAp">
+            <node concept="37vLTI" id="77nuVWJ49X7" role="3clFbG">
+              <node concept="3clFbT" id="77nuVWJ49X8" role="37vLTx">
+                <property role="3clFbU" value="false" />
+              </node>
+              <node concept="2OqwBi" id="77nuVWJ49X9" role="37vLTJ">
+                <node concept="Xjq3P" id="77nuVWJ49Xa" role="2Oq$k0" />
+                <node concept="2OwXpG" id="77nuVWJ49Xb" role="2OqNvi">
+                  <ref role="2Oxat5" node="4Uw4Kib5aZf" resolve="onlyLastGeneratedModels" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="77nuVWJ4ezS" role="3cqZAp">
+            <node concept="37vLTI" id="77nuVWJ4eTk" role="3clFbG">
+              <node concept="37vLTw" id="77nuVWJ4fqx" role="37vLTx">
+                <ref role="3cqZAo" node="77nuVWJ4awo" resolve="parameters" />
+              </node>
+              <node concept="2OqwBi" id="77nuVWJ4eAI" role="37vLTJ">
+                <node concept="Xjq3P" id="77nuVWJ4ezQ" role="2Oq$k0" />
+                <node concept="2OwXpG" id="77nuVWJ4eKG" role="2OqNvi">
+                  <ref role="2Oxat5" node="77nuVWJ4dv0" resolve="parameters" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="77nuVWJ49Xc" role="1B3o_S" />
+        <node concept="37vLTG" id="77nuVWJ49Xd" role="3clF46">
+          <property role="TrG5h" value="proj" />
+          <node concept="3uibUv" id="77nuVWJ49Xe" role="1tU5fm">
+            <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="77nuVWJ49Xf" role="3clF46">
+          <property role="TrG5h" value="model" />
+          <node concept="H_c77" id="77nuVWJ49Xg" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="77nuVWJ49Xh" role="3clF46">
+          <property role="TrG5h" value="shouldRebuild" />
+          <node concept="10P_77" id="77nuVWJ49Xi" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="77nuVWJ4awo" role="3clF46">
+          <property role="TrG5h" value="parameters" />
+          <node concept="3rvAFt" id="77nuVWJ4aLy" role="1tU5fm">
+            <node concept="3uibUv" id="77nuVWJ4bcK" role="3rvSg0">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+            <node concept="17QB3L" id="77nuVWJ4aZd" role="3rvQeY" />
+          </node>
+        </node>
+        <node concept="NWlO9" id="77nuVWJ49Xj" role="lGtFl">
+          <property role="NWlVz" value="Constructor." />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7kEiJU7Cdqo" role="jymVt" />
+      <node concept="3clFbW" id="4Uw4Kib5ipC" role="jymVt">
+        <node concept="3cqZAl" id="4Uw4Kib5ipD" role="3clF45" />
+        <node concept="3clFbS" id="4Uw4Kib5ipE" role="3clF47">
+          <node concept="3clFbF" id="7uk5GW4M7jt" role="3cqZAp">
+            <node concept="37vLTI" id="7uk5GW4M7Y1" role="3clFbG">
+              <node concept="37vLTw" id="7uk5GW4M7ZN" role="37vLTx">
+                <ref role="3cqZAo" node="7uk5GW4M6LD" resolve="proj" />
+              </node>
+              <node concept="2OqwBi" id="7uk5GW4M7lS" role="37vLTJ">
+                <node concept="Xjq3P" id="7uk5GW4M7jr" role="2Oq$k0" />
+                <node concept="2OwXpG" id="7uk5GW4M7Ji" role="2OqNvi">
+                  <ref role="2Oxat5" node="7uk5GW4LZcY" resolve="proj" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4Uw4Kib5ipF" role="3cqZAp">
+            <node concept="37vLTI" id="4Uw4Kib5ipG" role="3clFbG">
+              <node concept="37vLTw" id="4Uw4Kib5ipH" role="37vLTx">
+                <ref role="3cqZAo" node="4Uw4Kib5ipY" resolve="model" />
+              </node>
+              <node concept="2OqwBi" id="4Uw4Kib5ipI" role="37vLTJ">
+                <node concept="Xjq3P" id="4Uw4Kib5ipJ" role="2Oq$k0" />
+                <node concept="2OwXpG" id="4Uw4Kib5ipK" role="2OqNvi">
+                  <ref role="2Oxat5" node="7LK0SI3XjY" resolve="model" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="3RNYYaJy2ln" role="3cqZAp">
+            <node concept="37vLTI" id="3RNYYaJy3cy" role="3clFbG">
+              <node concept="3clFbT" id="3RNYYaJy3l$" role="37vLTx">
+                <property role="3clFbU" value="true" />
+              </node>
+              <node concept="2OqwBi" id="3RNYYaJy2oo" role="37vLTJ">
+                <node concept="Xjq3P" id="3RNYYaJy2ll" role="2Oq$k0" />
+                <node concept="2OwXpG" id="3RNYYaJy2M8" role="2OqNvi">
+                  <ref role="2Oxat5" node="4FpLBMtUMdh" resolve="shouldRebuild" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4Uw4Kib5ipR" role="3cqZAp">
+            <node concept="37vLTI" id="4Uw4Kib5ipS" role="3clFbG">
+              <node concept="3clFbT" id="4Uw4Kib5jST" role="37vLTx">
+                <property role="3clFbU" value="true" />
+              </node>
+              <node concept="2OqwBi" id="4Uw4Kib5ipU" role="37vLTJ">
+                <node concept="Xjq3P" id="4Uw4Kib5ipV" role="2Oq$k0" />
+                <node concept="2OwXpG" id="4Uw4Kib5ipW" role="2OqNvi">
+                  <ref role="2Oxat5" node="4Uw4Kib5aZf" resolve="onlyLastGeneratedModels" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="4Uw4Kib5ipX" role="1B3o_S" />
+        <node concept="37vLTG" id="7uk5GW4M6LD" role="3clF46">
+          <property role="TrG5h" value="proj" />
+          <node concept="3uibUv" id="7uk5GW4M6Yd" role="1tU5fm">
+            <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="4Uw4Kib5ipY" role="3clF46">
+          <property role="TrG5h" value="model" />
+          <node concept="H_c77" id="4Uw4Kib5ipZ" role="1tU5fm" />
+        </node>
+        <node concept="NWlO9" id="4Uw4Kib5iq4" role="lGtFl">
+          <property role="NWlVz" value="Constructor." />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4Uw4Kib5hDw" role="jymVt" />
+      <node concept="3Tm6S6" id="7iCG_8XctIx" role="1B3o_S" />
+      <node concept="3uibUv" id="7LK0SI3_45" role="EKbjA">
+        <ref role="3uigEE" to="5zyv:~Future" resolve="Future" />
+        <node concept="3uibUv" id="6nns7dDd3Ns" role="11_B2D">
+          <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="7LK0SI3Drc" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="cancel" />
+        <property role="DiZV1" value="false" />
+        <property role="IEkAT" value="false" />
+        <node concept="3Tm1VV" id="7LK0SI3Drd" role="1B3o_S" />
+        <node concept="10P_77" id="7LK0SI3Drf" role="3clF45" />
+        <node concept="37vLTG" id="7LK0SI3Drg" role="3clF46">
+          <property role="TrG5h" value="b" />
+          <node concept="10P_77" id="7LK0SI3Drh" role="1tU5fm" />
+        </node>
+        <node concept="3clFbS" id="7LK0SI3Dri" role="3clF47">
+          <node concept="3clFbF" id="7LK0SI3Drk" role="3cqZAp">
+            <node concept="3clFbT" id="7LK0SI3Drj" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="NWlO9" id="7kEiJU7CcWu" role="lGtFl">
+          <property role="NWlVz" value="{@inheritDoc}" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7kEiJU7CdYl" role="jymVt" />
+      <node concept="3clFb_" id="7LK0SI3Drl" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="isCancelled" />
+        <property role="DiZV1" value="false" />
+        <property role="IEkAT" value="false" />
+        <node concept="3Tm1VV" id="7LK0SI3Drm" role="1B3o_S" />
+        <node concept="10P_77" id="7LK0SI3Dro" role="3clF45" />
+        <node concept="3clFbS" id="7LK0SI3Drp" role="3clF47">
+          <node concept="3clFbF" id="7LK0SI3Drr" role="3cqZAp">
+            <node concept="3clFbT" id="7LK0SI3Drq" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="NWlO9" id="7kEiJU7Cf6m" role="lGtFl">
+          <property role="NWlVz" value="{@inheritDoc}" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7kEiJU7CeyG" role="jymVt" />
+      <node concept="3clFb_" id="7LK0SI3Drs" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="isDone" />
+        <property role="DiZV1" value="false" />
+        <property role="IEkAT" value="false" />
+        <node concept="3Tm1VV" id="7LK0SI3Drt" role="1B3o_S" />
+        <node concept="10P_77" id="7LK0SI3Drv" role="3clF45" />
+        <node concept="3clFbS" id="7LK0SI3Drw" role="3clF47">
+          <node concept="3clFbF" id="7LK0SI3Dry" role="3cqZAp">
+            <node concept="3clFbT" id="7LK0SI3Drx" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="NWlO9" id="7kEiJU7Cf$6" role="lGtFl">
+          <property role="NWlVz" value="{@inheritDoc}" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7LK0SI4ppi" role="jymVt" />
+      <node concept="3clFb_" id="7LK0SI3Drz" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="get" />
+        <property role="DiZV1" value="false" />
+        <property role="IEkAT" value="false" />
+        <node concept="3Tm1VV" id="7LK0SI3Dr$" role="1B3o_S" />
+        <node concept="3uibUv" id="6nns7dDd498" role="3clF45">
+          <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
+        </node>
+        <node concept="3uibUv" id="7LK0SI3DrB" role="Sfmx6">
+          <ref role="3uigEE" to="wyt6:~InterruptedException" resolve="InterruptedException" />
+        </node>
+        <node concept="3uibUv" id="7LK0SI3DrC" role="Sfmx6">
+          <ref role="3uigEE" to="5zyv:~ExecutionException" resolve="ExecutionException" />
+        </node>
+        <node concept="3clFbS" id="7LK0SI3DrE" role="3clF47">
+          <node concept="3cpWs8" id="6nns7dDd69N" role="3cqZAp">
+            <node concept="3cpWsn" id="6nns7dDd69O" role="3cpWs9">
+              <property role="TrG5h" value="rebuildResult" />
+              <node concept="3uibUv" id="6nns7dDd69P" role="1tU5fm">
+                <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
+              </node>
+              <node concept="10Nm6u" id="4Uw4Kib5pX$" role="33vP2m" />
+            </node>
+          </node>
+          <node concept="2GUZhq" id="15d7XIo$S8p" role="3cqZAp">
+            <node concept="3clFbS" id="15d7XIo$S8r" role="2GV8ay">
+              <node concept="3clFbF" id="15d7XIo_8Xi" role="3cqZAp">
+                <node concept="37vLTI" id="15d7XIo_9zH" role="3clFbG">
+                  <node concept="3clFbT" id="15d7XIo_9_D" role="37vLTx">
+                    <property role="3clFbU" value="true" />
+                  </node>
+                  <node concept="37vLTw" id="77nuVWJ3Z2N" role="37vLTJ">
+                    <ref role="3cqZAo" node="15d7XIo_3VJ" resolve="MAKE_PROCESS_ACTIVE" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="68pU13V29oB" role="3cqZAp">
+                <node concept="3cpWsn" id="68pU13V29oC" role="3cpWs9">
+                  <property role="TrG5h" value="module" />
+                  <node concept="3uibUv" id="68pU13V29oD" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                  </node>
+                  <node concept="2OqwBi" id="68pU13V29oE" role="33vP2m">
+                    <node concept="2JrnkZ" id="68pU13V29oF" role="2Oq$k0">
+                      <node concept="37vLTw" id="68pU13V29oG" role="2JrQYb">
+                        <ref role="3cqZAo" node="7LK0SI3XjY" resolve="model" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="68pU13V29oH" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SModel.getModule():org.jetbrains.mps.openapi.module.SModule" resolve="getModule" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbJ" id="4Uw4Kib5n0F" role="3cqZAp">
+                <node concept="3clFbS" id="4Uw4Kib5n0I" role="3clFbx">
+                  <node concept="3clFbF" id="4Uw4Kib5lcX" role="3cqZAp">
+                    <node concept="37vLTI" id="4Uw4Kib5lcZ" role="3clFbG">
+                      <node concept="1rXfSq" id="4FpLBMtUite" role="37vLTx">
+                        <ref role="37wK5l" node="4FpLBMtUOZ0" resolve="doRebuildProject" />
+                        <node concept="37vLTw" id="7uk5GW4M5_Y" role="37wK5m">
+                          <ref role="3cqZAo" node="7uk5GW4LZcY" resolve="proj" />
+                        </node>
+                        <node concept="37vLTw" id="4FpLBMtUj64" role="37wK5m">
+                          <ref role="3cqZAo" node="7LK0SI3XjY" resolve="model" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="4Uw4Kib5ld3" role="37vLTJ">
+                        <ref role="3cqZAo" node="6nns7dDd69O" resolve="rebuildResult" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3fqX7Q" id="4Uw4Kib5nVj" role="3clFbw">
+                  <node concept="37vLTw" id="4Uw4Kib5o2v" role="3fr31v">
+                    <ref role="3cqZAo" node="4Uw4Kib5aZf" resolve="onlyLastGeneratedModels" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="4FpLBMtUkCO" role="3cqZAp" />
+              <node concept="3cpWs8" id="68pU13V29oN" role="3cqZAp">
+                <node concept="3cpWsn" id="68pU13V29oO" role="3cpWs9">
+                  <property role="3TUv4t" value="false" />
+                  <property role="TrG5h" value="tmp" />
+                  <node concept="3uibUv" id="4LT5zeEI1JF" role="1tU5fm">
+                    <ref role="3uigEE" to="ap4t:~TransientModelsProvider" resolve="TransientModelsProvider" />
+                  </node>
+                  <node concept="2OqwBi" id="68pU13V29oQ" role="33vP2m">
+                    <node concept="37vLTw" id="7uk5GW4M5Ki" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7uk5GW4LZcY" resolve="proj" />
+                    </node>
+                    <node concept="liA8E" id="68pU13V29oS" role="2OqNvi">
+                      <ref role="37wK5l" to="z1c3:~Project.getComponent(java.lang.Class):java.lang.Object" resolve="getComponent" />
+                      <node concept="3VsKOn" id="4LT5zeEI1yr" role="37wK5m">
+                        <ref role="3VsUkX" to="ap4t:~TransientModelsProvider" resolve="TransientModelsProvider" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="7Z4mKjks8$K" role="3cqZAp">
+                <node concept="3cpWsn" id="7Z4mKjks8$L" role="3cpWs9">
+                  <property role="TrG5h" value="epm" />
+                  <node concept="3uibUv" id="7Z4mKjks8$M" role="1tU5fm">
+                    <ref role="3uigEE" node="7Z4mKjkrVLB" resolve="MakeUtils.MakeFuture.ProgressMonitorWrapper" />
+                  </node>
+                  <node concept="2ShNRf" id="7Z4mKjks9P5" role="33vP2m">
+                    <node concept="HV5vD" id="7Z4mKjksb97" role="2ShVmc">
+                      <ref role="HV5vE" node="7Z4mKjkrVLB" resolve="MakeUtils.MakeFuture.ProgressMonitorWrapper" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="7kEiJU7uqXW" role="3cqZAp">
+                <node concept="3cpWsn" id="7kEiJU7uqXX" role="3cpWs9">
+                  <property role="TrG5h" value="msgHandler" />
+                  <node concept="3uibUv" id="7kEiJU7uqXV" role="1tU5fm">
+                    <ref role="3uigEE" node="7LK0SI677r" resolve="MakeUtils.NullMessageHandler" />
+                  </node>
+                  <node concept="2ShNRf" id="7kEiJU7uqXY" role="33vP2m">
+                    <node concept="HV5vD" id="7kEiJU7uqXZ" role="2ShVmc">
+                      <ref role="HV5vE" node="7LK0SI677r" resolve="MakeUtils.NullMessageHandler" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="68pU13V29p5" role="3cqZAp">
+                <node concept="3cpWsn" id="68pU13V29p6" role="3cpWs9">
+                  <property role="TrG5h" value="textGenHandler" />
+                  <node concept="3uibUv" id="1XaymyqIMYr" role="1tU5fm">
+                    <ref role="3uigEE" node="68pU13V151W" resolve="MakeUtils.LastTransientModelHandler" />
+                  </node>
+                  <node concept="2ShNRf" id="68pU13V29p8" role="33vP2m">
+                    <node concept="HV5vD" id="68pU13V2sgO" role="2ShVmc">
+                      <ref role="HV5vE" node="68pU13V151W" resolve="MakeUtils.LastTransientModelHandler" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="5pNvrID27Vd" role="3cqZAp">
+                <node concept="3cpWsn" id="5pNvrID27Ve" role="3cpWs9">
+                  <property role="TrG5h" value="builder" />
+                  <node concept="3uibUv" id="5pNvrID27Vc" role="1tU5fm">
+                    <ref role="3uigEE" to="ap4t:~GenerationOptions$OptionsBuilder" resolve="GenerationOptions.OptionsBuilder" />
+                  </node>
+                  <node concept="2YIFZM" id="5pNvrID27Vf" role="33vP2m">
+                    <ref role="1Pybhc" to="ap4t:~GenerationOptions" resolve="GenerationOptions" />
+                    <ref role="37wK5l" to="ap4t:~GenerationOptions.getDefaults():jetbrains.mps.generator.GenerationOptions$OptionsBuilder" resolve="getDefaults" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="77nuVWJ4MxK" role="3cqZAp">
+                <node concept="3cpWsn" id="77nuVWJ4MxL" role="3cpWs9">
+                  <property role="TrG5h" value="provider" />
+                  <node concept="3uibUv" id="77nuVWJ4MxI" role="1tU5fm">
+                    <ref role="3uigEE" to="ap4t:~DefaultGenerationParametersProvider" resolve="DefaultGenerationParametersProvider" />
+                  </node>
+                  <node concept="2ShNRf" id="77nuVWJ4MxM" role="33vP2m">
+                    <node concept="1pGfFk" id="77nuVWJ4MxN" role="2ShVmc">
+                      <ref role="37wK5l" to="ap4t:~DefaultGenerationParametersProvider.&lt;init&gt;()" resolve="DefaultGenerationParametersProvider" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbJ" id="77nuVWJ4NwW" role="3cqZAp">
+                <node concept="3clFbS" id="77nuVWJ4NwY" role="3clFbx">
+                  <node concept="2Gpval" id="77nuVWJ4Qsk" role="3cqZAp">
+                    <node concept="2GrKxI" id="77nuVWJ4Qsm" role="2Gsz3X">
+                      <property role="TrG5h" value="param" />
+                    </node>
+                    <node concept="3clFbS" id="77nuVWJ4Qso" role="2LFqv$">
+                      <node concept="3clFbF" id="77nuVWJ4S$l" role="3cqZAp">
+                        <node concept="2OqwBi" id="77nuVWJ4SOi" role="3clFbG">
+                          <node concept="37vLTw" id="77nuVWJ4S$k" role="2Oq$k0">
+                            <ref role="3cqZAo" node="77nuVWJ4MxL" resolve="provider" />
+                          </node>
+                          <node concept="liA8E" id="77nuVWJ4SXv" role="2OqNvi">
+                            <ref role="37wK5l" to="ap4t:~DefaultGenerationParametersProvider.addParameter(java.lang.String,java.lang.Object):void" resolve="addParameter" />
+                            <node concept="2OqwBi" id="77nuVWJ4TEY" role="37wK5m">
+                              <node concept="2GrUjf" id="77nuVWJ4Tqo" role="2Oq$k0">
+                                <ref role="2Gs0qQ" node="77nuVWJ4Qsm" resolve="param" />
+                              </node>
+                              <node concept="3AY5_j" id="77nuVWJ4TK8" role="2OqNvi" />
+                            </node>
+                            <node concept="2OqwBi" id="77nuVWJ4U7T" role="37wK5m">
+                              <node concept="2GrUjf" id="77nuVWJ4U3B" role="2Oq$k0">
+                                <ref role="2Gs0qQ" node="77nuVWJ4Qsm" resolve="param" />
+                              </node>
+                              <node concept="3AV6Ez" id="77nuVWJ4UdE" role="2OqNvi" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="77nuVWJ4QFq" role="2GsD0m">
+                      <ref role="3cqZAo" node="77nuVWJ4dv0" resolve="parameters" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3y3z36" id="77nuVWJ4Pi6" role="3clFbw">
+                  <node concept="10Nm6u" id="77nuVWJ4Pxw" role="3uHU7w" />
+                  <node concept="37vLTw" id="77nuVWJ4NVj" role="3uHU7B">
+                    <ref role="3cqZAo" node="77nuVWJ4dv0" resolve="parameters" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="77nuVWJ4JSj" role="3cqZAp" />
+              <node concept="3cpWs8" id="68pU13V29pa" role="3cqZAp">
+                <node concept="3cpWsn" id="68pU13V29pb" role="3cpWs9">
+                  <property role="TrG5h" value="genOpt" />
+                  <node concept="3uibUv" id="68pU13V29pc" role="1tU5fm">
+                    <ref role="3uigEE" to="ap4t:~GenerationOptions" resolve="GenerationOptions" />
+                  </node>
+                  <node concept="2OqwBi" id="5psiJWPxItJ" role="33vP2m">
+                    <node concept="2OqwBi" id="77nuVWJ44LA" role="2Oq$k0">
+                      <node concept="2OqwBi" id="7kEiJU7tLvG" role="2Oq$k0">
+                        <node concept="2OqwBi" id="7kEiJU7tEt3" role="2Oq$k0">
+                          <node concept="2OqwBi" id="ETuBV6jxSd" role="2Oq$k0">
+                            <node concept="2OqwBi" id="ETuBV6lGwa" role="2Oq$k0">
+                              <node concept="37vLTw" id="5pNvrID27Vg" role="2Oq$k0">
+                                <ref role="3cqZAo" node="5pNvrID27Ve" resolve="builder" />
+                              </node>
+                              <node concept="liA8E" id="ETuBV6lH7s" role="2OqNvi">
+                                <ref role="37wK5l" to="ap4t:~GenerationOptions$OptionsBuilder.reporting(boolean,boolean,boolean,int):jetbrains.mps.generator.GenerationOptions$OptionsBuilder" resolve="reporting" />
+                                <node concept="3clFbT" id="ETuBV6lHD9" role="37wK5m">
+                                  <property role="3clFbU" value="true" />
+                                </node>
+                                <node concept="3clFbT" id="ETuBV6lI8s" role="37wK5m">
+                                  <property role="3clFbU" value="true" />
+                                </node>
+                                <node concept="3clFbT" id="ETuBV6lJ7S" role="37wK5m">
+                                  <property role="3clFbU" value="true" />
+                                </node>
+                                <node concept="3cmrfG" id="ETuBV6lLcJ" role="37wK5m">
+                                  <property role="3cmrfH" value="-1" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="ETuBV6jzbp" role="2OqNvi">
+                              <ref role="37wK5l" to="ap4t:~GenerationOptions$OptionsBuilder.rebuildAll(boolean):jetbrains.mps.generator.GenerationOptions$OptionsBuilder" resolve="rebuildAll" />
+                              <node concept="3clFbT" id="ETuBV6jAB6" role="37wK5m">
+                                <property role="3clFbU" value="true" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="7kEiJU7tFDA" role="2OqNvi">
+                            <ref role="37wK5l" to="ap4t:~GenerationOptions$OptionsBuilder.keepOutputModel(boolean):jetbrains.mps.generator.GenerationOptions$OptionsBuilder" resolve="keepOutputModel" />
+                            <node concept="3clFbT" id="7kEiJU7tFY$" role="37wK5m">
+                              <property role="3clFbU" value="true" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="7kEiJU7tMdI" role="2OqNvi">
+                          <ref role="37wK5l" to="ap4t:~GenerationOptions$OptionsBuilder.showBadChildWarning(boolean):jetbrains.mps.generator.GenerationOptions$OptionsBuilder" resolve="showBadChildWarning" />
+                          <node concept="3clFbT" id="7kEiJU7tMyu" role="37wK5m">
+                            <property role="3clFbU" value="true" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="77nuVWJ45ex" role="2OqNvi">
+                        <ref role="37wK5l" to="ap4t:~GenerationOptions$OptionsBuilder.parameters(jetbrains.mps.generator.GenerationParametersProvider):jetbrains.mps.generator.GenerationOptions$OptionsBuilder" resolve="parameters" />
+                        <node concept="37vLTw" id="77nuVWJ4UYa" role="37wK5m">
+                          <ref role="3cqZAo" node="77nuVWJ4MxL" resolve="provider" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="5psiJWPxJyY" role="2OqNvi">
+                      <ref role="37wK5l" to="ap4t:~GenerationOptions$OptionsBuilder.create():jetbrains.mps.generator.GenerationOptions" resolve="create" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs8" id="68pU13V29oY" role="3cqZAp">
+                <node concept="3cpWsn" id="68pU13V29oZ" role="3cpWs9">
+                  <property role="TrG5h" value="context" />
+                  <node concept="3uibUv" id="68pU13V29p0" role="1tU5fm">
+                    <ref role="3uigEE" to="z1c3:~ModuleContext" resolve="ModuleContext" />
+                  </node>
+                  <node concept="2ShNRf" id="68pU13V29p1" role="33vP2m">
+                    <node concept="1pGfFk" id="68pU13V29p2" role="2ShVmc">
+                      <ref role="37wK5l" to="z1c3:~ModuleContext.&lt;init&gt;(org.jetbrains.mps.openapi.module.SModule,jetbrains.mps.project.Project)" resolve="ModuleContext" />
+                      <node concept="37vLTw" id="68pU13V29p3" role="37wK5m">
+                        <ref role="3cqZAo" node="68pU13V29oC" resolve="module" />
+                      </node>
+                      <node concept="37vLTw" id="7uk5GW4M62i" role="37wK5m">
+                        <ref role="3cqZAo" node="7uk5GW4LZcY" resolve="proj" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1QHqEM" id="68pU13V29oV" role="3cqZAp">
+                <node concept="1QHqEC" id="68pU13V29oW" role="1QHqEI">
+                  <node concept="3clFbS" id="68pU13V29oX" role="1bW5cS">
+                    <node concept="3clFbF" id="4vhnvnDTHqw" role="3cqZAp">
+                      <node concept="NRdvd" id="5pNvrID27qg" role="3clFbG">
+                        <ref role="37wK5l" to="ap4t:~GenerationFacade.generateModels(jetbrains.mps.project.Project,java.util.List,jetbrains.mps.smodel.IOperationContext,jetbrains.mps.generator.generationTypes.IGenerationHandler,org.jetbrains.mps.openapi.util.ProgressMonitor,jetbrains.mps.messages.IMessageHandler,jetbrains.mps.generator.GenerationOptions,jetbrains.mps.generator.TransientModelsProvider):boolean" resolve="generateModels" />
+                        <ref role="1Pybhc" to="ap4t:~GenerationFacade" resolve="GenerationFacade" />
+                        <node concept="37vLTw" id="7uk5GW4M6iL" role="37wK5m">
+                          <ref role="3cqZAo" node="7uk5GW4LZcY" resolve="proj" />
+                        </node>
+                        <node concept="NRdvd" id="5pNvrID27qi" role="37wK5m">
+                          <ref role="37wK5l" to="33ny:~Collections.singletonList(java.lang.Object):java.util.List" resolve="singletonList" />
+                          <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
+                          <node concept="37vLTw" id="5pNvrID27qj" role="37wK5m">
+                            <ref role="3cqZAo" node="7LK0SI3XjY" resolve="model" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="7uk5GW4JXPU" role="37wK5m">
+                          <ref role="3cqZAo" node="68pU13V29oZ" resolve="context" />
+                        </node>
+                        <node concept="37vLTw" id="5pNvrID27ql" role="37wK5m">
+                          <ref role="3cqZAo" node="68pU13V29p6" resolve="textGenHandler" />
+                        </node>
+                        <node concept="37vLTw" id="5pNvrID27qm" role="37wK5m">
+                          <ref role="3cqZAo" node="7Z4mKjks8$L" resolve="epm" />
+                        </node>
+                        <node concept="37vLTw" id="5pNvrID27qn" role="37wK5m">
+                          <ref role="3cqZAo" node="7kEiJU7uqXX" resolve="msgHandler" />
+                        </node>
+                        <node concept="37vLTw" id="5pNvrID27qo" role="37wK5m">
+                          <ref role="3cqZAo" node="68pU13V29pb" resolve="genOpt" />
+                        </node>
+                        <node concept="37vLTw" id="5pNvrID27qp" role="37wK5m">
+                          <ref role="3cqZAo" node="68pU13V29oO" resolve="tmp" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="640gwNkFRAc" role="3cqZAp">
+                <node concept="2OqwBi" id="640gwNkFSZ0" role="3clFbG">
+                  <node concept="2OqwBi" id="640gwNkFSuQ" role="2Oq$k0">
+                    <node concept="37vLTw" id="640gwNkFRAb" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7Z4mKjks8$L" resolve="epm" />
+                    </node>
+                    <node concept="2OwXpG" id="640gwNkFSOd" role="2OqNvi">
+                      <ref role="2Oxat5" node="640gwNkFP73" resolve="countDownLatch" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="640gwNkFTj4" role="2OqNvi">
+                    <ref role="37wK5l" to="5zyv:~CountDownLatch.await():void" resolve="await" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="15d7XIo$S8s" role="2GVbov">
+              <node concept="3clFbF" id="15d7XIo_9Ed" role="3cqZAp">
+                <node concept="37vLTI" id="15d7XIo_9XE" role="3clFbG">
+                  <node concept="3clFbT" id="15d7XIo_a2r" role="37vLTx">
+                    <property role="3clFbU" value="false" />
+                  </node>
+                  <node concept="37vLTw" id="77nuVWJ3Z2U" role="37vLTJ">
+                    <ref role="3cqZAo" node="15d7XIo_3VJ" resolve="MAKE_PROCESS_ACTIVE" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs6" id="68pU13V29pw" role="3cqZAp">
+            <node concept="37vLTw" id="6nns7dDd89q" role="3cqZAk">
+              <ref role="3cqZAo" node="6nns7dDd69O" resolve="rebuildResult" />
+            </node>
+          </node>
+        </node>
+        <node concept="NWlO9" id="7kEiJU7Cg2k" role="lGtFl">
+          <property role="NWlVz" value="{@inheritDoc}" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7LK0SI4oH6" role="jymVt" />
+      <node concept="3clFb_" id="4FpLBMtUOZ0" role="jymVt">
+        <property role="TrG5h" value="doRebuildProject" />
+        <property role="DiZV1" value="false" />
+        <node concept="3uibUv" id="6nns7dDd8KJ" role="3clF45">
+          <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
+        </node>
+        <node concept="37vLTG" id="47xghtTLhAO" role="3clF46">
+          <property role="TrG5h" value="proj" />
+          <property role="3TUv4t" value="true" />
+          <node concept="3uibUv" id="7uk5GW4JJfx" role="1tU5fm">
+            <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="47xghtTLhAQ" role="3clF46">
+          <property role="TrG5h" value="model" />
+          <node concept="3uibUv" id="47xghtTLhAR" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="47xghtTLh$P" role="3clF47">
+          <node concept="3cpWs8" id="47xghtTLh_0" role="3cqZAp">
+            <node concept="3cpWsn" id="47xghtTLh_1" role="3cpWs9">
+              <property role="TrG5h" value="session" />
+              <property role="3TUv4t" value="true" />
+              <node concept="3uibUv" id="47xghtTLh_2" role="1tU5fm">
+                <ref role="3uigEE" to="hfuk:7yGn3z4N4Nd" resolve="MakeSession" />
+              </node>
+              <node concept="2ShNRf" id="47xghtTLh_3" role="33vP2m">
+                <node concept="1pGfFk" id="47xghtTLh_4" role="2ShVmc">
+                  <ref role="37wK5l" to="hfuk:2BjwmTxT7Q7" resolve="MakeSession" />
+                  <node concept="3cpWs2" id="47xghtTLh_5" role="37wK5m">
+                    <ref role="3cqZAo" node="47xghtTLhAO" resolve="proj" />
+                  </node>
+                  <node concept="10M0yZ" id="7JDtVAB4QVc" role="37wK5m">
+                    <ref role="1PxDUh" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+                    <ref role="3cqZAo" to="et5u:~IMessageHandler.NULL_HANDLER" resolve="NULL_HANDLER" />
+                  </node>
+                  <node concept="37vLTw" id="640gwNkEtne" role="37wK5m">
+                    <ref role="3cqZAo" node="4FpLBMtUMdh" resolve="shouldRebuild" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="47xghtTLh_8" role="3cqZAp">
+            <node concept="3cpWsn" id="47xghtTLh_9" role="3cpWs9">
+              <property role="TrG5h" value="seq" />
+              <node concept="2ShNRf" id="47xghtTLh_a" role="33vP2m">
+                <node concept="Tc6Ow" id="47xghtTLh_b" role="2ShVmc">
+                  <node concept="3uibUv" id="47xghtTLh_c" role="HW$YZ">
+                    <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+                  </node>
+                </node>
+              </node>
+              <node concept="_YKpA" id="47xghtTLh_d" role="1tU5fm">
+                <node concept="3uibUv" id="47xghtTLh_e" role="_ZDj9">
+                  <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="47xghtTLh_f" role="3cqZAp">
+            <node concept="2OqwBi" id="47xghtTLh_g" role="3clFbG">
+              <node concept="3cpWsa" id="47xghtTLh_h" role="2Oq$k0">
+                <ref role="3cqZAo" node="47xghtTLh_9" resolve="seq" />
+              </node>
+              <node concept="TSZUe" id="47xghtTLh_i" role="2OqNvi">
+                <node concept="3cpWs2" id="47xghtTLh_j" role="25WWJ7">
+                  <ref role="3cqZAo" node="47xghtTLhAQ" resolve="model" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="47xghtTLh_k" role="3cqZAp">
+            <node concept="3cpWsn" id="47xghtTLh_l" role="3cpWs9">
+              <property role="TrG5h" value="res" />
+              <property role="3TUv4t" value="true" />
+              <node concept="A3Dl8" id="47xghtTLh_m" role="1tU5fm" />
+              <node concept="2OqwBi" id="47xghtTLh_o" role="33vP2m">
+                <node concept="2ShNRf" id="47xghtTLh_p" role="2Oq$k0">
+                  <node concept="1pGfFk" id="47xghtTLh_q" role="2ShVmc">
+                    <ref role="37wK5l" to="fn29:6zsZmIC0WqK" resolve="ModelsToResources" />
+                    <node concept="3cpWsa" id="47xghtTLh_s" role="37wK5m">
+                      <ref role="3cqZAo" node="47xghtTLh_9" resolve="seq" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="47xghtTLh_t" role="2OqNvi">
+                  <ref role="37wK5l" to="fn29:6gLh390ElAV" resolve="resources" />
+                  <node concept="3clFbT" id="47xghtTLh_u" role="37wK5m" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="1Fm2OOqLLNX" role="3cqZAp">
+            <node concept="3cpWsn" id="1Fm2OOqLLNY" role="3cpWs9">
+              <property role="TrG5h" value="makeService" />
+              <node concept="3uibUv" id="1Fm2OOqLLNW" role="1tU5fm">
+                <ref role="3uigEE" to="hfuk:1NAY6bPd4nM" resolve="IMakeService" />
+              </node>
+              <node concept="2YIFZM" id="1Fm2OOqLLNZ" role="33vP2m">
+                <ref role="37wK5l" to="hfuk:7yGn3z4MRr2" resolve="get" />
+                <ref role="1Pybhc" to="hfuk:7yGn3z4MRqM" resolve="IMakeService.INSTANCE" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="47xghtTLh_v" role="3cqZAp">
+            <node concept="3clFbS" id="47xghtTLh_w" role="3clFbx">
+              <node concept="3cpWs8" id="4FpLBMtU0Oc" role="3cqZAp">
+                <node concept="3cpWsn" id="4FpLBMtU0Od" role="3cpWs9">
+                  <property role="TrG5h" value="future" />
+                  <node concept="3uibUv" id="4FpLBMtU0Oe" role="1tU5fm">
+                    <ref role="3uigEE" to="5zyv:~Future" resolve="Future" />
+                    <node concept="3uibUv" id="4FpLBMtU0Of" role="11_B2D">
+                      <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="4FpLBMtU0Og" role="33vP2m">
+                    <node concept="37vLTw" id="1Fm2OOqLLO1" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1Fm2OOqLLNY" resolve="makeService" />
+                    </node>
+                    <node concept="liA8E" id="4FpLBMtU0Oi" role="2OqNvi">
+                      <ref role="37wK5l" to="hfuk:7yGn3z4N64T" resolve="make" />
+                      <node concept="3cpWsa" id="4FpLBMtU0Oj" role="37wK5m">
+                        <ref role="3cqZAo" node="47xghtTLh_1" resolve="session" />
+                      </node>
+                      <node concept="3cpWsa" id="4FpLBMtU0Ok" role="37wK5m">
+                        <ref role="3cqZAo" node="47xghtTLh_l" resolve="res" />
+                      </node>
+                      <node concept="10Nm6u" id="4FpLBMtU0Ol" role="37wK5m" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="SfApY" id="4FpLBMtU2Al" role="3cqZAp">
+                <node concept="3clFbS" id="4FpLBMtU0On" role="SfCbr">
+                  <node concept="3cpWs6" id="6nns7dDdaQe" role="3cqZAp">
+                    <node concept="2OqwBi" id="640gwNkG7Ur" role="3cqZAk">
+                      <node concept="37vLTw" id="640gwNkG7C6" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4FpLBMtU0Od" resolve="future" />
+                      </node>
+                      <node concept="liA8E" id="640gwNkG91r" role="2OqNvi">
+                        <ref role="37wK5l" to="5zyv:~Future.get():java.lang.Object" resolve="get" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="TDmWw" id="4FpLBMtU0Os" role="TEbGg">
+                  <node concept="3cpWsn" id="4FpLBMtU0Ot" role="TDEfY">
+                    <property role="TrG5h" value="ex" />
+                    <node concept="3uibUv" id="4FpLBMtU0Ou" role="1tU5fm">
+                      <ref role="3uigEE" to="wyt6:~Exception" resolve="Exception" />
+                    </node>
+                  </node>
+                  <node concept="3clFbS" id="4FpLBMtU0Ov" role="TDEfX">
+                    <node concept="3clFbF" id="4FpLBMtU0Ow" role="3cqZAp">
+                      <node concept="2OqwBi" id="4FpLBMtU0Ox" role="3clFbG">
+                        <node concept="3cpWsa" id="4FpLBMtU0Oy" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4FpLBMtU0Ot" resolve="ex" />
+                        </node>
+                        <node concept="liA8E" id="4FpLBMtU0Oz" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~Throwable.printStackTrace():void" resolve="printStackTrace" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1Wc70l" id="47xghtTLhAx" role="3clFbw">
+              <node concept="2OqwBi" id="47xghtTLhAy" role="3uHU7B">
+                <node concept="3cpWsa" id="47xghtTLhAz" role="2Oq$k0">
+                  <ref role="3cqZAo" node="47xghtTLh_l" resolve="res" />
+                </node>
+                <node concept="3GX2aA" id="47xghtTLhA$" role="2OqNvi" />
+              </node>
+              <node concept="2OqwBi" id="47xghtTLhA_" role="3uHU7w">
+                <node concept="37vLTw" id="1Fm2OOqLLO0" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1Fm2OOqLLNY" resolve="makeService" />
+                </node>
+                <node concept="liA8E" id="47xghtTLhAB" role="2OqNvi">
+                  <ref role="37wK5l" to="hfuk:7yGn3z4N63W" resolve="openNewSession" />
+                  <node concept="3cpWsa" id="47xghtTLhAC" role="37wK5m">
+                    <ref role="3cqZAo" node="47xghtTLh_1" resolve="session" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="640gwNkExna" role="3cqZAp">
+            <node concept="10Nm6u" id="640gwNkExn8" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="3Tm6S6" id="47xghtTLkPG" role="1B3o_S" />
+        <node concept="NWlO9" id="4FpLBMtUQ19" role="lGtFl">
+          <property role="NWlVz" value="Rebuilds the project." />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7kEiJU7BkUl" role="jymVt" />
+      <node concept="312cEu" id="7Z4mKjkrVLB" role="jymVt">
+        <property role="2bfB8j" value="false" />
+        <property role="1sVAO0" value="false" />
+        <property role="1EXbeo" value="false" />
+        <property role="TrG5h" value="ProgressMonitorWrapper" />
+        <node concept="312cEg" id="640gwNkFP73" role="jymVt">
+          <property role="34CwA1" value="false" />
+          <property role="eg7rD" value="false" />
+          <property role="TrG5h" value="countDownLatch" />
+          <property role="3TUv4t" value="false" />
+          <node concept="3Tm1VV" id="640gwNkFOIt" role="1B3o_S" />
+          <node concept="3uibUv" id="640gwNkFP4y" role="1tU5fm">
+            <ref role="3uigEE" to="5zyv:~CountDownLatch" resolve="CountDownLatch" />
+          </node>
+          <node concept="2ShNRf" id="640gwNkFPl_" role="33vP2m">
+            <node concept="1pGfFk" id="640gwNkFPTL" role="2ShVmc">
+              <ref role="37wK5l" to="5zyv:~CountDownLatch.&lt;init&gt;(int)" resolve="CountDownLatch" />
+              <node concept="3cmrfG" id="640gwNkFPUo" role="37wK5m">
+                <property role="3cmrfH" value="1" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2tJIrI" id="7Z4mKjkrXxh" role="jymVt" />
+        <node concept="3Tm6S6" id="7Z4mKjkrUbA" role="1B3o_S" />
+        <node concept="3uibUv" id="7Z4mKjkrXrb" role="1zkMxy">
+          <ref role="3uigEE" to="mk8z:~EmptyProgressMonitor" resolve="EmptyProgressMonitor" />
+        </node>
+        <node concept="3clFb_" id="7Z4mKjkrXt7" role="jymVt">
+          <property role="1EzhhJ" value="false" />
+          <property role="TrG5h" value="done" />
+          <property role="DiZV1" value="false" />
+          <property role="IEkAT" value="false" />
+          <node concept="3Tm1VV" id="7Z4mKjkrXt8" role="1B3o_S" />
+          <node concept="3cqZAl" id="7Z4mKjkrXta" role="3clF45" />
+          <node concept="3clFbS" id="7Z4mKjkrXtb" role="3clF47">
+            <node concept="3clFbF" id="7Z4mKjkrXte" role="3cqZAp">
+              <node concept="3nyPlj" id="7Z4mKjkrXtd" role="3clFbG">
+                <ref role="37wK5l" to="mk8z:~EmptyProgressMonitor.done():void" resolve="done" />
+              </node>
+            </node>
+            <node concept="3clFbF" id="640gwNkFQ8A" role="3cqZAp">
+              <node concept="2OqwBi" id="640gwNkFQai" role="3clFbG">
+                <node concept="37vLTw" id="640gwNkFQ8_" role="2Oq$k0">
+                  <ref role="3cqZAo" node="640gwNkFP73" resolve="countDownLatch" />
+                </node>
+                <node concept="liA8E" id="640gwNkFQpJ" role="2OqNvi">
+                  <ref role="37wK5l" to="5zyv:~CountDownLatch.countDown():void" resolve="countDown" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2AHcQZ" id="7Z4mKjkrXtc" role="2AJF6D">
+            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+          </node>
+        </node>
+        <node concept="NWlO9" id="7kEiJU7BUQG" role="lGtFl">
+          <property role="NWlVz" value="Simple wrapper for the progress monitor to get when the generation ended." />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7kEiJU7BTo5" role="jymVt" />
+      <node concept="3clFb_" id="7LK0SI3DrF" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="get" />
+        <property role="DiZV1" value="false" />
+        <property role="IEkAT" value="false" />
+        <node concept="3Tm1VV" id="7LK0SI3DrG" role="1B3o_S" />
+        <node concept="3uibUv" id="6nns7dDdkGU" role="3clF45">
+          <ref role="3uigEE" to="i9so:17I1R__cQ5X" resolve="IResult" />
+        </node>
+        <node concept="37vLTG" id="7LK0SI3DrJ" role="3clF46">
+          <property role="TrG5h" value="l" />
+          <node concept="3cpWsb" id="7LK0SI3DrK" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="7LK0SI3DrL" role="3clF46">
+          <property role="TrG5h" value="u" />
+          <node concept="3uibUv" id="7LK0SI3DrM" role="1tU5fm">
+            <ref role="3uigEE" to="5zyv:~TimeUnit" resolve="TimeUnit" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="7LK0SI3DrN" role="Sfmx6">
+          <ref role="3uigEE" to="wyt6:~InterruptedException" resolve="InterruptedException" />
+        </node>
+        <node concept="3uibUv" id="7LK0SI3DrO" role="Sfmx6">
+          <ref role="3uigEE" to="5zyv:~ExecutionException" resolve="ExecutionException" />
+        </node>
+        <node concept="3uibUv" id="7LK0SI3DrP" role="Sfmx6">
+          <ref role="3uigEE" to="5zyv:~TimeoutException" resolve="TimeoutException" />
+        </node>
+        <node concept="3clFbS" id="7LK0SI3DrR" role="3clF47">
+          <node concept="3clFbF" id="7LK0SI3E4u" role="3cqZAp">
+            <node concept="1rXfSq" id="7LK0SI3E4t" role="3clFbG">
+              <ref role="37wK5l" node="7LK0SI3Drz" resolve="get" />
+            </node>
+          </node>
+        </node>
+        <node concept="NWlO9" id="7kEiJU7Bpt5" role="lGtFl">
+          <property role="NWlVz" value="{@inheritDoc}" />
+        </node>
+      </node>
+      <node concept="NWlO9" id="41thbhvrjr1" role="lGtFl">
+        <property role="NWlVz" value="A future that makes and saves the transient models." />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7LK0SI62pT" role="jymVt" />
+    <node concept="312cEu" id="7LK0SI677r" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="1sVAO0" value="false" />
+      <property role="1EXbeo" value="false" />
+      <property role="TrG5h" value="NullMessageHandler" />
+      <node concept="3Tm6S6" id="7LK0SI65Jr" role="1B3o_S" />
+      <node concept="3uibUv" id="7LK0SI68zf" role="EKbjA">
+        <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
+      </node>
+      <node concept="2tJIrI" id="7kEiJU7Bno$" role="jymVt" />
+      <node concept="3clFb_" id="7LK0SI69jl" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="handle" />
+        <property role="DiZV1" value="false" />
+        <property role="IEkAT" value="false" />
+        <node concept="3Tm1VV" id="7LK0SI69jm" role="1B3o_S" />
+        <node concept="3cqZAl" id="7LK0SI69jo" role="3clF45" />
+        <node concept="37vLTG" id="7LK0SI69jp" role="3clF46">
+          <property role="TrG5h" value="message" />
+          <node concept="3uibUv" id="7LK0SI69jq" role="1tU5fm">
+            <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="7LK0SI69jr" role="3clF47">
+          <node concept="3clFbJ" id="7Z4mKjkuM$S" role="3cqZAp">
+            <node concept="3clFbS" id="7Z4mKjkuM$V" role="3clFbx">
+              <node concept="3clFbF" id="7Z4mKjksrry" role="3cqZAp">
+                <node concept="2OqwBi" id="7Z4mKjksrru" role="3clFbG">
+                  <node concept="10M0yZ" id="7Z4mKjksrrv" role="2Oq$k0">
+                    <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
+                    <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                  </node>
+                  <node concept="liA8E" id="7Z4mKjksrrw" role="2OqNvi">
+                    <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+                    <node concept="3cpWs3" id="7Z4mKjksrI2" role="37wK5m">
+                      <node concept="2OqwBi" id="7Z4mKjksrO9" role="3uHU7w">
+                        <node concept="37vLTw" id="7Z4mKjksrKs" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7LK0SI69jp" resolve="message" />
+                        </node>
+                        <node concept="liA8E" id="7Z4mKjkss2f" role="2OqNvi">
+                          <ref role="37wK5l" to="et5u:~IMessage.getText():java.lang.String" resolve="getText" />
+                        </node>
+                      </node>
+                      <node concept="Xl_RD" id="7Z4mKjksrrx" role="3uHU7B">
+                        <property role="Xl_RC" value="MakeUtils ---- " />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="77nuVWJ3Z39" role="3clFbw">
+              <ref role="3cqZAo" node="7Z4mKjkuL6D" resolve="DEBUG" />
+            </node>
+          </node>
+        </node>
+        <node concept="NWlO9" id="7kEiJU7BMH5" role="lGtFl">
+          <property role="NWlVz" value="{@inheritDoc}" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="7kEiJU7BnbI" role="jymVt" />
+      <node concept="3clFb_" id="7LK0SI69js" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="clear" />
+        <property role="DiZV1" value="false" />
+        <property role="IEkAT" value="false" />
+        <node concept="3Tm1VV" id="7LK0SI69jt" role="1B3o_S" />
+        <node concept="3cqZAl" id="7LK0SI69jv" role="3clF45" />
+        <node concept="3clFbS" id="7LK0SI69jw" role="3clF47">
+          <node concept="3SKdUt" id="7LK0SI69oO" role="3cqZAp">
+            <node concept="3SKdUq" id="7LK0SI69oS" role="3SKWNk">
+              <property role="3SKdUp" value="do nothing" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="NWlO9" id="41thbhvpiGZ" role="lGtFl">
+        <property role="NWlVz" value="A message handler with empty implementation." />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="68pU13V11QB" role="jymVt" />
+    <node concept="Wx3nA" id="68pU13V1MV$" role="jymVt">
+      <property role="IEkAT" value="false" />
+      <property role="TrG5h" value="lastOutputModel" />
+      <property role="3TUv4t" value="false" />
+      <node concept="3uibUv" id="68pU13V1rgz" role="1tU5fm">
+        <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+      </node>
+      <node concept="3Tm1VV" id="68pU13V1MGu" role="1B3o_S" />
+      <node concept="NWlO9" id="7kEiJU7BOXX" role="lGtFl">
+        <property role="NWlVz" value="The last output model before the text is generated." />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="68pU13V1hF5" role="jymVt" />
+    <node concept="312cEu" id="68pU13V151W" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="1sVAO0" value="false" />
+      <property role="1EXbeo" value="false" />
+      <property role="TrG5h" value="LastTransientModelHandler" />
+      <node concept="3uibUv" id="1XaymyqIFVh" role="1zkMxy">
+        <ref role="3uigEE" to="3uhc:~GenerationHandlerBase" resolve="GenerationHandlerBase" />
+      </node>
+      <node concept="2tJIrI" id="68pU13V17i4" role="jymVt" />
+      <node concept="3clFb_" id="68pU13V17GB" role="jymVt">
+        <property role="TrG5h" value="handleOutput" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="2AHcQZ" id="68pU13V17GC" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+        <node concept="37vLTG" id="68pU13V17GD" role="3clF46">
+          <property role="TrG5h" value="m" />
+          <property role="3TUv4t" value="false" />
+          <node concept="3uibUv" id="68pU13V17GE" role="1tU5fm">
+            <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="68pU13V17GF" role="3clF46">
+          <property role="TrG5h" value="im" />
+          <property role="3TUv4t" value="false" />
+          <node concept="3uibUv" id="68pU13V18Gn" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="68pU13V17GH" role="3clF46">
+          <property role="TrG5h" value="s" />
+          <property role="3TUv4t" value="false" />
+          <node concept="3uibUv" id="68pU13V17GI" role="1tU5fm">
+            <ref role="3uigEE" to="ap4t:~GenerationStatus" resolve="GenerationStatus" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="68pU13V17GJ" role="3clF46">
+          <property role="TrG5h" value="ctx" />
+          <property role="3TUv4t" value="false" />
+          <node concept="3uibUv" id="68pU13V17GK" role="1tU5fm">
+            <ref role="3uigEE" to="w1kc:~IOperationContext" resolve="IOperationContext" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="68pU13V17GL" role="3clF46">
+          <property role="TrG5h" value="pm" />
+          <property role="3TUv4t" value="false" />
+          <node concept="3uibUv" id="68pU13V1Jl6" role="1tU5fm">
+            <ref role="3uigEE" to="yyf4:~ProgressMonitor" resolve="ProgressMonitor" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="68pU13V17GN" role="3clF47">
+          <node concept="3clFbF" id="68pU13V1wmS" role="3cqZAp">
+            <node concept="37vLTI" id="68pU13V1xZq" role="3clFbG">
+              <node concept="37vLTw" id="77nuVWJ3Z3e" role="37vLTJ">
+                <ref role="3cqZAo" node="68pU13V1MV$" resolve="lastOutputModel" />
+              </node>
+              <node concept="2OqwBi" id="68pU13V1yiy" role="37vLTx">
+                <node concept="37vLTw" id="68pU13V1yiz" role="2Oq$k0">
+                  <ref role="3cqZAo" node="68pU13V17GH" resolve="s" />
+                </node>
+                <node concept="liA8E" id="68pU13V1yi$" role="2OqNvi">
+                  <ref role="37wK5l" to="ap4t:~GenerationStatus.getOutputModel():org.jetbrains.mps.openapi.model.SModel" resolve="getOutputModel" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs6" id="1XaymyqIIAS" role="3cqZAp">
+            <node concept="3clFbT" id="1XaymyqIIYS" role="3cqZAk">
+              <property role="3clFbU" value="true" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="68pU13V17HQ" role="1B3o_S" />
+        <node concept="10P_77" id="68pU13V17HR" role="3clF45" />
+        <node concept="NWlO9" id="7kEiJU7BPgm" role="lGtFl">
+          <property role="NWlVz" value="{@inheritDoc}" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="68pU13V17i7" role="jymVt" />
+      <node concept="3Tm6S6" id="68pU13V13Dz" role="1B3o_S" />
+      <node concept="3clFb_" id="EINAMTznkd" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="canHandle" />
+        <property role="DiZV1" value="false" />
+        <property role="IEkAT" value="false" />
+        <node concept="3Tm1VV" id="EINAMTznke" role="1B3o_S" />
+        <node concept="10P_77" id="EINAMTznkg" role="3clF45" />
+        <node concept="37vLTG" id="EINAMTznkh" role="3clF46">
+          <property role="TrG5h" value="model" />
+          <node concept="3uibUv" id="EINAMTznki" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="EINAMTznkk" role="3clF47">
+          <node concept="3cpWs6" id="EINAMTzBgV" role="3cqZAp">
+            <node concept="3y3z36" id="EINAMTzDHS" role="3cqZAk">
+              <node concept="10Nm6u" id="EINAMTzE$5" role="3uHU7w" />
+              <node concept="37vLTw" id="EINAMTzCJF" role="3uHU7B">
+                <ref role="3cqZAo" node="EINAMTznkh" resolve="model" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="EINAMTzt5r" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+        <node concept="NWlO9" id="7kEiJU7BPwg" role="lGtFl">
+          <property role="NWlVz" value="{@inheritDoc}" />
+        </node>
+      </node>
+      <node concept="3clFb_" id="1XaymyqIJxD" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="estimateCompilationMillis" />
+        <property role="DiZV1" value="false" />
+        <property role="IEkAT" value="false" />
+        <node concept="3Tm1VV" id="1XaymyqIJxE" role="1B3o_S" />
+        <node concept="10Oyi0" id="1XaymyqIJxG" role="3clF45" />
+        <node concept="3clFbS" id="1XaymyqIJxJ" role="3clF47">
+          <node concept="3cpWs6" id="1XaymyqIJQw" role="3cqZAp">
+            <node concept="3cmrfG" id="1XaymyqIJRo" role="3cqZAk">
+              <property role="3cmrfH" value="0" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="NWlO9" id="7kEiJU7BOZY" role="lGtFl">
+        <property role="NWlVz" value="Wrapper for the text generation handler to acccess the last generated model before textgen." />
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="6SYIklyM6Mh" role="1B3o_S" />
+    <node concept="NWlO9" id="41thbhvrpSr" role="lGtFl">
+      <property role="NWlVz" value="Utility methods for rebuilding the analyzed model." />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/pluginSolution.msd
index aeb3d7db7e..7627fd5c49 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/pluginSolution.msd
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/pluginSolution.msd
@@ -24,6 +24,8 @@
     <dependency reexport="false">019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)</dependency>
+    <dependency reexport="false">df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources)</dependency>
+    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
   </dependencies>
   <languageVersions>
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
@@ -101,6 +103,7 @@
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
     <module reference="20351dc3-a2df-46f5-b667-fc9adab1f1c9(jetbrains.mps.make)" version="0" />
     <module reference="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
+    <module reference="df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/com/mbeddr/core/unittest/generator/unittest_main/util.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/com/mbeddr/core/unittest/generator/unittest_main/util.mps
index 97a839c2e1..50dca91783 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/com/mbeddr/core/unittest/generator/unittest_main/util.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/com/mbeddr/core/unittest/generator/unittest_main/util.mps
@@ -2,12 +2,17 @@
 <model ref="r:719526d7-70f6-49c2-b98b-23125efc7823(com.mbeddr.core.unittest.generator.unittest_main.util)">
   <persistence version="9" />
   <languages>
+    <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
+    <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
     <import index="x27k" ref="r:75ecab8a-8931-4140-afc6-4b46398710fc(com.mbeddr.core.modules.structure)" />
     <import index="yz9a" ref="r:734c02dd-cc16-4184-99eb-5fd9f43aa37e(com.mbeddr.core.unittest.structure)" />
     <import index="k146" ref="r:5209fc71-bade-45c9-9079-f2d474f0d6ca(com.mbeddr.core.util.structure)" />
+    <import index="btm1" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3(org.apache.commons/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps
index 4d6352f913..1301772cb4 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps
@@ -53,6 +53,9 @@
       <concept id="1161622665029" name="jetbrains.mps.lang.sharedConcepts.structure.ConceptFunctionParameter_model" flags="nn" index="1Q6Npb" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
+        <child id="1082485599096" name="statements" index="9aQI4" />
+      </concept>
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -97,9 +100,9 @@
       </concept>
       <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
-        <child id="1206060520071" name="elsifClauses" index="3eNLev" />
       </concept>
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
@@ -116,10 +119,6 @@
       </concept>
       <concept id="1068581242866" name="jetbrains.mps.baseLanguage.structure.LocalVariableReference" flags="nn" index="3cpWsa" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
-        <child id="1206060619838" name="condition" index="3eO9$A" />
-        <child id="1206060644605" name="statementList" index="3eOfB_" />
-      </concept>
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
@@ -469,9 +468,6 @@
       </concept>
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
-      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
-        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
-      </concept>
       <concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
       <concept id="1181949435690" name="jetbrains.mps.lang.smodel.structure.Concept_NewInstance" flags="nn" index="LFhST" />
       <concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
@@ -3930,14 +3926,17 @@
         <node concept="3cpWs8" id="ILZbnBTjGw" role="3cqZAp">
           <node concept="3cpWsn" id="ILZbnBTjGx" role="3cpWs9">
             <property role="TrG5h" value="bc" />
-            <node concept="2I9FWS" id="ILZbnBTjGu" role="1tU5fm">
-              <ref role="2I9WkF" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
-            </node>
-            <node concept="2OqwBi" id="ILZbnBTjGy" role="33vP2m">
-              <node concept="1Q6Npb" id="ILZbnBTjGz" role="2Oq$k0" />
-              <node concept="2RRcyG" id="ILZbnBTjG$" role="2OqNvi">
-                <ref role="2RRcyH" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
+            <node concept="2OqwBi" id="77nuVWJ1tjg" role="33vP2m">
+              <node concept="2OqwBi" id="ILZbnBTjGy" role="2Oq$k0">
+                <node concept="1Q6Npb" id="ILZbnBTjGz" role="2Oq$k0" />
+                <node concept="2RRcyG" id="ILZbnBTjG$" role="2OqNvi">
+                  <ref role="2RRcyH" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
+                </node>
               </node>
+              <node concept="1uHKPH" id="77nuVWJ1vca" role="2OqNvi" />
+            </node>
+            <node concept="3Tqbb2" id="77nuVWJ1B7l" role="1tU5fm">
+              <ref role="ehGHo" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
             </node>
           </node>
         </node>
@@ -4026,11 +4025,8 @@
             <node concept="3clFbF" id="5usoWIKpQ5L" role="3cqZAp">
               <node concept="2OqwBi" id="5usoWIKq4XE" role="3clFbG">
                 <node concept="2OqwBi" id="5usoWIKq3q3" role="2Oq$k0">
-                  <node concept="2OqwBi" id="5usoWIKpR66" role="2Oq$k0">
-                    <node concept="37vLTw" id="ILZbnBTjG_" role="2Oq$k0">
-                      <ref role="3cqZAo" node="ILZbnBTjGx" resolve="bc" />
-                    </node>
-                    <node concept="1uHKPH" id="5usoWIKpZgK" role="2OqNvi" />
+                  <node concept="37vLTw" id="ILZbnBTjG_" role="2Oq$k0">
+                    <ref role="3cqZAo" node="ILZbnBTjGx" resolve="bc" />
                   </node>
                   <node concept="3Tsc0h" id="5usoWIKq3LF" role="2OqNvi">
                     <ref role="3TtcxE" to="51wr:4o9sgv8R$fb" />
@@ -4094,34 +4090,14 @@
         <node concept="3cpWs8" id="44MAav8_Ft" role="3cqZAp">
           <node concept="3cpWsn" id="44MAav8_Fu" role="3cpWs9">
             <property role="TrG5h" value="isNotIsolated" />
-            <node concept="2OqwBi" id="ILZbnBTs0Y" role="33vP2m">
-              <node concept="2OqwBi" id="ILZbnBTruV" role="2Oq$k0">
-                <node concept="2OqwBi" id="ILZbnBTrbB" role="2Oq$k0">
-                  <node concept="2OqwBi" id="ILZbnBTqFc" role="2Oq$k0">
-                    <node concept="2OqwBi" id="ILZbnBTngD" role="2Oq$k0">
-                      <node concept="37vLTw" id="ILZbnBTmrh" role="2Oq$k0">
-                        <ref role="3cqZAo" node="ILZbnBTjGx" resolve="bc" />
-                      </node>
-                      <node concept="13MTOL" id="ILZbnBToYu" role="2OqNvi">
-                        <ref role="13MTZf" to="vs0r:3R$6B6bKw0E" />
-                      </node>
-                    </node>
-                    <node concept="v3k3i" id="ILZbnBTqRZ" role="2OqNvi">
-                      <node concept="chp4Y" id="ILZbnBTr0I" role="v3oSu">
-                        <ref role="cht4Q" to="yz9a:7tWSY$P9Odb" resolve="TestCaseConfigItem" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="1uHKPH" id="ILZbnBTrjk" role="2OqNvi" />
-                </node>
-                <node concept="3TrEf2" id="ILZbnBTrRa" role="2OqNvi">
-                  <ref role="3Tt5mk" to="yz9a:ILZbnBPQGC" />
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="ILZbnBTsdf" role="2OqNvi">
-                <node concept="chp4Y" id="ILZbnBTsmC" role="cj9EA">
-                  <ref role="cht4Q" to="yz9a:ILZbnBPQGE" resolve="NoTestIsolationStrategy" />
+            <node concept="3fqX7Q" id="77nuVWJ1Fcw" role="33vP2m">
+              <node concept="2YIFZM" id="77nuVWJ1Fcy" role="3fr31v">
+                <ref role="37wK5l" to="4rjt:77nuVWJ0D9N" resolve="isIsloationApplicable" />
+                <ref role="1Pybhc" to="4rjt:77nuVWJ0D7o" resolve="IsolationHelper" />
+                <node concept="37vLTw" id="77nuVWJ1Fcz" role="37wK5m">
+                  <ref role="3cqZAo" node="ILZbnBTjGx" resolve="bc" />
                 </node>
+                <node concept="1iwH7S" id="77nuVWJ6_yC" role="37wK5m" />
               </node>
             </node>
             <node concept="10P_77" id="44MAav8_Fv" role="1tU5fm" />
@@ -5191,42 +5167,30 @@
             <node concept="2es0OD" id="1qmB$fdA_38" role="2OqNvi">
               <node concept="1bVj0M" id="1qmB$fdA_3a" role="23t8la">
                 <node concept="3clFbS" id="1qmB$fdA_3b" role="1bW5cS">
-                  <node concept="3cpWs8" id="ILZbnBSNLC" role="3cqZAp">
-                    <node concept="3cpWsn" id="ILZbnBSNLD" role="3cpWs9">
-                      <property role="TrG5h" value="configItem" />
-                      <node concept="3Tqbb2" id="ILZbnBSNLg" role="1tU5fm">
-                        <ref role="ehGHo" to="yz9a:7tWSY$P9Odb" resolve="TestCaseConfigItem" />
-                      </node>
-                      <node concept="2OqwBi" id="ILZbnBSNLE" role="33vP2m">
-                        <node concept="2OqwBi" id="ILZbnBSNLF" role="2Oq$k0">
-                          <node concept="2OqwBi" id="ILZbnBSNLG" role="2Oq$k0">
-                            <node concept="2OqwBi" id="ILZbnBSNLH" role="2Oq$k0">
-                              <node concept="37vLTw" id="ILZbnBSNLI" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
-                              </node>
-                              <node concept="2Xjw5R" id="ILZbnBSNLJ" role="2OqNvi">
-                                <node concept="1xMEDy" id="ILZbnBSNLK" role="1xVPHs">
-                                  <node concept="chp4Y" id="ILZbnBSNLL" role="ri$Ld">
-                                    <ref role="cht4Q" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
-                                  </node>
-                                </node>
+                  <node concept="3clFbH" id="ILZbnBSD7A" role="3cqZAp" />
+                  <node concept="3cpWs8" id="77nuVWJ0EfJ" role="3cqZAp">
+                    <node concept="3cpWsn" id="77nuVWJ0EfK" role="3cpWs9">
+                      <property role="TrG5h" value="isloationApplicable" />
+                      <node concept="10P_77" id="77nuVWJ0EfE" role="1tU5fm" />
+                      <node concept="2YIFZM" id="77nuVWJ0EfL" role="33vP2m">
+                        <ref role="37wK5l" to="4rjt:77nuVWJ0D9N" resolve="isIsloationApplicable" />
+                        <ref role="1Pybhc" to="4rjt:77nuVWJ0D7o" resolve="IsolationHelper" />
+                        <node concept="2OqwBi" id="77nuVWJ0EfM" role="37wK5m">
+                          <node concept="37vLTw" id="77nuVWJ0EfN" role="2Oq$k0">
+                            <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
+                          </node>
+                          <node concept="2Xjw5R" id="77nuVWJ0EfO" role="2OqNvi">
+                            <node concept="1xMEDy" id="77nuVWJ0EfP" role="1xVPHs">
+                              <node concept="chp4Y" id="77nuVWJ0EfQ" role="ri$Ld">
+                                <ref role="cht4Q" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
                               </node>
                             </node>
-                            <node concept="3Tsc0h" id="ILZbnBSNLM" role="2OqNvi">
-                              <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" />
-                            </node>
-                          </node>
-                          <node concept="v3k3i" id="ILZbnBSNLN" role="2OqNvi">
-                            <node concept="chp4Y" id="ILZbnBSNLO" role="v3oSu">
-                              <ref role="cht4Q" to="yz9a:7tWSY$P9Odb" resolve="TestCaseConfigItem" />
-                            </node>
                           </node>
                         </node>
-                        <node concept="1uHKPH" id="ILZbnBSNLP" role="2OqNvi" />
+                        <node concept="1iwH7S" id="77nuVWJ6yVK" role="37wK5m" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbH" id="ILZbnBSD7A" role="3cqZAp" />
                   <node concept="3clFbF" id="1qmB$fdA_4_" role="3cqZAp">
                     <node concept="2OqwBi" id="1qmB$fdAAns" role="3clFbG">
                       <node concept="2OqwBi" id="1qmB$fdA_8R" role="2Oq$k0">
@@ -5256,29 +5220,29 @@
                     </node>
                   </node>
                   <node concept="3clFbJ" id="44MAav70LH" role="3cqZAp">
-                    <node concept="3eNFk2" id="ILZbnBT4Mq" role="3eNLev">
-                      <node concept="3clFbS" id="ILZbnBT4Mr" role="3eOfB_">
-                        <node concept="3clFbF" id="ILZbnBT4Ms" role="3cqZAp">
-                          <node concept="2OqwBi" id="ILZbnBT4Mt" role="3clFbG">
-                            <node concept="2OqwBi" id="ILZbnBT4Mu" role="2Oq$k0">
-                              <node concept="37vLTw" id="ILZbnBT4Mv" role="2Oq$k0">
+                    <node concept="9aQIb" id="77nuVWJ0Xm9" role="9aQIa">
+                      <node concept="3clFbS" id="77nuVWJ0Xma" role="9aQI4">
+                        <node concept="3clFbF" id="44MAav73mT" role="3cqZAp">
+                          <node concept="2OqwBi" id="44MAav73mU" role="3clFbG">
+                            <node concept="2OqwBi" id="44MAav73mV" role="2Oq$k0">
+                              <node concept="37vLTw" id="44MAav73mW" role="2Oq$k0">
                                 <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
                               </node>
-                              <node concept="3Tsc0h" id="ILZbnBT4Mw" role="2OqNvi">
+                              <node concept="3Tsc0h" id="44MAav73mX" role="2OqNvi">
                                 <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" />
                               </node>
                             </node>
-                            <node concept="TSZUe" id="ILZbnBT4Mx" role="2OqNvi">
-                              <node concept="1sne9v" id="ILZbnBT4My" role="25WWJ7">
-                                <node concept="1sne01" id="ILZbnBT4Mz" role="1sne8H">
+                            <node concept="TSZUe" id="44MAav73mY" role="2OqNvi">
+                              <node concept="1sne9v" id="44MAav73mZ" role="25WWJ7">
+                                <node concept="1sne01" id="44MAav73n0" role="1sne8H">
                                   <ref role="1snh0D" to="tpck:4uZwTti3__2" />
-                                  <node concept="1shVQo" id="ILZbnBT4M$" role="ccFIB">
+                                  <node concept="1shVQo" id="44MAav73n1" role="ccFIB">
                                     <ref role="1shVQp" to="51wr:6GqYvBOf2Xb" resolve="ModuleRef" />
                                   </node>
-                                  <node concept="1sh8R2" id="ILZbnBT4M_" role="1sne05">
+                                  <node concept="1sh8R2" id="44MAav73n2" role="1sne05">
                                     <ref role="1sh8R3" to="51wr:6GqYvBOf2Xc" />
-                                    <node concept="3B5_sB" id="ILZbnBT4MA" role="1sh8R0">
-                                      <ref role="3B5MYn" to="9g8w:44MAav6D2s" resolve="Unittest_Helper_Isolated" />
+                                    <node concept="3B5_sB" id="44MAav73n3" role="1sh8R0">
+                                      <ref role="3B5MYn" to="9g8w:44MAav6Nkc" resolve="Unittest_Helper_NonIsolated" />
                                     </node>
                                   </node>
                                 </node>
@@ -5287,59 +5251,32 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="2OqwBi" id="ILZbnBT6mT" role="3eO9$A">
-                        <node concept="2OqwBi" id="ILZbnBT6mU" role="2Oq$k0">
-                          <node concept="37vLTw" id="ILZbnBT6mV" role="2Oq$k0">
-                            <ref role="3cqZAo" node="ILZbnBSNLD" resolve="configItem" />
-                          </node>
-                          <node concept="3TrEf2" id="ILZbnBT6mW" role="2OqNvi">
-                            <ref role="3Tt5mk" to="yz9a:ILZbnBPQGC" />
-                          </node>
-                        </node>
-                        <node concept="1mIQ4w" id="ILZbnBT6mX" role="2OqNvi">
-                          <node concept="chp4Y" id="ILZbnBT7V1" role="cj9EA">
-                            <ref role="cht4Q" to="yz9a:ILZbnBPQGH" resolve="TestIsolationStrategy" />
-                          </node>
-                        </node>
-                      </node>
                     </node>
-                    <node concept="2OqwBi" id="ILZbnBT08J" role="3clFbw">
-                      <node concept="2OqwBi" id="ILZbnBSWWl" role="2Oq$k0">
-                        <node concept="37vLTw" id="ILZbnBSVsz" role="2Oq$k0">
-                          <ref role="3cqZAo" node="ILZbnBSNLD" resolve="configItem" />
-                        </node>
-                        <node concept="3TrEf2" id="ILZbnBSY$v" role="2OqNvi">
-                          <ref role="3Tt5mk" to="yz9a:ILZbnBPQGC" />
-                        </node>
-                      </node>
-                      <node concept="1mIQ4w" id="ILZbnBT1Fr" role="2OqNvi">
-                        <node concept="chp4Y" id="ILZbnBT3eJ" role="cj9EA">
-                          <ref role="cht4Q" to="yz9a:ILZbnBPQGE" resolve="NoTestIsolationStrategy" />
-                        </node>
-                      </node>
+                    <node concept="37vLTw" id="77nuVWJ0Rsn" role="3clFbw">
+                      <ref role="3cqZAo" node="77nuVWJ0EfK" resolve="isloationApplicable" />
                     </node>
                     <node concept="3clFbS" id="44MAav70LJ" role="3clFbx">
-                      <node concept="3clFbF" id="44MAav73mT" role="3cqZAp">
-                        <node concept="2OqwBi" id="44MAav73mU" role="3clFbG">
-                          <node concept="2OqwBi" id="44MAav73mV" role="2Oq$k0">
-                            <node concept="37vLTw" id="44MAav73mW" role="2Oq$k0">
+                      <node concept="3clFbF" id="77nuVWJ0VNp" role="3cqZAp">
+                        <node concept="2OqwBi" id="77nuVWJ0VNq" role="3clFbG">
+                          <node concept="2OqwBi" id="77nuVWJ0VNr" role="2Oq$k0">
+                            <node concept="37vLTw" id="77nuVWJ0VNs" role="2Oq$k0">
                               <ref role="3cqZAo" node="1qmB$fdA_3c" resolve="binary" />
                             </node>
-                            <node concept="3Tsc0h" id="44MAav73mX" role="2OqNvi">
+                            <node concept="3Tsc0h" id="77nuVWJ0VNt" role="2OqNvi">
                               <ref role="3TtcxE" to="51wr:4o9sgv8QoKn" />
                             </node>
                           </node>
-                          <node concept="TSZUe" id="44MAav73mY" role="2OqNvi">
-                            <node concept="1sne9v" id="44MAav73mZ" role="25WWJ7">
-                              <node concept="1sne01" id="44MAav73n0" role="1sne8H">
+                          <node concept="TSZUe" id="77nuVWJ0VNu" role="2OqNvi">
+                            <node concept="1sne9v" id="77nuVWJ0VNv" role="25WWJ7">
+                              <node concept="1sne01" id="77nuVWJ0VNw" role="1sne8H">
                                 <ref role="1snh0D" to="tpck:4uZwTti3__2" />
-                                <node concept="1shVQo" id="44MAav73n1" role="ccFIB">
+                                <node concept="1shVQo" id="77nuVWJ0VNx" role="ccFIB">
                                   <ref role="1shVQp" to="51wr:6GqYvBOf2Xb" resolve="ModuleRef" />
                                 </node>
-                                <node concept="1sh8R2" id="44MAav73n2" role="1sne05">
+                                <node concept="1sh8R2" id="77nuVWJ0VNy" role="1sne05">
                                   <ref role="1sh8R3" to="51wr:6GqYvBOf2Xc" />
-                                  <node concept="3B5_sB" id="44MAav73n3" role="1sh8R0">
-                                    <ref role="3B5MYn" to="9g8w:44MAav6Nkc" resolve="Unittest_Helper_NonIsolated" />
+                                  <node concept="3B5_sB" id="77nuVWJ0VNz" role="1sh8R0">
+                                    <ref role="3B5MYn" to="9g8w:44MAav6D2s" resolve="Unittest_Helper_Isolated" />
                                   </node>
                                 </node>
                               </node>
@@ -5458,20 +5395,8 @@
                     </node>
                   </node>
                   <node concept="3clFbJ" id="44MAav7d$w" role="3cqZAp">
-                    <node concept="2OqwBi" id="ILZbnBT9vZ" role="3clFbw">
-                      <node concept="2OqwBi" id="ILZbnBT9w0" role="2Oq$k0">
-                        <node concept="37vLTw" id="ILZbnBT9w1" role="2Oq$k0">
-                          <ref role="3cqZAo" node="ILZbnBSNLD" resolve="configItem" />
-                        </node>
-                        <node concept="3TrEf2" id="ILZbnBT9w2" role="2OqNvi">
-                          <ref role="3Tt5mk" to="yz9a:ILZbnBPQGC" />
-                        </node>
-                      </node>
-                      <node concept="1mIQ4w" id="ILZbnBT9w3" role="2OqNvi">
-                        <node concept="chp4Y" id="ILZbnBT9w4" role="cj9EA">
-                          <ref role="cht4Q" to="yz9a:ILZbnBPQGH" resolve="TestIsolationStrategy" />
-                        </node>
-                      </node>
+                    <node concept="37vLTw" id="77nuVWJ1aFo" role="3clFbw">
+                      <ref role="3cqZAo" node="77nuVWJ0EfK" resolve="isloationApplicable" />
                     </node>
                     <node concept="3clFbS" id="44MAav7d$y" role="3clFbx">
                       <node concept="3clFbF" id="5PZNJkfFZqK" role="3cqZAp">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/plugin.mps
index 23d0d781da..68ba5cc6c6 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/plugin.mps
@@ -3,9 +3,18 @@
   <persistence version="9" />
   <languages>
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="2" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
+    <import index="yz9a" ref="r:734c02dd-cc16-4184-99eb-5fd9f43aa37e(com.mbeddr.core.unittest.structure)" />
+    <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="btm1" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3(org.apache.commons/)" />
+    <import index="51wr" ref="r:b31f1c3c-99aa-4f1e-a329-cba27efb1a6b(com.mbeddr.core.buildconfig.structure)" />
     <import index="mj1l" ref="r:c371cf98-dcc8-4a43-8eb8-8a8096de18b2(com.mbeddr.core.expressions.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
@@ -14,6 +23,10 @@
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
@@ -23,11 +36,24 @@
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -39,6 +65,11 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
         <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
@@ -47,9 +78,19 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -58,15 +99,34 @@
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+    </language>
+    <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
+      <concept id="1217889725928" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_SessionObjectAccess" flags="nn" index="2fSANN" />
+      <concept id="1217889960776" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_UserObjectAccessBase" flags="nn" index="2fTw9j">
+        <child id="1217890689512" name="userKey" index="2fWi3N" />
+      </concept>
+      <concept id="1216860049633" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextType" flags="in" index="1iwH7U" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
+      <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
+        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
+      </concept>
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
@@ -80,12 +140,18 @@
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
+      <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
+        <reference id="1138056546658" name="link" index="3TtcxE" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+    </language>
   </registry>
   <node concept="312cEu" id="4esKCdYwmKP">
     <property role="TrG5h" value="GeneratorHelper" />
@@ -193,5 +259,139 @@
     <node concept="2tJIrI" id="4esKCdYwmU6" role="jymVt" />
     <node concept="3Tm1VV" id="4esKCdYwmKQ" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="77nuVWJ0D7o">
+    <property role="TrG5h" value="IsolationHelper" />
+    <node concept="2tJIrI" id="77nuVWJ0D7Y" role="jymVt" />
+    <node concept="2YIFZL" id="77nuVWJ0D9N" role="jymVt">
+      <property role="TrG5h" value="isIsloationApplicable" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="77nuVWJ0D8u" role="3clF47">
+        <node concept="3cpWs8" id="77nuVWJ5mbb" role="3cqZAp">
+          <node concept="3cpWsn" id="77nuVWJ5mbc" role="3cpWs9">
+            <property role="TrG5h" value="temp" />
+            <node concept="3uibUv" id="77nuVWJ5mb6" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+            <node concept="2OqwBi" id="77nuVWJ5mbd" role="33vP2m">
+              <node concept="37vLTw" id="77nuVWJ5mbe" role="2Oq$k0">
+                <ref role="3cqZAo" node="77nuVWJ5dcW" resolve="ctx" />
+              </node>
+              <node concept="2fSANN" id="77nuVWJ5mbf" role="2OqNvi">
+                <node concept="Xl_RD" id="77nuVWJ5mbg" role="2fWi3N">
+                  <property role="Xl_RC" value="force_no_isolation" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="77nuVWJ9F6z" role="3cqZAp">
+          <node concept="3cpWsn" id="77nuVWJ9F6A" role="3cpWs9">
+            <property role="TrG5h" value="is_no_isolation_set" />
+            <node concept="3uibUv" id="77nuVWJ9FQ3" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+            </node>
+            <node concept="3clFbT" id="77nuVWJ9Fcj" role="33vP2m">
+              <property role="3clFbU" value="false" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="77nuVWJ9Fig" role="3cqZAp">
+          <node concept="3clFbS" id="77nuVWJ9Fii" role="3clFbx">
+            <node concept="3clFbF" id="77nuVWJ9FuS" role="3cqZAp">
+              <node concept="37vLTI" id="77nuVWJ9FxN" role="3clFbG">
+                <node concept="37vLTw" id="77nuVWJ9FuQ" role="37vLTJ">
+                  <ref role="3cqZAo" node="77nuVWJ9F6A" resolve="is_no_isolation_set" />
+                </node>
+                <node concept="1eOMI4" id="77nuVWJ9F_w" role="37vLTx">
+                  <node concept="10QFUN" id="77nuVWJ9F_x" role="1eOMHV">
+                    <node concept="37vLTw" id="77nuVWJ9F_v" role="10QFUP">
+                      <ref role="3cqZAo" node="77nuVWJ5mbc" resolve="temp" />
+                    </node>
+                    <node concept="3uibUv" id="77nuVWJ9FZk" role="10QFUM">
+                      <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="77nuVWJ9Fnl" role="3clFbw">
+            <node concept="10Nm6u" id="77nuVWJ9FnZ" role="3uHU7w" />
+            <node concept="37vLTw" id="77nuVWJ9Fms" role="3uHU7B">
+              <ref role="3cqZAo" node="77nuVWJ5mbc" resolve="temp" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="77nuVWJ9EI$" role="3cqZAp" />
+        <node concept="3cpWs6" id="77nuVWJ0MVO" role="3cqZAp">
+          <node concept="1Wc70l" id="77nuVWJ1O_p" role="3cqZAk">
+            <node concept="2OqwBi" id="77nuVWJ0MVQ" role="3uHU7w">
+              <node concept="2OqwBi" id="77nuVWJ0N7e" role="2Oq$k0">
+                <node concept="2OqwBi" id="77nuVWJ0MVR" role="2Oq$k0">
+                  <node concept="2OqwBi" id="77nuVWJ0MVS" role="2Oq$k0">
+                    <node concept="2OqwBi" id="77nuVWJ0MVT" role="2Oq$k0">
+                      <node concept="3Tsc0h" id="77nuVWJ0MVU" role="2OqNvi">
+                        <ref role="3TtcxE" to="vs0r:3R$6B6bKw0E" />
+                      </node>
+                      <node concept="37vLTw" id="77nuVWJ0MVV" role="2Oq$k0">
+                        <ref role="3cqZAo" node="77nuVWJ0D8F" resolve="bc" />
+                      </node>
+                    </node>
+                    <node concept="v3k3i" id="77nuVWJ0MVW" role="2OqNvi">
+                      <node concept="chp4Y" id="77nuVWJ0MVX" role="v3oSu">
+                        <ref role="cht4Q" to="yz9a:7tWSY$P9Odb" resolve="TestCaseConfigItem" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1uHKPH" id="77nuVWJ0MVY" role="2OqNvi" />
+                </node>
+                <node concept="3TrEf2" id="77nuVWJ0NgT" role="2OqNvi">
+                  <ref role="3Tt5mk" to="yz9a:ILZbnBPQGC" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="77nuVWJ0MVZ" role="2OqNvi">
+                <node concept="chp4Y" id="77nuVWJ0MW0" role="cj9EA">
+                  <ref role="cht4Q" to="yz9a:ILZbnBPQGH" resolve="TestIsolationStrategy" />
+                </node>
+              </node>
+            </node>
+            <node concept="1Wc70l" id="77nuVWJ5mjB" role="3uHU7B">
+              <node concept="3clFbC" id="77nuVWJ5mpm" role="3uHU7B">
+                <node concept="3clFbT" id="77nuVWJ5ms6" role="3uHU7w">
+                  <property role="3clFbU" value="false" />
+                </node>
+                <node concept="37vLTw" id="77nuVWJ9FAP" role="3uHU7B">
+                  <ref role="3cqZAo" node="77nuVWJ9F6A" resolve="is_no_isolation_set" />
+                </node>
+              </node>
+              <node concept="3clFbC" id="77nuVWJ1P1p" role="3uHU7w">
+                <node concept="3clFbT" id="77nuVWJ1P2y" role="3uHU7w">
+                  <property role="3clFbU" value="false" />
+                </node>
+                <node concept="10M0yZ" id="77nuVWJ1OGR" role="3uHU7B">
+                  <ref role="3cqZAo" to="btm1:~SystemUtils.IS_OS_WINDOWS" resolve="IS_OS_WINDOWS" />
+                  <ref role="1PxDUh" to="btm1:~SystemUtils" resolve="SystemUtils" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="77nuVWJ0D8F" role="3clF46">
+        <property role="TrG5h" value="bc" />
+        <node concept="3Tqbb2" id="77nuVWJ0D8E" role="1tU5fm">
+          <ref role="ehGHo" to="51wr:6GqYvBOf2X8" resolve="BuildConfiguration" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="77nuVWJ5dcW" role="3clF46">
+        <property role="TrG5h" value="ctx" />
+        <node concept="1iwH7U" id="77nuVWJ5jBh" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="77nuVWJ0D8l" role="3clF45" />
+      <node concept="3Tm1VV" id="77nuVWJ0D89" role="1B3o_S" />
+    </node>
+    <node concept="3Tm1VV" id="77nuVWJ0D7p" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/typesystem.mps
index 67bd23b11f..80714633f2 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/typesystem.mps
@@ -18,6 +18,7 @@
     <import index="bdcd" ref="r:d5deda81-7a35-4c2b-bda1-1fdc1db99e3b(com.mbeddr.mpsutil.suppresswarning.structure)" />
     <import index="c4fa" ref="r:9f0e84b6-2ec7-4f9e-83e0-feedc77b63a3(com.mbeddr.core.statements.structure)" />
     <import index="dqn8" ref="r:6f177fc3-8a05-4826-8d08-fd8676623247(com.mbeddr.mpsutil.suppresswarning.behavior)" />
+    <import index="btm1" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3(org.apache.commons/)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
@@ -46,6 +47,9 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -68,7 +72,7 @@
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
         <child id="1206060520071" name="elsifClauses" index="3eNLev" />
       </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" index="3clFbS">
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
@@ -120,6 +124,9 @@
         <child id="1185805056450" name="argument" index="nvjzm" />
         <child id="1205761991995" name="argumentRepresentator" index="2X0Ygz" />
       </concept>
+      <concept id="1224760201579" name="jetbrains.mps.lang.typesystem.structure.InfoStatement" flags="nn" index="Dpp1Q">
+        <child id="1224760230762" name="infoText" index="Dpw9R" />
+      </concept>
       <concept id="1175517767210" name="jetbrains.mps.lang.typesystem.structure.ReportErrorStatement" flags="nn" index="2MkqsV">
         <child id="1175517851849" name="errorString" index="2MkJ7o" />
       </concept>
@@ -1227,5 +1234,52 @@
       <ref role="1YaFvo" to="yz9a:6TAwvhVRBLA" resolve="TestCollection" />
     </node>
   </node>
+  <node concept="18kY7G" id="77nuVWJ1PbK">
+    <property role="TrG5h" value="check_TCCI" />
+    <node concept="3clFbS" id="77nuVWJ1PbL" role="18ibNy">
+      <node concept="3clFbJ" id="77nuVWJ1PcX" role="3cqZAp">
+        <node concept="3clFbS" id="77nuVWJ1PcZ" role="3clFbx">
+          <node concept="Dpp1Q" id="77nuVWJ1PbW" role="3cqZAp">
+            <node concept="2OqwBi" id="77nuVWJ1PK2" role="2OEOjV">
+              <node concept="1YBJjd" id="77nuVWJ1PF8" role="2Oq$k0">
+                <ref role="1YBMHb" node="77nuVWJ1PbN" resolve="testCaseConfigItem" />
+              </node>
+              <node concept="3TrEf2" id="77nuVWJ1PRA" role="2OqNvi">
+                <ref role="3Tt5mk" to="yz9a:ILZbnBPQGC" />
+              </node>
+            </node>
+            <node concept="Xl_RD" id="77nuVWJ1Pce" role="Dpw9R">
+              <property role="Xl_RC" value="Testisolation will not be executed on windows" />
+            </node>
+          </node>
+        </node>
+        <node concept="1Wc70l" id="77nuVWJ1Pha" role="3clFbw">
+          <node concept="2OqwBi" id="77nuVWJ1Pxw" role="3uHU7w">
+            <node concept="2OqwBi" id="77nuVWJ1PkA" role="2Oq$k0">
+              <node concept="1YBJjd" id="77nuVWJ1Ph$" role="2Oq$k0">
+                <ref role="1YBMHb" node="77nuVWJ1PbN" resolve="testCaseConfigItem" />
+              </node>
+              <node concept="3TrEf2" id="77nuVWJ1Pqv" role="2OqNvi">
+                <ref role="3Tt5mk" to="yz9a:ILZbnBPQGC" />
+              </node>
+            </node>
+            <node concept="1mIQ4w" id="77nuVWJ1PBA" role="2OqNvi">
+              <node concept="chp4Y" id="77nuVWJ1PDg" role="cj9EA">
+                <ref role="cht4Q" to="yz9a:ILZbnBPQGH" resolve="TestIsolationStrategy" />
+              </node>
+            </node>
+          </node>
+          <node concept="10M0yZ" id="77nuVWJ1Oy9" role="3uHU7B">
+            <ref role="3cqZAo" to="btm1:~SystemUtils.IS_OS_WINDOWS" resolve="IS_OS_WINDOWS" />
+            <ref role="1PxDUh" to="btm1:~SystemUtils" resolve="SystemUtils" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="77nuVWJ1PbN" role="1YuTPh">
+      <property role="TrG5h" value="testCaseConfigItem" />
+      <ref role="1YaFvo" to="yz9a:7tWSY$P9Odb" resolve="TestCaseConfigItem" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/unittest.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/unittest.mpl
index 4ce0ff499a..8af93b25eb 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/unittest.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/unittest.mpl
@@ -26,6 +26,7 @@
         <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
         <dependency reexport="false">2ed50273-af07-4e30-9004-b1f89545178a(com.mbeddr.core.stdlib)</dependency>
         <dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
+        <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
       </dependencies>
       <usedDevKits>
         <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -119,6 +120,7 @@
         <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
+        <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_before">
@@ -172,6 +174,7 @@
     <dependency reexport="false">06d68b77-b699-4918-83b8-857e63787800(com.mbeddr.core.unittest)</dependency>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
     <dependency reexport="false">2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig)</dependency>
+    <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
   </dependencies>
   <usedDevKits>
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -227,6 +230,7 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
     <language id="7fa12e9c-b949-4976-b4fa-19accbc320b4" fqName="jetbrains.mps.lang.dataFlow" version="0" />
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" fqName="jetbrains.mps.lang.editor" version="2" />
+    <language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" fqName="jetbrains.mps.lang.generator.generationContext" version="0" />
     <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" fqName="jetbrains.mps.lang.intentions" version="0" />
     <language id="90746344-04fd-4286-97d5-b46ae6a81709" fqName="jetbrains.mps.lang.migration" version="0" />
     <language id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" fqName="jetbrains.mps.lang.pattern" version="0" />
@@ -284,6 +288,7 @@
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
     <module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
+    <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
     <extendedLanguage>3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)</extendedLanguage>