diff --git a/CHANGELOG.md b/CHANGELOG.md
index decc292381..cd96ee99b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,16 +7,28 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 # April 2024
 
+## com.mbeddr.core
+
+### Added
+
+- Base: Added possibility to explicitly not display roots of concept `IMbeddrIDERoot` in mbeddr menus.
+
 ## com.mbeddr.doc.aspect.ui
 
-## Fixed
+### Fixed
 
 - A null pointer was fixed that was related to showing the documentation when the documentation tab is not opened.
 - The documentation Tool is now only updated when the selection changed.
 
 ## com.mbeddr.mpsutil
 
+### Fixed
+
 - An initialization issue related to the context actions tool was fixed.
+- EditingGuide: `ProgramFragments` support error suppression, i.e. all model-checking errors are suppressed in `ProgramFragments`, so modelchecker will disregard them and not clutter.
+- EditingGuide: Fragment module depends on its original module, to access data that is needed, but in the original module and not copied to the temporary exercise model.
+- Hyperlink: `HyperlinkUtil.openInBrowser()` behaves like no-op instead of raising an exception on null or empty URLs.
+- Asynccell: Stops polling for the calculated value in case the poll-request throws an exception and shows to the user, that the calculation has failed together with the thrown exception, instead of spamming the log on each poll with the exception.
 
 # March 2024
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
index b00bafdc60..6bead76436 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
@@ -63,9 +63,9 @@
     <import index="eoo2" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.nio.file(JDK/)" />
     <import index="btm1" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3(org.apache.commons/)" />
     <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
-    <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
-    <import index="ddhc" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide(MPS.IDEA/)" />
     <import index="b9kz" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm.ex(MPS.IDEA/)" />
+    <import index="ddhc" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide(MPS.IDEA/)" />
+    <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
     <import index="6xgk" ref="r:6e9ad488-5df2-49e4-8c01-8a7f3812adf7(jetbrains.mps.lang.scopes.runtime)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
@@ -4359,6 +4359,29 @@
   </node>
   <node concept="13h7C7" id="IviauXaxW">
     <ref role="13h7C2" to="vs0r:IviauXabd" resolve="IMbeddrIDERoot" />
+    <node concept="13i0hz" id="2daXVy6Qz1j" role="13h7CS">
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="isDisplayed" />
+      <node concept="3Tm1VV" id="7jN4X3UX2AX" role="1B3o_S" />
+      <node concept="10P_77" id="7jN4X3UX3Yi" role="3clF45" />
+      <node concept="3clFbS" id="7jN4X3UX2AZ" role="3clF47">
+        <node concept="3clFbF" id="7jN4X3UX40a" role="3cqZAp">
+          <node concept="3clFbT" id="7jN4X3UX409" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="7jN4X3UX40r" role="lGtFl">
+        <node concept="TZ5HA" id="7jN4X3UX40s" role="TZ5H$">
+          <node concept="1dT_AC" id="7jN4X3UX40t" role="1dT_Ay">
+            <property role="1dT_AB" value="" />
+          </node>
+        </node>
+        <node concept="x79VA" id="7jN4X3UX40u" role="3nqlJM">
+          <property role="x79VB" value="Whether such node can be created from the mbeddr context menu" />
+        </node>
+      </node>
+    </node>
     <node concept="13i0hz" id="IviauXb0g" role="13h7CS">
       <property role="13i0iv" value="true" />
       <property role="13i0it" value="true" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
index 91d39fa8df..2ac2e15bcb 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -8085,6 +8085,21 @@
                               </node>
                             </node>
                           </node>
+                          <node concept="3clFbJ" id="7jN4X3UX8Up" role="3cqZAp">
+                            <node concept="3clFbS" id="7jN4X3UX8Ur" role="3clFbx">
+                              <node concept="3N13vt" id="2yoIUpb$_Ne" role="3cqZAp" />
+                            </node>
+                            <node concept="3fqX7Q" id="CZOBkuwhkX" role="3clFbw">
+                              <node concept="2OqwBi" id="CZOBkuwhkZ" role="3fr31v">
+                                <node concept="37vLTw" id="CZOBkuwhl0" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4augEjZSVuv" resolve="createNode" />
+                                </node>
+                                <node concept="2qgKlT" id="CZOBkuwhl1" role="2OqNvi">
+                                  <ref role="37wK5l" to="hwgx:2daXVy6Qz1j" resolve="isDisplayed" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
                           <node concept="3cpWs8" id="4augEjZSVuF" role="3cqZAp">
                             <node concept="3cpWsn" id="4augEjZSVuG" role="3cpWs9">
                               <property role="TrG5h" value="category" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/behavior.mps
index eb785e5c12..19afe841d4 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/languageModels/behavior.mps
@@ -8,9 +8,9 @@
   <imports>
     <import index="ykkq" ref="r:7171fd48-62d6-4c67-ab22-d7d6b8fa4653(com.mbeddr.mpsutil.actionsfilter.runtime)" />
     <import index="au0v" ref="r:ae24f9b4-2210-4864-8fbf-79fb5fb02754(com.mbeddr.mpsutil.actionsfilter.structure)" />
+    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
-    <import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -79,6 +79,7 @@
       <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" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
       </concept>
@@ -490,6 +491,29 @@
       <node concept="3clFbS" id="5ReuVUpd_x1" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="2jUI4_LR4Qq">
+    <ref role="13h7C2" to="au0v:2jUI4_LQRKG" resolve="ConceptFunction_ApplicationInfo" />
+    <node concept="13hLZK" id="2jUI4_LR4Qr" role="13h7CW">
+      <node concept="3clFbS" id="2jUI4_LR4Qs" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="2jUI4_LR4Q_" role="13h7CS">
+      <property role="TrG5h" value="getType" />
+      <ref role="13i0hy" to="tpek:27DJnJtIQ9C" resolve="getType" />
+      <node concept="3Tm1VV" id="2jUI4_LR4QA" role="1B3o_S" />
+      <node concept="3clFbS" id="2jUI4_LR4QF" role="3clF47">
+        <node concept="3clFbF" id="2jUI4_LR4Zw" role="3cqZAp">
+          <node concept="2c44tf" id="2jUI4_LR5b4" role="3clFbG">
+            <node concept="3uibUv" id="2jUI4_LR5d3" role="2c44tc">
+              <ref role="3uigEE" to="bd8o:~ApplicationInfo" resolve="ApplicationInfo" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="2jUI4_LR4QG" role="3clF45">
+        <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+      </node>
+    </node>
+  </node>
   <node concept="13h7C7" id="2jUI4_LQMcJ">
     <ref role="13h7C2" to="au0v:2jUI4_LQLA2" resolve="ActivationCondition" />
     <node concept="13hLZK" id="2jUI4_LQMcK" role="13h7CW">
@@ -555,27 +579,69 @@
       <node concept="3Tqbb2" id="2jUI4_LQMd1" role="3clF45" />
     </node>
   </node>
-  <node concept="13h7C7" id="2jUI4_LR4Qq">
-    <ref role="13h7C2" to="au0v:2jUI4_LQRKG" resolve="ConceptFunction_ApplicationInfo" />
-    <node concept="13hLZK" id="2jUI4_LR4Qr" role="13h7CW">
-      <node concept="3clFbS" id="2jUI4_LR4Qs" role="2VODD2" />
+  <node concept="13h7C7" id="5wANKxaV9gi">
+    <property role="3GE5qa" value="toolBar" />
+    <ref role="13h7C2" to="au0v:6nrtUqYelxV" resolve="ToolBarAction" />
+    <node concept="13hLZK" id="5wANKxaV9gj" role="13h7CW">
+      <node concept="3clFbS" id="5wANKxaV9gk" role="2VODD2" />
     </node>
-    <node concept="13i0hz" id="2jUI4_LR4Q_" role="13h7CS">
-      <property role="TrG5h" value="getType" />
-      <ref role="13i0hy" to="tpek:27DJnJtIQ9C" resolve="getType" />
-      <node concept="3Tm1VV" id="2jUI4_LR4QA" role="1B3o_S" />
-      <node concept="3clFbS" id="2jUI4_LR4QF" role="3clF47">
-        <node concept="3clFbF" id="2jUI4_LR4Zw" role="3cqZAp">
-          <node concept="2c44tf" id="2jUI4_LR5b4" role="3clFbG">
-            <node concept="3uibUv" id="2jUI4_LR5d3" role="2c44tc">
-              <ref role="3uigEE" to="bd8o:~ApplicationInfo" resolve="ApplicationInfo" />
+    <node concept="13i0hz" id="5wANKxaV9gt" role="13h7CS">
+      <property role="TrG5h" value="refersToActionId" />
+      <ref role="13i0hy" node="5ReuVUpdzR3" resolve="refersToActionId" />
+      <node concept="3Tm1VV" id="5wANKxaV9gu" role="1B3o_S" />
+      <node concept="3clFbS" id="5wANKxaV9gz" role="3clF47">
+        <node concept="3cpWs6" id="5wANKxaV9D4" role="3cqZAp">
+          <node concept="1Wc70l" id="5wANKxaV9D5" role="3cqZAk">
+            <node concept="3y3z36" id="5wANKxaV9D6" role="3uHU7B">
+              <node concept="10Nm6u" id="5wANKxaV9D7" role="3uHU7w" />
+              <node concept="37vLTw" id="5wANKxaV9D8" role="3uHU7B">
+                <ref role="3cqZAo" node="5wANKxaV9g$" resolve="id" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="5wANKxaV9D9" role="3uHU7w">
+              <node concept="37vLTw" id="5wANKxaV9Da" role="2Oq$k0">
+                <ref role="3cqZAo" node="5wANKxaV9g$" resolve="id" />
+              </node>
+              <node concept="liA8E" id="5wANKxaV9Db" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                <node concept="2OqwBi" id="5wANKxaV9Dc" role="37wK5m">
+                  <node concept="13iPFW" id="5wANKxaV9Dd" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="5wANKxaV9De" role="2OqNvi">
+                    <ref role="3TsBF5" to="au0v:6nrtUqYfdz4" resolve="actionID" />
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="3Tqbb2" id="2jUI4_LR4QG" role="3clF45">
-        <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
+      <node concept="37vLTG" id="5wANKxaV9g$" role="3clF46">
+        <property role="TrG5h" value="id" />
+        <node concept="17QB3L" id="5wANKxaV9g_" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="5wANKxaV9gA" role="3clF45" />
+    </node>
+  </node>
+  <node concept="13h7C7" id="5wANKxaV9kB">
+    <property role="3GE5qa" value="toolBar" />
+    <ref role="13h7C2" to="au0v:6nrtUqYelxW" resolve="ToolBarSeparator" />
+    <node concept="13hLZK" id="5wANKxaV9kC" role="13h7CW">
+      <node concept="3clFbS" id="5wANKxaV9kD" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="5wANKxaV9kM" role="13h7CS">
+      <property role="TrG5h" value="refersToActionId" />
+      <ref role="13i0hy" node="5ReuVUpdzR3" resolve="refersToActionId" />
+      <node concept="3Tm1VV" id="5wANKxaV9kN" role="1B3o_S" />
+      <node concept="3clFbS" id="5wANKxaV9kS" role="3clF47">
+        <node concept="3clFbF" id="5wANKxaV9kX" role="3cqZAp">
+          <node concept="3clFbT" id="5wANKxaV9kW" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5wANKxaV9kT" role="3clF46">
+        <property role="TrG5h" value="id" />
+        <node concept="17QB3L" id="5wANKxaV9kU" role="1tU5fm" />
       </node>
+      <node concept="10P_77" id="5wANKxaV9kV" role="3clF45" />
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/behavior.mps
index c52f00f3ff..8d367ab876 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/behavior.mps
@@ -14,6 +14,9 @@
   </imports>
   <registry>
     <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" />
@@ -41,10 +44,10 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
-        <child id="1182160096073" name="cls" index="YeSDq" />
-      </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
+        <child id="1164991057263" name="throwable" index="YScLw" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg">
@@ -81,6 +84,7 @@
       </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" />
       </concept>
@@ -101,7 +105,6 @@
       </concept>
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
@@ -122,8 +125,11 @@
       <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="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
-      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
-        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
@@ -169,6 +175,14 @@
         <property role="Xl_RC" value="my value" />
       </node>
     </node>
+    <node concept="312cEg" id="2YOONxNStSE" role="jymVt">
+      <property role="TrG5h" value="exception" />
+      <node concept="3Tmbuc" id="2YOONxNStw7" role="1B3o_S" />
+      <node concept="3uibUv" id="2YOONxNSvNh" role="1tU5fm">
+        <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
+      </node>
+      <node concept="10Nm6u" id="2YOONxNSujU" role="33vP2m" />
+    </node>
     <node concept="2tJIrI" id="17HIJlKZysZ" role="jymVt" />
     <node concept="2YIFZL" id="17HIJlL07UK" role="jymVt">
       <property role="TrG5h" value="getInstance" />
@@ -216,20 +230,55 @@
       <property role="DiZV1" value="false" />
       <property role="2aFKle" value="false" />
       <node concept="3clFbS" id="17HIJlL090f" role="3clF47">
