diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77e4022b77..2f213f01e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project are documented in this file.
 
 The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
 
+## October 2025
+
+### Fixed
+
+- *de.itemis.mps.editor.bool.runtime* Improve loading of checkbox images to work in scenarios where the node being edited is not part of a model (even if only temporarily).
+
 ## September 2025
 
 ### Fixed
diff --git a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
index 7cabb50259..00629b66c5 100644
--- a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
+++ b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
@@ -234,6 +234,96 @@
         </node>
       </node>
     </node>
+    <node concept="15bmVD" id="1gaGt1klOqW" role="15bmVC">
+      <node concept="15ShDW" id="1gaGt1klOqT" role="15bq2Y">
+        <property role="15ShDY" value="Po4Z58IgBa/October" />
+        <property role="15ShDw" value="2025" />
+      </node>
+      <node concept="15bAme" id="1gaGt1klOqU" role="15bAlL">
+        <node concept="2DRihI" id="1gaGt1klOqV" role="15bAlk">
+          <node concept="15Ami3" id="1gaGt1klOqX" role="1PaTwD">
+            <node concept="37shsh" id="1gaGt1klOqY" role="15Aodc">
+              <node concept="1dCxOk" id="1gaGt1klOr3" role="37shsm">
+                <property role="1XweGW" value="278dc825-2faf-4320-b29f-78b1e6994ed4" />
+                <property role="1XxBO9" value="de.itemis.mps.editor.bool.runtime" />
+              </node>
+            </node>
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDc" role="1PaTwD">
+            <property role="3oM_SC" value="Improve" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDd" role="1PaTwD">
+            <property role="3oM_SC" value="loading" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDe" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDf" role="1PaTwD">
+            <property role="3oM_SC" value="checkbox" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDg" role="1PaTwD">
+            <property role="3oM_SC" value="images" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDh" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDi" role="1PaTwD">
+            <property role="3oM_SC" value="work" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDj" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDk" role="1PaTwD">
+            <property role="3oM_SC" value="scenarios" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDl" role="1PaTwD">
+            <property role="3oM_SC" value="where" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDm" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDn" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDs" role="1PaTwD">
+            <property role="3oM_SC" value="being" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDt" role="1PaTwD">
+            <property role="3oM_SC" value="edited" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDu" role="1PaTwD">
+            <property role="3oM_SC" value="is" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDv" role="1PaTwD">
+            <property role="3oM_SC" value="not" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDw" role="1PaTwD">
+            <property role="3oM_SC" value="part" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDx" role="1PaTwD">
+            <property role="3oM_SC" value="of" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDy" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTD_" role="1PaTwD">
+            <property role="3oM_SC" value="model" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDE" role="1PaTwD">
+            <property role="3oM_SC" value="(even" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTHN" role="1PaTwD">
+            <property role="3oM_SC" value="if" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDF" role="1PaTwD">
+            <property role="3oM_SC" value="only" />
+          </node>
+          <node concept="3oM_SD" id="1gaGt1klTDG" role="1PaTwD">
+            <property role="3oM_SC" value="temporarily)." />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="15bmVD" id="4xFP9J_Gj2t" role="15bmVC">
       <node concept="15ShDW" id="4xFP9J_Gj2q" role="15bq2Y">
         <property role="15ShDY" value="Po4Z58IgB0/September" />
diff --git a/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/de.itemis.mps.editor.bool.runtime.msd b/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/de.itemis.mps.editor.bool.runtime.msd
index 89634b05fd..cfba8db87c 100644
--- a/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/de.itemis.mps.editor.bool.runtime.msd
+++ b/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/de.itemis.mps.editor.bool.runtime.msd
@@ -19,6 +19,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/models/de/itemis/mps/editor/bool/runtime.mps b/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/models/de/itemis/mps/editor/bool/runtime.mps
index 047afb05b0..511b890bb8 100644
--- a/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/models/de/itemis/mps/editor/bool/runtime.mps
+++ b/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/models/de/itemis/mps/editor/bool/runtime.mps
@@ -6,6 +6,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
@@ -66,10 +67,15 @@
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+        <child id="1188214630783" name="value" index="2B76xF" />
       </concept>
       <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