-        <node concept="RRSsy" id="17HIJlL0sRI" role="3cqZAp">
-          <property role="RRSoG" value="gZ5fksE/warn" />
-          <node concept="3cpWs3" id="MypZlGVbiz" role="RRSoy">
-            <node concept="37vLTw" id="MypZlGVbmJ" role="3uHU7w">
-              <ref role="3cqZAo" node="17HIJlKZysM" resolve="value" />
+        <node concept="3clFbJ" id="2YOONxNSuBw" role="3cqZAp">
+          <node concept="3clFbS" id="2YOONxNSuBy" role="3clFbx">
+            <node concept="RRSsy" id="2YOONxNSxKw" role="3cqZAp">
+              <property role="RRSoG" value="gZ5fksE/warn" />
+              <node concept="3cpWs3" id="2YOONxNSxKx" role="RRSoy">
+                <node concept="Xl_RD" id="2YOONxNSxKz" role="3uHU7B">
+                  <property role="Xl_RC" value="getValue() raises " />
+                </node>
+                <node concept="2OqwBi" id="2YOONxNSyL0" role="3uHU7w">
+                  <node concept="37vLTw" id="2YOONxNSyo6" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2YOONxNStSE" resolve="exception" />
+                  </node>
+                  <node concept="liA8E" id="2YOONxNSz1I" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                  </node>
+                </node>
+              </node>
             </node>
-            <node concept="Xl_RD" id="17HIJlL0tmE" role="3uHU7B">
-              <property role="Xl_RC" value="getValue() = " />
+            <node concept="YS8fn" id="2YOONxNSvvx" role="3cqZAp">
+              <node concept="37vLTw" id="2YOONxNSvzI" role="YScLw">
+                <ref role="3cqZAo" node="2YOONxNStSE" resolve="exception" />
+              </node>
             </node>
           </node>
-        </node>
-        <node concept="3cpWs6" id="17HIJlL092F" role="3cqZAp">
-          <node concept="37vLTw" id="17HIJlL092U" role="3cqZAk">
-            <ref role="3cqZAo" node="17HIJlKZysM" resolve="value" />
+          <node concept="3y3z36" id="2YOONxNSvlA" role="3clFbw">
+            <node concept="10Nm6u" id="2YOONxNSvpC" role="3uHU7w" />
+            <node concept="37vLTw" id="2YOONxNSuUr" role="3uHU7B">
+              <ref role="3cqZAo" node="2YOONxNStSE" resolve="exception" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="2YOONxNSxoE" role="9aQIa">
+            <node concept="3clFbS" id="2YOONxNSxoF" role="9aQI4">
+              <node concept="RRSsy" id="17HIJlL0sRI" role="3cqZAp">
+                <property role="RRSoG" value="gZ5fksE/warn" />
+                <node concept="3cpWs3" id="MypZlGVbiz" role="RRSoy">
+                  <node concept="37vLTw" id="MypZlGVbmJ" role="3uHU7w">
+                    <ref role="3cqZAo" node="17HIJlKZysM" resolve="value" />
+                  </node>
+                  <node concept="Xl_RD" id="17HIJlL0tmE" role="3uHU7B">
+                    <property role="Xl_RC" value="getValue() = " />
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs6" id="17HIJlL092F" role="3cqZAp">
+                <node concept="37vLTw" id="17HIJlL092U" role="3cqZAk">
+                  <ref role="3cqZAo" node="17HIJlKZysM" resolve="value" />
+                </node>
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -260,6 +309,17 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="2YOONxNSvXS" role="3cqZAp">
+          <node concept="37vLTI" id="2YOONxNSwG4" role="3clFbG">
+            <node concept="10Nm6u" id="2YOONxNSwNj" role="37vLTx" />
+            <node concept="2OqwBi" id="2YOONxNSw91" role="37vLTJ">
+              <node concept="Xjq3P" id="2YOONxNSvXQ" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2YOONxNSwfa" role="2OqNvi">
+                <ref role="2Oxat5" node="2YOONxNStSE" resolve="exception" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="17HIJlL0hJn" role="3cqZAp">
           <node concept="37vLTI" id="17HIJlL0iTQ" role="3clFbG">
             <node concept="37vLTw" id="17HIJlL0j3n" role="37vLTx">
@@ -289,128 +349,194 @@
       <property role="DiZV1" value="false" />
       <property role="2aFKle" value="false" />
       <node concept="3clFbS" id="17HIJlKZMbi" role="3clF47">
-        <node concept="3clFbF" id="17HIJlL0kz0" role="3cqZAp">
-          <node concept="1rXfSq" id="17HIJlL0kyY" role="3clFbG">
+        <node concept="3clFbF" id="2YOONxNRGur" role="3cqZAp">
+          <node concept="1rXfSq" id="2YOONxNRGuq" role="3clFbG">
+            <ref role="37wK5l" node="2YOONxNRGui" resolve="runAfterMsPassed" />
+            <node concept="37vLTw" id="2YOONxNRGup" role="37wK5m">
+              <ref role="3cqZAo" node="17HIJlL0juE" resolve="delayInMs" />
+            </node>
+            <node concept="1bVj0M" id="2YOONxNRHGF" role="37wK5m">
+              <node concept="3clFbS" id="2YOONxNRHGH" role="1bW5cS">
+                <node concept="3clFbF" id="2YOONxNRIi1" role="3cqZAp">
+                  <node concept="1rXfSq" id="2YOONxNRGu2" role="3clFbG">
+                    <ref role="37wK5l" node="17HIJlL0h$4" resolve="setValue" />
+                    <node concept="37vLTw" id="2YOONxNRGuo" role="37wK5m">
+                      <ref role="3cqZAo" node="17HIJlL0js1" resolve="newValue" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTG" id="2YOONxNRI4J" role="1bW2Oz">
+                <property role="TrG5h" value="p" />
+                <node concept="3uibUv" id="2YOONxNRI4I" role="1tU5fm">
+                  <ref role="3uigEE" to="hyam:~ActionEvent" resolve="ActionEvent" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="17HIJlKZM92" role="1B3o_S" />
+      <node concept="3cqZAl" id="17HIJlKZMb8" role="3clF45" />
+      <node concept="37vLTG" id="17HIJlL0js1" role="3clF46">
+        <property role="TrG5h" value="newValue" />
+        <property role="3TUv4t" value="true" />
+        <node concept="17QB3L" id="17HIJlL0js0" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="17HIJlL0juE" role="3clF46">
+        <property role="TrG5h" value="delayInMs" />
+        <node concept="10Oyi0" id="17HIJlL0jyx" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="17HIJlKZys4" role="1B3o_S" />
+    <node concept="3clFb_" id="2YOONxNRN8o" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="throwAfterMsPassed" />
+      <property role="od$2w" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="2aFKle" value="false" />
+      <node concept="3clFbS" id="2YOONxNRN8p" role="3clF47">
+        <node concept="3clFbF" id="2YOONxNRN8q" role="3cqZAp">
+          <node concept="1rXfSq" id="2YOONxNRN8r" role="3clFbG">
+            <ref role="37wK5l" node="2YOONxNRGui" resolve="runAfterMsPassed" />
+            <node concept="37vLTw" id="2YOONxNRN8s" role="37wK5m">
+              <ref role="3cqZAo" node="2YOONxNRN8C" resolve="delayInMs" />
+            </node>
+            <node concept="1bVj0M" id="2YOONxNRN8t" role="37wK5m">
+              <node concept="3clFbS" id="2YOONxNRN8u" role="1bW5cS">
+                <node concept="3clFbF" id="2YOONxNSXJA" role="3cqZAp">
+                  <node concept="37vLTI" id="2YOONxNSY7N" role="3clFbG">
+                    <node concept="37vLTw" id="2YOONxNSYnF" role="37vLTx">
+                      <ref role="3cqZAo" node="2YOONxNRN8A" resolve="exception" />
+                    </node>
+                    <node concept="2OqwBi" id="2YOONxNT55h" role="37vLTJ">
+                      <node concept="Xjq3P" id="2YOONxNT4U2" role="2Oq$k0" />
+                      <node concept="2OwXpG" id="2YOONxNT5hB" role="2OqNvi">
+                        <ref role="2Oxat5" node="2YOONxNStSE" resolve="exception" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="37vLTG" id="2YOONxNRN8y" role="1bW2Oz">
+                <property role="TrG5h" value="p" />
+                <node concept="3uibUv" id="2YOONxNRN8z" role="1tU5fm">
+                  <ref role="3uigEE" to="hyam:~ActionEvent" resolve="ActionEvent" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2YOONxNRN8$" role="1B3o_S" />
+      <node concept="3cqZAl" id="2YOONxNRN8_" role="3clF45" />
+      <node concept="37vLTG" id="2YOONxNRN8A" role="3clF46">
+        <property role="TrG5h" value="exception" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="2YOONxNT47t" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2YOONxNRN8C" role="3clF46">
+        <property role="TrG5h" value="delayInMs" />
+        <node concept="10Oyi0" id="2YOONxNRN8D" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2YOONxNRGZi" role="jymVt" />
+    <node concept="3clFb_" id="2YOONxNRGui" role="jymVt">
+      <property role="TrG5h" value="runAfterMsPassed" />
+      <node concept="3Tmbuc" id="2YOONxNRGuj" role="1B3o_S" />
+      <node concept="3cqZAl" id="2YOONxNRGuk" role="3clF45" />
+      <node concept="37vLTG" id="2YOONxNRGud" role="3clF46">
+        <property role="TrG5h" value="delayInMs" />
+        <node concept="10Oyi0" id="2YOONxNRGue" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2YOONxNRMiO" role="3clF46">
+        <property role="TrG5h" value="listener" />
+        <node concept="3uibUv" id="2YOONxNRMF$" role="1tU5fm">
+          <ref role="3uigEE" to="hyam:~ActionListener" resolve="ActionListener" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="2YOONxNRGtt" role="3clF47">
+        <node concept="3clFbF" id="2YOONxNRGtu" role="3cqZAp">
+          <node concept="1rXfSq" id="2YOONxNRGtv" role="3clFbG">
             <ref role="37wK5l" node="17HIJlL0h$4" resolve="setValue" />
-            <node concept="10Nm6u" id="17HIJlL0kSw" role="37wK5m" />
+            <node concept="10Nm6u" id="2YOONxNRGtw" role="37wK5m" />
           </node>
         </node>
-        <node concept="3clFbJ" id="17HIJlL0Haz" role="3cqZAp">
-          <node concept="3clFbS" id="17HIJlL0Ha_" role="3clFbx">
-            <node concept="3clFbF" id="17HIJlL0FDE" role="3cqZAp">
-              <node concept="2OqwBi" id="17HIJlL0Gdi" role="3clFbG">
-                <node concept="2OqwBi" id="17HIJlL0FSr" role="2Oq$k0">
-                  <node concept="Xjq3P" id="17HIJlL0FDC" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="17HIJlL0FYQ" role="2OqNvi">
+        <node concept="3clFbJ" id="2YOONxNRGtx" role="3cqZAp">
+          <node concept="3clFbS" id="2YOONxNRGty" role="3clFbx">
+            <node concept="3clFbF" id="2YOONxNRGtz" role="3cqZAp">
+              <node concept="2OqwBi" id="2YOONxNRGt$" role="3clFbG">
+                <node concept="2OqwBi" id="2YOONxNRGt_" role="2Oq$k0">
+                  <node concept="Xjq3P" id="2YOONxNRGtA" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="2YOONxNRGtB" role="2OqNvi">
                     <ref role="2Oxat5" node="17HIJlL0Ew$" resolve="timer" />
                   </node>
                 </node>
-                <node concept="liA8E" id="17HIJlL0Gns" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~Timer.stop()" resolve="stop" />
+                <node concept="liA8E" id="2YOONxNRGtC" role="2OqNvi">
+                  <ref role="37wK5l" to="dxuu:~Timer.stop():void" resolve="stop" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3y3z36" id="17HIJlL0HTv" role="3clFbw">
-            <node concept="10Nm6u" id="17HIJlL0HXo" role="3uHU7w" />
-            <node concept="2OqwBi" id="17HIJlL0Hx1" role="3uHU7B">
-              <node concept="Xjq3P" id="17HIJlL0HkF" role="2Oq$k0" />
-              <node concept="2OwXpG" id="17HIJlL0HCG" role="2OqNvi">
+          <node concept="3y3z36" id="2YOONxNRGtD" role="3clFbw">
+            <node concept="10Nm6u" id="2YOONxNRGtE" role="3uHU7w" />
+            <node concept="2OqwBi" id="2YOONxNRGtF" role="3uHU7B">
+              <node concept="Xjq3P" id="2YOONxNRGtG" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2YOONxNRGtH" role="2OqNvi">
                 <ref role="2Oxat5" node="17HIJlL0Ew$" resolve="timer" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="17HIJlL0xR0" role="3cqZAp" />
-        <node concept="3clFbF" id="17HIJlL0EwU" role="3cqZAp">
-          <node concept="37vLTI" id="17HIJlL0EwV" role="3clFbG">
-            <node concept="2OqwBi" id="17HIJlL0EwW" role="37vLTJ">
-              <node concept="Xjq3P" id="17HIJlL0EwX" role="2Oq$k0" />
-              <node concept="2OwXpG" id="17HIJlL0EwY" role="2OqNvi">
+        <node concept="3clFbH" id="2YOONxNRGtI" role="3cqZAp" />
+        <node concept="3clFbF" id="2YOONxNRGtJ" role="3cqZAp">
+          <node concept="37vLTI" id="2YOONxNRGtK" role="3clFbG">
+            <node concept="2OqwBi" id="2YOONxNRGtL" role="37vLTJ">
+              <node concept="Xjq3P" id="2YOONxNRGtM" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2YOONxNRGtN" role="2OqNvi">
                 <ref role="2Oxat5" node="17HIJlL0Ew$" resolve="timer" />
               </node>
             </node>
-            <node concept="2ShNRf" id="17HIJlL0EwZ" role="37vLTx">
-              <node concept="1pGfFk" id="17HIJlL0Ex0" role="2ShVmc">
+            <node concept="2ShNRf" id="2YOONxNRGtO" role="37vLTx">
+              <node concept="1pGfFk" id="2YOONxNRGtP" role="2ShVmc">
                 <ref role="37wK5l" to="dxuu:~Timer.&lt;init&gt;(int,java.awt.event.ActionListener)" resolve="Timer" />
-                <node concept="37vLTw" id="17HIJlL0Ex1" role="37wK5m">
-                  <ref role="3cqZAo" node="17HIJlL0juE" resolve="delayInMs" />
+                <node concept="37vLTw" id="2YOONxNRGuf" role="37wK5m">
+                  <ref role="3cqZAo" node="2YOONxNRGud" resolve="delayInMs" />
                 </node>
-                <node concept="2ShNRf" id="17HIJlL0Ex2" role="37wK5m">
-                  <node concept="YeOm9" id="17HIJlL0Ex3" role="2ShVmc">
-                    <node concept="1Y3b0j" id="17HIJlL0Ex4" role="YeSDq">
-                      <property role="2bfB8j" value="true" />
-                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                      <ref role="1Y3XeK" to="hyam:~ActionListener" resolve="ActionListener" />
-                      <node concept="3Tm1VV" id="17HIJlL0Ex5" role="1B3o_S" />
-                      <node concept="3clFb_" id="17HIJlL0Ex6" role="jymVt">
-                        <property role="1EzhhJ" value="false" />
-                        <property role="TrG5h" value="actionPerformed" />
-                        <property role="DiZV1" value="false" />
-                        <property role="od$2w" value="false" />
-                        <node concept="3Tm1VV" id="17HIJlL0Ex7" role="1B3o_S" />
-                        <node concept="3cqZAl" id="17HIJlL0Ex8" role="3clF45" />
-                        <node concept="37vLTG" id="17HIJlL0Ex9" role="3clF46">
-                          <property role="TrG5h" value="p0" />
-                          <node concept="3uibUv" id="17HIJlL0Exa" role="1tU5fm">
-                            <ref role="3uigEE" to="hyam:~ActionEvent" resolve="ActionEvent" />
-                          </node>
-                        </node>
-                        <node concept="3clFbS" id="17HIJlL0Exb" role="3clF47">
-                          <node concept="3clFbF" id="17HIJlL0Exc" role="3cqZAp">
-                            <node concept="1rXfSq" id="17HIJlL0Exd" role="3clFbG">
-                              <ref role="37wK5l" node="17HIJlL0h$4" resolve="setValue" />
-                              <node concept="37vLTw" id="17HIJlL0Exe" role="37wK5m">
-                                <ref role="3cqZAo" node="17HIJlL0js1" resolve="newValue" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
+                <node concept="37vLTw" id="2YOONxNRMWG" role="37wK5m">
+                  <ref role="3cqZAo" node="2YOONxNRMiO" resolve="listener" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="17HIJlL0Bah" role="3cqZAp">
-          <node concept="2OqwBi" id="17HIJlL0Bp7" role="3clFbG">
-            <node concept="37vLTw" id="17HIJlL0GA1" role="2Oq$k0">
+        <node concept="3clFbF" id="2YOONxNRGu4" role="3cqZAp">
+          <node concept="2OqwBi" id="2YOONxNRGu5" role="3clFbG">
+            <node concept="37vLTw" id="2YOONxNRGu6" role="2Oq$k0">
               <ref role="3cqZAo" node="17HIJlL0Ew$" resolve="timer" />
             </node>
-            <node concept="liA8E" id="17HIJlL0BGc" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~Timer.setRepeats(boolean)" resolve="setRepeats" />
-              <node concept="3clFbT" id="17HIJlL0Cz2" role="37wK5m">
+            <node concept="liA8E" id="2YOONxNRGu7" role="2OqNvi">
+              <ref role="37wK5l" to="dxuu:~Timer.setRepeats(boolean):void" resolve="setRepeats" />
+              <node concept="3clFbT" id="2YOONxNRGu8" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="17HIJlL0jEp" role="3cqZAp">
-          <node concept="2OqwBi" id="17HIJlL0pGN" role="3clFbG">
-            <node concept="37vLTw" id="17HIJlL0GGE" role="2Oq$k0">
+        <node concept="3clFbF" id="2YOONxNRGu9" role="3cqZAp">
+          <node concept="2OqwBi" id="2YOONxNRGua" role="3clFbG">
+            <node concept="37vLTw" id="2YOONxNRGub" role="2Oq$k0">
               <ref role="3cqZAo" node="17HIJlL0Ew$" resolve="timer" />
             </node>
-            <node concept="liA8E" id="17HIJlL0pUp" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~Timer.start()" resolve="start" />
+            <node concept="liA8E" id="2YOONxNRGuc" role="2OqNvi">
+              <ref role="37wK5l" to="dxuu:~Timer.start():void" resolve="start" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="17HIJlKZM92" role="1B3o_S" />
-      <node concept="3cqZAl" id="17HIJlKZMb8" role="3clF45" />
-      <node concept="37vLTG" id="17HIJlL0js1" role="3clF46">
-        <property role="TrG5h" value="newValue" />
-        <property role="3TUv4t" value="true" />
-        <node concept="17QB3L" id="17HIJlL0js0" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="17HIJlL0juE" role="3clF46">
-        <property role="TrG5h" value="delayInMs" />
-        <node concept="10Oyi0" id="17HIJlL0jyx" role="1tU5fm" />
-      </node>
     </node>
-    <node concept="3Tm1VV" id="17HIJlKZys4" role="1B3o_S" />
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps
index 3006a63afb..f1263001e7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps
@@ -151,6 +151,7 @@
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
@@ -192,61 +193,45 @@
                     <ref role="3cqZAo" node="17HIJlKZU71" resolve="button" />
                   </node>
                   <node concept="liA8E" id="17HIJlKZWfd" role="2OqNvi">
-                    <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
-                    <node concept="2ShNRf" id="17HIJlKZWt8" role="37wK5m">
-                      <node concept="YeOm9" id="17HIJlKZXp_" role="2ShVmc">
-                        <node concept="1Y3b0j" id="17HIJlKZXpC" role="YeSDq">
-                          <property role="2bfB8j" value="true" />
-                          <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                          <ref role="1Y3XeK" to="hyam:~ActionListener" resolve="ActionListener" />
-                          <node concept="3Tm1VV" id="17HIJlKZXpD" role="1B3o_S" />
-                          <node concept="3clFb_" id="17HIJlKZXpE" role="jymVt">
-                            <property role="1EzhhJ" value="false" />
-                            <property role="TrG5h" value="actionPerformed" />
-                            <property role="DiZV1" value="false" />
-                            <property role="od$2w" value="false" />
-                            <node concept="3Tm1VV" id="17HIJlKZXpF" role="1B3o_S" />
-                            <node concept="3cqZAl" id="17HIJlKZXpH" role="3clF45" />
-                            <node concept="37vLTG" id="17HIJlKZXpI" role="3clF46">
-                              <property role="TrG5h" value="p0" />
-                              <node concept="3uibUv" id="17HIJlKZXpJ" role="1tU5fm">
-                                <ref role="3uigEE" to="hyam:~ActionEvent" resolve="ActionEvent" />
-                              </node>
+                    <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener):void" resolve="addActionListener" />
+                    <node concept="1bVj0M" id="2YOONxNRT5i" role="37wK5m">
+                      <node concept="3clFbS" id="2YOONxNRT5j" role="1bW5cS">
+                        <node concept="3clFbF" id="17HIJlL0gGV" role="3cqZAp">
+                          <node concept="2OqwBi" id="17HIJlL0h9$" role="3clFbG">
+                            <node concept="2YIFZM" id="17HIJlL0h3p" role="2Oq$k0">
+                              <ref role="1Pybhc" to="re1d:17HIJlKZys3" resolve="MyAsyncCalculator" />
+                              <ref role="37wK5l" to="re1d:17HIJlL07UK" resolve="getInstance" />
                             </node>
-                            <node concept="3clFbS" id="17HIJlKZXpK" role="3clF47">
-                              <node concept="3clFbF" id="17HIJlL0gGV" role="3cqZAp">
-                                <node concept="2OqwBi" id="17HIJlL0h9$" role="3clFbG">
-                                  <node concept="2YIFZM" id="17HIJlL0h3p" role="2Oq$k0">
-                                    <ref role="37wK5l" to="re1d:17HIJlL07UK" resolve="getInstance" />
-                                    <ref role="1Pybhc" to="re1d:17HIJlKZys3" resolve="MyAsyncCalculator" />
-                                  </node>
-                                  <node concept="liA8E" id="17HIJlL0hhV" role="2OqNvi">
-                                    <ref role="37wK5l" to="re1d:17HIJlKZMbf" resolve="setValueAfterMsPassed" />
-                                    <node concept="Xl_RD" id="17HIJlL0orp" role="37wK5m">
-                                      <property role="Xl_RC" value="my result" />
-                                    </node>
-                                    <node concept="3cmrfG" id="17HIJlL0oNv" role="37wK5m">
-                                      <property role="3cmrfH" value="5000" />
-                                    </node>
-                                  </node>
-                                </node>
+                            <node concept="liA8E" id="17HIJlL0hhV" role="2OqNvi">
+                              <ref role="37wK5l" to="re1d:17HIJlKZMbf" resolve="setValueAfterMsPassed" />
+                              <node concept="Xl_RD" id="17HIJlL0orp" role="37wK5m">
+                                <property role="Xl_RC" value="my result" />
                               </node>
-                              <node concept="3clFbF" id="2u$73V9t9yl" role="3cqZAp">
-                                <node concept="2OqwBi" id="2u$73V9t9ym" role="3clFbG">
-                                  <node concept="2OqwBi" id="2u$73V9t9yn" role="2Oq$k0">
-                                    <node concept="1Q80Hx" id="2u$73V9t9yo" role="2Oq$k0" />
-                                    <node concept="liA8E" id="2u$73V9t9yp" role="2OqNvi">
-                                      <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
-                                    </node>
-                                  </node>
-                                  <node concept="liA8E" id="2u$73V9t9yq" role="2OqNvi">
-                                    <ref role="37wK5l" to="cj4x:~EditorComponent.update()" resolve="update" />
-                                  </node>
-                                </node>
+                              <node concept="3cmrfG" id="17HIJlL0oNv" role="37wK5m">
+                                <property role="3cmrfH" value="5000" />
                               </node>
                             </node>
                           </node>
                         </node>
+                        <node concept="3clFbF" id="2u$73V9t9yl" role="3cqZAp">
+                          <node concept="2OqwBi" id="2u$73V9t9ym" role="3clFbG">
+                            <node concept="2OqwBi" id="2u$73V9t9yn" role="2Oq$k0">
+                              <node concept="1Q80Hx" id="2u$73V9t9yo" role="2Oq$k0" />
+                              <node concept="liA8E" id="2u$73V9t9yp" role="2OqNvi">
+                                <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent():jetbrains.mps.openapi.editor.EditorComponent" resolve="getEditorComponent" />
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="2u$73V9t9yq" role="2OqNvi">
+                              <ref role="37wK5l" to="cj4x:~EditorComponent.update():void" resolve="update" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="37vLTG" id="2YOONxNRTkd" role="1bW2Oz">
+                        <property role="TrG5h" value="e" />
+                        <node concept="3uibUv" id="2YOONxNRTkc" role="1tU5fm">
+                          <ref role="3uigEE" to="hyam:~ActionEvent" resolve="ActionEvent" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -260,6 +245,88 @@
             </node>
           </node>
         </node>