+      <concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
+        <reference id="1188214555875" name="key" index="2B6OnR" />
+        <child id="1188214607812" name="value" index="2B70Vg" />
+      </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
@@ -265,6 +271,21 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="5383422241790532083" name="tags" index="3nqlJM" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI">
+        <child id="2667874559098216723" name="text" index="3HnX3l" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+    </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
         <property id="2034914114981261751" name="severity" index="RRSoG" />
@@ -281,6 +302,9 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -322,11 +346,6 @@
       <node concept="3uibUv" id="20OtND1NH7S" role="1tU5fm">
         <ref role="3uigEE" node="20OtND1EgbU" resolve="CheckboxImages" />
       </node>
-      <node concept="2ShNRf" id="20OtND1O4vc" role="33vP2m">
-        <node concept="1pGfFk" id="20OtND1O4vb" role="2ShVmc">
-          <ref role="37wK5l" node="20OtND1EghC" resolve="CheckboxImages" />
-        </node>
-      </node>
     </node>
     <node concept="2tJIrI" id="4g2H4r3VbVp" role="jymVt" />
     <node concept="3clFbW" id="4g2H4r3V7I2" role="jymVt">
@@ -342,6 +361,26 @@
             <ref role="3cqZAo" node="4g2H4r3V827" resolve="node" />
           </node>
         </node>
+        <node concept="3clFbF" id="1gaGt1klAGm" role="3cqZAp">
+          <node concept="37vLTI" id="1gaGt1klAGn" role="3clFbG">
+            <node concept="2ShNRf" id="1gaGt1klAGo" role="37vLTx">
+              <node concept="1pGfFk" id="1gaGt1klAGp" role="2ShVmc">
+                <ref role="37wK5l" node="20OtND1EghC" resolve="CheckboxImages" />
+                <node concept="2OqwBi" id="1gaGt1klGT6" role="37wK5m">
+                  <node concept="37vLTw" id="1gaGt1klGDj" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4g2H4r3V7Zd" resolve="context" />
+                  </node>
+                  <node concept="liA8E" id="1gaGt1klHzK" role="2OqNvi">
+                    <ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="1gaGt1klFyx" role="37vLTJ">
+              <ref role="3cqZAo" node="20OtND1NE28" resolve="myImages" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="4g2H4r3VcGD" role="3cqZAp">
           <node concept="37vLTI" id="4g2H4r3VcQS" role="3clFbG">
             <node concept="37vLTw" id="4g2H4r3VcTm" role="37vLTx">
@@ -1645,6 +1684,14 @@
   </node>
   <node concept="312cEu" id="20OtND1EgbU">
     <property role="TrG5h" value="CheckboxImages" />
+    <node concept="312cEg" id="1gaGt1kl5TI" role="jymVt">
+      <property role="TrG5h" value="myRepository" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm6S6" id="1gaGt1kkZmm" role="1B3o_S" />
+      <node concept="3uibUv" id="1gaGt1kl1EU" role="1tU5fm">
+        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+      </node>
+    </node>
     <node concept="312cEg" id="20OtND1EgeJ" role="jymVt">
       <property role="TrG5h" value="myImageTrue" />
       <node concept="3Tm6S6" id="20OtND1EgeK" role="1B3o_S" />
@@ -1790,9 +1837,25 @@
     </node>
     <node concept="2tJIrI" id="20OtND1EAOb" role="jymVt" />
     <node concept="3clFbW" id="20OtND1EghC" role="jymVt">
+      <node concept="37vLTG" id="1gaGt1kl84U" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="1gaGt1kl8fS" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
       <node concept="3cqZAl" id="20OtND1EghE" role="3clF45" />
       <node concept="3Tm1VV" id="20OtND1EghF" role="1B3o_S" />
       <node concept="3clFbS" id="20OtND1EghG" role="3clF47">
+        <node concept="3clFbF" id="1gaGt1kl8yn" role="3cqZAp">
+          <node concept="37vLTI" id="1gaGt1kl8WH" role="3clFbG">
+            <node concept="37vLTw" id="1gaGt1kl9cY" role="37vLTx">
+              <ref role="3cqZAo" node="1gaGt1kl84U" resolve="repository" />
+            </node>
+            <node concept="37vLTw" id="1gaGt1kl8yl" role="37vLTJ">
+              <ref role="3cqZAo" node="1gaGt1kl5TI" resolve="myRepository" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="20OtND1RDae" role="3cqZAp">
           <node concept="1rXfSq" id="20OtND1RDad" role="3clFbG">
             <ref role="37wK5l" node="20OtND1EGlB" resolve="updateSize" />