+        <node concept="3gTLQM" id="2YOONxNRDtn" role="3EZMnx">
+          <node concept="3Fmcul" id="2YOONxNRDto" role="3FoqZy">
+            <node concept="3clFbS" id="2YOONxNRDtp" role="2VODD2">
+              <node concept="3cpWs8" id="2YOONxNRDtq" role="3cqZAp">
+                <node concept="3cpWsn" id="2YOONxNRDtr" role="3cpWs9">
+                  <property role="TrG5h" value="button" />
+                  <node concept="3uibUv" id="2YOONxNRDts" role="1tU5fm">
+                    <ref role="3uigEE" to="dxuu:~JButton" resolve="JButton" />
+                  </node>
+                  <node concept="2ShNRf" id="2YOONxNRDtt" role="33vP2m">
+                    <node concept="1pGfFk" id="2YOONxNRDtu" role="2ShVmc">
+                      <ref role="37wK5l" to="dxuu:~JButton.&lt;init&gt;(java.lang.String)" resolve="JButton" />
+                      <node concept="Xl_RD" id="2YOONxNRDtv" role="37wK5m">
+                        <property role="Xl_RC" value="Throw Exception in 5s" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbF" id="2YOONxNRDtw" role="3cqZAp">
+                <node concept="2OqwBi" id="2YOONxNRDtx" role="3clFbG">
+                  <node concept="37vLTw" id="2YOONxNRDty" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2YOONxNRDtr" resolve="button" />
+                  </node>
+                  <node concept="liA8E" id="2YOONxNRDtz" role="2OqNvi">
+                    <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener):void" resolve="addActionListener" />
+                    <node concept="1bVj0M" id="2YOONxNRQT4" role="37wK5m">
+                      <node concept="3clFbS" id="2YOONxNRQT5" role="1bW5cS">
+                        <node concept="3clFbF" id="2YOONxNRQqV" role="3cqZAp">
+                          <node concept="2OqwBi" id="2YOONxNRDtJ" role="3clFbG">
+                            <node concept="2YIFZM" id="2YOONxNRDtK" role="2Oq$k0">
+                              <ref role="1Pybhc" to="re1d:17HIJlKZys3" resolve="MyAsyncCalculator" />
+                              <ref role="37wK5l" to="re1d:17HIJlL07UK" resolve="getInstance" />
+                            </node>
+                            <node concept="liA8E" id="2YOONxNRDtL" role="2OqNvi">
+                              <ref role="37wK5l" to="re1d:2YOONxNRN8o" resolve="throwAfterMsPassed" />
+                              <node concept="2ShNRf" id="2YOONxNROY_" role="37wK5m">
+                                <node concept="1pGfFk" id="2YOONxNRPbh" role="2ShVmc">
+                                  <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
+                                  <node concept="Xl_RD" id="2YOONxNT1E6" role="37wK5m">
+                                    <property role="Xl_RC" value="An error happened during calculation" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3cmrfG" id="2YOONxNRDtN" role="37wK5m">
+                                <property role="3cmrfH" value="5000" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbF" id="2YOONxNRDtO" role="3cqZAp">
+                          <node concept="2OqwBi" id="2YOONxNRDtP" role="3clFbG">
+                            <node concept="2OqwBi" id="2YOONxNRDtQ" role="2Oq$k0">
+                              <node concept="1Q80Hx" id="2YOONxNRDtR" role="2Oq$k0" />
+                              <node concept="liA8E" id="2YOONxNRDtS" role="2OqNvi">
+                                <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent():jetbrains.mps.openapi.editor.EditorComponent" resolve="getEditorComponent" />
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="2YOONxNRDtT" role="2OqNvi">
+                              <ref role="37wK5l" to="cj4x:~EditorComponent.update():void" resolve="update" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="37vLTG" id="2YOONxNRRLM" role="1bW2Oz">
+                        <property role="TrG5h" value="e" />
+                        <node concept="3uibUv" id="2YOONxNRRLL" role="1tU5fm">
+                          <ref role="3uigEE" to="hyam:~ActionEvent" resolve="ActionEvent" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWs6" id="2YOONxNRDtU" role="3cqZAp">
+                <node concept="37vLTw" id="2YOONxNRDtV" role="3cqZAk">
+                  <ref role="3cqZAo" node="2YOONxNRDtr" resolve="button" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3F0ifn" id="2u$73V9sUHz" role="3EZMnx">
           <property role="3F0ifm" value="|" />
           <node concept="VPM3Z" id="2u$73V9sVM1" role="3F10Kt">
@@ -291,7 +358,7 @@
                     <ref role="3cqZAo" node="2u$73V9r4da" resolve="button" />
                   </node>
                   <node concept="liA8E" id="2u$73V9r4di" role="2OqNvi">
-                    <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
+                    <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener):void" resolve="addActionListener" />
                     <node concept="2ShNRf" id="2u$73V9r4dj" role="37wK5m">
                       <node concept="YeOm9" id="2u$73V9r4dk" role="2ShVmc">
                         <node concept="1Y3b0j" id="2u$73V9r4dl" role="YeSDq">
@@ -330,11 +397,11 @@
                                   <node concept="2OqwBi" id="2u$73V9t9pz" role="2Oq$k0">
                                     <node concept="1Q80Hx" id="2u$73V9t9p$" role="2Oq$k0" />
                                     <node concept="liA8E" id="2u$73V9t9p_" role="2OqNvi">
-                                      <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
+                                      <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent():jetbrains.mps.openapi.editor.EditorComponent" resolve="getEditorComponent" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="2u$73V9t9pA" role="2OqNvi">
-                                    <ref role="37wK5l" to="cj4x:~EditorComponent.update()" resolve="update" />
+                                    <ref role="37wK5l" to="cj4x:~EditorComponent.update():void" resolve="update" />
                                   </node>
                                 </node>
                               </node>
@@ -379,7 +446,7 @@
                     <ref role="3cqZAo" node="2u$73V9r4Bu" resolve="button" />
                   </node>
                   <node concept="liA8E" id="2u$73V9r4BA" role="2OqNvi">
-                    <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
+                    <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener):void" resolve="addActionListener" />
                     <node concept="2ShNRf" id="2u$73V9r4BB" role="37wK5m">
                       <node concept="YeOm9" id="2u$73V9r4BC" role="2ShVmc">
                         <node concept="1Y3b0j" id="2u$73V9r4BD" role="YeSDq">
@@ -420,11 +487,11 @@
                                   <node concept="2OqwBi" id="2u$73V9r4BN" role="2Oq$k0">
                                     <node concept="1Q80Hx" id="2u$73V9r4BO" role="2Oq$k0" />
                                     <node concept="liA8E" id="2u$73V9r4BP" role="2OqNvi">
-                                      <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
+                                      <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent():jetbrains.mps.openapi.editor.EditorComponent" resolve="getEditorComponent" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="2u$73V9r4BQ" role="2OqNvi">
-                                    <ref role="37wK5l" to="cj4x:~EditorComponent.update()" resolve="update" />
+                                    <ref role="37wK5l" to="cj4x:~EditorComponent.update():void" resolve="update" />
                                   </node>
                                 </node>
                               </node>
@@ -497,11 +564,11 @@
                             <node concept="2EnYce" id="2u$73V9uyfS" role="2Oq$k0">
                               <node concept="1Q80Hx" id="2u$73V9uwFY" role="2Oq$k0" />
                               <node concept="liA8E" id="2u$73V9uwFZ" role="2OqNvi">
-                                <ref role="37wK5l" to="cj4x:~EditorContext.getContextCell()" resolve="getContextCell" />
+                                <ref role="37wK5l" to="cj4x:~EditorContext.getContextCell():jetbrains.mps.openapi.editor.cells.EditorCell" resolve="getContextCell" />
                               </node>
                             </node>
                             <node concept="liA8E" id="2u$73V9uwG0" role="2OqNvi">
-                              <ref role="37wK5l" to="f4zo:~EditorCell.getStyle()" resolve="getStyle" />
+                              <ref role="37wK5l" to="f4zo:~EditorCell.getStyle():jetbrains.mps.openapi.editor.style.Style" resolve="getStyle" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/structure.mps
index 83e5668b8c..d4a76dcee3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/models/structure.mps
@@ -163,6 +163,9 @@
     <node concept="PrWs8" id="22irgSmHTqp" role="PzmwI">
       <ref role="PrY4T" node="44LrdWQ3eCt" resolve="INodeExporter" />
     </node>
+    <node concept="PrWs8" id="1_bTRifhdz1" role="PzmwI">
+      <ref role="PrY4T" to="tpck:2WmWrdnSpX3" resolve="ISuppressErrors" />
+    </node>
   </node>
   <node concept="1TIwiD" id="3p1cdQ7_d_V">
     <property role="TrG5h" value="LiteralProgramFragment" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/com.mbeddr.mpsutil.editor.displayControl.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/com.mbeddr.mpsutil.editor.displayControl.sandbox.mpl
index cebb6d89d4..355587da45 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/com.mbeddr.mpsutil.editor.displayControl.sandbox.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/com.mbeddr.mpsutil.editor.displayControl.sandbox.mpl
@@ -39,6 +39,7 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
     <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.structure.mps
index b1c6197a2f..e78669a392 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editor.displayControl.sandbox/models/com.mbeddr.mpsutil.editor.displayControl.sandbox.structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:9346a16d-d612-4cfd-a80d-017c41200de8(com.mbeddr.mpsutil.editor.displayControl.sandbox.structure)">
   <persistence version="9" />
   <languages>
-    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
     <import index="s8pm" ref="r:1a263161-b47f-4c8c-8169-e2033bd674f4(com.mbeddr.mpsutil.editor.displayControl.structure)" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/behavior.mps
index 308ad6878f..8219e5b1c7 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.filepicker/models/behavior.mps
@@ -1146,7 +1146,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="3uIy_akxeur" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
     </node>
     <node concept="13i0hz" id="35YirduUNg0" role="13h7CS">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/com.mbeddr.mpsutil.hyperlink.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/com.mbeddr.mpsutil.hyperlink.sandbox.mpl
index afccb83889..43491700c6 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/com.mbeddr.mpsutil.hyperlink.sandbox.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/com.mbeddr.mpsutil.hyperlink.sandbox.mpl
@@ -20,7 +20,6 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:04e1f940-330e-483b-9a6a-1648b396a81c:com.mbeddr.mpsutil.hyperlink" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/models/editor.mps
index cf1877ac2c..aa499b640b 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/models/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink.sandbox/models/editor.mps
@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
-    <use id="04e1f940-330e-483b-9a6a-1648b396a81c" name="com.mbeddr.mpsutil.hyperlink" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -73,6 +72,9 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </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="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -401,6 +403,67 @@
         </node>
       </node>
       <node concept="3F0ifn" id="5YjCZTskMch" role="3EZMnx" />
+      <node concept="3F0ifn" id="1vOFPmHie07" role="3EZMnx">
+        <property role="3F0ifm" value="A URL link to an arbitrary URL" />
+        <node concept="3tD6jV" id="1vOFPmHie08" role="3F10Kt">
+          <ref role="3tD7wE" to="tj7y:3T8dS7TLUcl" resolve="hyperlink-style" />
+          <node concept="3sjG9q" id="1vOFPmHie09" role="3tD6jU">
+            <node concept="3clFbS" id="1vOFPmHie0a" role="2VODD2">
+              <node concept="3clFbF" id="1vOFPmHie0b" role="3cqZAp">
+                <node concept="Rm8GO" id="1vOFPmHie0c" role="3clFbG">
+                  <ref role="1Px2BO" to="tj7y:3T8dS7U966b" resolve="HyperlinkStyle" />
+                  <ref role="Rm8GQ" to="tj7y:3T8dS7U98jM" resolve="URL" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3tD6jV" id="1vOFPmHie0d" role="3F10Kt">
+          <ref role="3tD7wE" to="tj7y:5A_Zlt6qyoK" resolve="hyperlink-handler" />
+          <node concept="3sjG9q" id="1vOFPmHie0e" role="3tD6jU">
+            <node concept="3clFbS" id="1vOFPmHie0f" role="2VODD2">
+              <node concept="3clFbF" id="1vOFPmHie0g" role="3cqZAp">
+                <node concept="2ShNRf" id="1vOFPmHie0h" role="3clFbG">
+                  <node concept="YeOm9" id="1vOFPmHie0i" role="2ShVmc">
+                    <node concept="1Y3b0j" id="1vOFPmHie0j" role="YeSDq">
+                      <property role="2bfB8j" value="true" />
+                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                      <ref role="1Y3XeK" to="ag3p:5A_Zlt6xR6d" resolve="HyperlinkHandler" />
+                      <node concept="3Tm1VV" id="1vOFPmHie0k" role="1B3o_S" />
+                      <node concept="3clFb_" id="1vOFPmHie0l" role="jymVt">
+                        <property role="1EzhhJ" value="false" />
+                        <property role="TrG5h" value="open" />
+                        <node concept="3cqZAl" id="1vOFPmHie0m" role="3clF45" />
+                        <node concept="3Tm1VV" id="1vOFPmHie0n" role="1B3o_S" />
+                        <node concept="37vLTG" id="1vOFPmHie0o" role="3clF46">
+                          <property role="TrG5h" value="util" />
+                          <node concept="3uibUv" id="1vOFPmHie0p" role="1tU5fm">
+                            <ref role="3uigEE" to="ag3p:5A_Zlt6xR7j" resolve="HyperlinkUtil" />
+                          </node>
+                        </node>
+                        <node concept="3clFbS" id="1vOFPmHie0q" role="3clF47">
+                          <node concept="3clFbF" id="1vOFPmHiAIA" role="3cqZAp">
+                            <node concept="2OqwBi" id="1vOFPmHie0v" role="3clFbG">
+                              <node concept="37vLTw" id="1vOFPmHie0w" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1vOFPmHie0o" resolve="util" />
+                              </node>
+                              <node concept="liA8E" id="1vOFPmHie0x" role="2OqNvi">
+                                <ref role="37wK5l" to="ag3p:5A_Zlt6y20F" resolve="openInBrowser" />
+                                <node concept="Xl_RD" id="1vOFPmHie0y" role="37wK5m" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="1vOFPmHie06" role="3EZMnx" />
       <node concept="3F0ifn" id="5YjCZTskO$C" role="3EZMnx">
         <property role="3F0ifm" value="A reference link to a handler" />
         <node concept="3tD6jV" id="5YjCZTskPRE" role="3F10Kt">
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageAccessories/com/mbeddr/mpsutil/hyperlink/runtime.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageAccessories/com/mbeddr/mpsutil/hyperlink/runtime.mps
index 01ce4b7865..30556fa29f 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageAccessories/com/mbeddr/mpsutil/hyperlink/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageAccessories/com/mbeddr/mpsutil/hyperlink/runtime.mps
@@ -2,6 +2,7 @@
 <model ref="04e1f940-330e-483b-9a6a-1648b396a81c/r:4f3facd2-2d6c-40e4-a229-cdeb0a5137d8(com.mbeddr.mpsutil.hyperlink/com.mbeddr.mpsutil.hyperlink.runtime)">
   <persistence version="9" />
   <languages>
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -48,6 +49,7 @@
       <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="1225271408483" name="jetbrains.mps.baseLanguage.structure.IsNotEmptyOperation" flags="nn" index="17RvpY" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -118,7 +120,31 @@
       </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
+      <concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
+        <reference id="6832197706140518108" name="param" index="zr_51" />
+      </concept>
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+        <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="8465538089690881930" name="jetbrains.mps.baseLanguage.javadoc.structure.ParameterBlockDocTag" flags="ng" index="TUZQ0">
+        <property id="8465538089690881934" name="text" index="TUZQ4" />
+        <child id="6832197706140518123" name="parameter" index="zr_5Q" />
+      </concept>
+      <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="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="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="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
@@ -310,11 +336,19 @@
                   </node>
                 </node>
               </node>
-              <node concept="3y3z36" id="3DAECxFHCVI" role="3clFbw">
-                <node concept="37vLTw" id="3DAECxFHCVJ" role="3uHU7B">
-                  <ref role="3cqZAo" node="3DAECxFHCVy" resolve="d" />
+              <node concept="1Wc70l" id="1_bTRifhpRH" role="3clFbw">
+                <node concept="2OqwBi" id="1_bTRifhqrT" role="3uHU7w">
+                  <node concept="37vLTw" id="1_bTRifhq0J" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5A_Zlt6y22D" resolve="url" />
+                  </node>
+                  <node concept="17RvpY" id="1_bTRifhqIT" role="2OqNvi" />
+                </node>
+                <node concept="3y3z36" id="3DAECxFHCVI" role="3uHU7B">
+                  <node concept="37vLTw" id="3DAECxFHCVJ" role="3uHU7B">
+                    <ref role="3cqZAo" node="3DAECxFHCVy" resolve="d" />
+                  </node>
+                  <node concept="10Nm6u" id="3DAECxFHCVK" role="3uHU7w" />
                 </node>
-                <node concept="10Nm6u" id="3DAECxFHCVK" role="3uHU7w" />
               </node>
             </node>
           </node>
@@ -354,6 +388,24 @@
           </node>
         </node>
       </node>
+      <node concept="P$JXv" id="1vOFPmHilQh" role="lGtFl">
+        <node concept="TZ5HA" id="1vOFPmHilQi" role="TZ5H$">
+          <node concept="1dT_AC" id="1vOFPmHilQj" role="1dT_Ay">
+            <property role="1dT_AB" value="Will open a provided URL via the OS' default browser." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="1vOFPmHiocU" role="TZ5H$">
+          <node concept="1dT_AC" id="1vOFPmHiocV" role="1dT_Ay">
+            <property role="1dT_AB" value="No-op, if the provided URL is null or empty." />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="1vOFPmHilQk" role="3nqlJM">
+          <property role="TUZQ4" value="any URL that should be opened in the OS' default browser" />
+          <node concept="zr_55" id="1vOFPmHilQm" role="zr_5Q">
+            <ref role="zr_51" node="5A_Zlt6y22D" resolve="url" />
+          </node>
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.behavior.mps
index 03a3eb0c00..f1c824dfc3 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.behavior.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.behavior.mps
@@ -4,8 +4,8 @@
   <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
+    <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="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
@@ -71,17 +71,9 @@
         <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
         <reference id="1144432896254" name="enumClass" index="1Px2BO" />
       </concept>
-      <concept id="1164879751025" name="jetbrains.mps.baseLanguage.structure.TryCatchStatement" flags="nn" index="SfApY">
-        <child id="1164879758292" name="body" index="SfCbr" />
-        <child id="1164903496223" name="catchClause" index="TEbGg" />
-      </concept>
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
-      <concept id="1164903280175" name="jetbrains.mps.baseLanguage.structure.CatchClause" flags="nn" index="TDmWw">
-        <child id="1164903359218" name="catchBody" index="TDEfX" />
-        <child id="1164903359217" name="throwable" index="TDEfY" />
-      </concept>
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
@@ -602,8 +594,8 @@
             </node>
           </node>
         </node>
-        <node concept="SfApY" id="6pzXh8ftxCM" role="3cqZAp">
-          <node concept="3clFbS" id="6pzXh8ftxCN" role="SfCbr">
+        <node concept="3J1_TO" id="6pzXh8ftxCM" role="3cqZAp">
+          <node concept="3clFbS" id="6pzXh8ftxCN" role="1zxBo7">
             <node concept="3cpWs8" id="6pzXh8fty1g" role="3cqZAp">
               <node concept="3cpWsn" id="6pzXh8fty1h" role="3cpWs9">
                 <property role="TrG5h" value="rootNode" />
@@ -663,39 +655,45 @@
               </node>
             </node>
           </node>
-          <node concept="TDmWw" id="6pzXh8ftxCE" role="TEbGg">
-            <node concept="3clFbS" id="6pzXh8ftxCF" role="TDEfX">
+          <node concept="3uVAMA" id="6pzXh8ftxCE" role="1zxBo5">
+            <node concept="XOnhg" id="6pzXh8ftxCG" role="1zc67B">
+              <property role="3TUv4t" value="false" />
+              <property role="TrG5h" value="e" />
+              <node concept="nSUau" id="HzqgCR2R8u" role="1tU5fm">
+                <node concept="3uibUv" id="6pzXh8ftxCH" role="nSUat">
+                  <ref role="3uigEE" to="i4mf:~JsonProcessingException" resolve="JsonProcessingException" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbS" id="6pzXh8ftxCF" role="1zc67A">
               <node concept="RRSsy" id="72Ne6Stc96M" role="3cqZAp">
-                <property role="RRSoG" value="error" />
+                <property role="RRSoG" value="gZ5fh_4/error" />
                 <node concept="37vLTw" id="72Ne6Stc96Q" role="RRSow">
                   <ref role="3cqZAo" node="6pzXh8ftxCG" resolve="e" />
                 </node>
                 <node concept="Xl_RD" id="72Ne6Stc96O" role="RRSoy" />
               </node>
             </node>
-            <node concept="3cpWsn" id="6pzXh8ftxCG" role="TDEfY">
+          </node>
+          <node concept="3uVAMA" id="6pzXh8ftxCI" role="1zxBo5">
+            <node concept="XOnhg" id="6pzXh8ftxCK" role="1zc67B">
+              <property role="3TUv4t" value="false" />
               <property role="TrG5h" value="e" />
-              <node concept="3uibUv" id="6pzXh8ftxCH" role="1tU5fm">
-                <ref role="3uigEE" to="i4mf:~JsonProcessingException" resolve="JsonProcessingException" />
+              <node concept="nSUau" id="HzqgCR2R8A" role="1tU5fm">
+                <node concept="3uibUv" id="6pzXh8ftxCL" role="nSUat">
+                  <ref role="3uigEE" to="guwi:~IOException" resolve="IOException" />
+                </node>
               </node>
             </node>
-          </node>
-          <node concept="TDmWw" id="6pzXh8ftxCI" role="TEbGg">
-            <node concept="3clFbS" id="6pzXh8ftxCJ" role="TDEfX">
+            <node concept="3clFbS" id="6pzXh8ftxCJ" role="1zc67A">
               <node concept="RRSsy" id="72Ne6Stc9sA" role="3cqZAp">
-                <property role="RRSoG" value="error" />
+                <property role="RRSoG" value="gZ5fh_4/error" />
                 <node concept="37vLTw" id="72Ne6Stc9sE" role="RRSow">
                   <ref role="3cqZAo" node="6pzXh8ftxCK" resolve="e" />
                 </node>
                 <node concept="Xl_RD" id="72Ne6Stc9sC" role="RRSoy" />
               </node>
             </node>
-            <node concept="3cpWsn" id="6pzXh8ftxCK" role="TDEfY">
-              <property role="TrG5h" value="e" />
-              <node concept="3uibUv" id="6pzXh8ftxCL" role="1tU5fm">
-                <ref role="3uigEE" to="guwi:~IOException" resolve="IOException" />
-              </node>
-            </node>
           </node>
         </node>
         <node concept="3cpWs6" id="6pzXh8ftyxF" role="3cqZAp">
@@ -757,7 +755,7 @@
             </node>
             <node concept="3clFbS" id="6V56CwaCgUq" role="1zc67A">
               <node concept="RRSsy" id="6V56CwaCihU" role="3cqZAp">
-                <property role="RRSoG" value="error" />
+                <property role="RRSoG" value="gZ5fh_4/error" />
                 <node concept="Xl_RD" id="6V56CwaCihV" role="RRSoy" />
                 <node concept="37vLTw" id="6V56CwaCihW" role="RRSow">
                   <ref role="3cqZAo" node="6V56CwaCgUn" resolve="e" />
@@ -841,12 +839,14 @@
                     <ref role="2pJxaS" to="21pk:3L4lRB2GdnE" resolve="Boolean" />
                     <node concept="2pJxcG" id="1Alud3KUiug" role="2pJxcM">
                       <ref role="2pJxcJ" to="21pk:3L4lRB2GdnH" resolve="value" />
-                      <node concept="2OqwBi" id="3eUX6LRWswT" role="28ntcv">
-                        <node concept="37vLTw" id="3eUX6LRWo9s" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3eUX6LRW7Kz" resolve="jsonNode" />
-                        </node>
-                        <node concept="liA8E" id="3eUX6LRWtlC" role="2OqNvi">
-                          <ref role="37wK5l" to="7k8f:~JsonNode.booleanValue()" resolve="booleanValue" />
+                      <node concept="WxPPo" id="20iAftur$ta" role="28ntcv">
+                        <node concept="2OqwBi" id="3eUX6LRWswT" role="WxPPp">
+                          <node concept="37vLTw" id="3eUX6LRWo9s" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3eUX6LRW7Kz" resolve="jsonNode" />
+                          </node>
+                          <node concept="liA8E" id="3eUX6LRWtlC" role="2OqNvi">
+                            <ref role="37wK5l" to="7k8f:~JsonNode.booleanValue()" resolve="booleanValue" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -871,12 +871,14 @@
                     <ref role="2pJxaS" to="21pk:3L4lRB2Gdrb" resolve="String" />
                     <node concept="2pJxcG" id="1Alud3KUk5Q" role="2pJxcM">
                       <ref role="2pJxcJ" to="21pk:3L4lRB2Gdre" resolve="value" />
-                      <node concept="2OqwBi" id="72Ne6Stc2x5" role="28ntcv">
-                        <node concept="37vLTw" id="72Ne6Stc1rE" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3eUX6LRW7Kz" resolve="jsonNode" />
-                        </node>
-                        <node concept="liA8E" id="72Ne6Stc2Vi" role="2OqNvi">
-                          <ref role="37wK5l" to="7k8f:~JsonNode.asText()" resolve="asText" />
+                      <node concept="WxPPo" id="20iAftur$tb" role="28ntcv">
+                        <node concept="2OqwBi" id="72Ne6Stc2x5" role="WxPPp">
+                          <node concept="37vLTw" id="72Ne6Stc1rE" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3eUX6LRW7Kz" resolve="jsonNode" />
+                          </node>
+                          <node concept="liA8E" id="72Ne6Stc2Vi" role="2OqNvi">
+                            <ref role="37wK5l" to="7k8f:~JsonNode.asText()" resolve="asText" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -893,18 +895,20 @@
                     <ref role="2pJxaS" to="21pk:3L4lRB2Gdrg" resolve="Number" />
                     <node concept="2pJxcG" id="1Alud3KUluc" role="2pJxcM">
                       <ref role="2pJxcJ" to="21pk:6Cwq1JbSTxh" resolve="value" />
-                      <node concept="2OqwBi" id="72Ne6StbXxb" role="28ntcv">
-                        <node concept="2OqwBi" id="72Ne6StbU4h" role="2Oq$k0">
-                          <node concept="37vLTw" id="72Ne6StbTyn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3eUX6LRW7Kz" resolve="jsonNode" />
+                      <node concept="WxPPo" id="20iAftur$tc" role="28ntcv">
+                        <node concept="2OqwBi" id="72Ne6StbXxb" role="WxPPp">
+                          <node concept="2OqwBi" id="72Ne6StbU4h" role="2Oq$k0">
+                            <node concept="37vLTw" id="72Ne6StbTyn" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3eUX6LRW7Kz" resolve="jsonNode" />
+                            </node>
+                            <node concept="liA8E" id="72Ne6StbXmM" role="2OqNvi">
+                              <ref role="37wK5l" to="7k8f:~JsonNode.numberValue()" resolve="numberValue" />
+                            </node>
                           </node>
-                          <node concept="liA8E" id="72Ne6StbXmM" role="2OqNvi">
-                            <ref role="37wK5l" to="7k8f:~JsonNode.numberValue()" resolve="numberValue" />
+                          <node concept="liA8E" id="72Ne6StbXG4" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                           </node>
                         </node>
-                        <node concept="liA8E" id="72Ne6StbXG4" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -936,14 +940,16 @@
                     <ref role="2pJxaS" to="21pk:3L4lRB2Gdrg" resolve="Number" />
                     <node concept="2pJxcG" id="1Alud3KUmG$" role="2pJxcM">
                       <ref role="2pJxcJ" to="21pk:6Cwq1JbSTxh" resolve="value" />