@@ -1873,13 +1936,16 @@
             <node concept="37vLTw" id="20OtND1Mo8o" role="37vLTJ">
               <ref role="3cqZAo" node="20OtND1EgeJ" resolve="myImageTrue" />
             </node>
-            <node concept="2YIFZM" id="7_hVqhyE0PW" role="37vLTx">
-              <ref role="37wK5l" node="20OtND1EkN0" resolve="loadImage" />
+            <node concept="2YIFZM" id="1gaGt1klozw" role="37vLTx">
+              <ref role="37wK5l" node="1gaGt1kiIho" resolve="loadImage" />
               <ref role="1Pybhc" node="7_hVqhyE0pS" resolve="ImageLoading" />
-              <node concept="37vLTw" id="20OtND1MoVQ" role="37wK5m">
+              <node concept="37vLTw" id="1gaGt1klozx" role="37wK5m">
+                <ref role="3cqZAo" node="1gaGt1kl5TI" resolve="myRepository" />
+              </node>
+              <node concept="37vLTw" id="1gaGt1klozy" role="37wK5m">
                 <ref role="3cqZAo" node="20OtND1LnDh" resolve="path" />
               </node>
-              <node concept="37vLTw" id="20OtND1Mypj" role="37wK5m">
+              <node concept="37vLTw" id="1gaGt1klozz" role="37wK5m">
                 <ref role="3cqZAo" node="20OtND1MoXD" resolve="node" />
               </node>
             </node>
@@ -1911,13 +1977,16 @@
             <node concept="37vLTw" id="20OtND1Nm6M" role="37vLTJ">
               <ref role="3cqZAo" node="20OtND1EgfV" resolve="myImageFalse" />
             </node>
-            <node concept="2YIFZM" id="7_hVqhyE0PX" role="37vLTx">
-              <ref role="37wK5l" node="20OtND1EkN0" resolve="loadImage" />
+            <node concept="2YIFZM" id="1gaGt1klqyB" role="37vLTx">
+              <ref role="37wK5l" node="1gaGt1kiIho" resolve="loadImage" />
               <ref role="1Pybhc" node="7_hVqhyE0pS" resolve="ImageLoading" />
-              <node concept="37vLTw" id="20OtND1MMfE" role="37wK5m">
+              <node concept="37vLTw" id="1gaGt1klqyC" role="37wK5m">
+                <ref role="3cqZAo" node="1gaGt1kl5TI" resolve="myRepository" />
+              </node>
+              <node concept="37vLTw" id="1gaGt1klqyD" role="37wK5m">
                 <ref role="3cqZAo" node="20OtND1MMfu" resolve="path" />
               </node>
-              <node concept="37vLTw" id="20OtND1MMfF" role="37wK5m">
+              <node concept="37vLTw" id="1gaGt1klqyE" role="37wK5m">
                 <ref role="3cqZAo" node="20OtND1MMfw" resolve="node" />
               </node>
             </node>
@@ -4394,6 +4463,76 @@
       <property role="DiZV1" value="false" />
       <property role="od$2w" value="false" />
       <node concept="3clFbS" id="20OtND1EgVD" role="3clF47">