-                      <node concept="3cpWs3" id="55Y4t6SRAX6" role="28ntcv">
-                        <node concept="Xl_RD" id="55Y4t6SRB0X" role="3uHU7w" />
-                        <node concept="2OqwBi" id="55Y4t6SR$W$" role="3uHU7B">
-                          <node concept="37vLTw" id="55Y4t6SR$tN" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3eUX6LRW7Kz" resolve="jsonNode" />
-                          </node>
-                          <node concept="liA8E" id="55Y4t6SR_oz" role="2OqNvi">
-                            <ref role="37wK5l" to="7k8f:~JsonNode.isFloatingPointNumber()" resolve="isFloatingPointNumber" />
+                      <node concept="WxPPo" id="20iAftur$td" role="28ntcv">
+                        <node concept="3cpWs3" id="55Y4t6SRAX6" role="WxPPp">
+                          <node concept="Xl_RD" id="55Y4t6SRB0X" role="3uHU7w" />
+                          <node concept="2OqwBi" id="55Y4t6SR$W$" role="3uHU7B">
+                            <node concept="37vLTw" id="55Y4t6SR$tN" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3eUX6LRW7Kz" resolve="jsonNode" />
+                            </node>
+                            <node concept="liA8E" id="55Y4t6SR_oz" role="2OqNvi">
+                              <ref role="37wK5l" to="7k8f:~JsonNode.isFloatingPointNumber()" resolve="isFloatingPointNumber" />
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -993,7 +999,7 @@
           <node concept="9aQIb" id="72Ne6Stczh1" role="9aQIa">
             <node concept="3clFbS" id="72Ne6Stczh2" role="9aQI4">
               <node concept="RRSsy" id="72Ne6StczSy" role="3cqZAp">
-                <property role="RRSoG" value="error" />
+                <property role="RRSoG" value="gZ5fh_4/error" />
                 <node concept="3cpWs3" id="72Ne6Stc$Og" role="RRSoy">
                   <node concept="2OqwBi" id="72Ne6Stc_za" role="3uHU7w">
                     <node concept="37vLTw" id="72Ne6Stc_0M" role="2Oq$k0">
@@ -1108,12 +1114,14 @@
                       <ref role="2pJxaS" to="21pk:3L4lRB2GdlR" resolve="Variable" />
                       <node concept="2pJxcG" id="1Alud3KUcpA" role="2pJxcM">
                         <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
-                        <node concept="2OqwBi" id="6pzXh8furBI" role="28ntcv">
-                          <node concept="37vLTw" id="6pzXh8furpf" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6pzXh8fur10" resolve="field" />
-                          </node>
-                          <node concept="liA8E" id="6pzXh8furQe" role="2OqNvi">
-                            <ref role="37wK5l" to="33ny:~Map$Entry.getKey()" resolve="getKey" />
+                        <node concept="WxPPo" id="20iAftur$te" role="28ntcv">
+                          <node concept="2OqwBi" id="6pzXh8furBI" role="WxPPp">
+                            <node concept="37vLTw" id="6pzXh8furpf" role="2Oq$k0">
+                              <ref role="3cqZAo" node="6pzXh8fur10" resolve="field" />
+                            </node>
+                            <node concept="liA8E" id="6pzXh8furQe" role="2OqNvi">
+                              <ref role="37wK5l" to="33ny:~Map$Entry.getKey()" resolve="getKey" />
+                            </node>
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.editor.mps
index 134559f2bd..f0b35e51f1 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.editor.mps
@@ -329,7 +329,7 @@
         </node>
       </node>
       <node concept="3F2HdR" id="3L4lRB2Gduv" role="3EZMnx">
-        <property role="Q2I2d" value="punctuation" />
+        <property role="Q2I2d" value="g$1Qtxb/punctuation" />
         <ref role="1NtTu8" to="21pk:3L4lRB2GdnM" resolve="values" />
         <node concept="l2Vlx" id="1F5R5ewJC2F" role="2czzBx" />
         <node concept="pVoyu" id="3L4lRB2GnqV" role="3F10Kt">
@@ -541,7 +541,7 @@
             </node>
           </node>
           <node concept="VechU" id="34$4Bn6iCdm" role="3F10Kt">
-            <property role="Vb096" value="lightGray" />
+            <property role="Vb096" value="fLJRk5A/lightGray" />
           </node>
           <node concept="pkWqt" id="34$4Bn6iCta" role="pqm2j">
             <node concept="3clFbS" id="34$4Bn6iCtb" role="2VODD2">
@@ -571,47 +571,43 @@
     <node concept="14StLt" id="1F5R5ewIWPQ" role="V601i">
       <property role="TrG5h" value="string" />
       <node concept="VechU" id="1F5R5ewIWPT" role="3F10Kt">
-        <property role="Vb096" value="DARK_GREEN" />
+        <property role="Vb096" value="g1_qRwE/darkGreen" />
       </node>
     </node>
     <node concept="14StLt" id="1F5R5ewIWPV" role="V601i">
       <property role="TrG5h" value="bool" />
       <node concept="VechU" id="1F5R5ewIWPW" role="3F10Kt">
-        <property role="Vb096" value="DARK_BLUE" />
+        <property role="Vb096" value="g1_eI4o/darkBlue" />
       </node>
       <node concept="Vb9p2" id="1F5R5ewIWQ4" role="3F10Kt">
-        <property role="Vbekb" value="BOLD" />
+        <property role="Vbekb" value="g1_k_vY/BOLD" />
       </node>
     </node>
     <node concept="14StLt" id="1F5R5ewIWQ8" role="V601i">
       <property role="TrG5h" value="number" />
       <node concept="VechU" id="1F5R5ewIWQ9" role="3F10Kt">
-        <property role="Vb096" value="DARK_BLUE" />
-      </node>
-      <node concept="Vb9p2" id="1F5R5ewIWQa" role="3F10Kt">
-        <property role="Vbekb" value="PLAIN" />
+        <property role="Vb096" value="g1_eI4o/darkBlue" />
       </node>
+      <node concept="Vb9p2" id="1F5R5ewIWQa" role="3F10Kt" />
     </node>
     <node concept="14StLt" id="1F5R5ewIWQj" role="V601i">
       <property role="TrG5h" value="nill" />
       <node concept="VechU" id="1F5R5ewIWQk" role="3F10Kt">
-        <property role="Vb096" value="DARK_BLUE" />
+        <property role="Vb096" value="g1_eI4o/darkBlue" />
       </node>
       <node concept="Vb9p2" id="1F5R5ewIWQl" role="3F10Kt">
-        <property role="Vbekb" value="BOLD" />
+        <property role="Vbekb" value="g1_k_vY/BOLD" />
       </node>
     </node>
     <node concept="14StLt" id="1F5R5ewIWQx" role="V601i">
       <property role="TrG5h" value="id" />
       <node concept="VechU" id="1F5R5ewIWQy" role="3F10Kt">
-        <property role="Vb096" value="red" />
+        <property role="Vb096" value="fLwANPn/red" />
         <node concept="1iSF2X" id="1F5R5ewJ5uT" role="VblUZ">
           <property role="1iTho6" value="b73162" />
         </node>
       </node>
-      <node concept="Vb9p2" id="1F5R5ewIWQz" role="3F10Kt">
-        <property role="Vbekb" value="PLAIN" />
-      </node>
+      <node concept="Vb9p2" id="1F5R5ewIWQz" role="3F10Kt" />
     </node>
   </node>
   <node concept="3ICUPy" id="1F5R5ewK1tQ">
@@ -619,7 +615,7 @@
     <node concept="1Qtc8_" id="1F5R5ewK1tR" role="IW6Ez">
       <node concept="3cWJ9i" id="1F5R5ewK1tV" role="1Qtc8$">
         <node concept="CtIbL" id="1F5R5ewK1tX" role="CtIbM">
-          <property role="CtIbK" value="RIGHT" />
+          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
         </node>
       </node>
       <node concept="IWgqT" id="1F5R5ewK1u1" role="1Qtc8A">
@@ -857,7 +853,7 @@
       </node>
       <node concept="3cWJ9i" id="1F5R5ewKn4H" role="1Qtc8$">
         <node concept="CtIbL" id="1F5R5ewKn4J" role="CtIbM">
-          <property role="CtIbK" value="RIGHT" />
+          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
         </node>
       </node>
     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.structure.mps
index 71bd2f60b9..b2da4e1cae 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/com.mbeddr.mpsutil.json.structure.mps
@@ -2,6 +2,7 @@
 <model ref="r:be665d13-1e1d-44cd-9817-8bd4d610f422(com.mbeddr.mpsutil.json.structure)">
   <persistence version="9" />
   <languages>
+    <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps
index 8a9cd4a519..f48c7a74c0 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps
@@ -2,7 +2,7 @@
 <model ref="r:6492a138-3e52-4756-96b0-7e3c330fe78e(com.mbeddr.mpsutil.json.plugin)">
   <persistence version="9" />
   <languages>
-    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd
index 34a135c1f1..e0c543ad9e 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mbeddr.mpsutil.actionsfilter.runtime" uuid="436eb984-d162-4543-a347-2601ff5bb2a0" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+<solution name="com.mbeddr.mpsutil.actionsfilter.runtime" uuid="436eb984-d162-4543-a347-2601ff5bb2a0" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps
index ca28eeb4c8..d36ee73ef2 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps
@@ -339,6 +339,12 @@
         <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" />
+        <child id="2034914114981261753" name="message" index="RRSoy" />
+      </concept>
+    </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">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
@@ -9484,7 +9490,6 @@
     <node concept="2tJIrI" id="2ZrHegMYtNF" role="jymVt" />
     <node concept="312cEg" id="61pZq5SvuY2" role="jymVt">
       <property role="TrG5h" value="myFilteredIds" />
-      <node concept="3Tm1VV" id="5KoJxDfaHvY" role="1B3o_S" />
       <node concept="2hMVRd" id="61pZq5SvFA$" role="1tU5fm">
         <node concept="17QB3L" id="61pZq5SvFAA" role="2hN53Y" />
       </node>
@@ -9493,6 +9498,7 @@
           <node concept="17QB3L" id="6RnZMKPH3y$" role="HW$YZ" />
         </node>
       </node>
+      <node concept="3Tm1VV" id="5KoJxDfaHvY" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="2ZrHegMYvTj" role="jymVt" />
     <node concept="3clFb_" id="61pZq5Svvw3" role="jymVt">
@@ -9970,7 +9976,6 @@
     <node concept="2tJIrI" id="3NH93cztXk5" role="jymVt" />
     <node concept="312cEg" id="3NH93czh8ub" role="jymVt">
       <property role="TrG5h" value="myProfiles" />
-      <node concept="3Tm1VV" id="49xzmIMxBgp" role="1B3o_S" />
       <node concept="_YKpA" id="3NH93czh8u$" role="1tU5fm">
         <node concept="3uibUv" id="3NH93czh8uS" role="_ZDj9">
           <ref role="3uigEE" node="3NH93czfhb6" resolve="Profile" />
@@ -9983,6 +9988,7 @@
           </node>
         </node>
       </node>
+      <node concept="3Tm1VV" id="49xzmIMxBgp" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="3NH93czh8vD" role="jymVt">
       <property role="TrG5h" value="myActiveProfileIndex" />
@@ -9995,10 +10001,10 @@
     <node concept="312cEg" id="3NH93cztr9T" role="jymVt">
       <property role="TrG5h" value="myPropertyChangeSupport" />
       <property role="eg7rD" value="true" />
-      <node concept="3Tm1VV" id="5KoJxDfaHwj" role="1B3o_S" />
       <node concept="3uibUv" id="3NH93cztsf$" role="1tU5fm">
         <ref role="3uigEE" to="mnlj:~PropertyChangeSupport" resolve="PropertyChangeSupport" />
       </node>
+      <node concept="3Tm1VV" id="5KoJxDfaHwj" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="3NH93czh8x8" role="jymVt" />
     <node concept="3clFbW" id="3NH93czhh96" role="jymVt">
@@ -11503,7 +11509,6 @@
     <node concept="2tJIrI" id="3NH93czfhC8" role="jymVt" />
     <node concept="312cEg" id="3NH93czwMuj" role="jymVt">
       <property role="TrG5h" value="myId" />
-      <node concept="3Tm1VV" id="5KoJxDfaHw1" role="1B3o_S" />
       <node concept="17QB3L" id="3NH93czwMTL" role="1tU5fm" />
       <node concept="2OqwBi" id="3NH93czwNfi" role="33vP2m">
         <node concept="2YIFZM" id="3NH93czwN1H" role="2Oq$k0">
@@ -11514,10 +11519,10 @@
           <ref role="37wK5l" to="33ny:~UUID.toString()" resolve="toString" />
         </node>
       </node>
+      <node concept="3Tm1VV" id="5KoJxDfaHw1" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="3NH93czfhCw" role="jymVt">
       <property role="TrG5h" value="myName" />
-      <node concept="3Tm1VV" id="5KoJxDfaHw4" role="1B3o_S" />
       <node concept="17QB3L" id="3NH93czfhCQ" role="1tU5fm" />
       <node concept="Xl_RD" id="3NH93czh3Cc" role="33vP2m">
         <property role="Xl_RC" value="&lt;no name&gt;" />
@@ -11525,10 +11530,10 @@
       <node concept="2AHcQZ" id="3NH93czh3CX" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
+      <node concept="3Tm1VV" id="5KoJxDfaHw4" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="3NH93czgEWC" role="jymVt">
       <property role="TrG5h" value="filterSettings" />
-      <node concept="3Tm1VV" id="5KoJxDfaHw7" role="1B3o_S" />
       <node concept="3uibUv" id="3NH93czgEXi" role="1tU5fm">
         <ref role="3uigEE" node="2ZrHegMYtMW" resolve="FilterSettings" />
       </node>
@@ -11540,39 +11545,40 @@
       <node concept="2AHcQZ" id="3NH93czh3En" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
+      <node concept="3Tm1VV" id="5KoJxDfaHw7" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="49MflvOOHeK" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="toolbarSettings" />
       <property role="3TUv4t" value="false" />