+        <node concept="3clFbF" id="1gaGt1kiTPG" role="3cqZAp">
+          <node concept="1rXfSq" id="1gaGt1kiTPE" role="3clFbG">
+            <ref role="37wK5l" node="1gaGt1kiIho" resolve="loadImage" />
+            <node concept="2OqwBi" id="1gaGt1kiY0T" role="37wK5m">
+              <node concept="2JrnkZ" id="1gaGt1kiXCt" role="2Oq$k0">
+                <node concept="2OqwBi" id="1gaGt1kiW2M" role="2JrQYb">
+                  <node concept="37vLTw" id="1gaGt1kiVj7" role="2Oq$k0">
+                    <ref role="3cqZAo" node="1wjaGbcRyZW" resolve="sourceNode" />
+                  </node>
+                  <node concept="I4A8Y" id="1gaGt1kiWp$" role="2OqNvi" />
+                </node>
+              </node>
+              <node concept="liA8E" id="1gaGt1kiZ8r" role="2OqNvi">
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="1gaGt1kj1c1" role="37wK5m">
+              <ref role="3cqZAo" node="20OtND1EgVB" resolve="fileName" />
+            </node>
+            <node concept="37vLTw" id="1gaGt1kj1v6" role="37wK5m">
+              <ref role="3cqZAo" node="1wjaGbcRyZW" resolve="sourceNode" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="20OtND1EgVB" role="3clF46">
+        <property role="TrG5h" value="fileName" />
+        <property role="3TUv4t" value="false" />
+        <node concept="17QB3L" id="20OtND1EhVk" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="20OtND1EjI5" role="3clF45">
+        <ref role="3uigEE" to="z60i:~Image" resolve="Image" />
+      </node>
+      <node concept="3Tm1VV" id="7_hVqhyE4dk" role="1B3o_S" />
+      <node concept="37vLTG" id="1wjaGbcRyZW" role="3clF46">
+        <property role="TrG5h" value="sourceNode" />
+        <property role="3TUv4t" value="false" />
+        <node concept="3Tqbb2" id="1wjaGbcRyZX" role="1tU5fm" />
+      </node>
+      <node concept="P$JXv" id="1gaGt1klS9T" role="lGtFl">
+        <node concept="TZ5HI" id="1gaGt1klS9U" role="3nqlJM">
+          <node concept="TZ5HA" id="1gaGt1klS9V" role="3HnX3l">
+            <node concept="1dT_AC" id="1gaGt1klTmE" role="1dT_Ay">
+              <property role="1dT_AB" value="use the overload with the repository parameter. Left for compatibility with existing generated code." />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="1gaGt1klS9W" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
+        <node concept="2B6LJw" id="1gaGt1klTmF" role="2B76xF">
+          <ref role="2B6OnR" to="wyt6:~Deprecated.since()" resolve="since" />
+          <node concept="Xl_RD" id="1gaGt1klTpb" role="2B70Vg">
+            <property role="Xl_RC" value="2025-10" />
+          </node>
+        </node>
+        <node concept="2B6LJw" id="1gaGt1klTrb" role="2B76xF">
+          <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
+          <node concept="3clFbT" id="1gaGt1klTzy" role="2B70Vg">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1gaGt1kiJ_g" role="jymVt" />
+    <node concept="2YIFZL" id="1gaGt1kiIho" role="jymVt">
+      <property role="TrG5h" value="loadImage" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="1gaGt1kiIhp" role="3clF47">
         <node concept="3clFbJ" id="1wjaGbcR1WI" role="3cqZAp">
           <node concept="3clFbS" id="1wjaGbcR1WK" role="3clFbx">
             <node concept="3cpWs6" id="1wjaGbcRjIG" role="3cqZAp">
@@ -4403,7 +4542,7 @@
           <node concept="3clFbC" id="1wjaGbcRb1f" role="3clFbw">
             <node concept="10Nm6u" id="1wjaGbcReM1" role="3uHU7w" />
             <node concept="37vLTw" id="1wjaGbcR7dd" role="3uHU7B">
-              <ref role="3cqZAo" node="20OtND1EgVB" resolve="fileName" />
+              <ref role="3cqZAo" node="1gaGt1kiIkn" resolve="fileName" />
             </node>
           </node>
         </node>
@@ -4419,7 +4558,7 @@
               <node concept="2OqwBi" id="1kq2va83UMd" role="2Oq$k0">
                 <node concept="2OqwBi" id="1wjaGbcRSFX" role="2Oq$k0">
                   <node concept="37vLTw" id="1wjaGbcRSFY" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1wjaGbcRyZW" resolve="sourceNode" />
+                    <ref role="3cqZAo" node="1gaGt1kiIkr" resolve="sourceNode" />
                   </node>
                   <node concept="2yIwOk" id="1wjaGbcRSFZ" role="2OqNvi" />
                 </node>
@@ -4472,7 +4611,7 @@
                 </node>
                 <node concept="2OqwBi" id="3xul4PUMFLl" role="3uHU7B">
                   <node concept="37vLTw" id="3xul4PUME2B" role="2Oq$k0">
-                    <ref role="3cqZAo" node="20OtND1EgVB" resolve="fileName" />
+                    <ref role="3cqZAo" node="1gaGt1kiIkn" resolve="fileName" />
                   </node>
                   <node concept="liA8E" id="3xul4PUMHlp" role="2OqNvi">
                     <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
@@ -4623,7 +4762,7 @@
                 <node concept="17QB3L" id="1kq2va83w2T" role="1tU5fm" />
                 <node concept="2OqwBi" id="1kq2va8373q" role="33vP2m">
                   <node concept="37vLTw" id="1kq2va8373r" role="2Oq$k0">
-                    <ref role="3cqZAo" node="20OtND1EgVB" resolve="fileName" />
+                    <ref role="3cqZAo" node="1gaGt1kiIkn" resolve="fileName" />
                   </node>
                   <node concept="liA8E" id="1kq2va8373s" role="2OqNvi">
                     <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
@@ -4659,18 +4798,8 @@
                 <node concept="2YIFZM" id="1_rjAhZOW4U" role="2Oq$k0">
                   <ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository)" resolve="getInstance" />
                   <ref role="1Pybhc" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
-                  <node concept="2OqwBi" id="1_rjAhZP2M6" role="37wK5m">
-                    <node concept="2JrnkZ" id="1_rjAhZP2qT" role="2Oq$k0">
-                      <node concept="2OqwBi" id="1_rjAhZOXbT" role="2JrQYb">
-                        <node concept="37vLTw" id="1kq2va84Kl5" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1wjaGbcRyZW" resolve="sourceNode" />
-                        </node>
-                        <node concept="I4A8Y" id="1_rjAhZOZiX" role="2OqNvi" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="1_rjAhZP3M0" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
-                    </node>
+                  <node concept="37vLTw" id="1gaGt1km4Kf" role="37wK5m">
+                    <ref role="3cqZAo" node="1gaGt1kiKMN" resolve="repository" />
                   </node>
                 </node>
                 <node concept="liA8E" id="1_rjAhZP54M" role="2OqNvi">
@@ -4749,7 +4878,7 @@
           </node>
           <node concept="2OqwBi" id="1_rjAhZPAtQ" role="3clFbw">
             <node concept="37vLTw" id="1_rjAhZP$F1" role="2Oq$k0">
-              <ref role="3cqZAo" node="20OtND1EgVB" resolve="fileName" />
+              <ref role="3cqZAo" node="1gaGt1kiIkn" resolve="fileName" />
             </node>
             <node concept="liA8E" id="1_rjAhZPC9G" role="2OqNvi">
               <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
@@ -4774,12 +4903,12 @@
               <node concept="liA8E" id="1wjaGbcSOvi" role="2OqNvi">
                 <ref role="37wK5l" to="18ew:~MacroHelper.expandPath(java.lang.String)" resolve="expandPath" />
                 <node concept="37vLTw" id="1wjaGbcSOvj" role="37wK5m">
-                  <ref role="3cqZAo" node="20OtND1EgVB" resolve="fileName" />
+                  <ref role="3cqZAo" node="1gaGt1kiIkn" resolve="fileName" />
                 </node>
               </node>
             </node>
             <node concept="37vLTw" id="1wjaGbcT0_z" role="37vLTJ">
-              <ref role="3cqZAo" node="20OtND1EgVB" resolve="fileName" />
+              <ref role="3cqZAo" node="1gaGt1kiIkn" resolve="fileName" />
             </node>
           </node>
         </node>
@@ -4793,7 +4922,7 @@
               <node concept="liA8E" id="HtNrEHAIQK" role="2OqNvi">
                 <ref role="37wK5l" to="w827:~FileSystem.getFile(java.lang.String)" resolve="getFile" />
                 <node concept="37vLTw" id="HtNrEHAIQL" role="37wK5m">
-                  <ref role="3cqZAo" node="20OtND1EgVB" resolve="fileName" />
+                  <ref role="3cqZAo" node="1gaGt1kiIkn" resolve="fileName" />
                 </node>
               </node>
               <node concept="2OqwBi" id="1wjaGbcTr2c" role="2Oq$k0">
@@ -4874,20 +5003,36 @@
         <node concept="3cpWs6" id="20OtND1Ek0s" role="3cqZAp">
           <node concept="10Nm6u" id="20OtND1EkiQ" role="3cqZAk" />
         </node>
+        <node concept="3clFbH" id="1gaGt1klZJK" role="3cqZAp" />
       </node>