-      <node concept="3Tm1VV" id="5KoJxDfaHwa" role="1B3o_S" />
       <node concept="3uibUv" id="49MflvOOH3Z" role="1tU5fm">
         <ref role="3uigEE" node="1Csv4JJJ_wN" resolve="ToolbarSettings" />
       </node>
       <node concept="2AHcQZ" id="49MflvOOZqI" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
+      <node concept="3Tm1VV" id="5KoJxDfaHwa" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="49MflvOOZMG" role="jymVt" />
     <node concept="312cEg" id="1_Ri$6xA3J3" role="jymVt">
       <property role="TrG5h" value="myIsPredefined" />
-      <node concept="3Tm1VV" id="5KoJxDfaHwd" role="1B3o_S" />
       <node concept="10P_77" id="1_Ri$6xA4bB" role="1tU5fm" />
       <node concept="3clFbT" id="1_Ri$6xA4k_" role="33vP2m">
         <property role="3clFbU" value="false" />
       </node>
+      <node concept="3Tm1VV" id="5KoJxDfaHwd" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="2y5$DYCdCyT" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="myIsActiveByDefault" />
       <property role="3TUv4t" value="false" />
-      <node concept="3Tm1VV" id="5KoJxDfaHwg" role="1B3o_S" />
       <node concept="10P_77" id="2y5$DYCdCxi" role="1tU5fm" />
       <node concept="3clFbT" id="2y5$DYCdD2Q" role="33vP2m">
         <property role="3clFbU" value="false" />
       </node>
+      <node concept="3Tm1VV" id="5KoJxDfaHwg" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="7zBzSouMwxo" role="jymVt">
       <property role="TrG5h" value="myDefaultPriority" />
@@ -13105,7 +13111,6 @@
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="toolBarEntries" />
       <property role="3TUv4t" value="false" />
-      <node concept="3Tm1VV" id="5KoJxDfaMTS" role="1B3o_S" />
       <node concept="_YKpA" id="49MflvORO7i" role="1tU5fm">
         <node concept="3uibUv" id="3m_Gngis8jM" role="_ZDj9">
           <ref role="3uigEE" node="3m_GngirHvL" resolve="ToolBarEntry" />
@@ -13118,6 +13123,7 @@
           </node>
         </node>
       </node>
+      <node concept="3Tm1VV" id="5KoJxDfaMTS" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="3SW7dV3AZKC" role="jymVt" />
     <node concept="3clFbW" id="3SW7dV3B39k" role="jymVt">
@@ -13279,7 +13285,6 @@
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="entries" />
       <property role="3TUv4t" value="false" />
-      <node concept="3Tm1VV" id="3SW7dV3AZb3" role="1B3o_S" />
       <node concept="_YKpA" id="2D4mVfzuQGh" role="1tU5fm">
         <node concept="3uibUv" id="2D4mVfzuSOI" role="_ZDj9">
           <ref role="3uigEE" node="3m_GngirHvL" resolve="ToolBarEntry" />
@@ -13292,6 +13297,7 @@
           </node>
         </node>
       </node>
+      <node concept="3Tm1VV" id="3SW7dV3AZb3" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="4I$o2ar2tOY" role="jymVt" />
     <node concept="312cEg" id="7GYIME_ncRu" role="jymVt">
@@ -13304,7 +13310,6 @@
           <ref role="3uigEE" node="3m_GngirHvL" resolve="ToolBarEntry" />
         </node>
       </node>
-      <node concept="3Tm1VV" id="3SW7dV3AZb6" role="1B3o_S" />
       <node concept="2ShNRf" id="7GYIME_neJG" role="33vP2m">
         <node concept="Tc6Ow" id="7GYIME_mYbB" role="2ShVmc">
           <node concept="3uibUv" id="7GYIME_mYbC" role="HW$YZ">
@@ -13312,6 +13317,7 @@
           </node>
         </node>
       </node>
+      <node concept="3Tm1VV" id="3SW7dV3AZb6" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="54oLeKi_hme" role="jymVt" />
     <node concept="2YIFZL" id="1IyFrIF4lWQ" role="jymVt">
@@ -13663,74 +13669,159 @@
                 <node concept="3clFbS" id="2D4mVfzvU3Q" role="1bW5cS">
                   <node concept="3clFbJ" id="2D4mVfzvU3R" role="3cqZAp">
                     <node concept="3clFbS" id="2D4mVfzvU3S" role="3clFbx">
-                      <node concept="3clFbF" id="2D4mVfzvU3T" role="3cqZAp">
-                        <node concept="2OqwBi" id="2D4mVfzvU3U" role="3clFbG">
-                          <node concept="37vLTw" id="2D4mVfzvU3V" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2D4mVfzvU3z" resolve="toolBarActions" />
+                      <node concept="3cpWs8" id="7jxV$rv3ZGK" role="3cqZAp">
+                        <node concept="3cpWsn" id="7jxV$rv3ZGN" role="3cpWs9">
+                          <property role="TrG5h" value="actionId" />
+                          <node concept="17QB3L" id="7jxV$rv3ZGI" role="1tU5fm" />
+                          <node concept="2OqwBi" id="7jxV$rv40Lm" role="33vP2m">
+                            <node concept="37vLTw" id="7jxV$rv40pE" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
+                            </node>
+                            <node concept="liA8E" id="7jxV$rv410E" role="2OqNvi">
+                              <ref role="37wK5l" node="3m_GngirHOj" resolve="getId" />
+                            </node>
                           </node>
-                          <node concept="liA8E" id="2D4mVfzvU3W" role="2OqNvi">
-                            <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
-                            <node concept="2OqwBi" id="2D4mVfzvU3X" role="37wK5m">
-                              <node concept="2YIFZM" id="2D4mVfzvU3Y" role="2Oq$k0">
-                                <ref role="37wK5l" to="qkt:~ActionManager.getInstance()" resolve="getInstance" />
-                                <ref role="1Pybhc" to="qkt:~ActionManager" resolve="ActionManager" />
+                        </node>
+                      </node>
+                      <node concept="3clFbJ" id="7jxV$rv42w2" role="3cqZAp">
+                        <node concept="3clFbS" id="7jxV$rv42w4" role="3clFbx">
+                          <node concept="RRSsy" id="7jxV$rv44t3" role="3cqZAp">
+                            <property role="RRSoG" value="gZ5fh_4/error" />
+                            <node concept="3cpWs3" id="7jxV$rv4jwt" role="RRSoy">
+                              <node concept="Xl_RD" id="7jxV$rv4k9T" role="3uHU7w">
+                                <property role="Xl_RC" value=". Skipping it!" />
                               </node>
-                              <node concept="liA8E" id="2D4mVfzvU3Z" role="2OqNvi">
-                                <ref role="37wK5l" to="qkt:~ActionManager.getAction(java.lang.String)" resolve="getAction" />
-                                <node concept="2OqwBi" id="2D4mVfzvU40" role="37wK5m">
-                                  <node concept="37vLTw" id="2D4mVfzvU41" role="2Oq$k0">
+                              <node concept="3cpWs3" id="7jxV$rv4665" role="3uHU7B">
+                                <node concept="Xl_RD" id="7jxV$rv44t5" role="3uHU7B">
+                                  <property role="Xl_RC" value="Invalid action-id for entry: " />
+                                </node>
+                                <node concept="2OqwBi" id="7jxV$rv46U0" role="3uHU7w">
+                                  <node concept="37vLTw" id="7jxV$rv46qX" role="2Oq$k0">
                                     <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
                                   </node>
-                                  <node concept="liA8E" id="2D4mVfzvU42" role="2OqNvi">
-                                    <ref role="37wK5l" node="3m_GngirHOj" resolve="getId" />
+                                  <node concept="liA8E" id="7jxV$rv47k3" role="2OqNvi">
+                                    <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                      </node>
-                      <node concept="3clFbJ" id="fi1uEptEif" role="3cqZAp">
-                        <node concept="3clFbS" id="fi1uEptEih" role="3clFbx">
-                          <node concept="3clFbF" id="59JBFovnJ0m" role="3cqZAp">
-                            <node concept="2OqwBi" id="59JBFovnKBT" role="3clFbG">
-                              <node concept="2YIFZM" id="59JBFovnJFs" role="2Oq$k0">
-                                <ref role="37wK5l" to="8fb:~CustomActionsSchema.getInstance()" resolve="getInstance" />
-                                <ref role="1Pybhc" to="8fb:~CustomActionsSchema" resolve="CustomActionsSchema" />
-                              </node>
-                              <node concept="liA8E" id="59JBFovnLyG" role="2OqNvi">
-                                <ref role="37wK5l" to="8fb:~CustomActionsSchema.addIconCustomization(java.lang.String,java.lang.String)" resolve="addIconCustomization" />
-                                <node concept="2OqwBi" id="59JBFovnNcg" role="37wK5m">
-                                  <node concept="37vLTw" id="59JBFovnMmy" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
+                        <node concept="2OqwBi" id="7jxV$rv43vU" role="3clFbw">
+                          <node concept="37vLTw" id="7jxV$rv42W7" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7jxV$rv3ZGN" resolve="actionId" />
+                          </node>
+                          <node concept="17RlXB" id="7jxV$rv442k" role="2OqNvi" />
+                        </node>
+                        <node concept="9aQIb" id="7jxV$rv48OI" role="9aQIa">
+                          <node concept="3clFbS" id="7jxV$rv48OJ" role="9aQI4">
+                            <node concept="3cpWs8" id="7jxV$rv41Fy" role="3cqZAp">
+                              <node concept="3cpWsn" id="7jxV$rv41Fz" role="3cpWs9">
+                                <property role="TrG5h" value="action" />
+                                <node concept="3uibUv" id="7jxV$rv41F$" role="1tU5fm">
+                                  <ref role="3uigEE" to="qkt:~AnAction" resolve="AnAction" />
+                                </node>
+                                <node concept="2OqwBi" id="7jxV$rv427b" role="33vP2m">
+                                  <node concept="2YIFZM" id="7jxV$rv427c" role="2Oq$k0">
+                                    <ref role="1Pybhc" to="qkt:~ActionManager" resolve="ActionManager" />
+                                    <ref role="37wK5l" to="qkt:~ActionManager.getInstance()" resolve="getInstance" />
                                   </node>
-                                  <node concept="liA8E" id="59JBFovnO5U" role="2OqNvi">
-                                    <ref role="37wK5l" node="3m_GngirHOj" resolve="getId" />
+                                  <node concept="liA8E" id="7jxV$rv427d" role="2OqNvi">
+                                    <ref role="37wK5l" to="qkt:~ActionManager.getAction(java.lang.String)" resolve="getAction" />
+                                    <node concept="37vLTw" id="7jxV$rv4gqp" role="37wK5m">
+                                      <ref role="3cqZAo" node="7jxV$rv3ZGN" resolve="actionId" />
+                                    </node>
                                   </node>
                                 </node>
-                                <node concept="2OqwBi" id="59JBFovnQzf" role="37wK5m">
-                                  <node concept="37vLTw" id="59JBFovnPL1" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
+                              </node>
+                            </node>
+                            <node concept="3clFbJ" id="7jxV$rv49GT" role="3cqZAp">
+                              <node concept="3clFbS" id="7jxV$rv49GV" role="3clFbx">
+                                <node concept="RRSsy" id="7jxV$rv4bsQ" role="3cqZAp">
+                                  <property role="RRSoG" value="gZ5fh_4/error" />
+                                  <node concept="3cpWs3" id="7jxV$rv4kXJ" role="RRSoy">
+                                    <node concept="Xl_RD" id="7jxV$rv4lnw" role="3uHU7w">
+                                      <property role="Xl_RC" value=". Skipping it!" />
+                                    </node>
+                                    <node concept="3cpWs3" id="7jxV$rv4dFl" role="3uHU7B">
+                                      <node concept="Xl_RD" id="7jxV$rv4bsS" role="3uHU7B">
+                                        <property role="Xl_RC" value="action not found for action-id: " />
+                                      </node>
+                                      <node concept="37vLTw" id="7jxV$rv4ecb" role="3uHU7w">
+                                        <ref role="3cqZAo" node="7jxV$rv3ZGN" resolve="actionId" />
+                                      </node>
+                                    </node>
                                   </node>