-      <node concept="37vLTG" id="20OtND1EgVB" role="3clF46">
+      <node concept="37vLTG" id="1gaGt1kiKMN" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="1gaGt1kiL$B" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+        <node concept="2AHcQZ" id="1gaGt1kiMGT" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1gaGt1kiIkn" role="3clF46">
         <property role="TrG5h" value="fileName" />
         <property role="3TUv4t" value="false" />
-        <node concept="17QB3L" id="20OtND1EhVk" role="1tU5fm" />
+        <node concept="17QB3L" id="1gaGt1kiIko" role="1tU5fm" />
+        <node concept="2AHcQZ" id="1gaGt1kiNsn" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
       </node>
-      <node concept="3uibUv" id="20OtND1EjI5" role="3clF45">
+      <node concept="3uibUv" id="1gaGt1kiIkp" role="3clF45">
         <ref role="3uigEE" to="z60i:~Image" resolve="Image" />
       </node>
-      <node concept="3Tm1VV" id="7_hVqhyE4dk" role="1B3o_S" />
-      <node concept="37vLTG" id="1wjaGbcRyZW" role="3clF46">
+      <node concept="3Tm1VV" id="1gaGt1kiIkq" role="1B3o_S" />
+      <node concept="37vLTG" id="1gaGt1kiIkr" role="3clF46">
         <property role="TrG5h" value="sourceNode" />
         <property role="3TUv4t" value="false" />
-        <node concept="3Tqbb2" id="1wjaGbcRyZX" role="1tU5fm" />
+        <node concept="3Tqbb2" id="1gaGt1kiIks" role="1tU5fm" />
+        <node concept="2AHcQZ" id="1gaGt1kiOJK" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
       </node>
     </node>
   </node>
diff --git a/code/widgets/tests/models/test.de.itemis.mps.editor.bool.runtime@tests.mps b/code/widgets/tests/models/test.de.itemis.mps.editor.bool.runtime@tests.mps
index eb44369e6c..d21c81ad47 100644
--- a/code/widgets/tests/models/test.de.itemis.mps.editor.bool.runtime@tests.mps
+++ b/code/widgets/tests/models/test.de.itemis.mps.editor.bool.runtime@tests.mps
@@ -9,9 +9,11 @@
   <imports>
     <import index="hdil" ref="r:61f3a034-6f5c-43d5-a74f-5ddd196fba91(de.itemis.mps.editor.bool.runtime)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
+      <concept id="1225467090849" name="jetbrains.mps.lang.test.structure.ProjectExpression" flags="nn" index="1jxXqW" />
       <concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
         <property id="2616911529524314943" name="accessMode" index="3DII0k" />
         <child id="1217501822150" name="nodesToCheck" index="1SKRRt" />
@@ -27,6 +29,11 @@
       <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
@@ -108,13 +115,19 @@
             <node concept="3uibUv" id="7_hVqhyE5Jz" role="1tU5fm">
               <ref role="3uigEE" to="z60i:~Image" resolve="Image" />
             </node>
-            <node concept="2YIFZM" id="7_hVqhyE5M0" role="33vP2m">
-              <ref role="37wK5l" to="hdil:20OtND1EkN0" resolve="loadImage" />
+            <node concept="2YIFZM" id="1gaGt1klueM" role="33vP2m">
+              <ref role="37wK5l" to="hdil:1gaGt1kiIho" resolve="loadImage" />
               <ref role="1Pybhc" to="hdil:7_hVqhyE0pS" resolve="ImageLoading" />
-              <node concept="Xl_RD" id="7_hVqhyE5M1" role="37wK5m">
+              <node concept="2OqwBi" id="1gaGt1klueN" role="37wK5m">
+                <node concept="1jxXqW" id="1gaGt1klueO" role="2Oq$k0" />
+                <node concept="liA8E" id="1gaGt1klueP" role="2OqNvi">
+                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                </node>
+              </node>
+              <node concept="Xl_RD" id="1gaGt1klueQ" role="37wK5m">
                 <property role="Xl_RC" value="${module}/icons/build.png" />
               </node>
-              <node concept="3xONca" id="3xul4PUMvMd" role="37wK5m">
+              <node concept="3xONca" id="1gaGt1klueR" role="37wK5m">
                 <ref role="3xOPvv" node="7_hVqhyEpKE" resolve="buildProject" />
               </node>
             </node>
@@ -133,37 +146,55 @@
       <node concept="3cqZAl" id="3xul4PUMAhC" role="3clF45" />
       <node concept="3clFbS" id="3xul4PUMAhD" role="3clF47">
         <node concept="3ykFI1" id="3xul4PUMAjV" role="3cqZAp">
-          <node concept="2YIFZM" id="3xul4PUMAhH" role="3ykU8v">
-            <ref role="37wK5l" to="hdil:20OtND1EkN0" resolve="loadImage" />
+          <node concept="2YIFZM" id="1gaGt1klu5Q" role="3ykU8v">
+            <ref role="37wK5l" to="hdil:1gaGt1kiIho" resolve="loadImage" />
             <ref role="1Pybhc" to="hdil:7_hVqhyE0pS" resolve="ImageLoading" />
-            <node concept="Xl_RD" id="3xul4PUMAhI" role="37wK5m">
+            <node concept="2OqwBi" id="1gaGt1klu5R" role="37wK5m">
+              <node concept="1jxXqW" id="1gaGt1klu5S" role="2Oq$k0" />
+              <node concept="liA8E" id="1gaGt1klu5T" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+            <node concept="Xl_RD" id="1gaGt1klu5U" role="37wK5m">
               <property role="Xl_RC" value="${module}" />
             </node>
-            <node concept="3xONca" id="3xul4PUMAhJ" role="37wK5m">
+            <node concept="3xONca" id="1gaGt1klu5V" role="37wK5m">
               <ref role="3xOPvv" node="7_hVqhyEpKE" resolve="buildProject" />
             </node>
           </node>
         </node>
         <node concept="3ykFI1" id="3xul4PUMPo$" role="3cqZAp">
-          <node concept="2YIFZM" id="3xul4PUMPo_" role="3ykU8v">
-            <ref role="37wK5l" to="hdil:20OtND1EkN0" resolve="loadImage" />
+          <node concept="2YIFZM" id="1gaGt1klu8o" role="3ykU8v">
+            <ref role="37wK5l" to="hdil:1gaGt1kiIho" resolve="loadImage" />
             <ref role="1Pybhc" to="hdil:7_hVqhyE0pS" resolve="ImageLoading" />
-            <node concept="Xl_RD" id="3xul4PUMPoA" role="37wK5m">
+            <node concept="2OqwBi" id="1gaGt1klu8p" role="37wK5m">
+              <node concept="1jxXqW" id="1gaGt1klu8q" role="2Oq$k0" />
+              <node concept="liA8E" id="1gaGt1klu8r" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+            <node concept="Xl_RD" id="1gaGt1klu8s" role="37wK5m">
               <property role="Xl_RC" value="${module}/" />
             </node>
-            <node concept="3xONca" id="3xul4PUMPoB" role="37wK5m">
+            <node concept="3xONca" id="1gaGt1klu8t" role="37wK5m">
               <ref role="3xOPvv" node="7_hVqhyEpKE" resolve="buildProject" />
             </node>
           </node>
         </node>
         <node concept="3ykFI1" id="3xul4PUN2T3" role="3cqZAp">
-          <node concept="2YIFZM" id="3xul4PUN2T4" role="3ykU8v">
-            <ref role="37wK5l" to="hdil:20OtND1EkN0" resolve="loadImage" />
+          <node concept="2YIFZM" id="1gaGt1kluaZ" role="3ykU8v">
+            <ref role="37wK5l" to="hdil:1gaGt1kiIho" resolve="loadImage" />
             <ref role="1Pybhc" to="hdil:7_hVqhyE0pS" resolve="ImageLoading" />
-            <node concept="Xl_RD" id="3xul4PUN2T5" role="37wK5m">
+            <node concept="2OqwBi" id="1gaGt1klub0" role="37wK5m">
+              <node concept="1jxXqW" id="1gaGt1klub1" role="2Oq$k0" />
+              <node concept="liA8E" id="1gaGt1klub2" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+            <node concept="Xl_RD" id="1gaGt1klub3" role="37wK5m">
               <property role="Xl_RC" value="${module}/x" />
             </node>
-            <node concept="3xONca" id="3xul4PUN2T6" role="37wK5m">
+            <node concept="3xONca" id="1gaGt1klub4" role="37wK5m">
               <ref role="3xOPvv" node="7_hVqhyEpKE" resolve="buildProject" />
             </node>
           </node>