-                                  <node concept="liA8E" id="59JBFovnRnU" role="2OqNvi">
-                                    <ref role="37wK5l" node="6F5AXb8IsjZ" resolve="getIconPath" />
+                                </node>
+                              </node>
+                              <node concept="3clFbC" id="7jxV$rv4aAU" role="3clFbw">
+                                <node concept="10Nm6u" id="7jxV$rv4b7v" role="3uHU7w" />
+                                <node concept="37vLTw" id="7jxV$rv4a2o" role="3uHU7B">
+                                  <ref role="3cqZAo" node="7jxV$rv41Fz" resolve="action" />
+                                </node>
+                              </node>
+                              <node concept="9aQIb" id="7jxV$rv4ekP" role="9aQIa">
+                                <node concept="3clFbS" id="7jxV$rv4ekQ" role="9aQI4">
+                                  <node concept="3clFbF" id="2D4mVfzvU3T" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2D4mVfzvU3U" role="3clFbG">
+                                      <node concept="37vLTw" id="2D4mVfzvU3V" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="2D4mVfzvU3z" resolve="toolBarActions" />
+                                      </node>
+                                      <node concept="liA8E" id="2D4mVfzvU3W" role="2OqNvi">
+                                        <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
+                                        <node concept="37vLTw" id="7jxV$rv4hZu" role="37wK5m">
+                                          <ref role="3cqZAo" node="7jxV$rv41Fz" resolve="action" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbJ" id="fi1uEptEif" role="3cqZAp">
+                                    <node concept="3clFbS" id="fi1uEptEih" role="3clFbx">
+                                      <node concept="3clFbF" id="59JBFovnJ0m" role="3cqZAp">
+                                        <node concept="2OqwBi" id="59JBFovnKBT" role="3clFbG">
+                                          <node concept="2YIFZM" id="59JBFovnJFs" role="2Oq$k0">
+                                            <ref role="37wK5l" to="8fb:~CustomActionsSchema.getInstance()" resolve="getInstance" />
+                                            <ref role="1Pybhc" to="8fb:~CustomActionsSchema" resolve="CustomActionsSchema" />
+                                          </node>
+                                          <node concept="liA8E" id="59JBFovnLyG" role="2OqNvi">
+                                            <ref role="37wK5l" to="8fb:~CustomActionsSchema.addIconCustomization(java.lang.String,java.lang.String)" resolve="addIconCustomization" />
+                                            <node concept="2OqwBi" id="59JBFovnNcg" role="37wK5m">
+                                              <node concept="37vLTw" id="59JBFovnMmy" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
+                                              </node>
+                                              <node concept="liA8E" id="59JBFovnO5U" role="2OqNvi">
+                                                <ref role="37wK5l" node="3m_GngirHOj" resolve="getId" />
+                                              </node>
+                                            </node>
+                                            <node concept="2OqwBi" id="59JBFovnQzf" role="37wK5m">
+                                              <node concept="37vLTw" id="59JBFovnPL1" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
+                                              </node>
+                                              <node concept="liA8E" id="59JBFovnRnU" role="2OqNvi">
+                                                <ref role="37wK5l" node="6F5AXb8IsjZ" resolve="getIconPath" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="2OqwBi" id="fi1uEptFWy" role="3clFbw">
+                                      <node concept="2OqwBi" id="fi1uEptEX0" role="2Oq$k0">
+                                        <node concept="37vLTw" id="fi1uEptE$F" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
+                                        </node>
+                                        <node concept="liA8E" id="fi1uEptFgc" role="2OqNvi">
+                                          <ref role="37wK5l" node="6F5AXb8IsjZ" resolve="getIconPath" />
+                                        </node>
+                                      </node>
+                                      <node concept="17RvpY" id="fi1uEptH92" role="2OqNvi" />
+                                    </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="2OqwBi" id="fi1uEptFWy" role="3clFbw">
-                          <node concept="2OqwBi" id="fi1uEptEX0" role="2Oq$k0">
-                            <node concept="37vLTw" id="fi1uEptE$F" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2D4mVfzvU4h" resolve="entry" />
-                            </node>
-                            <node concept="liA8E" id="fi1uEptFgc" role="2OqNvi">
-                              <ref role="37wK5l" node="6F5AXb8IsjZ" resolve="getIconPath" />
-                            </node>
-                          </node>
-                          <node concept="17RvpY" id="fi1uEptH92" role="2OqNvi" />
-                        </node>
                       </node>
                     </node>
                     <node concept="2OqwBi" id="2D4mVfzvU43" role="3clFbw">
@@ -14162,35 +14253,35 @@
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="entryType" />
       <property role="3TUv4t" value="false" />
-      <node concept="3Tm1VV" id="67WVzZmonpY" role="1B3o_S" />
       <node concept="3uibUv" id="3m_GngirZL7" role="1tU5fm">
         <ref role="3uigEE" node="3m_GngirLka" resolve="ToolBarEntry.EntryType" />
       </node>
       <node concept="2AHcQZ" id="3m_Gngitw6q" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
       </node>
+      <node concept="3Tm1VV" id="67WVzZmonpY" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="3m_GngirH_J" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="actionID" />
       <property role="3TUv4t" value="false" />
-      <node concept="3Tm1VV" id="67WVzZmonq1" role="1B3o_S" />
       <node concept="17QB3L" id="3m_GngirH_D" role="1tU5fm" />
       <node concept="2AHcQZ" id="3m_GngirHEg" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
+      <node concept="3Tm1VV" id="67WVzZmonq1" role="1B3o_S" />
     </node>
     <node concept="312cEg" id="3m_GngirHG0" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
       <property role="TrG5h" value="icon" />
       <property role="3TUv4t" value="false" />
-      <node concept="3Tm1VV" id="67WVzZmonq4" role="1B3o_S" />
       <node concept="17QB3L" id="3m_GngirHE9" role="1tU5fm" />
       <node concept="2AHcQZ" id="3m_GngirHGl" role="2AJF6D">
         <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
+      <node concept="3Tm1VV" id="67WVzZmonq4" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="3m_GngirHx6" role="jymVt" />
     <node concept="3clFb_" id="3m_Gngis0l4" role="jymVt">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/README.md b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/README.md
index f369e0f751..4e1414c39b 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/README.md
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/README.md
@@ -38,6 +38,10 @@ cell provider:
 
 As example, see `com.mbeddr.mpsutil.asynccell.sandbox`.
 
+# Errors
+
+If the query callback raises an exception, the exception will be logged to stdout, the value will be set to `ERR` and the cell will stop calling it (until the next editor update).
+
 # State
 It contains automated tests and a sandbox for manual tests.
 So far, only used in Security Analyst.
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/models/plugin.mps
index 2ee4b22457..daf0f890b8 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/models/plugin.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.asynccell/models/plugin.mps
@@ -22,6 +22,7 @@
     <import index="hox0" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.style(MPS.Editor/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
+    <import index="5ueo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.style(MPS.Editor/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
   </imports>
   <registry>
@@ -2141,6 +2142,19 @@
                                   </node>
                                 </node>
                                 <node concept="3clFbS" id="3anL894Mo0G" role="1zc67A">
+                                  <node concept="3SKdUt" id="1_bTRifhsZ6" role="3cqZAp">
+                                    <node concept="1PaTwC" id="1_bTRifhsZ7" role="1aUNEU">
+                                      <node concept="3oM_SD" id="1_bTRifhsZ8" role="1PaTwD">
+                                        <property role="3oM_SC" value="&lt;no" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhsZi" role="1PaTwD">
+                                        <property role="3oM_SC" value="line&gt;" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhsZl" role="1PaTwD">
+                                        <property role="3oM_SC" value="print" />
+                                      </node>
+                                    </node>
+                                  </node>
                                   <node concept="3clFbF" id="3anL894Mo0H" role="3cqZAp">
                                     <node concept="2OqwBi" id="3anL894Mo0I" role="3clFbG">
                                       <node concept="37vLTw" id="3anL894Mo0J" role="2Oq$k0">
@@ -2151,6 +2165,100 @@
                                       </node>
                                     </node>
                                   </node>
+                                  <node concept="3SKdUt" id="1_bTRifhtbV" role="3cqZAp">
+                                    <node concept="1PaTwC" id="1_bTRifhtbW" role="1aUNEU">
+                                      <node concept="3oM_SD" id="1_bTRifhtbX" role="1PaTwD">
+                                        <property role="3oM_SC" value="&lt;no" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhtcc" role="1PaTwD">
+                                        <property role="3oM_SC" value="line&gt;" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhtcf" role="1PaTwD">
+                                        <property role="3oM_SC" value="show" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhtcj" role="1PaTwD">
+                                        <property role="3oM_SC" value="error" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3cpWs8" id="1_bTRifhulS" role="3cqZAp">
+                                    <node concept="3cpWsn" id="1_bTRifhulT" role="3cpWs9">
+                                      <property role="TrG5h" value="impl" />
+                                      <node concept="3uibUv" id="1_bTRifhulU" role="1tU5fm">
+                                        <ref role="3uigEE" to="5ueo:~StyleImpl" resolve="StyleImpl" />
+                                      </node>
+                                      <node concept="2ShNRf" id="1_bTRifhutz" role="33vP2m">
+                                        <node concept="1pGfFk" id="1_bTRifhvmP" role="2ShVmc">
+                                          <ref role="37wK5l" to="5ueo:~StyleImpl.&lt;init&gt;()" resolve="StyleImpl" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbF" id="1_bTRifhvzM" role="3cqZAp">
+                                    <node concept="37vLTI" id="1_bTRifhvKh" role="3clFbG">
+                                      <node concept="2ShNRf" id="1_bTRifhvZI" role="37vLTx">
+                                        <node concept="1pGfFk" id="1_bTRifhvSs" role="2ShVmc">
+                                          <ref role="37wK5l" node="5HPe_Jxcpw8" resolve="AsyncCellValue" />
+                                          <node concept="Xl_RD" id="1_bTRifhw73" role="37wK5m">
+                                            <property role="Xl_RC" value="ERR_AsyncCell" />
+                                          </node>
+                                          <node concept="37vLTw" id="1_bTRifhwpv" role="37wK5m">
+                                            <ref role="3cqZAo" node="1_bTRifhulT" resolve="impl" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="37vLTw" id="1_bTRifhvzK" role="37vLTJ">
+                                        <ref role="3cqZAo" node="3anL894Mo0i" resolve="result" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3SKdUt" id="1_bTRifhwFq" role="3cqZAp">
+                                    <node concept="1PaTwC" id="1_bTRifhwFr" role="1aUNEU">
+                                      <node concept="3oM_SD" id="1_bTRifhwFs" role="1PaTwD">
+                                        <property role="3oM_SC" value="&lt;no" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhwFX" role="1PaTwD">
+                                        <property role="3oM_SC" value="line&gt;" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhwG0" role="1PaTwD">
+                                        <property role="3oM_SC" value="and" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhwG4" role="1PaTwD">
+                                        <property role="3oM_SC" value="forget" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhwG9" role="1PaTwD">
+                                        <property role="3oM_SC" value="about" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhwGf" role="1PaTwD">
+                                        <property role="3oM_SC" value="it" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhwGm" role="1PaTwD">
+                                        <property role="3oM_SC" value="immediately" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhwGu" role="1PaTwD">
+                                        <property role="3oM_SC" value="to" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhwGB" role="1PaTwD">
+                                        <property role="3oM_SC" value="prevent" />
+                                      </node>
+                                      <node concept="3oM_SD" id="1_bTRifhwGL" role="1PaTwD">
+                                        <property role="3oM_SC" value="spamming" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbF" id="1_bTRifhx4r" role="3cqZAp">
+                                    <node concept="2OqwBi" id="1_bTRifhxkD" role="3clFbG">
+                                      <node concept="37vLTw" id="1_bTRifhx4p" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="5HPe_JwXHEl" resolve="_cellManager" />
+                                      </node>
+                                      <node concept="liA8E" id="1_bTRifhxu0" role="2OqNvi">
+                                        <ref role="37wK5l" node="5HPe_JwZDXR" resolve="removeAsyncCell" />
+                                        <node concept="2GrUjf" id="1_bTRifhxAU" role="37wK5m">
+                                          <ref role="2Gs0qQ" node="3anL894Mo04" resolve="cell" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
                             </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/models/com/mbeddr/mpsutil/editingGuide/execution.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/models/com/mbeddr/mpsutil/editingGuide/execution.mps
index f82342e604..89c7b3c1d2 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/models/com/mbeddr/mpsutil/editingGuide/execution.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/models/com/mbeddr/mpsutil/editingGuide/execution.mps
@@ -1498,6 +1498,47 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbF" id="1_bTRifhjV$" role="3cqZAp">
+              <node concept="2OqwBi" id="1_bTRifhl_8" role="3clFbG">
+                <node concept="1eOMI4" id="1_bTRifhjVy" role="2Oq$k0">
+                  <node concept="10QFUN" id="1_bTRifhjVv" role="1eOMHV">
+                    <node concept="3uibUv" id="1_bTRifhkLV" role="10QFUM">
+                      <ref role="3uigEE" to="z1c3:~AbstractModule" resolve="AbstractModule" />
+                    </node>
+                    <node concept="2OqwBi" id="1_bTRifhl67" role="10QFUP">
+                      <node concept="37vLTw" id="1_bTRifhkUv" role="2Oq$k0">
+                        <ref role="3cqZAo" node="692bXAb5E1e" resolve="tempModel" />
+                      </node>
+                      <node concept="liA8E" id="1_bTRifhlhU" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="1_bTRifhlUu" role="2OqNvi">
+                  <ref role="37wK5l" to="z1c3:~AbstractModule.addDependency(org.jetbrains.mps.openapi.module.SModuleReference,boolean)" resolve="addDependency" />
+                  <node concept="2OqwBi" id="1_bTRifho2w" role="37wK5m">
+                    <node concept="2OqwBi" id="1_bTRifhnsN" role="2Oq$k0">
+                      <node concept="2JrnkZ" id="1_bTRifhnbx" role="2Oq$k0">
+                        <node concept="2OqwBi" id="1_bTRifhmxR" role="2JrQYb">
+                          <node concept="37vLTw" id="1_bTRifhm4f" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5h2rxDjX6nB" resolve="myOriginalExercise" />
+                          </node>
+                          <node concept="I4A8Y" id="1_bTRifhmNA" role="2OqNvi" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="1_bTRifhnSv" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="1_bTRifhoik" role="2OqNvi">
+                      <ref role="37wK5l" to="lui2:~SModule.getModuleReference()" resolve="getModuleReference" />
+                    </node>
+                  </node>
+                  <node concept="3clFbT" id="1_bTRifhoCs" role="37wK5m" />
+                </node>
+              </node>
+            </node>
             <node concept="3clFbF" id="c5q2Wzl9AX" role="3cqZAp">
               <node concept="2OqwBi" id="c5q2WzlaqL" role="3clFbG">
                 <node concept="1eOMI4" id="c5q2Wzl9AZ" role="2Oq$k0">