From 97622ffb52bdb75847c9636c0323e77456719af2 Mon Sep 17 00:00:00 2001
From: danielratiu <ratiud@googlemail.com>
Date: Wed, 27 Mar 2024 14:22:33 +0100
Subject: [PATCH] gradle.lockfile: updated dependencies to mps.extension,
 mbeddr.platform overall: ran automated migrations

---
 ...hw.sandbox._010_simple_hw_architecture.mps |   8 +-
 .../com.symo.sysml.ibd.sandbox._010_smoke.mps |  16 +-
 .../com.mbeddr.formal.base.arch.mpl           |   2 +-
 .../models/editor.mps                         |   2 +-
 .../com.mbeddr.formal.base.operatorspanel.mpl |   2 +-
 .../models/editor.mps                         |   2 +-
 .../com.mbeddr.formal.nusmv.arch.mpl          |   2 +-
 .../models/editor.mps                         |   2 +-
 .../com.mbeddr.formal.nusmv.cbd.mpl           |   4 +-
 .../generator/template/main@generator.mps     |   2 +-
 .../models/editor.mps                         |   2 +-
 .../models/flatten.util.mps                   |   2 +-
 .../com.mbeddr.formal.nusmv.sm.mpl            |   2 +-
 .../models/editor.mps                         |   2 +-
 .../models/com.mbeddr.formal.ocra.sandbox.mps | 246 ++++----
 ...asten.base.activity.sandbox._010_smoke.mps |   8 +-
 .../com.mbeddr.formal.base.tooling.msd        |   2 +-
 .../models/analyzer.mps                       | 264 ++++++---
 .../models/make.mps                           | 213 +++++--
 .../models/nodes.mps                          | 100 +++-
 .../models/results_model.mps                  | 168 ++++--
 .../models/results_ui.mps                     | 500 +++++++++++-----
 .../models/simulator.mps                      |  85 ++-
 .../models/tools.mps                          | 353 ++++++++---
 .../models/com.mbeddr.formal.nusmv.build.mps  | 121 ++--
 ...mbeddr.formal.nusmv.cbd.pluginSolution.msd |   3 +-
 .../models/analyzer.mps                       | 222 +++++--
 .../com.mbeddr.formal.nusmv.importer.rt.msd   |   2 +-
 .../models/importer.mps                       |   2 +-
 ...com.mbeddr.formal.nusmv.pluginSolution.msd |   3 +-
 .../models/plugin.mps                         |  28 +-
 .../models/runner.mps                         | 554 +++++++++++++-----
 .../models/ui.mps                             | 226 +++++--
 .../models/utils.mps                          |  26 +-
 .../com.mbeddr.formal.rcp.tutorialActions.msd |   5 +-
 .../models/plugin.mps                         |  36 +-
 .../models/base@tests.mps                     |   2 +-
 .../models/cbd@tests.mps                      |   2 +-
 .../models/nusmv_ext@tests.mps                |   2 +-
 .../models/nusmv_importer@tests.mps           |  26 +-
 .../models/nusmv_runs@tests.mps               |   2 +-
 ...eddr.formal.nusmv.counterexample@tests.mps |   2 +-
 .../models/tests_source@tests.mps             |   2 +-
 .../models/tl_patterns_tests@tests.mps        |   2 +-
 .../test.mbeddr.formal.nusmv.msd              |   5 +-
 ...com.mbeddr.formal.prism.pluginSolution.msd |   3 +-
 ...ddr.formal.prism.pluginSolution.runner.mps |  32 +-
 ...est.com.mbeddr.formal.prism._010_smoke.mps |  66 +--
 .../.mps/migration.xml                        |  12 +
 .../.mps/modules.xml                          | 188 ++++++
 .../com.fasten.meta.all.msd                   |   2 +-
 .../models/com.fasten.meta.all.scripts.mps    |  21 +
 ...m.fasten.meta.linters.filesystem_level.mps |   2 +-
 .../com.fasten.meta.linters.nodes_level.mps   |   2 +-
 ...l.req.tl_patterns.nusmv.pluginSolution.msd |   2 +-
 ...tl_patterns.nusmv.pluginSolution.utils.mps |   2 +-
 .../com.mbeddr.formal.safety.gsn.doc.mpl      |   2 +-
 .../com.mbeddr.formal.safety.gsn.ext.mpl      |   2 +-
 ...om.mbeddr.formal.safety.gsn.ext.editor.mps |   2 +-
 .../com.mbeddr.formal.safety.gsn.mpl          |   3 +-
 .../com.mbeddr.formal.safety.gsn.editor.mps   |  37 +-
 ...m.fasten.safety.ft.xfta.pluginSolution.msd |   3 +-
 ...n.safety.ft.xfta.pluginSolution.plugin.mps |   2 +-
 ...n.safety.ft.xfta.pluginSolution.runner.mps |  32 +-
 ...asten.safety.ft.xfta.pluginSolution.ui.mps |  82 ++-
 ...safety.argument.runtime.pluginSolution.msd |   2 +-
 ...ety.argument.runtime.pluginSolution.ui.mps |   2 +-
 .../com.mbeddr.formal.safety.gsn.sandbox.msd  |   2 +-
 ...r.formal.safety.gsn.smv.pluginSolution.msd |   3 +-
 ...afety.gsn.smv.pluginSolution.analyzers.mps |  86 ++-
 ...l.safety.gsn.smv.pluginSolution.plugin.mps |   2 +-
 ....formal.safety.gsn.spin.pluginSolution.msd |   2 +-
 ....safety.gsn.spin.pluginSolution.plugin.mps |   2 +-
 .../test.com.fasten.safety.doc2word.msd       |   2 +-
 ...dr.formal.gsn._010_gsn_smv_tests@tests.mps |   2 +-
 ...ormal.gsn._020_gsn_cbd_smv_tests@tests.mps |   2 +-
 ...rmal.gsn._050_gsn_odd_spin_tests@tests.mps |   2 +-
 .../test.mbeddr.formal.gsn.msd                |   2 +-
 .../com.mbeddr.formal.smtlib.synthesis.mpl    |   2 +-
 .../generator/template/main@generator.mps     |  16 +-
 .../models/translator.mps                     |   2 +-
 .../models/util.mps                           |  41 +-
 .../com.mbeddr.formal.smtlib.z3.rt.msd        |   2 +-
 .../models/runner.mps                         |   2 +-
 .../models/translator.mps                     |   2 +-
 .../models/_010_simple_output.mps             |  10 +-
 .../models/sandbox._010_smoke_synth.mps       |  52 +-
 .../models/_010_smoke.mps                     |  90 +--
 .../com.mbeddr.formal.spin.hdl.mpl            |   2 +-
 .../models/plugin.mps                         |   2 +-
 .../com.mbeddr.formal.spin.mpl                |   2 +-
 .../com.mbeddr.formal.spin/models/plugin.mps  |   2 +-
 .../com.mbeddr.formal.spin.pluginSolution.msd |   2 +-
 .../com.mbeddr.formal.spin.analyzer.model.mps | 218 +++++--
 .../com.mbeddr.formal.spin.analyzer.mps       | 256 ++++++--
 .../models/com.mbeddr.formal.spin.runner.mps  |   2 +-
 .../com.mbeddr.formal.spin.testing_utils.mps  |  73 ++-
 .../models/com.mbeddr.formal.spin.ui.mps      | 222 +++++--
 .../models/com.mbeddr.formal.spin.utils.mps   |  26 +-
 .../models/plugin.mps                         |  46 +-
 .../models/_010_promela_tests@tests.mps       |   2 +-
 ...050_promela_extensions_tests_gen@tests.mps |   2 +-
 .../models/_100_hdl_tests@tests.mps           |   2 +-
 .../models/_100_hdl_tests_gen@tests.mps       |   2 +-
 .../test.mbeddr.formal.spin.msd               |   2 +-
 gradle.lockfile                               |   4 +-
 106 files changed, 3569 insertions(+), 1387 deletions(-)
 create mode 100644 code/languages/com.mbeddr.formal.repo_admin/.mps/migration.xml

diff --git a/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps b/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
index ba5c068d9..bb96c00cb 100644
--- a/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
+++ b/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
@@ -89,12 +89,12 @@
       <property role="TrG5h" value="ecu2" />
     </node>
     <node concept="2jnq7J" id="2gpUZARhwa8" role="2jnmDS">
-      <ref role="2jnmXU" node="2gpUZARh4BO" resolve="ecu1" />
-      <ref role="2jnmXW" node="2gpUZARh4BT" resolve="bus" />
+      <ref role="2jnmXU" node="2gpUZARh4BO" />
+      <ref role="2jnmXW" node="2gpUZARh4BT" />
     </node>
     <node concept="2jnq7J" id="2gpUZARhwaa" role="2jnmDS">
-      <ref role="2jnmXU" node="2gpUZARh4C9" resolve="ecu2" />
-      <ref role="2jnmXW" node="2gpUZARh4BT" resolve="bus" />
+      <ref role="2jnmXU" node="2gpUZARh4C9" />
+      <ref role="2jnmXW" node="2gpUZARh4BT" />
     </node>
   </node>
 </model>
diff --git a/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps b/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps
index 1d85733e4..40a964cc9 100644
--- a/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps
+++ b/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/models/com.symo.sysml.ibd.sandbox._010_smoke.mps
@@ -75,7 +75,7 @@
       <property role="TrG5h" value="Sender" />
       <node concept="3USqFc" id="pk5lVrZWqi" role="3UVs02">
         <property role="TrG5h" value="data" />
-        <ref role="3US7yy" node="pk5lVrZWqd" resolve="Data" />
+        <ref role="3US7yy" node="pk5lVrZWqd" />
       </node>
     </node>
     <node concept="3UUxL_" id="pk5lVrZWqq" role="3UUxLy" />
@@ -83,7 +83,7 @@
       <property role="TrG5h" value="Receiver" />
       <node concept="3USqFc" id="pk5lVrZWqL" role="3UVs00">
         <property role="TrG5h" value="data" />
-        <ref role="3US7yy" node="pk5lVrZWqd" resolve="Data" />
+        <ref role="3US7yy" node="pk5lVrZWqd" />
       </node>
     </node>
     <node concept="3UUxL_" id="pk5lVrZWr9" role="3UUxLy" />
@@ -92,20 +92,20 @@
       <node concept="3UVpuM" id="pk5lVrZWrH" role="3UVWDc">
         <node concept="3UVpuK" id="pk5lVrZWrJ" role="3UVKbZ">
           <property role="TrG5h" value="s" />
-          <ref role="3UVpu6" node="6TLpWSY0gIt" resolve="Sender" />
+          <ref role="3UVpu6" node="6TLpWSY0gIt" />
         </node>
         <node concept="3UVpuK" id="pk5lVrZWrO" role="3UVKbZ">
           <property role="TrG5h" value="r" />
-          <ref role="3UVpu6" node="pk5lVrZWqB" resolve="Receiver" />
+          <ref role="3UVpu6" node="pk5lVrZWqB" />
         </node>
         <node concept="3UVptf" id="pk5lVrZWrW" role="3UVKbZ">
           <node concept="3UVgTP" id="pk5lVrZWs1" role="3UVptc">
-            <ref role="3UVgTb" node="pk5lVrZWrJ" resolve="s" />
-            <ref role="3UVgT4" node="pk5lVrZWqi" resolve="data" />
+            <ref role="3UVgTb" node="pk5lVrZWrJ" />
+            <ref role="3UVgT4" node="pk5lVrZWqi" />
           </node>
           <node concept="3UVgTP" id="pk5lVrZWs3" role="3UVpta">
-            <ref role="3UVgTb" node="pk5lVrZWrO" resolve="r" />
-            <ref role="3UVgT4" node="pk5lVrZWqL" resolve="data" />
+            <ref role="3UVgTb" node="pk5lVrZWrO" />
+            <ref role="3UVgT4" node="pk5lVrZWqL" />
           </node>
         </node>
         <node concept="37mRI7" id="pk5lVrZWs6" role="lGtFl">
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl
index ea683f9c7..1e7f7dd36 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl
@@ -22,7 +22,7 @@
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
     <language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps
index 072a3f017..a5a1e7bf2 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/models/editor.mps
@@ -7,7 +7,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl
index b5d184ea7..ed966ef7f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl
@@ -20,7 +20,7 @@
     <dependency reexport="true">4bf9a860-39c9-4cb2-8004-157a961bf42c(com.mbeddr.formal.base.operatorspanel.rt)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <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.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps
index 91c6dcb39..f4a25becf 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/models/editor.mps
@@ -6,7 +6,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl
index 6b9f5a605..9d05e3336 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl
@@ -86,7 +86,7 @@
     <dependency reexport="false">8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
     <language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
     <language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps
index b6b1e8c8a..ce55d9a30 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/models/editor.mps
@@ -5,7 +5,7 @@
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
     <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl
index d1e40f324..263f15b58 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl
@@ -39,7 +39,7 @@
         <language slang="l:001b2375-3bd5-4d5e-9958-6b3f62dc8548:com.mbeddr.formal.nusmv" version="0" />
         <language slang="l:c0e6afd4-e20f-4e33-9970-004cf26b9bf6:com.mbeddr.formal.nusmv.ext" version="0" />
         <language slang="l:bf72618c-958a-47f5-9aac-3eff98d79ffd:com.mbeddr.formal.nusmv.source" version="0" />
-        <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+        <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
@@ -112,7 +112,7 @@
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
     <language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/generator/template/main@generator.mps
index 2448df391..2297d0730 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/generator/template/main@generator.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="001b2375-3bd5-4d5e-9958-6b3f62dc8548" name="com.mbeddr.formal.nusmv" version="0" />
     <use id="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f" name="com.mbeddr.formal.base.expressions" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="c0e6afd4-e20f-4e33-9970-004cf26b9bf6" name="com.mbeddr.formal.nusmv.ext" version="0" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/editor.mps
index ff66b77ed..d74f77836 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/editor.mps
@@ -12,7 +12,7 @@
     <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
     <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
     <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/flatten.util.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/flatten.util.mps
index 329f476ec..45725b5cc 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/flatten.util.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/models/flatten.util.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <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>
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl
index 1de7bbcab..d0de4c3c6 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl
@@ -79,7 +79,7 @@
     <dependency reexport="false">d8f591ec-4d86-4af2-9f92-a9e93c803ffa(jetbrains.mps.lang.scopes)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
     <language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/editor.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/editor.mps
index d80859d9f..a6c314e97 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/models/editor.mps
@@ -5,7 +5,7 @@
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
     <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/models/com.mbeddr.formal.ocra.sandbox.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/models/com.mbeddr.formal.ocra.sandbox.mps
index 0bd1a786d..d9502b0a6 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/models/com.mbeddr.formal.ocra.sandbox.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/models/com.mbeddr.formal.ocra.sandbox.mps
@@ -283,7 +283,7 @@
           <node concept="3JpXL7" id="404$BAyZOhc" role="3JpXMp">
             <node concept="3z3nEs" id="404$BAz7Hru" role="1yBDGv">
               <node concept="3JpXLh" id="2LIcOCczt8m" role="3z7Dti">
-                <ref role="2eEb$9" node="1QMZQ041t5_" />
+                <ref role="2eEb$9" node="1QMZQ041t5_" resolve="myContinousParam" />
               </node>
               <node concept="3z608g" id="404$BAz7Hr_" role="3z60cZ" />
               <node concept="2IPVmt" id="404$BAz7HrG" role="3z614f">
@@ -298,7 +298,7 @@
                   <property role="2IPVms" value="42" />
                 </node>
                 <node concept="3JpXLh" id="2LIcOCczt8d" role="2H9Iav">
-                  <ref role="2eEb$9" node="404$BAyXroL" />
+                  <ref role="2eEb$9" node="404$BAyXroL" resolve="myInputEventPort" />
                 </node>
               </node>
             </node>
@@ -317,67 +317,67 @@
       <node concept="3JpXKZ" id="5MFfD6f6VvT" role="3JpXMq">
         <node concept="3JpXKI" id="5MFfD6faEsN" role="3JpXMt">
           <property role="TrG5h" value="a" />
-          <ref role="2uTqvm" node="5MFfD6f6VzQ" />
+          <ref role="2uTqvm" node="5MFfD6f6VzQ" resolve="A" />
         </node>
         <node concept="3JpXKI" id="5MFfD6faEtr" role="3JpXMt">
           <property role="TrG5h" value="b" />
-          <ref role="2uTqvm" node="5MFfD6f6VCu" />
+          <ref role="2uTqvm" node="5MFfD6f6VCu" resolve="B" />
         </node>
         <node concept="2uPaw6" id="5MFfD6f6VFM" role="3JpXMt" />
         <node concept="3JpXLn" id="5MFfD6f6VFV" role="3JpXMt">
           <node concept="1ziNjN" id="2LIcOCcw1bF" role="3JpXMd">
             <node concept="17cSpV" id="2LIcOCcw1bO" role="1ziNjJ">
-              <ref role="17cOEh" node="5MFfD6f6V$n" />
+              <ref role="17cOEh" node="5MFfD6f6V$n" resolve="in_data" />
             </node>
             <node concept="3jw80t" id="2LIcOCcw1bB" role="1ziNjM">
-              <ref role="1f8Sn1" node="5MFfD6faEsN" />
+              <ref role="1f8Sn1" node="5MFfD6faEsN" resolve="a" />
             </node>
           </node>
           <node concept="3JpXLh" id="2LIcOCczt5d" role="3JpXMM">
-            <ref role="2eEb$9" node="5MFfD6f6Vw2" />
+            <ref role="2eEb$9" node="5MFfD6f6Vw2" resolve="in_data" />
           </node>
         </node>
         <node concept="3JpXLn" id="5MFfD6f6VGi" role="3JpXMt">
           <node concept="1ziNjN" id="2LIcOCcw1bX" role="3JpXMd">
             <node concept="17cSpV" id="2LIcOCcw1c6" role="1ziNjJ">
-              <ref role="17cOEh" node="5MFfD6f6VDm" />
+              <ref role="17cOEh" node="5MFfD6f6VDm" resolve="in_data" />
             </node>
             <node concept="3jw80t" id="2LIcOCcw1bT" role="1ziNjM">
-              <ref role="1f8Sn1" node="5MFfD6faEtr" />
+              <ref role="1f8Sn1" node="5MFfD6faEtr" resolve="b" />
             </node>
           </node>
           <node concept="1ziNjN" id="2LIcOCcw1cK" role="3JpXMM">
             <node concept="3jw80t" id="2LIcOCcw1cF" role="1ziNjM">
-              <ref role="1f8Sn1" node="5MFfD6faEsN" />
+              <ref role="1f8Sn1" node="5MFfD6faEsN" resolve="a" />
             </node>
             <node concept="17cSpV" id="2LIcOCcw1d3" role="1ziNjJ">
-              <ref role="17cOEh" node="5MFfD6f6V$E" />
+              <ref role="17cOEh" node="5MFfD6f6V$E" resolve="out_data" />
             </node>
           </node>
         </node>
         <node concept="3JpXLn" id="5MFfD6f6VGR" role="3JpXMt">
           <node concept="3JpXLh" id="2LIcOCcw1ds" role="3JpXMd">
-            <ref role="2eEb$9" node="5MFfD6f6Vwl" />
+            <ref role="2eEb$9" node="5MFfD6f6Vwl" resolve="out_data" />
           </node>
           <node concept="1ziNjN" id="2LIcOCcw1de" role="3JpXMM">
             <node concept="17cSpV" id="2LIcOCcw1dn" role="1ziNjJ">
-              <ref role="17cOEh" node="5MFfD6f6VDF" />
+              <ref role="17cOEh" node="5MFfD6f6VDF" resolve="out_data" />
             </node>
             <node concept="3jw80t" id="2LIcOCcw1d9" role="1ziNjM">
-              <ref role="1f8Sn1" node="5MFfD6faEtr" />
+              <ref role="1f8Sn1" node="5MFfD6faEtr" resolve="b" />
             </node>
           </node>
         </node>
         <node concept="2uPaw6" id="5MFfD6f6VHa" role="3JpXMt" />
         <node concept="3JpXLq" id="5MFfD6f6VHB" role="3JpXMt">
           <node concept="3JpXL9" id="5MFfD6f6VHR" role="3tgAEN">
-            <ref role="3tgiSz" node="5MFfD6f6VwN" />
+            <ref role="3tgiSz" node="5MFfD6f6VwN" resolve="reaction" />
           </node>
           <node concept="3JpXL9" id="5MFfD6f6VHT" role="3JpXMs">
-            <ref role="3tgiSz" node="5MFfD6f6V_8" />
+            <ref role="3tgiSz" node="5MFfD6f6V_8" resolve="reaction" />
           </node>
           <node concept="3JpXL9" id="5MFfD6f6VHY" role="3JpXMs">
-            <ref role="3tgiSz" node="5MFfD6f6VEk" />
+            <ref role="3tgiSz" node="5MFfD6f6VEk" resolve="pass" />
           </node>
         </node>
       </node>
@@ -399,11 +399,11 @@
                 <node concept="rYEFr" id="5MFfD6f6VxX" role="32OYtT">
                   <node concept="rZvB3" id="5MFfD6f6Vyx" role="2H9Ial">
                     <node concept="3JpXLh" id="2LIcOCczt59" role="1yBIc4">
-                      <ref role="2eEb$9" node="5MFfD6f6Vwl" />
+                      <ref role="2eEb$9" node="5MFfD6f6Vwl" resolve="out_data" />
                     </node>
                   </node>
                   <node concept="3JpXLh" id="2LIcOCczt55" role="2H9Iav">
-                    <ref role="2eEb$9" node="5MFfD6f6Vw2" />
+                    <ref role="2eEb$9" node="5MFfD6f6Vw2" resolve="in_data" />
                   </node>
                 </node>
               </node>
@@ -412,7 +412,7 @@
           <node concept="3JpXL6" id="5MFfD6f6VwP" role="3JpXMo">
             <node concept="rZvB3" id="5MFfD6f6Vxj" role="1yBDGv">
               <node concept="3JpXLh" id="2LIcOCczt51" role="1yBIc4">
-                <ref role="2eEb$9" node="5MFfD6f6Vw2" />
+                <ref role="2eEb$9" node="5MFfD6f6Vw2" resolve="in_data" />
               </node>
             </node>
           </node>
@@ -441,11 +441,11 @@
                 <node concept="rYEFr" id="5MFfD6f6VAf" role="32OYtT">
                   <node concept="rZvB3" id="5MFfD6f6VAH" role="2H9Ial">
                     <node concept="3JpXLh" id="2LIcOCczt5l" role="1yBIc4">
-                      <ref role="2eEb$9" node="5MFfD6f6V$E" />
+                      <ref role="2eEb$9" node="5MFfD6f6V$E" resolve="out_data" />
                     </node>
                   </node>
                   <node concept="3JpXLh" id="2LIcOCczt5p" role="2H9Iav">
-                    <ref role="2eEb$9" node="5MFfD6f6V$n" />
+                    <ref role="2eEb$9" node="5MFfD6f6V$n" resolve="in_data" />
                   </node>
                 </node>
               </node>
@@ -454,7 +454,7 @@
           <node concept="3JpXL6" id="5MFfD6f6V_a" role="3JpXMo">
             <node concept="rZvB3" id="5MFfD6f6V_w" role="1yBDGv">
               <node concept="3JpXLh" id="2LIcOCczt5h" role="1yBIc4">
-                <ref role="2eEb$9" node="5MFfD6f6V$n" />
+                <ref role="2eEb$9" node="5MFfD6f6V$n" resolve="in_data" />
               </node>
             </node>
           </node>
@@ -481,10 +481,10 @@
               <node concept="32OYss" id="5MFfD6f6VEW" role="1yBIc4">
                 <node concept="rYEFr" id="5MFfD6f6VFb" role="32OYtT">
                   <node concept="3JpXLh" id="2LIcOCczt5x" role="2H9Ial">
-                    <ref role="2eEb$9" node="5MFfD6f6VDF" />
+                    <ref role="2eEb$9" node="5MFfD6f6VDF" resolve="out_data" />
                   </node>
                   <node concept="3JpXLh" id="2LIcOCczt5t" role="2H9Iav">
-                    <ref role="2eEb$9" node="5MFfD6f6VDm" />
+                    <ref role="2eEb$9" node="5MFfD6f6VDm" resolve="in_data" />
                   </node>
                 </node>
               </node>
@@ -506,39 +506,39 @@
       <node concept="3JpXKZ" id="5MFfD6f6VPA" role="3JpXMq">
         <node concept="3JpXKI" id="5MFfD6faEqf" role="3JpXMt">
           <property role="TrG5h" value="a" />
-          <ref role="2uTqvm" node="5MFfD6f6VST" />
+          <ref role="2uTqvm" node="5MFfD6f6VST" resolve="A" />
         </node>
         <node concept="3JpXKI" id="5MFfD6faEqT" role="3JpXMt">
           <property role="TrG5h" value="b" />
-          <ref role="2uTqvm" node="5MFfD6f6VWx" />
+          <ref role="2uTqvm" node="5MFfD6f6VWx" resolve="B" />
         </node>
         <node concept="2uPaw6" id="5MFfD6f6W37" role="3JpXMt" />
         <node concept="3JpXLn" id="5MFfD6f6W3g" role="3JpXMt">
           <node concept="1ziNjN" id="2LIcOCcw1ay" role="3JpXMd">
             <node concept="17cSpV" id="2LIcOCcw1aF" role="1ziNjJ">
-              <ref role="17cOEh" node="5MFfD6f6VXh" />
+              <ref role="17cOEh" node="5MFfD6f6VXh" resolve="in_data" />
             </node>
             <node concept="3jw80t" id="2LIcOCcw1au" role="1ziNjM">
-              <ref role="1f8Sn1" node="5MFfD6faEqT" />
+              <ref role="1f8Sn1" node="5MFfD6faEqT" resolve="b" />
             </node>
           </node>
           <node concept="2H9FEB" id="5MFfD6f6W3z" role="3JpXMM">
             <node concept="1ziNjN" id="2LIcOCcw1ag" role="2H9Ial">
               <node concept="17cSpV" id="2LIcOCcw1ap" role="1ziNjJ">
-                <ref role="17cOEh" node="5MFfD6f6VTp" />
+                <ref role="17cOEh" node="5MFfD6f6VTp" resolve="out_data" />
               </node>
               <node concept="3jw80t" id="2LIcOCcw1ab" role="1ziNjM">
-                <ref role="1f8Sn1" node="5MFfD6faEqf" />
+                <ref role="1f8Sn1" node="5MFfD6faEqf" resolve="a" />
               </node>
             </node>
             <node concept="3JpXLh" id="2LIcOCczt4j" role="2H9Iav">
-              <ref role="2eEb$9" node="5MFfD6f6VPK" />
+              <ref role="2eEb$9" node="5MFfD6f6VPK" resolve="in_data" />
             </node>
           </node>
         </node>
         <node concept="3JpXLn" id="5MFfD6f6W43" role="3JpXMt">
           <node concept="3JpXLh" id="2LIcOCcw1bf" role="3JpXMd">
-            <ref role="2eEb$9" node="5MFfD6f6VQ3" />
+            <ref role="2eEb$9" node="5MFfD6f6VQ3" resolve="positive" />
           </node>
           <node concept="nE0YJ" id="5MFfD6f6W4s" role="3JpXMM">
             <node concept="2IPVmt" id="5MFfD6f6W4C" role="2H9Ial">
@@ -546,10 +546,10 @@
             </node>
             <node concept="1ziNjN" id="2LIcOCcw1aU" role="2H9Iav">
               <node concept="17cSpV" id="2LIcOCcw1ba" role="1ziNjJ">
-                <ref role="17cOEh" node="5MFfD6f6VXy" />
+                <ref role="17cOEh" node="5MFfD6f6VXy" resolve="out_data" />
               </node>
               <node concept="3jw80t" id="2LIcOCcw1aP" role="1ziNjM">
-                <ref role="1f8Sn1" node="5MFfD6faEqT" />
+                <ref role="1f8Sn1" node="5MFfD6faEqT" resolve="b" />
               </node>
             </node>
           </node>
@@ -557,13 +557,13 @@
         <node concept="2uPaw6" id="5MFfD6f6W4P" role="3JpXMt" />
         <node concept="3JpXLq" id="5MFfD6f6W5k" role="3JpXMt">
           <node concept="3JpXL9" id="5MFfD6f6W5_" role="3tgAEN">
-            <ref role="3tgiSz" node="5MFfD6f6VQx" />
+            <ref role="3tgiSz" node="5MFfD6f6VQx" resolve="positive" />
           </node>
           <node concept="3JpXL9" id="5MFfD6f6W5B" role="3JpXMs">
-            <ref role="3tgiSz" node="5MFfD6f6VTL" />
+            <ref role="3tgiSz" node="5MFfD6f6VTL" resolve="positive" />
           </node>
           <node concept="3JpXL9" id="5MFfD6f6W5G" role="3JpXMs">
-            <ref role="3tgiSz" node="5MFfD6f6VY0" />
+            <ref role="3tgiSz" node="5MFfD6f6VY0" resolve="past" />
           </node>
         </node>
       </node>
@@ -582,7 +582,7 @@
           <node concept="3JpXL7" id="5MFfD6f6VQy" role="3JpXMp">
             <node concept="rZvlL" id="5MFfD6f6VRM" role="1yBDGv">
               <node concept="3JpXLh" id="2LIcOCczt4f" role="1yBIc4">
-                <ref role="2eEb$9" node="5MFfD6f6VQ3" />
+                <ref role="2eEb$9" node="5MFfD6f6VQ3" resolve="positive" />
               </node>
             </node>
           </node>
@@ -594,7 +594,7 @@
                     <property role="2IPVms" value="0" />
                   </node>
                   <node concept="3JpXLh" id="2LIcOCczt4b" role="2H9Iav">
-                    <ref role="2eEb$9" node="5MFfD6f6VPK" />
+                    <ref role="2eEb$9" node="5MFfD6f6VPK" resolve="in_data" />
                   </node>
                 </node>
               </node>
@@ -623,7 +623,7 @@
                     <property role="2IPVms" value="0" />
                   </node>
                   <node concept="3JpXLh" id="2LIcOCczt4n" role="2H9Iav">
-                    <ref role="2eEb$9" node="5MFfD6f6VTp" />
+                    <ref role="2eEb$9" node="5MFfD6f6VTp" resolve="out_data" />
                   </node>
                 </node>
               </node>
@@ -656,7 +656,7 @@
                 <node concept="rYEFr" id="5MFfD6f6W0h" role="32OYtT">
                   <node concept="nE0YK" id="5MFfD6f6W0i" role="2H9Iav">
                     <node concept="3JpXLh" id="2LIcOCczt4r" role="2H9Iav">
-                      <ref role="2eEb$9" node="5MFfD6f6VXy" />
+                      <ref role="2eEb$9" node="5MFfD6f6VXy" resolve="out_data" />
                     </node>
                     <node concept="2IPVmt" id="5MFfD6f6W0j" role="2H9Ial">
                       <property role="2IPVms" value="0" />
@@ -668,7 +668,7 @@
                         <property role="2IPVms" value="0" />
                       </node>
                       <node concept="3JpXLh" id="2LIcOCczt4w" role="2H9Iav">
-                        <ref role="2eEb$9" node="5MFfD6f6VXh" />
+                        <ref role="2eEb$9" node="5MFfD6f6VXh" resolve="in_data" />
                       </node>
                     </node>
                   </node>
@@ -691,51 +691,51 @@
       <node concept="3JpXKZ" id="5MFfD6f6WfG" role="3JpXMq">
         <node concept="3JpXKI" id="5MFfD6faEkl" role="3JpXMt">
           <property role="TrG5h" value="d" />
-          <ref role="2uTqvm" node="5MFfD6f6WfX" />
+          <ref role="2uTqvm" node="5MFfD6f6WfX" resolve="Device" />
         </node>
         <node concept="3JpXKI" id="5MFfD6faEmP" role="3JpXMt">
           <property role="TrG5h" value="m" />
-          <ref role="2uTqvm" node="5MFfD6f6WgN" />
+          <ref role="2uTqvm" node="5MFfD6f6WgN" resolve="Monitor" />
         </node>
         <node concept="2uPaw6" id="5MFfD6f8Mcy" role="3JpXMt" />
         <node concept="3JpXLn" id="5MFfD6f8McH" role="3JpXMt">
           <node concept="3JpXLh" id="2LIcOCczo61" role="3JpXMM">
-            <ref role="2eEb$9" node="5MFfD6f8adj" />
+            <ref role="2eEb$9" node="5MFfD6f8adj" resolve="x" />
           </node>
           <node concept="1ziNjN" id="4zSAnzA_svM" role="3JpXMd">
             <node concept="17cSpV" id="4zSAnzA_svV" role="1ziNjJ">
-              <ref role="17cOEh" node="5MFfD6f8a2Y" />
+              <ref role="17cOEh" node="5MFfD6f8a2Y" resolve="x" />
             </node>
             <node concept="3jw80t" id="4zSAnzA_svJ" role="1ziNjM">
-              <ref role="1f8Sn1" node="5MFfD6faEkl" />
+              <ref role="1f8Sn1" node="5MFfD6faEkl" resolve="d" />
             </node>
           </node>
         </node>
         <node concept="3JpXLn" id="5MFfD6f8Md4" role="3JpXMt">
           <node concept="3JpXLh" id="2LIcOCcw0Du" role="3JpXMd">
-            <ref role="2eEb$9" node="5MFfD6f8ad$" />
+            <ref role="2eEb$9" node="5MFfD6f8ad$" resolve="alarm" />
           </node>
           <node concept="1ziNjN" id="4zSAnzAy4xD" role="3JpXMM">
             <node concept="17cSpV" id="4zSAnzAy4xM" role="1ziNjJ">
-              <ref role="17cOEh" node="5MFfD6f6Wjn" />
+              <ref role="17cOEh" node="5MFfD6f6Wjn" resolve="out_alarm" />
             </node>
             <node concept="3jw80t" id="4zSAnzAy4xA" role="1ziNjM">
-              <ref role="1f8Sn1" node="5MFfD6faEmP" />
+              <ref role="1f8Sn1" node="5MFfD6faEmP" resolve="m" />
             </node>
           </node>
         </node>
         <node concept="3JpXLn" id="5MFfD6f8Q5f" role="3JpXMt">
           <node concept="1ziNjN" id="1FGIUxtRNRa" role="3JpXMd">
             <node concept="17cSpV" id="4zSAnzAupo8" role="1ziNjJ">
-              <ref role="17cOEh" node="5MFfD6f6Wid" />
+              <ref role="17cOEh" node="5MFfD6f6Wid" resolve="period" />
             </node>
             <node concept="3jw80t" id="1FGIUxtRNR5" role="1ziNjM">
-              <ref role="1f8Sn1" node="5MFfD6faEmP" />
+              <ref role="1f8Sn1" node="5MFfD6faEmP" resolve="m" />
             </node>
           </node>
           <node concept="d4bQV" id="5MFfD6f8Q6p" role="3JpXMM">
             <node concept="3JpXLh" id="2LIcOCczsf3" role="d498F">
-              <ref role="2eEb$9" node="5MFfD6f8adV" />
+              <ref role="2eEb$9" node="5MFfD6f8adV" resolve="min_period" />
             </node>
             <node concept="2IPVmt" id="5MFfD6f8Q7f" role="d498I">
               <property role="2IPVms" value="2" />
@@ -746,7 +746,7 @@
                   <property role="2IPVms" value="2" />
                 </node>
                 <node concept="3JpXLh" id="2LIcOCczseQ" role="2H9Iav">
-                  <ref role="2eEb$9" node="5MFfD6f8adV" />
+                  <ref role="2eEb$9" node="5MFfD6f8adV" resolve="min_period" />
                 </node>
               </node>
             </node>
@@ -755,14 +755,14 @@
         <node concept="3JpXLn" id="5MFfD6f8Md_" role="3JpXMt">
           <node concept="1ziNjN" id="4zSAnzAupTV" role="3JpXMd">
             <node concept="17cSpV" id="4zSAnzAupU4" role="1ziNjJ">
-              <ref role="17cOEh" node="5MFfD6f8a48" />
+              <ref role="17cOEh" node="5MFfD6f8a48" resolve="threshold" />
             </node>
             <node concept="3jw80t" id="4zSAnzAupTQ" role="1ziNjM">
-              <ref role="1f8Sn1" node="5MFfD6faEkl" />
+              <ref role="1f8Sn1" node="5MFfD6faEkl" resolve="d" />
             </node>
           </node>
           <node concept="3JpXLh" id="2LIcOCczsf7" role="3JpXMM">
-            <ref role="2eEb$9" node="5MFfD6f8aem" />
+            <ref role="2eEb$9" node="5MFfD6f8aem" resolve="threshold" />
           </node>
         </node>
         <node concept="2uPaw6" id="5MFfD6f8Q7s" role="3JpXMt" />
@@ -773,10 +773,10 @@
                 <node concept="3z3nEs" id="5MFfD6f8Q9A" role="2H9Ial">
                   <node concept="1ziNjN" id="4zSAnzAuq1$" role="3z7Dti">
                     <node concept="17cSpV" id="4zSAnzAuq1H" role="1ziNjJ">
-                      <ref role="17cOEh" node="5MFfD6f8a3h" />
+                      <ref role="17cOEh" node="5MFfD6f8a3h" resolve="request" />
                     </node>
                     <node concept="3jw80t" id="4zSAnzAuq1v" role="1ziNjM">
-                      <ref role="1f8Sn1" node="5MFfD6faEkl" />
+                      <ref role="1f8Sn1" node="5MFfD6faEkl" resolve="d" />
                     </node>
                   </node>
                   <node concept="3z60bb" id="5MFfD6f8Q9Z" role="3z60cZ" />
@@ -786,10 +786,10 @@
                 </node>
                 <node concept="1ziNjN" id="4zSAnzAuq1X" role="2H9Iav">
                   <node concept="17cSpV" id="4zSAnzAuq2$" role="1ziNjJ">
-                    <ref role="17cOEh" node="5MFfD6f6WhM" />
+                    <ref role="17cOEh" node="5MFfD6f6WhM" resolve="request" />
                   </node>
                   <node concept="3jw80t" id="4zSAnzAuq1S" role="1ziNjM">
-                    <ref role="1f8Sn1" node="5MFfD6faEmP" />
+                    <ref role="1f8Sn1" node="5MFfD6faEmP" resolve="m" />
                   </node>
                 </node>
               </node>
@@ -803,10 +803,10 @@
                 <node concept="3z3nEs" id="5MFfD6f8QcS" role="2H9Ial">
                   <node concept="1ziNjN" id="4zSAnzAuq43" role="3z7Dti">
                     <node concept="17cSpV" id="4zSAnzAuq4c" role="1ziNjJ">
-                      <ref role="17cOEh" node="5MFfD6f6Whp" />
+                      <ref role="17cOEh" node="5MFfD6f6Whp" resolve="in_alarm" />
                     </node>
                     <node concept="3jw80t" id="4zSAnzAuq3Y" role="1ziNjM">
-                      <ref role="1f8Sn1" node="5MFfD6faEmP" />
+                      <ref role="1f8Sn1" node="5MFfD6faEmP" resolve="m" />
                     </node>
                   </node>
                   <node concept="3z60bb" id="5MFfD6f8Qd6" role="3z60cZ" />
@@ -816,10 +816,10 @@
                 </node>
                 <node concept="1ziNjN" id="4zSAnzAuq3c" role="2H9Iav">
                   <node concept="17cSpV" id="4zSAnzAuq3N" role="1ziNjJ">
-                    <ref role="17cOEh" node="5MFfD6f8a3E" />
+                    <ref role="17cOEh" node="5MFfD6f8a3E" resolve="alarm" />
                   </node>
                   <node concept="3jw80t" id="4zSAnzAuq37" role="1ziNjM">
-                    <ref role="1f8Sn1" node="5MFfD6faEkl" />
+                    <ref role="1f8Sn1" node="5MFfD6faEkl" resolve="d" />
                   </node>
                 </node>
               </node>
@@ -829,16 +829,16 @@
         <node concept="2uPaw6" id="5MFfD6f8Qai" role="3JpXMt" />
         <node concept="3JpXLq" id="5MFfD6f8Qe5" role="3JpXMt">
           <node concept="3JpXL9" id="5MFfD6f8QeM" role="3tgAEN">
-            <ref role="3tgiSz" node="5MFfD6f8af0" />
+            <ref role="3tgiSz" node="5MFfD6f8af0" resolve="alarm" />
           </node>
           <node concept="3JpXL9" id="5MFfD6f8QeO" role="3JpXMs">
-            <ref role="3tgiSz" node="5MFfD6f8a4P" />
+            <ref role="3tgiSz" node="5MFfD6f8a4P" resolve="alarm" />
           </node>
           <node concept="3JpXL9" id="5MFfD6f8QeT" role="3JpXMs">
-            <ref role="3tgiSz" node="5MFfD6f89ZU" />
+            <ref role="3tgiSz" node="5MFfD6f89ZU" resolve="alarm" />
           </node>
           <node concept="3JpXL9" id="5MFfD6f8Qf1" role="3JpXMs">
-            <ref role="3tgiSz" node="5MFfD6f6WiT" />
+            <ref role="3tgiSz" node="5MFfD6f6WiT" resolve="request" />
           </node>
         </node>
         <node concept="2uPaw6" id="5MFfD6f8Qdp" role="3JpXMt" />
@@ -903,10 +903,10 @@
                 <node concept="32OYss" id="5MFfD6f8M7o" role="1yBIc4">
                   <node concept="nE0YK" id="5MFfD6f8M7p" role="32OYtT">
                     <node concept="3JpXLh" id="2LIcOCczo65" role="2H9Iav">
-                      <ref role="2eEb$9" node="5MFfD6f8adj" />
+                      <ref role="2eEb$9" node="5MFfD6f8adj" resolve="x" />
                     </node>
                     <node concept="3JpXLh" id="2LIcOCczseb" role="2H9Ial">
-                      <ref role="2eEb$9" node="5MFfD6f8aem" />
+                      <ref role="2eEb$9" node="5MFfD6f8aem" resolve="threshold" />
                     </node>
                   </node>
                 </node>
@@ -914,10 +914,10 @@
               <node concept="3z3nEs" id="5MFfD6f8M7J" role="2H9Ial">
                 <node concept="1ziNjN" id="2LIcOCcw0ZD" role="3z7Dti">
                   <node concept="17cSpV" id="2LIcOCcw0ZM" role="1ziNjJ">
-                    <ref role="17cOEh" node="5MFfD6f6Wh8" />
+                    <ref role="17cOEh" node="5MFfD6f6Wh8" resolve="alarm" />
                   </node>
                   <node concept="3jw80t" id="2LIcOCcw0Z$" role="1ziNjM">
-                    <ref role="1f8Sn1" node="5MFfD6faEmP" />
+                    <ref role="1f8Sn1" node="5MFfD6faEmP" resolve="m" />
                   </node>
                 </node>
                 <node concept="3z60bb" id="5MFfD6f8M7V" role="3z60cZ" />
@@ -932,7 +932,7 @@
               <node concept="rZvlL" id="5MFfD6f8M5k" role="2H9Iav">
                 <node concept="3z0ZEZ" id="5MFfD6f8afL" role="1yBIc4">
                   <node concept="3JpXLh" id="2LIcOCczo69" role="3z0ZEY">
-                    <ref role="2eEb$9" node="5MFfD6f8adj" />
+                    <ref role="2eEb$9" node="5MFfD6f8adj" resolve="x" />
                   </node>
                 </node>
               </node>
@@ -940,12 +940,12 @@
                 <node concept="3z3nEs" id="5MFfD6f8M5O" role="1yBIc4">
                   <node concept="3z0ZEZ" id="5MFfD6f8M5Z" role="3z7Dti">
                     <node concept="3JpXLh" id="2LIcOCczo6d" role="3z0ZEY">
-                      <ref role="2eEb$9" node="5MFfD6f8adj" />
+                      <ref role="2eEb$9" node="5MFfD6f8adj" resolve="x" />
                     </node>
                   </node>
                   <node concept="3z608g" id="5MFfD6f8M68" role="3z60cZ" />
                   <node concept="3JpXLh" id="2LIcOCczsew" role="3z614f">
-                    <ref role="2eEb$9" node="5MFfD6f8adV" />
+                    <ref role="2eEb$9" node="5MFfD6f8adV" resolve="min_period" />
                   </node>
                 </node>
               </node>
@@ -983,7 +983,7 @@
                 <node concept="rYEFr" id="5MFfD6f8a7N" role="32OYtT">
                   <node concept="3z3nEs" id="5MFfD6f8aau" role="2H9Ial">
                     <node concept="3JpXLh" id="2LIcOCcw18V" role="3z7Dti">
-                      <ref role="2eEb$9" node="5MFfD6f8a3E" />
+                      <ref role="2eEb$9" node="5MFfD6f8a3E" resolve="alarm" />
                     </node>
                     <node concept="3z60bb" id="5MFfD6f8aaC" role="3z60cZ" />
                     <node concept="2IPVmt" id="5MFfD6f8aaI" role="3z614f">
@@ -994,14 +994,14 @@
                     <node concept="rYEuI" id="5MFfD6f8a5U" role="32OYtT">
                       <node concept="nE0YK" id="5MFfD6f8a6D" role="2H9Ial">
                         <node concept="3JpXLh" id="2LIcOCczsfb" role="2H9Ial">
-                          <ref role="2eEb$9" node="5MFfD6f8a48" />
+                          <ref role="2eEb$9" node="5MFfD6f8a48" resolve="threshold" />
                         </node>
                         <node concept="3JpXLh" id="2LIcOCczo6l" role="2H9Iav">
-                          <ref role="2eEb$9" node="5MFfD6f8a2Y" />
+                          <ref role="2eEb$9" node="5MFfD6f8a2Y" resolve="x" />
                         </node>
                       </node>
                       <node concept="3JpXLh" id="2LIcOCczo6h" role="2H9Iav">
-                        <ref role="2eEb$9" node="5MFfD6f8a3h" />
+                        <ref role="2eEb$9" node="5MFfD6f8a3h" resolve="request" />
                       </node>
                     </node>
                   </node>
@@ -1054,16 +1054,16 @@
                       <node concept="rZvz2" id="5MFfD6f89Yn" role="2H9Ial">
                         <node concept="3z3nEs" id="5MFfD6f89Y_" role="1yBIc4">
                           <node concept="3JpXLh" id="2LIcOCczsfr" role="3z7Dti">
-                            <ref role="2eEb$9" node="5MFfD6f6WhM" />
+                            <ref role="2eEb$9" node="5MFfD6f6WhM" resolve="request" />
                           </node>
                           <node concept="3z60bb" id="5MFfD6f89YI" role="3z60cZ" />
                           <node concept="3JpXLh" id="2LIcOCczsfu" role="3z614f">
-                            <ref role="2eEb$9" node="5MFfD6f6Wid" />
+                            <ref role="2eEb$9" node="5MFfD6f6Wid" resolve="period" />
                           </node>
                         </node>
                       </node>
                       <node concept="3JpXLh" id="2LIcOCczsfn" role="2H9Iav">
-                        <ref role="2eEb$9" node="5MFfD6f6WhM" />
+                        <ref role="2eEb$9" node="5MFfD6f6WhM" resolve="request" />
                       </node>
                     </node>
                   </node>
@@ -1072,11 +1072,11 @@
               <node concept="32OYss" id="5MFfD6f6WkS" role="2H9Iav">
                 <node concept="3z3nEs" id="5MFfD6f6Wl8" role="32OYtT">
                   <node concept="3JpXLh" id="2LIcOCczsff" role="3z7Dti">
-                    <ref role="2eEb$9" node="5MFfD6f6WhM" />
+                    <ref role="2eEb$9" node="5MFfD6f6WhM" resolve="request" />
                   </node>
                   <node concept="3z60bb" id="5MFfD6f89WS" role="3z60cZ" />
                   <node concept="3JpXLh" id="2LIcOCczsfj" role="3z614f">
-                    <ref role="2eEb$9" node="5MFfD6f6Wid" />
+                    <ref role="2eEb$9" node="5MFfD6f6Wid" resolve="period" />
                   </node>
                 </node>
               </node>
@@ -1092,7 +1092,7 @@
                 <node concept="rYEFr" id="5MFfD6f8a1e" role="32OYtT">
                   <node concept="3z3nEs" id="5MFfD6f8a1I" role="2H9Ial">
                     <node concept="3JpXLh" id="2LIcOCczsfA" role="3z7Dti">
-                      <ref role="2eEb$9" node="5MFfD6f6Wjn" />
+                      <ref role="2eEb$9" node="5MFfD6f6Wjn" resolve="out_alarm" />
                     </node>
                     <node concept="3z60bb" id="5MFfD6f8a1U" role="3z60cZ" />
                     <node concept="2IPVmt" id="5MFfD6f8a20" role="3z614f">
@@ -1100,7 +1100,7 @@
                     </node>
                   </node>
                   <node concept="3JpXLh" id="2LIcOCczsfy" role="2H9Iav">
-                    <ref role="2eEb$9" node="5MFfD6f6Whp" />
+                    <ref role="2eEb$9" node="5MFfD6f6Whp" resolve="in_alarm" />
                   </node>
                 </node>
               </node>
@@ -1118,17 +1118,17 @@
     <property role="3GE5qa" value="tlc-example" />
     <node concept="3JpXKQ" id="2OfmkSY3$Q_" role="1dZ_iz">
       <node concept="uloHs" id="2OfmkSY3J3q" role="ulUGd">
-        <ref role="uloG$" node="2OfmkSY2WCT" />
+        <ref role="uloG$" node="2OfmkSY2WCT" resolve="EnumLibrary" />
       </node>
     </node>
     <node concept="3JpXKQ" id="5MFfD6f8RYs" role="1dZ_iz">
       <node concept="uloHs" id="5MFfD6f8RYx" role="ulUGd">
-        <ref role="uloG$" node="5MFfD6f8Rv8" />
+        <ref role="uloG$" node="5MFfD6f8Rv8" resolve="Controller" />
       </node>
     </node>
     <node concept="3JpXKQ" id="5MFfD6f8RYk" role="1dZ_iz">
       <node concept="uloHs" id="5MFfD6f8RYm" role="ulUGd">
-        <ref role="uloG$" node="5MFfD6f8RuG" />
+        <ref role="uloG$" node="5MFfD6f8RuG" resolve="Merger" />
       </node>
     </node>
     <node concept="2uPaw6" id="5MFfD6f8RYz" role="1dZ_iz" />
@@ -1137,70 +1137,70 @@
       <node concept="3JpXKZ" id="5MFfD6f8RYL" role="3JpXMq">
         <node concept="3JpXKI" id="5MFfD6faEvu" role="3JpXMt">
           <property role="TrG5h" value="m" />
-          <ref role="2uTqvm" node="5MFfD6f8RNs" />
+          <ref role="2uTqvm" node="5MFfD6f8RNs" resolve="Merger" />
         </node>
         <node concept="3JpXKI" id="5MFfD6faEwa" role="3JpXMt">
           <property role="TrG5h" value="c" />
-          <ref role="2uTqvm" node="5MFfD6f8Rwh" />
+          <ref role="2uTqvm" node="5MFfD6f8Rwh" resolve="Controller" />
         </node>
         <node concept="2uPaw6" id="5MFfD6faEv9" role="3JpXMt" />
         <node concept="3JpXLn" id="5MFfD6f8S3e" role="3JpXMt">
           <node concept="3JpXLh" id="2LIcOCcw1A7" role="3JpXMd">
-            <ref role="2eEb$9" node="5MFfD6f8S0w" />
+            <ref role="2eEb$9" node="5MFfD6f8S0w" resolve="leftReq" />
           </node>
           <node concept="1ziNjN" id="2LIcOCcw1_j" role="3JpXMM">
             <node concept="17cSpV" id="2LIcOCcw1_s" role="1ziNjJ">
-              <ref role="17cOEh" node="5MFfD6f8RNA" />
+              <ref role="17cOEh" node="5MFfD6f8RNA" resolve="left" />
             </node>
             <node concept="3jw80t" id="2LIcOCcw1_e" role="1ziNjM">
-              <ref role="1f8Sn1" node="5MFfD6faEvu" />
+              <ref role="1f8Sn1" node="5MFfD6faEvu" resolve="m" />
             </node>
           </node>
         </node>
         <node concept="3JpXLn" id="5MFfD6f8S5V" role="3JpXMt">
           <node concept="3JpXLh" id="2LIcOCcw1Aa" role="3JpXMd">
-            <ref role="2eEb$9" node="5MFfD6f8S19" />
+            <ref role="2eEb$9" node="5MFfD6f8S19" resolve="rightReq" />
           </node>
           <node concept="1ziNjN" id="2LIcOCcw1_N" role="3JpXMM">
             <node concept="17cSpV" id="2LIcOCcw1_W" role="1ziNjJ">
-              <ref role="17cOEh" node="5MFfD6f8RNV" />
+              <ref role="17cOEh" node="5MFfD6f8RNV" resolve="right" />
             </node>
             <node concept="3jw80t" id="2LIcOCcw1_I" role="1ziNjM">
-              <ref role="1f8Sn1" node="5MFfD6faEvu" />
+              <ref role="1f8Sn1" node="5MFfD6faEvu" resolve="m" />
             </node>
           </node>
         </node>
         <node concept="3JpXLn" id="5MFfD6f8S7m" role="3JpXMt">
           <node concept="3JpXLh" id="2LIcOCcw1A1" role="3JpXMd">
-            <ref role="2eEb$9" node="5MFfD6f8S1Q" />
+            <ref role="2eEb$9" node="5MFfD6f8S1Q" resolve="pedestrian_lights" />
           </node>
           <node concept="3JpXLh" id="2LIcOCcztcD" role="3JpXMM">
-            <ref role="2eEb$9" node="5MFfD6f8S1Q" />
+            <ref role="2eEb$9" node="5MFfD6f8S1Q" resolve="pedestrian_lights" />
           </node>
         </node>
         <node concept="3JpXLn" id="5MFfD6f8S88" role="3JpXMt">
           <node concept="3JpXLh" id="2LIcOCcw1A4" role="3JpXMd">
-            <ref role="2eEb$9" node="5MFfD6f8S2q" />
+            <ref role="2eEb$9" node="5MFfD6f8S2q" resolve="traffic_lights" />
           </node>
           <node concept="3JpXLh" id="2LIcOCcztcH" role="3JpXMM">
-            <ref role="2eEb$9" node="5MFfD6f8S2q" />
+            <ref role="2eEb$9" node="5MFfD6f8S2q" resolve="traffic_lights" />
           </node>
         </node>
         <node concept="3JpXLn" id="5MFfD6f8S90" role="3JpXMt">
           <node concept="1ziNjN" id="2LIcOCcw1BV" role="3JpXMd">
             <node concept="17cSpV" id="2LIcOCcw1C4" role="1ziNjJ">
-              <ref role="17cOEh" node="5MFfD6f8ROr" />
+              <ref role="17cOEh" node="5MFfD6f8ROr" resolve="merged" />
             </node>
             <node concept="3jw80t" id="2LIcOCcw1BR" role="1ziNjM">
-              <ref role="1f8Sn1" node="5MFfD6faEvu" />
+              <ref role="1f8Sn1" node="5MFfD6faEvu" resolve="m" />
             </node>
           </node>
           <node concept="1ziNjN" id="2LIcOCcw1Bt" role="3JpXMM">
             <node concept="17cSpV" id="2LIcOCcw1BA" role="1ziNjJ">
-              <ref role="17cOEh" node="5MFfD6f8Rwr" />
+              <ref role="17cOEh" node="5MFfD6f8Rwr" resolve="pedestrian_request" />
             </node>
             <node concept="3jw80t" id="2LIcOCcw1Bo" role="1ziNjM">
-              <ref role="1f8Sn1" node="5MFfD6faEwa" />
+              <ref role="1f8Sn1" node="5MFfD6faEwa" resolve="c" />
             </node>
           </node>
         </node>
@@ -1220,13 +1220,13 @@
         <node concept="3JpXKA" id="5MFfD6f8S1Q" role="3JpXMY">
           <property role="TrG5h" value="pedestrian_lights" />
           <node concept="2XJXdx" id="2OfmkSY3J3u" role="3JpXLx">
-            <ref role="2XJXdw" node="2OfmkSY3vvs" />
+            <ref role="2XJXdw" node="2OfmkSY3vvs" resolve="PEDESTRIAN_LIGHTS" />
           </node>
         </node>
         <node concept="3JpXKA" id="5MFfD6f8S2q" role="3JpXMY">
           <property role="TrG5h" value="traffic_lights" />
           <node concept="2XJXdx" id="2OfmkSY3vvb" role="3JpXLx">
-            <ref role="2XJXdw" node="2OfmkSY3vrS" />
+            <ref role="2XJXdw" node="2OfmkSY3vrS" resolve="TRAFFIC_LIGHTS" />
           </node>
         </node>
         <node concept="2uPaw6" id="5MFfD6f8S0k" role="3JpXMY" />
@@ -1242,17 +1242,17 @@
                         <ref role="2HeeqO" node="2OfmkSY3vvF" resolve="DONT_WALK" />
                       </node>
                       <node concept="3JpXLh" id="2LIcOCcztbQ" role="2H9Iav">
-                        <ref role="2eEb$9" node="5MFfD6f8S1Q" />
+                        <ref role="2eEb$9" node="5MFfD6f8S1Q" resolve="pedestrian_lights" />
                       </node>
                     </node>
                   </node>
                   <node concept="32OYss" id="5MFfD6f8RZM" role="2H9Iav">
                     <node concept="rYEnY" id="5MFfD6f8Sax" role="32OYtT">
                       <node concept="3JpXLh" id="2LIcOCcztbM" role="2H9Ial">
-                        <ref role="2eEb$9" node="5MFfD6f8S19" />
+                        <ref role="2eEb$9" node="5MFfD6f8S19" resolve="rightReq" />
                       </node>
                       <node concept="3JpXLh" id="2LIcOCcztbI" role="2H9Iav">
-                        <ref role="2eEb$9" node="5MFfD6f8S0w" />
+                        <ref role="2eEb$9" node="5MFfD6f8S0w" resolve="leftReq" />
                       </node>
                     </node>
                   </node>
@@ -1273,7 +1273,7 @@
                 <node concept="rYEFr" id="5MFfD6f8SjA" role="32OYtT">
                   <node concept="2HbLFT" id="5MFfD6f8SjB" role="2H9Iav">
                     <node concept="3JpXLh" id="2LIcOCcztc7" role="2H9Iav">
-                      <ref role="2eEb$9" node="5MFfD6f8S1Q" />
+                      <ref role="2eEb$9" node="5MFfD6f8S1Q" resolve="pedestrian_lights" />
                     </node>
                     <node concept="2IPVmt" id="5MFfD6f8SjC" role="2H9Ial">
                       <property role="2IPVms" value="1" />
@@ -1284,7 +1284,7 @@
                       <property role="2IPVms" value="3" />
                     </node>
                     <node concept="3JpXLh" id="2LIcOCcztco" role="2H9Iav">
-                      <ref role="2eEb$9" node="5MFfD6f8S2q" />
+                      <ref role="2eEb$9" node="5MFfD6f8S2q" resolve="traffic_lights" />
                     </node>
                   </node>
                 </node>
@@ -1327,15 +1327,15 @@
               <node concept="32OYss" id="5MFfD6f8RRX" role="1yBIc4">
                 <node concept="rYEFr" id="5MFfD6f8RS8" role="32OYtT">
                   <node concept="3JpXLh" id="2LIcOCcztaJ" role="2H9Ial">
-                    <ref role="2eEb$9" node="5MFfD6f8ROr" />
+                    <ref role="2eEb$9" node="5MFfD6f8ROr" resolve="merged" />
                   </node>
                   <node concept="32OYss" id="5MFfD6f8RRY" role="2H9Iav">
                     <node concept="rYEnY" id="5MFfD6f8RRZ" role="32OYtT">
                       <node concept="3JpXLh" id="2LIcOCcztaB" role="2H9Iav">
-                        <ref role="2eEb$9" node="5MFfD6f8RNA" />
+                        <ref role="2eEb$9" node="5MFfD6f8RNA" resolve="left" />
                       </node>
                       <node concept="3JpXLh" id="2LIcOCcztaF" role="2H9Ial">
-                        <ref role="2eEb$9" node="5MFfD6f8RNV" />
+                        <ref role="2eEb$9" node="5MFfD6f8RNV" resolve="right" />
                       </node>
                     </node>
                   </node>
@@ -1365,13 +1365,13 @@
         <node concept="3JpXKA" id="5MFfD6f8RwL" role="3JpXMY">
           <property role="TrG5h" value="traffic_lights" />
           <node concept="2XJXdx" id="2OfmkSY3vvQ" role="3JpXLx">
-            <ref role="2XJXdw" node="2OfmkSY3vrS" />
+            <ref role="2XJXdw" node="2OfmkSY3vrS" resolve="TRAFFIC_LIGHTS" />
           </node>
         </node>
         <node concept="3JpXKA" id="5MFfD6f8RzS" role="3JpXMY">
           <property role="TrG5h" value="pedestrian_lights" />
           <node concept="2XJXdx" id="2OfmkSY3vvW" role="3JpXLx">
-            <ref role="2XJXdw" node="2OfmkSY3vvs" />
+            <ref role="2XJXdw" node="2OfmkSY3vvs" resolve="PEDESTRIAN_LIGHTS" />
           </node>
         </node>
         <node concept="2uPaw6" id="5MFfD6f8R_d" role="3JpXMY" />
@@ -1387,12 +1387,12 @@
                         <property role="2IPVms" value="1" />
                       </node>
                       <node concept="3JpXLh" id="70K71XXhMR2" role="2H9Iav">
-                        <ref role="2eEb$9" node="5MFfD6f8RzS" />
+                        <ref role="2eEb$9" node="5MFfD6f8RzS" resolve="pedestrian_lights" />
                       </node>
                     </node>
                   </node>
                   <node concept="3JpXLh" id="2LIcOCczt9$" role="2H9Iav">
-                    <ref role="2eEb$9" node="5MFfD6f8Rwr" />
+                    <ref role="2eEb$9" node="5MFfD6f8Rwr" resolve="pedestrian_request" />
                   </node>
                 </node>
               </node>
@@ -1410,7 +1410,7 @@
               <node concept="rZvlL" id="5MFfD6f8RK$" role="2H9Iav">
                 <node concept="2HbLFT" id="5MFfD6f8RK_" role="1yBIc4">
                   <node concept="3JpXLh" id="2LIcOCczt9T" role="2H9Iav">
-                    <ref role="2eEb$9" node="5MFfD6f8RwL" />
+                    <ref role="2eEb$9" node="5MFfD6f8RwL" resolve="traffic_lights" />
                   </node>
                   <node concept="2IPVmt" id="5MFfD6f8RKA" role="2H9Ial">
                     <property role="2IPVms" value="3" />
@@ -1422,7 +1422,7 @@
                   <property role="2IPVms" value="2" />
                 </node>
                 <node concept="3JpXLh" id="2OfmkSY3Jux" role="2H9Iav">
-                  <ref role="2eEb$9" node="5MFfD6f8RzS" />
+                  <ref role="2eEb$9" node="5MFfD6f8RzS" resolve="pedestrian_lights" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.activity.sandbox/models/com.fasten.base.activity.sandbox._010_smoke.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.activity.sandbox/models/com.fasten.base.activity.sandbox._010_smoke.mps
index b0f4f65ac..3798f7c6b 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.activity.sandbox/models/com.fasten.base.activity.sandbox._010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.activity.sandbox/models/com.fasten.base.activity.sandbox._010_smoke.mps
@@ -180,12 +180,12 @@
     </node>
     <node concept="38IQoX" id="214ojnhR53" role="38IxPB">
       <ref role="38IQCt" node="214ojnhR4I" />
-      <ref role="38IQCv" node="214ojnhR4N" />
+      <ref role="38IQCv" node="214ojnhR4N" resolve="read data" />
     </node>
     <node concept="38LK3e" id="214ojni6vt" role="38IxP_" />
     <node concept="38K6yZ" id="214ojni_3s" role="38IxP_" />
     <node concept="38IQoX" id="2tplabH7mh7" role="38IxPB">
-      <ref role="38IQCt" node="214ojnhR4N" />
+      <ref role="38IQCt" node="214ojnhR4N" resolve="read data" />
       <ref role="38IQCv" node="214ojni_3s" />
     </node>
     <node concept="3ah33V" id="3oG4rLM0dgn" role="38IxPB">
@@ -200,13 +200,13 @@
     </node>
     <node concept="3ah33V" id="3oG4rLM0dho" role="38IxPB">
       <ref role="38IQCt" node="214ojni_3s" />
-      <ref role="38IQCv" node="3oG4rLM0dgZ" />
+      <ref role="38IQCv" node="3oG4rLM0dgZ" resolve="processing" />
       <node concept="ru7O1" id="3oG4rLM0diB" role="3ah395">
         <property role="ru7PJ" value="data_valid" />
       </node>
     </node>
     <node concept="38IQoX" id="3oG4rLM0diD" role="38IxPB">
-      <ref role="38IQCt" node="3oG4rLM0dgZ" />
+      <ref role="38IQCt" node="3oG4rLM0dgZ" resolve="processing" />
       <ref role="38IQCv" node="214ojni6vt" />
     </node>
   </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd
index 6bf737143..4c2c2d140 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd
@@ -37,7 +37,7 @@
     <dependency reexport="false">5ad14eca-28d7-4bce-b8e0-648908a49062(org.apache.batik)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <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.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/analyzer.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/analyzer.mps
index 400daeec0..a4baa40d4 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/analyzer.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/analyzer.mps
@@ -5,8 +5,9 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
@@ -221,11 +222,6 @@
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
-    </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
       <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
       <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
@@ -239,6 +235,20 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -372,8 +382,12 @@
           <ref role="3uigEE" node="7iCG_8WDYdE" resolve="AtomicAnalysisJob" />
         </node>
       </node>
-      <node concept="NWlO9" id="7iCG_8WEzxo" role="lGtFl">
-        <property role="NWlVz" value="Submits for execution an atomic analysis job." />
+      <node concept="P$JXv" id="1y75Pbzy1un" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1ul" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1um" role="1dT_Ay">
+            <property role="1dT_AB" value="Submits for execution an atomic analysis job." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7iCG_8XdOtE" role="jymVt" />
@@ -386,13 +400,21 @@
         <property role="TrG5h" value="millis" />
         <node concept="3cpWsb" id="7iCG_8XdOUO" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="7iCG_8XdOWE" role="lGtFl">
-        <property role="NWlVz" value="Suspend the current thread until all jobs terminate or timeout elapses." />
+      <node concept="P$JXv" id="1y75Pbzy1uq" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1uo" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1up" role="1dT_Ay">
+            <property role="1dT_AB" value="Suspend the current thread until all jobs terminate or timeout elapses." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="7iCG_8WEzsh" role="1B3o_S" />
-    <node concept="NWlO9" id="7iCG_8WEzxF" role="lGtFl">
-      <property role="NWlVz" value="Generic interface for the analyses executors." />
+    <node concept="3UR2Jj" id="1y75Pbzy1ut" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1ur" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1us" role="1dT_Ay">
+          <property role="1dT_AB" value="Generic interface for the analyses executors." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="6DyMuFe0PCB">
@@ -498,8 +520,12 @@
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
       <node concept="3Tmbuc" id="1ZsZb$iRo0w" role="1B3o_S" />
-      <node concept="NWlO9" id="1ZsZb$iRo1t" role="lGtFl">
-        <property role="NWlVz" value="My repository." />
+      <node concept="z59LJ" id="1y75Pbzy1uw" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1uu" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1uv" role="1dT_Ay">
+            <property role="1dT_AB" value="My repository." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7iCG_8WCy6n" role="jymVt" />
@@ -512,8 +538,12 @@
       <node concept="3uibUv" id="7F8$WoW31Wy" role="1tU5fm">
         <ref role="3uigEE" to="xygl:~ProgressIndicator" resolve="ProgressIndicator" />
       </node>
-      <node concept="NWlO9" id="7iCG_8WCIj3" role="lGtFl">
-        <property role="NWlVz" value="The progress indicator." />
+      <node concept="z59LJ" id="1y75Pbzy1uz" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1ux" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1uy" role="1dT_Ay">
+            <property role="1dT_AB" value="The progress indicator." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7iCG_8WCVH5" role="jymVt" />
@@ -524,8 +554,12 @@
       <property role="3TUv4t" value="false" />
       <node concept="3Tmbuc" id="7F8$WoW5N1I" role="1B3o_S" />
       <node concept="10Oyi0" id="7F8$WoW5Psn" role="1tU5fm" />
-      <node concept="NWlO9" id="7iCG_8WDm4Q" role="lGtFl">
-        <property role="NWlVz" value="Number of steps that this analyzer has." />
+      <node concept="z59LJ" id="1y75Pbzy1uA" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1u$" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1u_" role="1dT_Ay">
+            <property role="1dT_AB" value="Number of steps that this analyzer has." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5nrC_ZcYiIO" role="jymVt" />
@@ -539,8 +573,12 @@
       <node concept="3clFbT" id="3iLtdpm5biw" role="33vP2m">
         <property role="3clFbU" value="true" />
       </node>
-      <node concept="NWlO9" id="7iCG_8WBTzY" role="lGtFl">
-        <property role="NWlVz" value="Flag is set if the previous analyses results should be cleared." />
+      <node concept="z59LJ" id="1y75Pbzy1uD" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1uB" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1uC" role="1dT_Ay">
+            <property role="1dT_AB" value="Flag is set if the previous analyses results should be cleared." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="Lg9kEapHW8" role="jymVt" />
@@ -549,8 +587,12 @@
       <node concept="3Tmbuc" id="6XKrTzkt4RV" role="1B3o_S" />
       <node concept="10P_77" id="6XKrTzkt6g8" role="1tU5fm" />
       <node concept="3clFbT" id="6XKrTzkt8P_" role="33vP2m" />
-      <node concept="NWlO9" id="6XKrTzkt8YJ" role="lGtFl">
-        <property role="NWlVz" value="When set to true, publish() will not be called (when this analyzer is part of a higher-level one)." />
+      <node concept="z59LJ" id="1y75Pbzy1uG" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1uE" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1uF" role="1dT_Ay">
+            <property role="1dT_AB" value="When set to true, publish() will not be called (when this analyzer is part of a higher-level one)." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6XKrTzkt7I9" role="jymVt" />
@@ -718,8 +760,12 @@
           <ref role="3uigEE" to="33ny:~List" resolve="List" />
         </node>
       </node>
-      <node concept="NWlO9" id="41thbhv81Xi" role="lGtFl">
-        <property role="NWlVz" value="Show the results in tool and advance progress." />
+      <node concept="P$JXv" id="1y75Pbzy1uJ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1uH" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1uI" role="1dT_Ay">
+            <property role="1dT_AB" value="Show the results in tool and advance progress." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5nrC_ZcXLJr" role="jymVt" />
@@ -900,8 +946,12 @@
         <property role="TrG5h" value="msg" />
         <node concept="17QB3L" id="6fVeF5smqIu" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="41thbhv86pV" role="lGtFl">
-        <property role="NWlVz" value="Initializes the progress." />
+      <node concept="P$JXv" id="1y75Pbzy1uM" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1uK" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1uL" role="1dT_Ay">
+            <property role="1dT_AB" value="Initializes the progress." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7F8$WoQT2s2" role="jymVt" />
@@ -1145,8 +1195,12 @@
       </node>
       <node concept="3Tmbuc" id="2UdJgvCLu_x" role="1B3o_S" />
       <node concept="3cqZAl" id="2UdJgvCLu_y" role="3clF45" />
-      <node concept="NWlO9" id="7iCG_8WyHy3" role="lGtFl">
-        <property role="NWlVz" value="Stops the progress if this analysis has proper progress. " />
+      <node concept="P$JXv" id="1y75Pbzy1uP" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1uN" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1uO" role="1dT_Ay">
+            <property role="1dT_AB" value="Stops the progress if this analysis has proper progress. " />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7iCG_8WOlir" role="jymVt" />
@@ -1194,8 +1248,12 @@
         <property role="TrG5h" value="clear" />
         <node concept="10P_77" id="3iLtdpm53GO" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="41thbhvk2AP" role="lGtFl">
-        <property role="NWlVz" value="Sets the flag whether previous results should be cleared from the table." />
+      <node concept="P$JXv" id="1y75Pbzy1uS" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1uQ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1uR" role="1dT_Ay">
+            <property role="1dT_AB" value="Sets the flag whether previous results should be cleared from the table." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5nrC_ZcYkEK" role="jymVt" />
@@ -1216,8 +1274,12 @@
       <node concept="3uibUv" id="7iCG_8WE$7H" role="3clF45">
         <ref role="3uigEE" node="7iCG_8WEzsg" resolve="AnalysesExecutorService" />
       </node>
-      <node concept="NWlO9" id="7iCG_8X7Tzi" role="lGtFl">
-        <property role="NWlVz" value="The current analyses executor." />
+      <node concept="P$JXv" id="1y75Pbzy1uV" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1uT" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1uU" role="1dT_Ay">
+            <property role="1dT_AB" value="The current analyses executor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7iCG_8X7Uu_" role="jymVt" />
@@ -1226,9 +1288,6 @@
       <property role="TrG5h" value="submit" />
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
-      <node concept="NWlO9" id="5uqRFp8AkvL" role="lGtFl">
-        <property role="NWlVz" value="Submits an analysis job to the analyis executor. " />
-      </node>
       <node concept="3clFbS" id="7iCG_8X8pFi" role="3clF47">
         <node concept="3clFbF" id="7iCG_8X8AmA" role="3cqZAp">
           <node concept="2OqwBi" id="7iCG_8X8A_I" role="3clFbG">
@@ -1252,6 +1311,13 @@
           <ref role="3uigEE" node="7iCG_8WDYdE" resolve="AtomicAnalysisJob" />
         </node>
       </node>
+      <node concept="P$JXv" id="1y75Pbzy1uY" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1uW" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1uX" role="1dT_Ay">
+            <property role="1dT_AB" value="Submits an analysis job to the analyis executor. " />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="6XKrTzktngF" role="jymVt" />
     <node concept="3clFb_" id="6XKrTzktqLC" role="jymVt">
@@ -1300,8 +1366,12 @@
     <node concept="16euLQ" id="6DyMuFe0SCO" role="16eVyc">
       <property role="TrG5h" value="S" />
     </node>
-    <node concept="NWlO9" id="7lqcRYfYviu" role="lGtFl">
-      <property role="NWlVz" value="Base class for all analyzers." />
+    <node concept="3UR2Jj" id="1y75Pbzy1v1" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1uZ" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1v0" role="1dT_Ay">
+          <property role="1dT_AB" value="Base class for all analyzers." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="5uqRFp8ViLO">
@@ -1340,8 +1410,12 @@
       <node concept="3clFbT" id="6wKLD3Gl26r" role="33vP2m">
         <property role="3clFbU" value="false" />
       </node>
-      <node concept="NWlO9" id="6wKLD3Gl2gt" role="lGtFl">
-        <property role="NWlVz" value="Did an error occur during generation?" />
+      <node concept="z59LJ" id="1y75Pbzy1v4" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1v2" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1v3" role="1dT_Ay">
+            <property role="1dT_AB" value="Did an error occur during generation?" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6wKLD3Gl26A" role="jymVt" />
@@ -1735,8 +1809,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="505H3_WYjas" role="lGtFl">
-        <property role="NWlVz" value="Makes the project and runs the analysis as a background task in MPS." />
+      <node concept="P$JXv" id="1y75Pbzy1v7" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1v5" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1v6" role="1dT_Ay">
+            <property role="1dT_AB" value="Makes the project and runs the analysis as a background task in MPS." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="505H3_WY3Qb" role="jymVt" />
@@ -1969,8 +2047,12 @@
       <node concept="3Tm1VV" id="5uqRFp8Vcgx" role="1B3o_S" />
     </node>
     <node concept="3Tm1VV" id="505H3_WY3Qc" role="1B3o_S" />
-    <node concept="NWlO9" id="505H3_WYiGj" role="lGtFl">
-      <property role="NWlVz" value="Facade for running the analyses in MPS." />
+    <node concept="3UR2Jj" id="1y75Pbzy1va" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1v8" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1v9" role="1dT_Ay">
+          <property role="1dT_AB" value="Facade for running the analyses in MPS." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="3HP615" id="7iCG_8WDYdE">
@@ -2025,8 +2107,12 @@
       </node>
       <node concept="3Tm1VV" id="57eVTvnGhir" role="1B3o_S" />
       <node concept="3cqZAl" id="57eVTvnGhix" role="3clF45" />
-      <node concept="NWlO9" id="57eVTvnNnPY" role="lGtFl">
-        <property role="NWlVz" value="Wrap and catch exceptions" />
+      <node concept="P$JXv" id="1y75Pbzy1vd" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vb" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vc" role="1dT_Ay">
+            <property role="1dT_AB" value="Wrap and catch exceptions" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="57eVTvnGhjT" role="jymVt" />
@@ -2038,16 +2124,24 @@
       <node concept="3clFbS" id="57eVTvnGig9" role="3clF47" />
       <node concept="3Tm1VV" id="57eVTvnGiaS" role="1B3o_S" />
       <node concept="3cqZAl" id="57eVTvnGifi" role="3clF45" />
-      <node concept="NWlO9" id="57eVTvnNnQF" role="lGtFl">
-        <property role="NWlVz" value="Does the job in a safe manner." />
+      <node concept="P$JXv" id="1y75Pbzy1vg" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1ve" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vf" role="1dT_Ay">
+            <property role="1dT_AB" value="Does the job in a safe manner." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="57eVTvnGgoK" role="1B3o_S" />
     <node concept="3uibUv" id="57eVTvnGhhU" role="EKbjA">
       <ref role="3uigEE" node="7iCG_8WDYdE" resolve="AtomicAnalysisJob" />
     </node>
-    <node concept="NWlO9" id="57eVTvnGiqd" role="lGtFl">
-      <property role="NWlVz" value="Base class for atomic analysis jobs that deals with exceptions." />
+    <node concept="3UR2Jj" id="1y75Pbzy1vj" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1vh" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1vi" role="1dT_Ay">
+          <property role="1dT_AB" value="Base class for atomic analysis jobs that deals with exceptions." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="7iCG_8WzcG5">
@@ -2061,8 +2155,12 @@
       <node concept="3cmrfG" id="41thbhvlYem" role="33vP2m">
         <property role="3cmrfH" value="3" />
       </node>
-      <node concept="NWlO9" id="41thbhvm0oH" role="lGtFl">
-        <property role="NWlVz" value="Default value for the maximum number of threads." />
+      <node concept="z59LJ" id="1y75Pbzy1vm" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vk" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vl" role="1dT_Ay">
+            <property role="1dT_AB" value="Default value for the maximum number of threads." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7iCG_8WzcGI" role="jymVt" />
@@ -2075,8 +2173,12 @@
         <ref role="3uigEE" to="5zyv:~ExecutorService" resolve="ExecutorService" />
       </node>
       <node concept="3Tmbuc" id="7iCG_8WBivs" role="1B3o_S" />
-      <node concept="NWlO9" id="7iCG_8WBh5V" role="lGtFl">
-        <property role="NWlVz" value="Wrapped executor service." />
+      <node concept="z59LJ" id="1y75Pbzy1vp" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vn" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vo" role="1dT_Ay">
+            <property role="1dT_AB" value="Wrapped executor service." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7iCG_8WBhb$" role="jymVt" />
@@ -2090,8 +2192,12 @@
       <node concept="37vLTw" id="1ZsZb$iVAcU" role="33vP2m">
         <ref role="3cqZAo" node="41thbhvlYen" resolve="DEFAULT_NUMBER_OF_THREADS" />
       </node>
-      <node concept="NWlO9" id="7iCG_8WBhuq" role="lGtFl">
-        <property role="NWlVz" value="Maximal number of threads." />
+      <node concept="z59LJ" id="1y75Pbzy1vs" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vq" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vr" role="1dT_Ay">
+            <property role="1dT_AB" value="Maximal number of threads." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7iCG_8WBhHG" role="jymVt" />
@@ -2101,8 +2207,12 @@
       <node concept="3uibUv" id="7iCG_8W$RAD" role="1tU5fm">
         <ref role="3uigEE" node="7iCG_8WzcG5" resolve="DefaultAnalysesExecutorService" />
       </node>
-      <node concept="NWlO9" id="7iCG_8WBhZr" role="lGtFl">
-        <property role="NWlVz" value="The single analyses executor service instance." />
+      <node concept="z59LJ" id="1y75Pbzy1vv" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vt" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vu" role="1dT_Ay">
+            <property role="1dT_AB" value="The single analyses executor service instance." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2YIFZL" id="7iCG_8W_05_" role="jymVt">
@@ -2163,8 +2273,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="7iCG_8WBi0L" role="lGtFl">
-        <property role="NWlVz" value="Constructor" />
+      <node concept="P$JXv" id="1y75Pbzy1vy" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vw" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vx" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7iCG_8W_0qW" role="jymVt" />
@@ -2286,8 +2400,12 @@
           <ref role="3uigEE" node="7iCG_8WDYdE" resolve="AtomicAnalysisJob" />
         </node>
       </node>
-      <node concept="NWlO9" id="7iCG_8WEWAR" role="lGtFl">
-        <property role="NWlVz" value="Submits an atomic analysis job." />
+      <node concept="P$JXv" id="1y75Pbzy1v_" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vz" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1v$" role="1dT_Ay">
+            <property role="1dT_AB" value="Submits an atomic analysis job." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7iCG_8XdP$L" role="jymVt" />
@@ -2378,8 +2496,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="7iCG_8XdUEW" role="lGtFl">
-        <property role="NWlVz" value="Awaits the termination for a given time." />
+      <node concept="P$JXv" id="1y75Pbzy1vC" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vA" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vB" role="1dT_Ay">
+            <property role="1dT_AB" value="Awaits the termination for a given time." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="41thbhvlfsq" role="jymVt" />
@@ -2420,8 +2542,12 @@
         <property role="TrG5h" value="threadsNum" />
         <node concept="10Oyi0" id="41thbhvljjN" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="41thbhvlkjU" role="lGtFl">
-        <property role="NWlVz" value="Sets the maximum number of threads." />
+      <node concept="P$JXv" id="1y75Pbzy1vF" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vD" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vE" role="1dT_Ay">
+            <property role="1dT_AB" value="Sets the maximum number of threads." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="41thbhvlMNc" role="jymVt" />
@@ -2458,8 +2584,12 @@
       </node>
       <node concept="3Tm1VV" id="41thbhvlONq" role="1B3o_S" />
       <node concept="3cqZAl" id="41thbhvlONr" role="3clF45" />
-      <node concept="NWlO9" id="41thbhvlONu" role="lGtFl">
-        <property role="NWlVz" value="Restores the maximum number of threads to its initial value." />
+      <node concept="P$JXv" id="1y75Pbzy1vI" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vG" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vH" role="1dT_Ay">
+            <property role="1dT_AB" value="Restores the maximum number of threads to its initial value." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="41thbhvlNMY" role="jymVt" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/make.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/make.mps
index 69e10f9cd..d7d2a86c2 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/make.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/make.mps
@@ -5,7 +5,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
@@ -247,11 +247,6 @@
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
-    </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
       <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
       <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
@@ -269,6 +264,20 @@
       </concept>
       <concept id="1225797177491" name="jetbrains.mps.baseLanguage.closures.structure.InvokeFunctionOperation" flags="nn" index="1Bd96e" />
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="6332851714983831325" name="jetbrains.mps.baseLanguage.logging.structure.MsgStatement" flags="ng" index="2xdQw9">
         <property id="6332851714983843871" name="severity" index="2xdLsb" />
@@ -334,10 +343,14 @@
       <node concept="3clFbT" id="15d7XIo_3VM" role="33vP2m">
         <property role="3clFbU" value="false" />
       </node>
-      <node concept="NWlO9" id="15d7XIo_3VN" role="lGtFl">
-        <property role="NWlVz" value="Is the make process active?" />
-      </node>
       <node concept="3Tm1VV" id="67ygqsLZFeG" role="1B3o_S" />
+      <node concept="z59LJ" id="1y75Pbzy1vL" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vJ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vK" role="1dT_Ay">
+            <property role="1dT_AB" value="Is the make process active?" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="47xghtTLgLK" role="jymVt" />
     <node concept="2YIFZL" id="5dSPU6qaBCP" role="jymVt">
@@ -396,8 +409,12 @@
           <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
         </node>
       </node>
-      <node concept="NWlO9" id="41thbhvrpPG" role="lGtFl">
-        <property role="NWlVz" value="Returns a future that makes the project." />
+      <node concept="P$JXv" id="1y75Pbzy1vO" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vM" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vN" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns a future that makes the project." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2AZbPfOSPxe" role="jymVt" />
@@ -465,8 +482,12 @@
         <property role="TrG5h" value="shouldRebuild" />
         <node concept="10P_77" id="4FpLBMtUL0s" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="4FpLBMtUK3D" role="lGtFl">
-        <property role="NWlVz" value="Returns a future that makes the project. If we run from tests then we should not rebuild." />
+      <node concept="P$JXv" id="1y75Pbzy1vR" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vP" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vQ" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns a future that makes the project. If we run from tests then we should not rebuild." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4FpLBMtUJiQ" role="jymVt" />
@@ -571,8 +592,12 @@
           <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
         </node>
       </node>
-      <node concept="NWlO9" id="4Uw4Kib5ewi" role="lGtFl">
-        <property role="NWlVz" value="This method is used from tests where from we we should not rebuild or make on the build server." />
+      <node concept="P$JXv" id="1y75Pbzy1vU" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1vS" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1vT" role="1dT_Ay">
+            <property role="1dT_AB" value="This method is used from tests where from we we should not rebuild or make on the build server." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4Uw4Kib5dr8" role="jymVt" />
@@ -588,10 +613,14 @@
         <property role="TrG5h" value="shouldRebuild" />
         <property role="3TUv4t" value="false" />
         <node concept="3Tm6S6" id="4FpLBMtUMdj" role="1B3o_S" />
-        <node concept="NWlO9" id="4FpLBMtUMdk" role="lGtFl">
-          <property role="NWlVz" value="Flag if we should rebuild." />
-        </node>
         <node concept="10P_77" id="4FpLBMtUMQz" role="1tU5fm" />
+        <node concept="z59LJ" id="1y75Pbzy1vX" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1vV" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1vW" role="1dT_Ay">
+              <property role="1dT_AB" value="Flag if we should rebuild." />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="4FpLBMtULO$" role="jymVt" />
       <node concept="312cEg" id="4Uw4Kib5aZf" role="jymVt">
@@ -600,10 +629,14 @@
         <property role="TrG5h" value="onlyLastGeneratedModels" />
         <property role="3TUv4t" value="false" />
         <node concept="3Tm6S6" id="4Uw4Kib5aZg" role="1B3o_S" />
-        <node concept="NWlO9" id="4Uw4Kib5aZh" role="lGtFl">
-          <property role="NWlVz" value="Flag if we should only make available the last generated models without make/rebuild." />
-        </node>
         <node concept="10P_77" id="4Uw4Kib5aZi" role="1tU5fm" />
+        <node concept="z59LJ" id="1y75Pbzy1w0" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1vY" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1vZ" role="1dT_Ay">
+              <property role="1dT_AB" value="Flag if we should only make available the last generated models without make/rebuild." />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="4Uw4Kib5ab8" role="jymVt" />
       <node concept="312cEg" id="7LK0SI3XjY" role="jymVt">
@@ -613,8 +646,12 @@
         <property role="3TUv4t" value="false" />
         <node concept="H_c77" id="7LK0SI4cgl" role="1tU5fm" />
         <node concept="3Tm6S6" id="7kEiJU7CbGn" role="1B3o_S" />
-        <node concept="NWlO9" id="7kEiJU7CbZ$" role="lGtFl">
-          <property role="NWlVz" value="The model to make." />
+        <node concept="z59LJ" id="1y75Pbzy1w3" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1w1" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1w2" role="1dT_Ay">
+              <property role="1dT_AB" value="The model to make." />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="7uk5GW4LX0X" role="jymVt" />
@@ -624,12 +661,16 @@
         <property role="TrG5h" value="proj" />
         <property role="3TUv4t" value="false" />
         <node concept="3Tm6S6" id="7uk5GW4LZd0" role="1B3o_S" />
-        <node concept="NWlO9" id="7uk5GW4LZd1" role="lGtFl">
-          <property role="NWlVz" value="The current project." />
-        </node>
         <node concept="3uibUv" id="7uk5GW4M0oS" role="1tU5fm">
           <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
         </node>
+        <node concept="z59LJ" id="1y75Pbzy1w6" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1w4" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1w5" role="1dT_Ay">
+              <property role="1dT_AB" value="The current project." />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="7uk5GW4LY6h" role="jymVt" />
       <node concept="3clFbW" id="7LK0SI3UtR" role="jymVt">
@@ -703,8 +744,12 @@
           <property role="TrG5h" value="shouldRebuild" />
           <node concept="10P_77" id="4FpLBMtUN3X" role="1tU5fm" />
         </node>
-        <node concept="NWlO9" id="7kEiJU7CcQp" role="lGtFl">
-          <property role="NWlVz" value="Constructor." />
+        <node concept="P$JXv" id="1y75Pbzy1w9" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1w7" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1w8" role="1dT_Ay">
+              <property role="1dT_AB" value="Constructor." />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="7kEiJU7Cdqo" role="jymVt" />
@@ -775,8 +820,12 @@
           <property role="TrG5h" value="model" />
           <node concept="H_c77" id="4Uw4Kib5ipZ" role="1tU5fm" />
         </node>
-        <node concept="NWlO9" id="4Uw4Kib5iq4" role="lGtFl">
-          <property role="NWlVz" value="Constructor." />
+        <node concept="P$JXv" id="1y75Pbzy1wc" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1wa" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1wb" role="1dT_Ay">
+              <property role="1dT_AB" value="Constructor." />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="4Uw4Kib5hDw" role="jymVt" />
@@ -805,8 +854,12 @@
             <node concept="3clFbT" id="7LK0SI3Drj" role="3clFbG" />
           </node>
         </node>
-        <node concept="NWlO9" id="7kEiJU7CcWu" role="lGtFl">
-          <property role="NWlVz" value="{@inheritDoc}" />
+        <node concept="P$JXv" id="1y75Pbzy1wf" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1wd" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1we" role="1dT_Ay">
+              <property role="1dT_AB" value="{@inheritDoc}" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="7kEiJU7CdYl" role="jymVt" />
@@ -821,8 +874,12 @@
             <node concept="3clFbT" id="7LK0SI3Drq" role="3clFbG" />
           </node>
         </node>
-        <node concept="NWlO9" id="7kEiJU7Cf6m" role="lGtFl">
-          <property role="NWlVz" value="{@inheritDoc}" />
+        <node concept="P$JXv" id="1y75Pbzy1wi" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1wg" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1wh" role="1dT_Ay">
+              <property role="1dT_AB" value="{@inheritDoc}" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="7kEiJU7CeyG" role="jymVt" />
@@ -837,8 +894,12 @@
             <node concept="3clFbT" id="7LK0SI3Drx" role="3clFbG" />
           </node>
         </node>
-        <node concept="NWlO9" id="7kEiJU7Cf$6" role="lGtFl">
-          <property role="NWlVz" value="{@inheritDoc}" />
+        <node concept="P$JXv" id="1y75Pbzy1wl" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1wj" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1wk" role="1dT_Ay">
+              <property role="1dT_AB" value="{@inheritDoc}" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="7LK0SI4ppi" role="jymVt" />
@@ -1146,8 +1207,12 @@
             </node>
           </node>
         </node>
-        <node concept="NWlO9" id="7kEiJU7Cg2k" role="lGtFl">
-          <property role="NWlVz" value="{@inheritDoc}" />
+        <node concept="P$JXv" id="1y75Pbzy1wo" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1wm" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1wn" role="1dT_Ay">
+              <property role="1dT_AB" value="{@inheritDoc}" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="7LK0SI4oH6" role="jymVt" />
@@ -1377,8 +1442,12 @@
           </node>
         </node>
         <node concept="3Tm6S6" id="47xghtTLkPG" role="1B3o_S" />
-        <node concept="NWlO9" id="4FpLBMtUQ19" role="lGtFl">
-          <property role="NWlVz" value="Rebuilds the project." />
+        <node concept="P$JXv" id="1y75Pbzy1wr" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1wp" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1wq" role="1dT_Ay">
+              <property role="1dT_AB" value="Rebuilds the project." />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="7kEiJU7BkUl" role="jymVt" />
@@ -1434,8 +1503,12 @@
             </node>
           </node>
         </node>
-        <node concept="NWlO9" id="7kEiJU7BUQG" role="lGtFl">
-          <property role="NWlVz" value="Simple wrapper for the progress monitor to get when the generation ended." />
+        <node concept="3UR2Jj" id="1y75Pbzy1wu" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1ws" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1wt" role="1dT_Ay">
+              <property role="1dT_AB" value="Simple wrapper for the progress monitor to get when the generation ended." />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="7kEiJU7BTo5" role="jymVt" />
@@ -1473,12 +1546,20 @@
             </node>
           </node>
         </node>
-        <node concept="NWlO9" id="7kEiJU7Bpt5" role="lGtFl">
-          <property role="NWlVz" value="{@inheritDoc}" />
+        <node concept="P$JXv" id="1y75Pbzy1wx" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1wv" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1ww" role="1dT_Ay">
+              <property role="1dT_AB" value="{@inheritDoc}" />
+            </node>
+          </node>
         </node>
       </node>
-      <node concept="NWlO9" id="41thbhvrjr1" role="lGtFl">
-        <property role="NWlVz" value="A future that makes and saves the transient models." />
+      <node concept="3UR2Jj" id="1y75Pbzy1w$" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1wy" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1wz" role="1dT_Ay">
+            <property role="1dT_AB" value="A future that makes and saves the transient models." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7LK0SI62pT" role="jymVt" />
@@ -1489,13 +1570,21 @@
         <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
       </node>
       <node concept="3Tm1VV" id="68pU13V1MGu" role="1B3o_S" />
-      <node concept="NWlO9" id="7kEiJU7BOXX" role="lGtFl">
-        <property role="NWlVz" value="The last output model before the text is generated." />
+      <node concept="z59LJ" id="1y75Pbzy1wB" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1w_" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1wA" role="1dT_Ay">
+            <property role="1dT_AB" value="The last output model before the text is generated." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="6SYIklyM6Mh" role="1B3o_S" />
-    <node concept="NWlO9" id="41thbhvrpSr" role="lGtFl">
-      <property role="NWlVz" value="Utility methods for rebuilding the analyzed model." />
+    <node concept="3UR2Jj" id="1y75Pbzy1wE" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1wC" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1wD" role="1dT_Ay">
+          <property role="1dT_AB" value="Utility methods for rebuilding the analyzed model." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="3AFGfkfpqfj">
@@ -2055,8 +2144,12 @@
         <node concept="H_c77" id="3hNQKr2Cm0M" role="1tU5fm" />
       </node>
       <node concept="17QB3L" id="3hNQKr2Cad4" role="3clF45" />
-      <node concept="NWlO9" id="6h7pCbA96tq" role="lGtFl">
-        <property role="NWlVz" value="Returns the path to the directory where the C files are generated." />
+      <node concept="P$JXv" id="1y75Pbzy1wH" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1wF" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1wG" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the path to the directory where the C files are generated." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="3AFGfkfpqfk" role="1B3o_S" />
@@ -2074,8 +2167,12 @@
       <node concept="3clFbT" id="6wKLD3Gl26r" role="33vP2m">
         <property role="3clFbU" value="false" />
       </node>
-      <node concept="NWlO9" id="6wKLD3Gl2gt" role="lGtFl">
-        <property role="NWlVz" value="Did an error occur during generation?" />
+      <node concept="z59LJ" id="1y75Pbzy1wK" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1wI" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1wJ" role="1dT_Ay">
+            <property role="1dT_AB" value="Did an error occur during generation?" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6wKLD3Gl26A" role="jymVt" />
@@ -2446,8 +2543,12 @@
           <node concept="3cqZAl" id="5AcI6zX4ukt" role="1ajl9A" />
         </node>
       </node>
-      <node concept="NWlO9" id="505H3_WYjas" role="lGtFl">
-        <property role="NWlVz" value="Makes the project and runs the analysis as a background task in MPS." />
+      <node concept="P$JXv" id="1y75Pbzy1wN" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1wL" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1wM" role="1dT_Ay">
+            <property role="1dT_AB" value="Makes the project and runs the analysis as a background task in MPS." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5AcI6zX4nor" role="jymVt" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/nodes.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/nodes.mps
index 2bfba658c..7ef84f119 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/nodes.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/nodes.mps
@@ -4,10 +4,11 @@
   <languages>
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
@@ -167,9 +168,6 @@
       </concept>
     </language>
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
       <concept id="5753587520027641499" name="com.mbeddr.mpsutil.blutil.structure.SafeReadAction" flags="ng" index="3kxDZ6">
         <child id="1423104411234567454" name="repo" index="ukAjM" />
         <child id="5753587520027644759" name="body" index="3kxCCa" />
@@ -181,6 +179,20 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
@@ -253,8 +265,12 @@
       <node concept="3Tm1VV" id="49yFphTYenV" role="1B3o_S" />
       <node concept="10P_77" id="49yFphTYenW" role="1tU5fm" />
       <node concept="3clFbT" id="49yFphTYenX" role="33vP2m" />
-      <node concept="NWlO9" id="49yFphTYenY" role="lGtFl">
-        <property role="NWlVz" value="Should we debug?" />
+      <node concept="z59LJ" id="1y75Pbzy1wQ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1wO" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1wP" role="1dT_Ay">
+            <property role="1dT_AB" value="Should we debug?" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="49yFphTYenG" role="jymVt" />
@@ -272,8 +288,12 @@
           <node concept="2I9FWS" id="49yFphTYeoY" role="3rHtpV" />
         </node>
       </node>
-      <node concept="NWlO9" id="49yFphTYeo2" role="lGtFl">
-        <property role="NWlVz" value="Cache that maps a program location to all possible original nodes." />
+      <node concept="z59LJ" id="1y75Pbzy1wT" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1wR" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1wS" role="1dT_Ay">
+            <property role="1dT_AB" value="Cache that maps a program location to all possible original nodes." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="49yFphTYenI" role="jymVt" />
@@ -301,8 +321,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="49yFphTYeo6" role="lGtFl">
-        <property role="NWlVz" value="Cache that prevents many reads of the trace.info file." />
+      <node concept="z59LJ" id="1y75Pbzy1wW" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1wU" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1wV" role="1dT_Ay">
+            <property role="1dT_AB" value="Cache that prevents many reads of the trace.info file." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="49yFphTYenK" role="jymVt" />
@@ -330,8 +354,12 @@
       </node>
       <node concept="3Tm1VV" id="49yFphTYeo8" role="1B3o_S" />
       <node concept="3cqZAl" id="49yFphTYeo9" role="3clF45" />
-      <node concept="NWlO9" id="49yFphTYeoa" role="lGtFl">
-        <property role="NWlVz" value="Clears the cache for original nodes." />
+      <node concept="P$JXv" id="1y75Pbzy1wZ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1wX" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1wY" role="1dT_Ay">
+            <property role="1dT_AB" value="Clears the cache for original nodes." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="49yFphTYenM" role="jymVt" />
@@ -375,8 +403,12 @@
       <node concept="3uibUv" id="49yFphTYeog" role="Sfmx6">
         <ref role="3uigEE" to="wyt6:~IllegalArgumentException" resolve="IllegalArgumentException" />
       </node>
-      <node concept="NWlO9" id="49yFphTYeoh" role="lGtFl">
-        <property role="NWlVz" value="Returns the first original node that is traced to a certain file and line." />
+      <node concept="P$JXv" id="1y75Pbzy1x2" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1x0" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1x1" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the first original node that is traced to a certain file and line." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="49yFphTYenO" role="jymVt" />
@@ -736,8 +768,12 @@
       <node concept="3uibUv" id="49yFphTYeon" role="Sfmx6">
         <ref role="3uigEE" to="wyt6:~IllegalArgumentException" resolve="IllegalArgumentException" />
       </node>
-      <node concept="NWlO9" id="49yFphTYeoo" role="lGtFl">
-        <property role="NWlVz" value="Returns all possible original nodes that can be traced to a certain file and line." />
+      <node concept="P$JXv" id="1y75Pbzy1x5" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1x3" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1x4" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns all possible original nodes that can be traced to a certain file and line." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="49yFphTYenQ" role="jymVt" />
@@ -907,8 +943,12 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="49yFphTYenT" role="1B3o_S" />
-    <node concept="NWlO9" id="49yFphTYenU" role="lGtFl">
-      <property role="NWlVz" value="Facade for tracing lines from generated files to nodes." />
+    <node concept="3UR2Jj" id="1y75Pbzy1x8" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1x6" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1x7" role="1dT_Ay">
+          <property role="1dT_AB" value="Facade for tracing lines from generated files to nodes." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="49yFphTYeaK">
@@ -1137,8 +1177,12 @@
         </node>
       </node>
       <node concept="3Tm6S6" id="49yFphTYeb6" role="1B3o_S" />
-      <node concept="NWlO9" id="49yFphTYeb7" role="lGtFl">
-        <property role="NWlVz" value="Returns the full unit name from a full path -- e.g. a.b.file from /Users/.../source_gen/a/b/file.c" />
+      <node concept="P$JXv" id="1y75Pbzy1xb" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1x9" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xa" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the full unit name from a full path -- e.g. a.b.file from /Users/.../source_gen/a/b/file.c" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="49yFphTYeaQ" role="jymVt" />
@@ -1263,12 +1307,20 @@
         <ref role="3uigEE" to="wyt6:~IllegalArgumentException" resolve="IllegalArgumentException" />
       </node>
       <node concept="3Tm1VV" id="49yFphTYebg" role="1B3o_S" />
-      <node concept="NWlO9" id="4yl5rmQRA40" role="lGtFl">
-        <property role="NWlVz" value="Returns the unit name - e.g. pack1.pack2.pack3.root_node_name" />
+      <node concept="P$JXv" id="1y75Pbzy1xe" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xc" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xd" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the unit name - e.g. pack1.pack2.pack3.root_node_name" />
+          </node>
+        </node>
       </node>
     </node>
-    <node concept="NWlO9" id="49yFphTYeaW" role="lGtFl">
-      <property role="NWlVz" value="General utility methods." />
+    <node concept="3UR2Jj" id="1y75Pbzy1xh" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1xf" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1xg" role="1dT_Ay">
+          <property role="1dT_AB" value="General utility methods." />
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_model.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_model.mps
index 330e7aa3f..844fe732f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_model.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_model.mps
@@ -3,8 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports />
   <registry>
@@ -80,17 +81,26 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
-    </language>
     <language id="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="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
@@ -133,8 +143,12 @@
       <node concept="3clFbS" id="TJrbIN7dfG" role="3clF47" />
       <node concept="3Tm1VV" id="TJrbIN7dfH" role="1B3o_S" />
       <node concept="17QB3L" id="TJrbIN7dfI" role="3clF45" />
-      <node concept="NWlO9" id="TJrbIN7dg5" role="lGtFl">
-        <property role="NWlVz" value="Returns the name of the category of this result." />
+      <node concept="P$JXv" id="1y75Pbzy1xk" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xi" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xj" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the name of the category of this result." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="TJrbIN7dfi" role="jymVt" />
@@ -146,8 +160,12 @@
       <node concept="3clFbS" id="TJrbIN8sPk" role="3clF47" />
       <node concept="3Tm1VV" id="TJrbIN8sPl" role="1B3o_S" />
       <node concept="17QB3L" id="TJrbIN8sPm" role="3clF45" />
-      <node concept="NWlO9" id="TJrbIN8sPn" role="lGtFl">
-        <property role="NWlVz" value="Returns the user friendly name of this result." />
+      <node concept="P$JXv" id="1y75Pbzy1xn" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xl" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xm" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the user friendly name of this result." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="TJrbIN8sNP" role="jymVt" />
@@ -157,8 +175,12 @@
       <node concept="3clFbS" id="TJrbIN8g11" role="3clF47" />
       <node concept="3Tm1VV" id="TJrbIN8g12" role="1B3o_S" />
       <node concept="3cpWsb" id="TJrbINbUTW" role="3clF45" />
-      <node concept="NWlO9" id="TJrbIN8g2_" role="lGtFl">
-        <property role="NWlVz" value="Returns the time in milliseconds which was needed to compute this result." />
+      <node concept="P$JXv" id="1y75Pbzy1xq" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xo" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xp" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the time in milliseconds which was needed to compute this result." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="TJrbIN7jpD" role="jymVt" />
@@ -168,8 +190,12 @@
       <node concept="3clFbS" id="TJrbIN7moW" role="3clF47" />
       <node concept="3Tm1VV" id="TJrbIN7moX" role="1B3o_S" />
       <node concept="10P_77" id="TJrbIN7mop" role="3clF45" />
-      <node concept="NWlO9" id="TJrbIN7mpD" role="lGtFl">
-        <property role="NWlVz" value="Returns whether this result is a success." />
+      <node concept="P$JXv" id="1y75Pbzy1xt" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xr" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xs" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns whether this result is a success." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="TJrbIN7msv" role="jymVt" />
@@ -179,8 +205,12 @@
       <node concept="3clFbS" id="TJrbIN7mu9" role="3clF47" />
       <node concept="3Tm1VV" id="TJrbIN7mua" role="1B3o_S" />
       <node concept="10P_77" id="TJrbIN7mtr" role="3clF45" />
-      <node concept="NWlO9" id="TJrbIN7mv1" role="lGtFl">
-        <property role="NWlVz" value="Returns whether this result is a failure." />
+      <node concept="P$JXv" id="1y75Pbzy1xw" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xu" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xv" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns whether this result is a failure." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="TJrbIN7mz2" role="jymVt" />
@@ -190,8 +220,12 @@
       <node concept="3clFbS" id="TJrbIN7_af" role="3clF47" />
       <node concept="3Tm1VV" id="TJrbIN7_ag" role="1B3o_S" />
       <node concept="10P_77" id="TJrbIN7_ah" role="3clF45" />
-      <node concept="NWlO9" id="TJrbIN7_ai" role="lGtFl">
-        <property role="NWlVz" value="Returns whether this result is unknown." />
+      <node concept="P$JXv" id="1y75Pbzy1xz" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xx" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xy" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns whether this result is unknown." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="TJrbIN7mzs" role="jymVt" />
@@ -201,8 +235,12 @@
       <node concept="3clFbS" id="TJrbIN7jlG" role="3clF47" />
       <node concept="3Tm1VV" id="TJrbIN7jlH" role="1B3o_S" />
       <node concept="10P_77" id="TJrbIN7jlk" role="3clF45" />
-      <node concept="NWlO9" id="TJrbIN7jme" role="lGtFl">
-        <property role="NWlVz" value="Returns true if this result was generated due to a runtime error." />
+      <node concept="P$JXv" id="1y75Pbzy1xA" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1x$" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1x_" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns true if this result was generated due to a runtime error." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="TJrbIN7_gF" role="jymVt" />
@@ -212,8 +250,12 @@
       <node concept="3clFbS" id="TJrbIN7_ff" role="3clF47" />
       <node concept="3Tm1VV" id="TJrbIN7_fg" role="1B3o_S" />
       <node concept="10P_77" id="TJrbIN7_fh" role="3clF45" />
-      <node concept="NWlO9" id="TJrbIN7_fi" role="lGtFl">
-        <property role="NWlVz" value="Returns whether the computation of this result was canceled." />
+      <node concept="P$JXv" id="1y75Pbzy1xD" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xB" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xC" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns whether the computation of this result was canceled." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="TJrbIN7_xi" role="jymVt" />
@@ -223,14 +265,15 @@
       <node concept="3clFbS" id="TJrbIN7_vF" role="3clF47" />
       <node concept="3Tm1VV" id="TJrbIN7_vG" role="1B3o_S" />
       <node concept="10P_77" id="TJrbIN7_vH" role="3clF45" />
-      <node concept="NWlO9" id="TJrbIN7_vI" role="lGtFl">
-        <property role="NWlVz" value="Returns whether the computation of this result was timeout" />
+      <node concept="P$JXv" id="1y75Pbzy1xG" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xE" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xF" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns whether the computation of this result was timeout" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="TJrbIN7de_" role="1B3o_S" />
-    <node concept="NWlO9" id="TJrbIN7dfa" role="lGtFl">
-      <property role="NWlVz" value="Interface for analyses results." />
-    </node>
     <node concept="2tJIrI" id="TJrbIN9dQq" role="jymVt" />
     <node concept="3clFb_" id="TJrbIN9dUD" role="jymVt">
       <property role="2aFKle" value="false" />
@@ -238,8 +281,12 @@
       <node concept="3clFbS" id="TJrbIN9dUG" role="3clF47" />
       <node concept="3Tm1VV" id="TJrbIN9dUH" role="1B3o_S" />
       <node concept="10Oyi0" id="TJrbIN9dSW" role="3clF45" />
-      <node concept="NWlO9" id="TJrbIN9dWA" role="lGtFl">
-        <property role="NWlVz" value="Returns the size of the whitness." />
+      <node concept="P$JXv" id="1y75Pbzy1xM" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xK" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xL" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the size of the whitness." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5a54bO_HkFY" role="jymVt" />
@@ -249,8 +296,19 @@
       <node concept="3clFbS" id="5a54bO_HkLy" role="3clF47" />
       <node concept="3Tm1VV" id="5a54bO_HkLz" role="1B3o_S" />
       <node concept="3Tqbb2" id="5a54bO_HkJB" role="3clF45" />
-      <node concept="NWlO9" id="5a54bO_HkOt" role="lGtFl">
-        <property role="NWlVz" value="Returns the node to which this result is attached to." />
+      <node concept="P$JXv" id="1y75Pbzy1xP" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xN" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xO" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the node to which this result is attached to." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3UR2Jj" id="1y75Pbzy1xJ" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1xH" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1xI" role="1dT_Ay">
+          <property role="1dT_AB" value="Interface for analyses results." />
+        </node>
       </node>
     </node>
   </node>
@@ -263,13 +321,21 @@
       <node concept="3clFbS" id="1EZfgaQmLsV" role="3clF47" />
       <node concept="3Tm1VV" id="1EZfgaQmLsW" role="1B3o_S" />
       <node concept="10P_77" id="1EZfgaQmLsM" role="3clF45" />
-      <node concept="NWlO9" id="1EZfgaQmLtC" role="lGtFl">
-        <property role="NWlVz" value="Is this witness entry a major one? Major entries will be printed with BOLD in the witness." />
+      <node concept="P$JXv" id="1y75Pbzy1xS" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xQ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xR" role="1dT_Ay">
+            <property role="1dT_AB" value="Is this witness entry a major one? Major entries will be printed with BOLD in the witness." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="1EZfgaQmLrU" role="1B3o_S" />
-    <node concept="NWlO9" id="1EZfgaQmLts" role="lGtFl">
-      <property role="NWlVz" value="An entry in the witness list." />
+    <node concept="3UR2Jj" id="1y75Pbzy1xV" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1xT" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1xU" role="1dT_Ay">
+          <property role="1dT_AB" value="An entry in the witness list." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="5a54bO_HcYB">
@@ -291,8 +357,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="5a54bO_HepO" role="lGtFl">
-        <property role="NWlVz" value="The results list." />
+      <node concept="z59LJ" id="1y75Pbzy1xY" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xW" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1xX" role="1dT_Ay">
+            <property role="1dT_AB" value="The results list." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5a54bO_Hem4" role="jymVt" />
@@ -370,8 +440,12 @@
         <property role="TrG5h" value="n" />
         <node concept="3Tqbb2" id="5a54bO_Hfzn" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="5a54bO_HoF6" role="lGtFl">
-        <property role="NWlVz" value="Returns true if there exists a result attached to the given node." />
+      <node concept="P$JXv" id="1y75Pbzy1y1" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1xZ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1y0" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns true if there exists a result attached to the given node." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5a54bO_HCxT" role="jymVt" />
@@ -434,8 +508,12 @@
         <property role="TrG5h" value="n" />
         <node concept="3Tqbb2" id="5a54bO_HCjI" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="5a54bO_HCjJ" role="lGtFl">
-        <property role="NWlVz" value="Returns true if all results are successful." />
+      <node concept="P$JXv" id="1y75Pbzy1y4" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1y2" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1y3" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns true if all results are successful." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5a54bO_HmSV" role="jymVt" />
@@ -458,8 +536,12 @@
       <node concept="3cqZAl" id="5a54bO_HmVQ" role="3clF45" />
     </node>
     <node concept="3Tm1VV" id="5a54bO_HcYC" role="1B3o_S" />
-    <node concept="NWlO9" id="5a54bO_HepF" role="lGtFl">
-      <property role="NWlVz" value="Container for the analyses results from the last analysis session." />
+    <node concept="3UR2Jj" id="1y75Pbzy1y7" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1y5" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1y6" role="1dT_Ay">
+          <property role="1dT_AB" value="Container for the analyses results from the last analysis session." />
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_ui.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_ui.mps
index 93b52d120..d232952cd 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_ui.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/results_ui.mps
@@ -4,8 +4,9 @@
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
@@ -248,17 +249,26 @@
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
-    </language>
     <language id="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="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </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" />
@@ -342,8 +352,12 @@
         <ref role="3uigEE" to="dxuu:~JPopupMenu" resolve="JPopupMenu" />
       </node>
       <node concept="3Tm6S6" id="4RSEWODyx3_" role="1B3o_S" />
-      <node concept="NWlO9" id="1EZfgaQlWvC" role="lGtFl">
-        <property role="NWlVz" value="The menu." />
+      <node concept="z59LJ" id="1y75Pbzy1ya" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1y8" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1y9" role="1dT_Ay">
+            <property role="1dT_AB" value="The menu." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1EZfgaQlWj_" role="jymVt" />
@@ -428,8 +442,12 @@
           <node concept="17QB3L" id="1EZfgaQm5Hx" role="_ZDj9" />
         </node>
       </node>
-      <node concept="NWlO9" id="1EZfgaQlUnV" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75Pbzy1yd" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1yb" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1yc" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4RSEWODAQ14" role="jymVt" />
@@ -468,12 +486,16 @@
       </node>
       <node concept="3Tm1VV" id="4RSEWODs9Tl" role="1B3o_S" />
       <node concept="3cqZAl" id="4RSEWODs9Tm" role="3clF45" />
-      <node concept="NWlO9" id="1EZfgaQlUwk" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
-      </node>
       <node concept="2AHcQZ" id="1EZfgaQlUEz" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
+      <node concept="P$JXv" id="1y75Pbzy1yg" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1ye" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1yf" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="3clFb_" id="4RSEWODs9Tn" role="jymVt">
       <property role="TrG5h" value="mouseReleased" />
@@ -513,8 +535,12 @@
       <node concept="2AHcQZ" id="1EZfgaQlUOR" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="1EZfgaQlUYZ" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75Pbzy1yj" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1yh" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1yi" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4RSEWODywpI" role="jymVt" />
@@ -567,16 +593,24 @@
       </node>
       <node concept="3Tm6S6" id="4RSEWODs9TK" role="1B3o_S" />
       <node concept="3cqZAl" id="4RSEWODs9TL" role="3clF45" />
-      <node concept="NWlO9" id="1EZfgaQlXnF" role="lGtFl">
-        <property role="NWlVz" value="Shows the menu." />
+      <node concept="P$JXv" id="1y75Pbzy1ym" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1yk" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1yl" role="1dT_Ay">
+            <property role="1dT_AB" value="Shows the menu." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="4RSEWODrZzf" role="1B3o_S" />
     <node concept="3uibUv" id="4RSEWODs9wR" role="1zkMxy">
       <ref role="3uigEE" to="hyam:~MouseAdapter" resolve="MouseAdapter" />
     </node>
-    <node concept="NWlO9" id="1EZfgaQlUe6" role="lGtFl">
-      <property role="NWlVz" value="Provider for pop-up menu in the analyses results view." />
+    <node concept="3UR2Jj" id="1y75Pbzy1yp" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1yn" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1yo" role="1dT_Ay">
+          <property role="1dT_AB" value="Provider for pop-up menu in the analyses results view." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="3DDJouLExSa">
@@ -595,8 +629,12 @@
           <ref role="37wK5l" to="dxuu:~JTabbedPane.&lt;init&gt;()" resolve="JTabbedPane" />
         </node>
       </node>
-      <node concept="NWlO9" id="3DDJouLEU90" role="lGtFl">
-        <property role="NWlVz" value="Tabbed pane containing different aspects of the raw result." />
+      <node concept="z59LJ" id="1y75Pbzy1ys" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1yq" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1yr" role="1dT_Ay">
+            <property role="1dT_AB" value="Tabbed pane containing different aspects of the raw result." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3DDJouLETWz" role="jymVt" />
@@ -607,14 +645,18 @@
       <node concept="3uibUv" id="42jqVeFlHvH" role="1tU5fm">
         <ref role="3uigEE" to="ztk3:1agNx8KBsHD" resolve="GenericSearchPanel" />
       </node>
-      <node concept="NWlO9" id="3DDJouLGcnd" role="lGtFl">
-        <property role="NWlVz" value="Search panel." />
-      </node>
       <node concept="2ShNRf" id="3DDJouLGhj6" role="33vP2m">
         <node concept="HV5vD" id="3DDJouLGiUU" role="2ShVmc">
           <ref role="HV5vE" to="ztk3:1agNx8KBsHD" resolve="GenericSearchPanel" />
         </node>
       </node>
+      <node concept="z59LJ" id="1y75Pbzy1yv" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1yt" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1yu" role="1dT_Ay">
+            <property role="1dT_AB" value="Search panel." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="3DDJouLETWN" role="jymVt" />
     <node concept="3clFbW" id="3DDJouLE_I_" role="jymVt">
@@ -767,8 +809,12 @@
         </node>
         <node concept="3clFbH" id="3DDJouLGNoE" role="3cqZAp" />
       </node>
-      <node concept="NWlO9" id="3DDJouLE_J4" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75Pbzy1yy" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1yw" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1yx" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3DDJouLE$5D" role="jymVt" />
@@ -856,9 +902,6 @@
         <ref role="3uigEE" to="dxuu:~JTextArea" resolve="JTextArea" />
       </node>
       <node concept="3Tmbuc" id="3DDJouLFa0I" role="1B3o_S" />
-      <node concept="NWlO9" id="3DDJouLFa6K" role="lGtFl">
-        <property role="NWlVz" value="Creates a typical text area." />
-      </node>
       <node concept="37vLTG" id="3DDJouLHdn4" role="3clF46">
         <property role="TrG5h" value="tabName" />
         <node concept="17QB3L" id="3DDJouLHebQ" role="1tU5fm" />
@@ -867,6 +910,13 @@
         <property role="TrG5h" value="lineWrap" />
         <node concept="10P_77" id="3DDJouLFf71" role="1tU5fm" />
       </node>
+      <node concept="P$JXv" id="1y75Pbzy1y_" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1yz" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1y$" role="1dT_Ay">
+            <property role="1dT_AB" value="Creates a typical text area." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="3DDJouLF9rl" role="jymVt" />
     <node concept="3clFb_" id="3DDJouLF$2t" role="jymVt">
@@ -899,15 +949,19 @@
         <ref role="3uigEE" to="dxuu:~JScrollPane" resolve="JScrollPane" />
       </node>
       <node concept="3Tmbuc" id="3DDJouLF$2O" role="1B3o_S" />
-      <node concept="NWlO9" id="3DDJouLF$2P" role="lGtFl">
-        <property role="NWlVz" value="Wraps a text area into a scroll pane." />
-      </node>
       <node concept="37vLTG" id="3DDJouLF$2Q" role="3clF46">
         <property role="TrG5h" value="c" />
         <node concept="3uibUv" id="3DDJouLFMps" role="1tU5fm">
           <ref role="3uigEE" to="z60i:~Component" resolve="Component" />
         </node>
       </node>
+      <node concept="P$JXv" id="1y75Pbzy1yC" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1yA" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1yB" role="1dT_Ay">
+            <property role="1dT_AB" value="Wraps a text area into a scroll pane." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="3DDJouLFzVn" role="jymVt" />
     <node concept="3clFb_" id="3DDJouLGJRi" role="jymVt">
@@ -923,17 +977,25 @@
           <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
         </node>
       </node>
-      <node concept="NWlO9" id="3DDJouLGK8Q" role="lGtFl">
-        <property role="NWlVz" value="Indexes for which we inhibit the search panel." />
+      <node concept="P$JXv" id="1y75Pbzy1yF" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1yD" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1yE" role="1dT_Ay">
+            <property role="1dT_AB" value="Indexes for which we inhibit the search panel." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="3DDJouLExSb" role="1B3o_S" />
-    <node concept="NWlO9" id="3DDJouLExTH" role="lGtFl">
-      <property role="NWlVz" value="Base class for analyses raw results." />
-    </node>
     <node concept="3uibUv" id="3DDJouLE$5r" role="1zkMxy">
       <ref role="3uigEE" to="dxuu:~JPanel" resolve="JPanel" />
     </node>
+    <node concept="3UR2Jj" id="1y75Pbzy1yI" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1yG" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1yH" role="1dT_Ay">
+          <property role="1dT_AB" value="Base class for analyses raw results." />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="12KLbTgpYCj">
     <property role="TrG5h" value="AnalysesResultsCellRenderer" />
@@ -956,8 +1018,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="TJrbINa7RW" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75Pbzy1yL" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1yJ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1yK" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7Bf6Ux7TBbH" role="jymVt" />
@@ -1531,14 +1597,15 @@
         <property role="TrG5h" value="i2" />
         <node concept="10Oyi0" id="12KLbTgpYCR" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="2WJ8cS_BvPq" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75Pbzy1yO" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1yM" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1yN" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7Bf6Ux7T_Ff" role="jymVt" />
-    <node concept="NWlO9" id="2WJ8cS_Bw12" role="lGtFl">
-      <property role="NWlVz" value="Renderer for the analyses results table." />
-    </node>
     <node concept="3uibUv" id="7Bf6Ux7TyGd" role="EKbjA">
       <ref role="3uigEE" to="c8ee:~TableCellRenderer" resolve="TableCellRenderer" />
     </node>
@@ -1560,8 +1627,19 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="TJrbINa7ZN" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75Pbzy1yU" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1yS" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1yT" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3UR2Jj" id="1y75Pbzy1yR" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1yP" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1yQ" role="1dT_Ay">
+          <property role="1dT_AB" value="Renderer for the analyses results table." />
+        </node>
       </node>
     </node>
   </node>
@@ -1674,15 +1752,23 @@
         <property role="TrG5h" value="i2" />
         <node concept="10Oyi0" id="2WJ8cS_BzOT" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="2WJ8cS_BzOU" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
-      </node>
       <node concept="2AHcQZ" id="1EZfgaQnKdB" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
+      <node concept="P$JXv" id="1y75Pbzy1yX" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1yV" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1yW" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
+      </node>
     </node>
-    <node concept="NWlO9" id="2WJ8cS_BzQ2" role="lGtFl">
-      <property role="NWlVz" value="Renderer for the index column." />
+    <node concept="3UR2Jj" id="1y75Pbzy1z0" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1yY" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1yZ" role="1dT_Ay">
+          <property role="1dT_AB" value="Renderer for the index column." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="31nZcrlJSwS">
@@ -1711,8 +1797,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="1EZfgaQnAdq" role="lGtFl">
-        <property role="NWlVz" value="Whitness entries which will be displayed when some filter is applied." />
+      <node concept="z59LJ" id="1y75Pbzy1z3" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1z1" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1z2" role="1dT_Ay">
+            <property role="1dT_AB" value="Whitness entries which will be displayed when some filter is applied." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1EZfgaQnDXA" role="jymVt" />
@@ -1726,8 +1816,12 @@
         </node>
       </node>
       <node concept="3Tmbuc" id="5Ac5QKE1GFq" role="1B3o_S" />
-      <node concept="NWlO9" id="1EZfgaQnDL_" role="lGtFl">
-        <property role="NWlVz" value="All whitness entries" />
+      <node concept="z59LJ" id="1y75Pbzy1z6" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1z4" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1z5" role="1dT_Ay">
+            <property role="1dT_AB" value="All whitness entries" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1d23YaEmbrh" role="jymVt" />
@@ -1738,8 +1832,12 @@
       <node concept="Xl_RD" id="1gub2tHzbjN" role="33vP2m">
         <property role="Xl_RC" value="" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHbBxW" role="lGtFl">
-        <property role="NWlVz" value="String used to filter the whitness entries." />
+      <node concept="z59LJ" id="1y75Pbzy1z9" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1z7" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1z8" role="1dT_Ay">
+            <property role="1dT_AB" value="String used to filter the whitness entries." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZHbAxb" role="jymVt" />
@@ -1750,8 +1848,12 @@
       <node concept="3clFbT" id="4vtpFxbq$pM" role="33vP2m">
         <property role="3clFbU" value="false" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHbV26" role="lGtFl">
-        <property role="NWlVz" value="Use regular expressions while filtering?" />
+      <node concept="z59LJ" id="1y75Pbzy1zc" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1za" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1zb" role="1dT_Ay">
+            <property role="1dT_AB" value="Use regular expressions while filtering?" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZHbUDd" role="jymVt" />
@@ -1774,8 +1876,12 @@
       <node concept="2AHcQZ" id="2k2dPZHbC61" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHbCnT" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75Pbzy1zf" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1zd" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1ze" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="12GRGX_agHw" role="jymVt" />
@@ -1805,8 +1911,12 @@
         <property role="TrG5h" value="rowIndex" />
         <node concept="10Oyi0" id="WwTuEsr05B" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="1EZfgaQnHSY" role="lGtFl">
-        <property role="NWlVz" value="Returns the whitness entry at a certain row." />
+      <node concept="P$JXv" id="1y75Pbzy1zi" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1zg" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1zh" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the whitness entry at a certain row." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="12GRGX_anaQ" role="jymVt" />
@@ -1863,8 +1973,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="2k2dPZHbDjb" role="lGtFl">
-        <property role="NWlVz" value="Sets the whitness entries." />
+      <node concept="P$JXv" id="1y75Pbzy1zl" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1zj" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1zk" role="1dT_Ay">
+            <property role="1dT_AB" value="Sets the whitness entries." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="12GRGX_aRSY" role="jymVt" />
@@ -1874,8 +1988,12 @@
       <node concept="3cqZAl" id="1gub2tHyR4z" role="3clF45" />
       <node concept="3Tm1VV" id="1gub2tHyR4$" role="1B3o_S" />
       <node concept="3clFbS" id="1gub2tHyR4_" role="3clF47" />
-      <node concept="NWlO9" id="1EZfgaQn_Xj" role="lGtFl">
-        <property role="NWlVz" value="Filter the whitness." />
+      <node concept="P$JXv" id="1y75Pbzy1zo" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1zm" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1zn" role="1dT_Ay">
+            <property role="1dT_AB" value="Filter the whitness." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1GgrF83gmaz" role="jymVt" />
@@ -1903,8 +2021,12 @@
       <node concept="2AHcQZ" id="3kLBXRr$3oN" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="1EZfgaQnJQe" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75Pbzy1zr" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1zp" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1zq" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5C7jL_4BOga" role="jymVt" />
@@ -1933,8 +2055,12 @@
         <property role="TrG5h" value="str" />
         <node concept="17QB3L" id="2k2dPZHbz$c" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHbGlg" role="lGtFl">
-        <property role="NWlVz" value="Filters the results." />
+      <node concept="P$JXv" id="1y75Pbzy1zu" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1zs" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1zt" role="1dT_Ay">
+            <property role="1dT_AB" value="Filters the results." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZHbzgC" role="jymVt" />
@@ -1963,8 +2089,12 @@
         <property role="TrG5h" value="selected" />
         <node concept="10P_77" id="4vtpFxbqvlE" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHc1To" role="lGtFl">
-        <property role="NWlVz" value="Set use regular expressions while filtering the whitness." />
+      <node concept="P$JXv" id="1y75Pbzy1zx" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1zv" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1zw" role="1dT_Ay">
+            <property role="1dT_AB" value="Set use regular expressions while filtering the whitness." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="16euLQ" id="1EZfgaQngo1" role="16eVyc">
@@ -1973,8 +2103,12 @@
         <ref role="3uigEE" to="c9r8:1EZfgaQmLrT" resolve="IWitnessEntry" />
       </node>
     </node>
-    <node concept="NWlO9" id="1EZfgaQny7Q" role="lGtFl">
-      <property role="NWlVz" value="Base class for whitness table models." />
+    <node concept="3UR2Jj" id="1y75Pbzy1z$" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1zy" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1zz" role="1dT_Ay">
+          <property role="1dT_AB" value="Base class for whitness table models." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="4wNvmgr9OM6">
@@ -1989,8 +2123,12 @@
       <node concept="3uibUv" id="7RSjqjskvQa" role="1tU5fm">
         <ref role="3uigEE" node="4wNvmgrbgv0" resolve="AnalysesResultsTreeTableModel" />
       </node>
-      <node concept="NWlO9" id="TJrbINa5SI" role="lGtFl">
-        <property role="NWlVz" value="The model." />
+      <node concept="z59LJ" id="1y75Pbzy1zB" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1z_" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1zA" role="1dT_Ay">
+            <property role="1dT_AB" value="The model." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4wNvmgra5Ju" role="jymVt" />
@@ -2422,8 +2560,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="TJrbINa6D4" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75Pbzy1zE" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1zC" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1zD" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4wNvmgrbUZW" role="jymVt" />
@@ -2625,8 +2767,12 @@
         <ref role="3uigEE" to="c9r8:TJrbIN7de$" resolve="IAnalysisResult" />
       </node>
     </node>
-    <node concept="NWlO9" id="TJrbINa4xY" role="lGtFl">
-      <property role="NWlVz" value="A tree table for presenting analyses results." />
+    <node concept="3UR2Jj" id="1y75Pbzy1zH" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1zF" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1zG" role="1dT_Ay">
+          <property role="1dT_AB" value="A tree table for presenting analyses results." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="TJrbIN8wsT">
@@ -4763,8 +4909,12 @@
       <node concept="3uibUv" id="2k2dPZHdiCx" role="1tU5fm">
         <ref role="3uigEE" node="31nZcrlJSwS" resolve="WhitnessTableModelBase" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHdjwd" role="lGtFl">
-        <property role="NWlVz" value="The model of the whitness table." />
+      <node concept="z59LJ" id="1y75Pbzy1zK" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1zI" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1zJ" role="1dT_Ay">
+            <property role="1dT_AB" value="The model of the whitness table." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZHdka8" role="jymVt" />
@@ -4969,8 +5119,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="1EZfgaQsHxR" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75Pbzy1zN" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1zL" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1zM" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZHbqJr" role="jymVt" />
@@ -5056,15 +5210,19 @@
     <node concept="3uibUv" id="1EZfgaQova0" role="1zkMxy">
       <ref role="3uigEE" to="dxuu:~JTable" resolve="JTable" />
     </node>
-    <node concept="NWlO9" id="1EZfgaQoVkT" role="lGtFl">
-      <property role="NWlVz" value="Table containing the whitness." />
-    </node>
     <node concept="16euLQ" id="2k2dPZHcTlr" role="16eVyc">
       <property role="TrG5h" value="T" />
       <node concept="3uibUv" id="2k2dPZHcUMK" role="3ztrMU">
         <ref role="3uigEE" to="c9r8:1EZfgaQmLrT" resolve="IWitnessEntry" />
       </node>
     </node>
+    <node concept="3UR2Jj" id="1y75Pbzy1zQ" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1zO" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1zP" role="1dT_Ay">
+          <property role="1dT_AB" value="Table containing the whitness." />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="$Bv_uL$29v">
     <property role="TrG5h" value="WhitnessCellRenderer" />
@@ -5254,12 +5412,20 @@
         <property role="TrG5h" value="i2" />
         <node concept="10Oyi0" id="$Bv_uL$2a5" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="2WJ8cS_Bva7" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75Pbzy1zT" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1zR" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1zS" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
-    <node concept="NWlO9" id="2WJ8cS_Bvq1" role="lGtFl">
-      <property role="NWlVz" value="Renderer for the counterexample table." />
+    <node concept="3UR2Jj" id="1y75Pbzy1zW" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1zU" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1zV" role="1dT_Ay">
+          <property role="1dT_AB" value="Renderer for the counterexample table." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="2k2dPZH6gae">
@@ -5294,8 +5460,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="2k2dPZH7yNa" role="lGtFl">
-        <property role="NWlVz" value="Font used in different texts." />
+      <node concept="z59LJ" id="1y75Pbzy1zZ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1zX" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1zY" role="1dT_Ay">
+            <property role="1dT_AB" value="Font used in different texts." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZH7y$0" role="jymVt" />
@@ -5308,8 +5478,12 @@
       <node concept="3uibUv" id="TJrbINcjhO" role="1tU5fm">
         <ref role="3uigEE" node="4wNvmgr9OM6" resolve="AnalysesResultsTreeTable" />
       </node>
-      <node concept="NWlO9" id="2k2dPZH85_p" role="lGtFl">
-        <property role="NWlVz" value="Table containing analyses results." />
+      <node concept="z59LJ" id="1y75Pbzy1$2" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$0" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$1" role="1dT_Ay">
+            <property role="1dT_AB" value="Table containing analyses results." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZH83G0" role="jymVt" />
@@ -5322,8 +5496,12 @@
       <node concept="3uibUv" id="2k2dPZHbHNS" role="1tU5fm">
         <ref role="3uigEE" node="1EZfgaQov3P" resolve="WhitnessTable" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHb525" role="lGtFl">
-        <property role="NWlVz" value="Table containing the whitness." />
+      <node concept="z59LJ" id="1y75Pbzy1$5" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$3" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$4" role="1dT_Ay">
+            <property role="1dT_AB" value="Table containing the whitness." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZHb6xe" role="jymVt" />
@@ -5336,8 +5514,12 @@
       <node concept="3clFbS" id="2k2dPZH6h6n" role="3clF47" />
       <node concept="3Tmbuc" id="2k2dPZH6gFg" role="1B3o_S" />
       <node concept="3cqZAl" id="2k2dPZH6h6g" role="3clF45" />
-      <node concept="NWlO9" id="2k2dPZH6h7W" role="lGtFl">
-        <property role="NWlVz" value="Instantiates additional, UI specific widgets." />
+      <node concept="P$JXv" id="1y75Pbzy1$8" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$6" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$7" role="1dT_Ay">
+            <property role="1dT_AB" value="Instantiates additional, UI specific widgets." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZH6gxY" role="jymVt" />
@@ -5352,8 +5534,12 @@
       <node concept="3uibUv" id="2k2dPZH8rd5" role="3clF45">
         <ref role="3uigEE" to="hyam:~MouseListener" resolve="MouseListener" />
       </node>
-      <node concept="NWlO9" id="2k2dPZH8bx9" role="lGtFl">
-        <property role="NWlVz" value="Defines what happens when one clicks on an entry from the analyses results table." />
+      <node concept="P$JXv" id="1y75Pbzy1$b" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$9" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$a" role="1dT_Ay">
+            <property role="1dT_AB" value="Defines what happens when one clicks on an entry from the analyses results table." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZH89Sz" role="jymVt" />
@@ -5366,8 +5552,12 @@
       <node concept="3clFbS" id="2k2dPZHbi7u" role="3clF47" />
       <node concept="3Tmbuc" id="2k2dPZHbgsQ" role="1B3o_S" />
       <node concept="3cqZAl" id="2k2dPZHbi7o" role="3clF45" />
-      <node concept="NWlO9" id="2k2dPZHblmU" role="lGtFl">
-        <property role="NWlVz" value="Creates the whitness and whitness table model." />
+      <node concept="P$JXv" id="1y75Pbzy1$e" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$c" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$d" role="1dT_Ay">
+            <property role="1dT_AB" value="Creates the whitness and whitness table model." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZHbjJD" role="jymVt" />
@@ -5382,8 +5572,12 @@
       <node concept="3uibUv" id="2k2dPZHavJy" role="3clF45">
         <ref role="3uigEE" to="hyam:~MouseListener" resolve="MouseListener" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHavJz" role="lGtFl">
-        <property role="NWlVz" value="Defines what happens when one clicks on an entry from the whitness table." />
+      <node concept="P$JXv" id="1y75Pbzy1$h" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$f" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$g" role="1dT_Ay">
+            <property role="1dT_AB" value="Defines what happens when one clicks on an entry from the whitness table." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZHavqE" role="jymVt" />
@@ -5396,15 +5590,19 @@
       <node concept="3clFbS" id="2k2dPZH8Aml" role="3clF47" />
       <node concept="3Tmbuc" id="2k2dPZH8Amm" role="1B3o_S" />
       <node concept="3cqZAl" id="2k2dPZH8Amn" role="3clF45" />
-      <node concept="NWlO9" id="2k2dPZH8Amo" role="lGtFl">
-        <property role="NWlVz" value="Adds additional widgets to the results UI." />
-      </node>
       <node concept="37vLTG" id="2k2dPZH8WLo" role="3clF46">
         <property role="TrG5h" value="topHalf" />
         <node concept="3uibUv" id="2k2dPZH8WLn" role="1tU5fm">
           <ref role="3uigEE" to="dxuu:~JPanel" resolve="JPanel" />
         </node>
       </node>
+      <node concept="P$JXv" id="1y75Pbzy1$k" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$i" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$j" role="1dT_Ay">
+            <property role="1dT_AB" value="Adds additional widgets to the results UI." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZH8A4_" role="jymVt" />
     <node concept="3clFb_" id="2k2dPZHacFj" role="jymVt">
@@ -5416,15 +5614,19 @@
       <node concept="3clFbS" id="2k2dPZHacFk" role="3clF47" />
       <node concept="3Tmbuc" id="2k2dPZHacFl" role="1B3o_S" />
       <node concept="3cqZAl" id="2k2dPZHacFm" role="3clF45" />
-      <node concept="NWlO9" id="2k2dPZHacFn" role="lGtFl">
-        <property role="NWlVz" value="Adds additional widgets to the whitness UI." />
-      </node>
       <node concept="37vLTG" id="2k2dPZHacFo" role="3clF46">
         <property role="TrG5h" value="bottomHalf" />
         <node concept="3uibUv" id="2k2dPZHacFp" role="1tU5fm">
           <ref role="3uigEE" to="dxuu:~JPanel" resolve="JPanel" />
         </node>
       </node>
+      <node concept="P$JXv" id="1y75Pbzy1$n" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$l" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$m" role="1dT_Ay">
+            <property role="1dT_AB" value="Adds additional widgets to the whitness UI." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZHacmQ" role="jymVt" />
     <node concept="312cEg" id="JsaLOcqBeI" role="jymVt">
@@ -5436,8 +5638,12 @@
         <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
       </node>
       <node concept="3Tmbuc" id="7V1Bqz73vxe" role="1B3o_S" />
-      <node concept="NWlO9" id="7YdkGnq3gJ" role="lGtFl">
-        <property role="NWlVz" value="Current project." />
+      <node concept="z59LJ" id="1y75Pbzy1$q" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$o" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$p" role="1dT_Ay">
+            <property role="1dT_AB" value="Current project." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7V1Bqz73y7W" role="jymVt" />
@@ -5450,8 +5656,12 @@
       <node concept="3uibUv" id="7V1Bqz75S5D" role="1tU5fm">
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
-      <node concept="NWlO9" id="7V1Bqz75VpM" role="lGtFl">
-        <property role="NWlVz" value="Current repository." />
+      <node concept="z59LJ" id="1y75Pbzy1$t" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$r" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$s" role="1dT_Ay">
+            <property role="1dT_AB" value="Current repository." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7V1Bqz75TFv" role="jymVt" />
@@ -5470,13 +5680,14 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="2k2dPZH6xf7" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75Pbzy1$w" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$u" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$v" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
-    <node concept="NWlO9" id="2k2dPZH6h72" role="lGtFl">
-      <property role="NWlVz" value="Base class for analyses results UI." />
-    </node>
     <node concept="2tJIrI" id="2k2dPZH7rc7" role="jymVt" />
     <node concept="3clFb_" id="4_pSipqUFfA" role="jymVt">
       <property role="TrG5h" value="createPartControl" />
@@ -6543,8 +6754,12 @@
           <ref role="3uigEE" to="hyam:~ItemListener" resolve="ItemListener" />
         </node>
       </node>
-      <node concept="NWlO9" id="2k2dPZH7rXO" role="lGtFl">
-        <property role="NWlVz" value="Creates the search panel." />
+      <node concept="P$JXv" id="1y75Pbzy1$A" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$$" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$_" role="1dT_Ay">
+            <property role="1dT_AB" value="Creates the search panel." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZH7reX" role="jymVt" />
@@ -6630,8 +6845,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="4_pSipqUXKt" role="1B3o_S" />
-      <node concept="NWlO9" id="2k2dPZH9Swp" role="lGtFl">
-        <property role="NWlVz" value="Set the analyses results." />
+      <node concept="P$JXv" id="1y75Pbzy1$D" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$B" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$C" role="1dT_Ay">
+            <property role="1dT_AB" value="Set the analyses results." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7F8$WoVDDQc" role="jymVt" />
@@ -6663,8 +6882,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="7F8$WoVE15P" role="1B3o_S" />
-      <node concept="NWlO9" id="2k2dPZHa3$9" role="lGtFl">
-        <property role="NWlVz" value="Appends a result to the analyses results." />
+      <node concept="P$JXv" id="1y75Pbzy1$G" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$E" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$F" role="1dT_Ay">
+            <property role="1dT_AB" value="Appends a result to the analyses results." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7F8$WoVDT$7" role="jymVt" />
@@ -6688,8 +6911,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="7yT88Oq7qMN" role="1B3o_S" />
-      <node concept="NWlO9" id="2k2dPZHa5ut" role="lGtFl">
-        <property role="NWlVz" value="Clears all existing results." />
+      <node concept="P$JXv" id="1y75Pbzy1$J" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$H" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$I" role="1dT_Ay">
+            <property role="1dT_AB" value="Clears all existing results." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7yT88Oq7q4i" role="jymVt" />
@@ -6749,8 +6976,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="4_pSipqUXKk" role="1B3o_S" />
-      <node concept="NWlO9" id="2k2dPZHa7AS" role="lGtFl">
-        <property role="NWlVz" value="Sets a single result." />
+      <node concept="P$JXv" id="1y75Pbzy1$M" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$K" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$L" role="1dT_Ay">
+            <property role="1dT_AB" value="Sets a single result." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7V1Bqz73Fy9" role="jymVt" />
@@ -6814,6 +7045,13 @@
         <ref role="3uigEE" to="c9r8:TJrbIN7de$" resolve="IAnalysisResult" />
       </node>
     </node>
+    <node concept="3UR2Jj" id="1y75Pbzy1$z" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1$x" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1$y" role="1dT_Ay">
+          <property role="1dT_AB" value="Base class for analyses results UI." />
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/simulator.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/simulator.mps
index e94896bda..e94f9dc24 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/simulator.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/simulator.mps
@@ -8,9 +8,10 @@
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="b19z" ref="r:11a68676-9d63-4e1c-b920-59aefe77def3(com.mbeddr.formal.base.structure)" />
@@ -160,11 +161,6 @@
         <reference id="3175313036448544057" name="extensionPoint" index="Sf$Xr" />
       </concept>
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
-    </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
       <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
       <concept id="8974276187400348174" name="jetbrains.mps.lang.access.structure.ExecuteCommandInEDTStatement" flags="nn" index="1QHqEF" />
@@ -180,6 +176,19 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="5455284157993911077" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitProperty" flags="ng" index="2pJxcG">
         <reference id="5455284157993911078" name="property" index="2pJxcJ" />
@@ -276,8 +285,12 @@
       <node concept="3clFbS" id="3fsZMFLDimx" role="3clF47" />
       <node concept="3Tm1VV" id="3fsZMFLDimy" role="1B3o_S" />
       <node concept="10Oyi0" id="3fsZMFLDimo" role="3clF45" />
-      <node concept="NWlO9" id="3fsZMFLDuBY" role="lGtFl">
-        <property role="NWlVz" value="Number of steps of this trace." />
+      <node concept="P$JXv" id="1y75Pbzy1$P" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$N" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$O" role="1dT_Ay">
+            <property role="1dT_AB" value="Number of steps of this trace." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3fsZMFLDin2" role="jymVt" />
@@ -296,8 +309,12 @@
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
       </node>
-      <node concept="NWlO9" id="3fsZMFLDuFf" role="lGtFl">
-        <property role="NWlVz" value="Nodes-to-values map for the current step." />
+      <node concept="P$JXv" id="1y75Pbzy1$S" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$Q" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$R" role="1dT_Ay">
+            <property role="1dT_AB" value="Nodes-to-values map for the current step." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1EKbsQR7u2Z" role="jymVt" />
@@ -307,14 +324,22 @@
       <node concept="3clFbS" id="1EKbsQR7vyR" role="3clF47" />
       <node concept="3Tm1VV" id="1EKbsQR7vyS" role="1B3o_S" />
       <node concept="3Tqbb2" id="1EKbsQR7vxR" role="3clF45" />
-      <node concept="NWlO9" id="1EKbsQR7v$j" role="lGtFl">
-        <property role="NWlVz" value="Returns the node which represents the entry in the simulation. Simulation bar will be attached to this node." />
+      <node concept="P$JXv" id="1y75Pbzy1$V" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$T" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1$U" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the node which represents the entry in the simulation. Simulation bar will be attached to this node." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="3fsZMFLDils" role="1B3o_S" />
     <node concept="2tJIrI" id="3fsZMFLDuAG" role="jymVt" />
-    <node concept="NWlO9" id="3fsZMFLDuBE" role="lGtFl">
-      <property role="NWlVz" value="Interface for a simulation trace." />
+    <node concept="3UR2Jj" id="1y75Pbzy1$Y" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1$W" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1$X" role="1dT_Ay">
+          <property role="1dT_AB" value="Interface for a simulation trace." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="2xeYpNCxAqa">
@@ -478,8 +503,12 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
-      <node concept="NWlO9" id="6Kf5KB6Tora" role="lGtFl">
-        <property role="NWlVz" value="Registers a simulation trace on a node entry." />
+      <node concept="P$JXv" id="1y75Pbzy1_1" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1$Z" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_0" role="1dT_Ay">
+            <property role="1dT_AB" value="Registers a simulation trace on a node entry." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2xeYpNCxEiP" role="jymVt" />
@@ -508,8 +537,12 @@
         <property role="TrG5h" value="entry" />
         <node concept="3Tqbb2" id="2xeYpNCxElK" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="6Kf5KB6Tovf" role="lGtFl">
-        <property role="NWlVz" value="Returns the simulation trace attached to this node." />
+      <node concept="P$JXv" id="1y75Pbzy1_4" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_2" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_3" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the simulation trace attached to this node." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2QUcAU24NRJ" role="jymVt" />
@@ -530,13 +563,21 @@
       </node>
       <node concept="3Tm1VV" id="2QUcAU24NW2" role="1B3o_S" />
       <node concept="3cqZAl" id="2QUcAU24O0o" role="3clF45" />
-      <node concept="NWlO9" id="2QUcAU24PeT" role="lGtFl">
-        <property role="NWlVz" value="Clears all simulation traces." />
+      <node concept="P$JXv" id="1y75Pbzy1_7" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_5" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_6" role="1dT_Ay">
+            <property role="1dT_AB" value="Clears all simulation traces." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="2xeYpNCxAqb" role="1B3o_S" />
-    <node concept="NWlO9" id="6Kf5KB6Toy6" role="lGtFl">
-      <property role="NWlVz" value="Registry of simulation traces." />
+    <node concept="3UR2Jj" id="1y75Pbzy1_a" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1_8" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1_9" role="1dT_Ay">
+          <property role="1dT_AB" value="Registry of simulation traces." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="3fsZMFLI1jW">
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/tools.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/tools.mps
index 427204f5b..b15963bef 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/tools.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/models/tools.mps
@@ -7,7 +7,7 @@
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
   </languages>
   <imports>
@@ -220,11 +220,6 @@
         <reference id="3175313036448544057" name="extensionPoint" index="Sf$Xr" />
       </concept>
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
-    </language>
     <language id="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" />
@@ -235,6 +230,7 @@
       <concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
         <property id="5858074156537516431" name="text" index="x79VB" />
       </concept>
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
       <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" />
@@ -254,6 +250,7 @@
       <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
         <property id="8970989240999019144" name="text" index="1dT_AB" />
       </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </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">
@@ -460,8 +457,12 @@
         <property role="3TUv4t" value="false" />
         <node concept="3Tm1VV" id="4$9c1ZxZIr1" role="1B3o_S" />
         <node concept="17QB3L" id="4$9c1ZxZKdM" role="1tU5fm" />
-        <node concept="NWlO9" id="4$9c1ZxZM4v" role="lGtFl">
-          <property role="NWlVz" value="Command which was ran to obtain this result." />
+        <node concept="z59LJ" id="1y75Pbzy1_d" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1_b" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1_c" role="1dT_Ay">
+              <property role="1dT_AB" value="Command which was ran to obtain this result." />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="4$9c1ZxZM4B" role="jymVt" />
@@ -923,8 +924,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="4$9c1ZykQTe" role="lGtFl">
-        <property role="NWlVz" value="Encapsulates the result of running CBMC." />
+      <node concept="3UR2Jj" id="1y75Pbzy1_g" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_e" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_f" role="1dT_Ay">
+            <property role="1dT_AB" value="Encapsulates the result of running CBMC." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4CtHBqNn$wW" role="jymVt" />
@@ -982,15 +987,19 @@
         <node concept="3Tm1VV" id="sEP8ohtFEn" role="1B3o_S" />
         <node concept="3clFbS" id="sEP8ohtFEo" role="3clF47" />
       </node>
-      <node concept="NWlO9" id="4CtTexwEVRQ" role="lGtFl">
-        <property role="NWlVz" value="Factory for creating ToolRunner objects." />
-      </node>
       <node concept="16euLQ" id="1CPQBcrdD5y" role="16eVyc">
         <property role="TrG5h" value="T" />
         <node concept="3uibUv" id="1CPQBcrdD7j" role="3ztrMU">
           <ref role="3uigEE" node="4CtHBqNlaPk" resolve="ToolRunner" />
         </node>
       </node>
+      <node concept="3UR2Jj" id="1y75Pbzy1_j" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_h" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_i" role="1dT_Ay">
+            <property role="1dT_AB" value="Factory for creating ToolRunner objects." />
+          </node>
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="494NBewV62B">
@@ -1008,8 +1017,12 @@
         <property role="3clFbU" value="true" />
       </node>
       <node concept="10P_77" id="1mocVhAC9ml" role="1tU5fm" />
-      <node concept="NWlO9" id="1mocVhACL3A" role="lGtFl">
-        <property role="NWlVz" value="Should we write debug infos?" />
+      <node concept="z59LJ" id="1y75Pbzy1_m" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_k" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_l" role="1dT_Ay">
+            <property role="1dT_AB" value="Should we write debug infos?" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1mocVhAC9Qd" role="jymVt" />
@@ -1021,8 +1034,12 @@
       <node concept="3Tm1VV" id="3_HSwtcw2V4" role="1B3o_S" />
       <node concept="3clFbT" id="3_HSwtcw2V5" role="33vP2m" />
       <node concept="10P_77" id="3_HSwtcw2V6" role="1tU5fm" />
-      <node concept="NWlO9" id="3_HSwtcw2V7" role="lGtFl">
-        <property role="NWlVz" value="Should we write the raw output?" />
+      <node concept="z59LJ" id="1y75Pbzy1_p" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_n" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_o" role="1dT_Ay">
+            <property role="1dT_AB" value="Should we write the raw output?" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3GkK2EESFDn" role="jymVt" />
@@ -1034,8 +1051,12 @@
       <node concept="Xl_RD" id="6ucyvMU$oGe" role="33vP2m">
         <property role="Xl_RC" value="ANALYZERS_DIR" />
       </node>
-      <node concept="NWlO9" id="6ucyvMU$CR6" role="lGtFl">
-        <property role="NWlVz" value="This is used on the build server to make explicit the location of executables such as nusmv, spin, ..." />
+      <node concept="z59LJ" id="1y75Pbzy1_s" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_q" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_r" role="1dT_Ay">
+            <property role="1dT_AB" value="This is used on the build server to make explicit the location of executables such as nusmv, spin, ..." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6ucyvMUJTj6" role="jymVt" />
@@ -1047,8 +1068,12 @@
       <node concept="3cmrfG" id="1XFitunRf7J" role="33vP2m">
         <property role="3cmrfH" value="-1" />
       </node>
-      <node concept="NWlO9" id="1mocVhACFzm" role="lGtFl">
-        <property role="NWlVz" value="Constant representing timeout that should be ignored." />
+      <node concept="z59LJ" id="1y75Pbzy1_v" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_t" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_u" role="1dT_Ay">
+            <property role="1dT_AB" value="Constant representing timeout that should be ignored." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1mocVhACsLO" role="jymVt" />
@@ -1056,8 +1081,12 @@
       <property role="TrG5h" value="toolBinaryName" />
       <node concept="3Tm6S6" id="2f0rWuL9sCa" role="1B3o_S" />
       <node concept="17QB3L" id="2f0rWuL9sCg" role="1tU5fm" />
-      <node concept="NWlO9" id="1mocVhACvbh" role="lGtFl">
-        <property role="NWlVz" value="The name of the binary of the program that will be started." />
+      <node concept="z59LJ" id="1y75Pbzy1_y" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_w" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_x" role="1dT_Ay">
+            <property role="1dT_AB" value="The name of the binary of the program that will be started." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1mocVhACwc4" role="jymVt" />
@@ -1068,8 +1097,12 @@
       <node concept="37vLTw" id="1ZsZb$iVXT2" role="33vP2m">
         <ref role="3cqZAo" node="1XFitunRf7A" resolve="IGNORE_TIMEOUT" />
       </node>
-      <node concept="NWlO9" id="1mocVhAC$yj" role="lGtFl">
-        <property role="NWlVz" value="The timeout in seconds." />
+      <node concept="z59LJ" id="1y75Pbzy1__" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_z" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_$" role="1dT_Ay">
+            <property role="1dT_AB" value="The timeout in seconds." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1mocVhACC1E" role="jymVt" />
@@ -1079,8 +1112,12 @@
         <ref role="3uigEE" to="xygl:~ProgressIndicator" resolve="ProgressIndicator" />
       </node>
       <node concept="3Tmbuc" id="5bdxpKkL_qm" role="1B3o_S" />
-      <node concept="NWlO9" id="1mocVhACO6E" role="lGtFl">
-        <property role="NWlVz" value="Progress indicator that tells when the user cancels the task." />
+      <node concept="z59LJ" id="1y75Pbzy1_C" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_A" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_B" role="1dT_Ay">
+            <property role="1dT_AB" value="Progress indicator that tells when the user cancels the task." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1mocVhACPw0" role="jymVt" />
@@ -1088,8 +1125,12 @@
       <property role="TrG5h" value="externalProcessFinished" />
       <node concept="3Tm6S6" id="6YINIHwdQwl" role="1B3o_S" />
       <node concept="10P_77" id="6YINIHwdQwr" role="1tU5fm" />
-      <node concept="NWlO9" id="1mocVhACRTA" role="lGtFl">
-        <property role="NWlVz" value="Has the external process finished?" />
+      <node concept="z59LJ" id="1y75Pbzy1_F" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_D" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_E" role="1dT_Ay">
+            <property role="1dT_AB" value="Has the external process finished?" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="54L4tspm9cm" role="jymVt" />
@@ -1135,8 +1176,12 @@
       <node concept="2AHcQZ" id="6h7pCb_YaK1" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="1mocVhAG0qp" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75Pbzy1_I" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_G" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_H" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5J7jTRjW5yu" role="jymVt" />
@@ -1814,8 +1859,12 @@
       <node concept="2AHcQZ" id="6h7pCb_XpLN" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="1mocVhAG2nl" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75Pbzy1_L" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_J" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_K" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="54L4tspkBQD" role="jymVt" />
@@ -2122,8 +2171,12 @@
       <node concept="3uibUv" id="7YBOkhBhwOW" role="Sfmx6">
         <ref role="3uigEE" to="guwi:~IOException" resolve="IOException" />
       </node>
-      <node concept="NWlO9" id="1mocVhAFYoI" role="lGtFl">
-        <property role="NWlVz" value="Runs the external program with certain arguments, on a set of files and in a certain directory." />
+      <node concept="P$JXv" id="1y75Pbzy1_O" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_M" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_N" role="1dT_Ay">
+            <property role="1dT_AB" value="Runs the external program with certain arguments, on a set of files and in a certain directory." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4$9c1ZxYQ5$" role="jymVt" />
@@ -2309,8 +2362,12 @@
       <node concept="_YKpA" id="4$9c1ZxYY8Z" role="3clF45">
         <node concept="17QB3L" id="4$9c1ZxYYiN" role="_ZDj9" />
       </node>
-      <node concept="NWlO9" id="4$9c1ZxZ47W" role="lGtFl">
-        <property role="NWlVz" value="Returns a list with the strings which when concatenated represent the command to be run." />
+      <node concept="P$JXv" id="1y75Pbzy1_R" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_P" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_Q" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns a list with the strings which when concatenated represent the command to be run." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="54L4tsplo3N" role="jymVt" />
@@ -2579,8 +2636,12 @@
       <node concept="3uibUv" id="44z3jezn1x_" role="Sfmx6">
         <ref role="3uigEE" to="guwi:~IOException" resolve="IOException" />
       </node>
-      <node concept="NWlO9" id="1mocVhAE3BR" role="lGtFl">
-        <property role="NWlVz" value="Kills the external process." />
+      <node concept="P$JXv" id="1y75Pbzy1_U" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_S" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_T" role="1dT_Ay">
+            <property role="1dT_AB" value="Kills the external process." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3_HSwtcz0yJ" role="jymVt" />
@@ -2608,8 +2669,12 @@
           <ref role="3uigEE" to="guwi:~InputStream" resolve="InputStream" />
         </node>
       </node>
-      <node concept="NWlO9" id="3i3mSh$ZuoD" role="lGtFl">
-        <property role="NWlVz" value="Factory method for stream reader." />
+      <node concept="P$JXv" id="1y75Pbzy1_X" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_V" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_W" role="1dT_Ay">
+            <property role="1dT_AB" value="Factory method for stream reader." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3i3mSh$ZjJe" role="jymVt" />
@@ -2666,10 +2731,14 @@
         <property role="TrG5h" value="s" />
         <node concept="17QB3L" id="42G5eOpPNkK" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="3_HSwtcz36o" role="lGtFl">
-        <property role="NWlVz" value="Debug." />
-      </node>
       <node concept="3Tm6S6" id="3_HSwtcG$Ia" role="1B3o_S" />
+      <node concept="P$JXv" id="1y75Pbzy1A0" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1_Y" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1_Z" role="1dT_Ay">
+            <property role="1dT_AB" value="Debug." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="62R55h2v3Tz" role="jymVt" />
     <node concept="312cEu" id="48zNdpj39bN" role="jymVt">
@@ -2686,8 +2755,12 @@
         <node concept="3uibUv" id="48zNdpj39bY" role="1tU5fm">
           <ref role="3uigEE" to="guwi:~InputStream" resolve="InputStream" />
         </node>
-        <node concept="NWlO9" id="1mocVhADYVG" role="lGtFl">
-          <property role="NWlVz" value="The input stream to be read." />
+        <node concept="z59LJ" id="1y75Pbzy1A3" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1A1" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1A2" role="1dT_Ay">
+              <property role="1dT_AB" value="The input stream to be read." />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="1mocVhADWSN" role="jymVt" />
@@ -2705,8 +2778,12 @@
             </node>
           </node>
         </node>
-        <node concept="NWlO9" id="1mocVhAE06B" role="lGtFl">
-          <property role="NWlVz" value="Read lines." />
+        <node concept="z59LJ" id="1y75Pbzy1A6" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1A4" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1A5" role="1dT_Ay">
+              <property role="1dT_AB" value="Read lines." />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="1mocVhADXLl" role="jymVt" />
@@ -2716,8 +2793,12 @@
         <node concept="3uibUv" id="48zNdpj3jQm" role="1tU5fm">
           <ref role="3uigEE" to="guwi:~IOException" resolve="IOException" />
         </node>
-        <node concept="NWlO9" id="1mocVhADZWZ" role="lGtFl">
-          <property role="NWlVz" value="Exception that is thrown while reading." />
+        <node concept="z59LJ" id="1y75Pbzy1A9" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1A7" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1A8" role="1dT_Ay">
+              <property role="1dT_AB" value="Exception that is thrown while reading." />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="62R55h2vmhi" role="jymVt" />
@@ -2742,8 +2823,12 @@
             <ref role="3uigEE" to="guwi:~InputStream" resolve="InputStream" />
           </node>
         </node>
-        <node concept="NWlO9" id="1mocVhADYDd" role="lGtFl">
-          <property role="NWlVz" value="Constructor." />
+        <node concept="P$JXv" id="1y75Pbzy1Ac" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1Aa" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1Ab" role="1dT_Ay">
+              <property role="1dT_AB" value="Constructor." />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="62R55h2vwKT" role="jymVt" />
@@ -2894,8 +2979,12 @@
           </node>
         </node>
         <node concept="3Tm1VV" id="48zNdpj3akV" role="1B3o_S" />
-        <node concept="NWlO9" id="1mocVhADZ7d" role="lGtFl">
-          <property role="NWlVz" value="{@inheritDoc}" />
+        <node concept="P$JXv" id="1y75Pbzy1Af" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1Ad" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1Ae" role="1dT_Ay">
+              <property role="1dT_AB" value="{@inheritDoc}" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="62R55h2vPih" role="jymVt" />
@@ -2930,12 +3019,20 @@
         <node concept="3uibUv" id="48zNdpj3jQl" role="Sfmx6">
           <ref role="3uigEE" to="guwi:~IOException" resolve="IOException" />
         </node>
-        <node concept="NWlO9" id="1mocVhAE0Xj" role="lGtFl">
-          <property role="NWlVz" value="Returns the read lines." />
+        <node concept="P$JXv" id="1y75Pbzy1Ai" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1Ag" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1Ah" role="1dT_Ay">
+              <property role="1dT_AB" value="Returns the read lines." />
+            </node>
+          </node>
         </node>
       </node>
-      <node concept="NWlO9" id="1mocVhADV7w" role="lGtFl">
-        <property role="NWlVz" value="Thread to read the output and error streams of a process." />
+      <node concept="3UR2Jj" id="1y75Pbzy1Al" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1Aj" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1Ak" role="1dT_Ay">
+            <property role="1dT_AB" value="Thread to read the output and error streams of a process." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="54L4tspl_np" role="jymVt" />
@@ -2952,8 +3049,12 @@
           <ref role="3cqZAo" node="1XFitunRf7A" resolve="IGNORE_TIMEOUT" />
         </node>
       </node>
-      <node concept="NWlO9" id="3VF7DCaOKL5" role="lGtFl">
-        <property role="NWlVz" value="Constant representing timeout that should be ignored." />
+      <node concept="z59LJ" id="1y75Pbzy1Ao" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1Am" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1An" role="1dT_Ay">
+            <property role="1dT_AB" value="Constant representing timeout that should be ignored." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3VF7DCaOWTF" role="jymVt" />
@@ -2969,8 +3070,12 @@
         <property role="TrG5h" value="elapsedMilliSeconds" />
         <node concept="3Tm6S6" id="1XFitunRf7N" role="1B3o_S" />
         <node concept="10Oyi0" id="3VF7DCaOGLw" role="1tU5fm" />
-        <node concept="NWlO9" id="1mocVhADtjQ" role="lGtFl">
-          <property role="NWlVz" value="How many milliseconds elapsed so far." />
+        <node concept="z59LJ" id="1y75Pbzy1Ar" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1Ap" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1Aq" role="1dT_Ay">
+              <property role="1dT_AB" value="How many milliseconds elapsed so far." />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="1mocVhADy5v" role="jymVt" />
@@ -2978,8 +3083,12 @@
         <property role="TrG5h" value="timeoutInMilliseconds" />
         <node concept="3Tm6S6" id="1XFitunRf8O" role="1B3o_S" />
         <node concept="10Oyi0" id="1XFitunRf8Q" role="1tU5fm" />
-        <node concept="NWlO9" id="1mocVhAD$vE" role="lGtFl">
-          <property role="NWlVz" value="Timeout in milliseconds for this process" />
+        <node concept="z59LJ" id="1y75Pbzy1Au" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1As" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1At" role="1dT_Ay">
+              <property role="1dT_AB" value="Timeout in milliseconds for this process" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="1d23YaEslBT" role="jymVt" />
@@ -3010,8 +3119,12 @@
           <property role="TrG5h" value="timeoutInSeconds" />
           <node concept="10Oyi0" id="1XFitunRf8M" role="1tU5fm" />
         </node>
-        <node concept="NWlO9" id="1mocVhADEoi" role="lGtFl">
-          <property role="NWlVz" value="Constructor" />
+        <node concept="P$JXv" id="1y75Pbzy1Ax" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1Av" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1Aw" role="1dT_Ay">
+              <property role="1dT_AB" value="Constructor" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="1d23YaEsl_c" role="jymVt" />
@@ -3127,8 +3240,12 @@
           </node>
         </node>
         <node concept="3Tm1VV" id="5bdxpKkKYGz" role="1B3o_S" />
-        <node concept="NWlO9" id="1mocVhADEA9" role="lGtFl">
-          <property role="NWlVz" value="{@inheritDoc}" />
+        <node concept="P$JXv" id="1y75Pbzy1A$" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1Ay" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1Az" role="1dT_Ay">
+              <property role="1dT_AB" value="{@inheritDoc}" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="1d23YaEslOr" role="jymVt" />
@@ -3158,12 +3275,20 @@
             </node>
           </node>
         </node>
-        <node concept="NWlO9" id="1mocVhADBxY" role="lGtFl">
-          <property role="NWlVz" value="Returns true if the elapsed time is too big and if we should case about timeouts." />
+        <node concept="P$JXv" id="1y75Pbzy1AB" role="lGtFl">
+          <node concept="TZ5HA" id="1y75Pbzy1A_" role="TZ5H$">
+            <node concept="1dT_AC" id="1y75Pbzy1AA" role="1dT_Ay">
+              <property role="1dT_AB" value="Returns true if the elapsed time is too big and if we should case about timeouts." />
+            </node>
+          </node>
         </node>
       </node>
-      <node concept="NWlO9" id="1mocVhADGV_" role="lGtFl">
-        <property role="NWlVz" value="A thread that monitors the cancel of the users. If cancel is pressed, then the external process is killed." />
+      <node concept="3UR2Jj" id="1y75Pbzy1AE" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1AC" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1AD" role="1dT_Ay">
+            <property role="1dT_AB" value="A thread that monitors the cancel of the users. If cancel is pressed, then the external process is killed." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="54L4tsplLRF" role="jymVt" />
@@ -3193,8 +3318,12 @@
         <property role="TrG5h" value="timeoutInSeconds" />
         <node concept="10Oyi0" id="4CtHBqN535N" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="1mocVhADQWV" role="lGtFl">
-        <property role="NWlVz" value="Sets the timeout in seconds." />
+      <node concept="P$JXv" id="1y75Pbzy1AH" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1AF" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1AG" role="1dT_Ay">
+            <property role="1dT_AB" value="Sets the timeout in seconds." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4CtHBqN5bK_" role="jymVt" />
@@ -3215,8 +3344,12 @@
       </node>
       <node concept="3Tm1VV" id="47vCOSht5_j" role="1B3o_S" />
       <node concept="10Oyi0" id="47vCOShtc0D" role="3clF45" />
-      <node concept="NWlO9" id="47vCOSht5_n" role="lGtFl">
-        <property role="NWlVz" value="Returns the timeout in seconds." />
+      <node concept="P$JXv" id="1y75Pbzy1AK" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1AI" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1AJ" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the timeout in seconds." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="47vCOSht3jl" role="jymVt" />
@@ -3236,8 +3369,12 @@
       <node concept="3uibUv" id="5uqRFp9pzuE" role="3clF45">
         <ref role="3uigEE" to="xygl:~ProgressIndicator" resolve="ProgressIndicator" />
       </node>
-      <node concept="NWlO9" id="5uqRFp9pE8W" role="lGtFl">
-        <property role="NWlVz" value="Returns the progress indicator used by this runner." />
+      <node concept="P$JXv" id="1y75Pbzy1AN" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1AL" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1AM" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the progress indicator used by this runner." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5uqRFp9pus_" role="jymVt" />
@@ -3269,16 +3406,24 @@
           <ref role="3uigEE" to="xygl:~ProgressIndicator" resolve="ProgressIndicator" />
         </node>
       </node>
-      <node concept="NWlO9" id="1mocVhADSTM" role="lGtFl">
-        <property role="NWlVz" value="Sets the progress indicator (used for getting the cancel from users)." />
+      <node concept="P$JXv" id="1y75Pbzy1AQ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1AO" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1AP" role="1dT_Ay">
+            <property role="1dT_AB" value="Sets the progress indicator (used for getting the cancel from users)." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1mocVhAClR1" role="jymVt" />
     <node concept="3uibUv" id="4CtHBqNlkip" role="EKbjA">
       <ref role="3uigEE" node="4CtHBqNlaPk" resolve="ToolRunner" />
     </node>
-    <node concept="NWlO9" id="1mocVhACdfi" role="lGtFl">
-      <property role="NWlVz" value="Base class for running external tools." />
+    <node concept="3UR2Jj" id="1y75Pbzy1AT" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1AR" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1AS" role="1dT_Ay">
+          <property role="1dT_AB" value="Base class for running external tools." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="3HP615" id="7GloF9XTgpa">
@@ -3289,8 +3434,12 @@
       <node concept="17QB3L" id="7GloF9XTkEm" role="3clF45" />
       <node concept="3Tm1VV" id="7GloF9XTkEn" role="1B3o_S" />
       <node concept="3clFbS" id="7GloF9XTkEo" role="3clF47" />
-      <node concept="NWlO9" id="7GloF9XTkEp" role="lGtFl">
-        <property role="NWlVz" value="Returns the name of the category of tools that this checker checks (e.g. cbmc)." />
+      <node concept="P$JXv" id="1y75Pbzy1AW" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1AU" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1AV" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the name of the category of tools that this checker checks (e.g. cbmc)." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7GloF9XTkDD" role="jymVt" />
@@ -3299,21 +3448,29 @@
       <node concept="10P_77" id="7Quig7_Pqgw" role="3clF45" />
       <node concept="3Tm1VV" id="7GloF9XTgFb" role="1B3o_S" />
       <node concept="3clFbS" id="7GloF9XTgFc" role="3clF47" />
-      <node concept="NWlO9" id="7GloF9XTgG3" role="lGtFl">
-        <property role="NWlVz" value="Returns a string with the result of the availability check." />
-      </node>
       <node concept="37vLTG" id="7Quig7_PqcO" role="3clF46">
         <property role="TrG5h" value="messages" />
         <node concept="_YKpA" id="7Quig7_PqcM" role="1tU5fm">
           <node concept="17QB3L" id="7Quig7_Pqe2" role="_ZDj9" />
         </node>
       </node>
+      <node concept="P$JXv" id="1y75Pbzy1AZ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1AX" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1AY" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns a string with the result of the availability check." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="3Tm1VV" id="7GloF9XTgpb" role="1B3o_S" />
-    <node concept="NWlO9" id="7GloF9XTgEJ" role="lGtFl">
-      <property role="NWlVz" value="Interface to check the availability of external tools and their proper configuration." />
-    </node>
     <node concept="2tJIrI" id="7GloF9XTpff" role="jymVt" />
+    <node concept="3UR2Jj" id="1y75Pbzy1B2" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1B0" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1B1" role="1dT_Ay">
+          <property role="1dT_AB" value="Interface to check the availability of external tools and their proper configuration." />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="7GloF9XTmYK">
     <property role="TrG5h" value="ToolsInstallationSanityChecker" />
@@ -3442,13 +3599,21 @@
           <node concept="17QB3L" id="7Quig7_Qpj5" role="_ZDj9" />
         </node>
       </node>
-      <node concept="NWlO9" id="7Quig7_UmZE" role="lGtFl">
-        <property role="NWlVz" value="Performs the check." />
+      <node concept="P$JXv" id="1y75Pbzy1B5" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1B3" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1B4" role="1dT_Ay">
+            <property role="1dT_AB" value="Performs the check." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="7GloF9XTmYL" role="1B3o_S" />
-    <node concept="NWlO9" id="7GloF9XTmZS" role="lGtFl">
-      <property role="NWlVz" value="Checks the sanity of external tools installation" />
+    <node concept="3UR2Jj" id="1y75Pbzy1B8" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1B6" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1B7" role="1dT_Ay">
+          <property role="1dT_AB" value="Checks the sanity of external tools installation" />
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps
index 84c997380..f403b9240 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps
@@ -528,6 +528,9 @@
       <node concept="m$_yC" id="26E6nZcE6W2" role="m$_yJ">
         <ref role="m$_y1" node="7he_lUumEw2" resolve="com.mpsbasics" />
       </node>
+      <node concept="m$_yC" id="1y75Pbzmr$k" role="m$_yJ">
+        <ref role="m$_y1" to="al5i:5fGcQI8WTaQ" resolve="com.mbeddr.mpsutil.smodule" />
+      </node>
       <node concept="m$_yC" id="26E6nZcE8uD" role="m$_yJ">
         <ref role="m$_y1" to="al5i:$bJ0jguQdg" resolve="com.mbeddr.platform" />
       </node>
@@ -752,11 +755,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="4ziKDEng_E5" role="3bR37C">
-          <node concept="3bR9La" id="4ziKDEng_E6" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4ziKDEng_E7" role="3bR37C">
           <node concept="3bR9La" id="4ziKDEng_E8" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
@@ -825,25 +823,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="rrK$a3QmdT" role="3bR37C">
-          <node concept="1BurEX" id="rrK$a3QmdU" role="1SiIV1">
-            <node concept="398BVA" id="rrK$a3QmdG" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="rrK$a3QmdH" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="rrK$a3QmdI" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.lib" />
-                  <node concept="2Ry0Ak" id="rrK$a3QmdJ" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="rrK$a3QmdK" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-diffx-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="rrK$a3Qme8" role="3bR37C">
           <node concept="1BurEX" id="rrK$a3Qme9" role="1SiIV1">
             <node concept="398BVA" id="rrK$a3QmdV" role="1BurEY">
@@ -1536,6 +1515,65 @@
           </node>
         </node>
       </node>
+      <node concept="1E1JtA" id="1y75PbzmpKi" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="com.mpsbasics.project.utils" />
+        <property role="3LESm3" value="1f4710e9-f074-4732-a0bd-6fa896d282b7" />
+        <node concept="398BVA" id="1y75PbzmpXK" role="3LF7KH">
+          <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
+          <node concept="2Ry0Ak" id="1y75PbzmpXL" role="iGT6I">
+            <property role="2Ry0Am" value="solutions" />
+            <node concept="2Ry0Ak" id="1y75Pbzmqno" role="2Ry0An">
+              <property role="2Ry0Am" value="com.mpsbasics.project.utils" />
+              <node concept="2Ry0Ak" id="1y75PbzmqCt" role="2Ry0An">
+                <property role="2Ry0Am" value="com.mpsbasics.project.utils.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1y75PbzmqSd" role="3bR37C">
+          <node concept="3bR9La" id="1y75PbzmqSe" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1y75PbzmqSf" role="3bR37C">
+          <node concept="3bR9La" id="1y75PbzmqSg" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1y75PbzmqSh" role="3bR37C">
+          <node concept="3bR9La" id="1y75PbzmqSi" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="1y75PbzmqSj" role="3bR37C">
+          <node concept="3bR9La" id="1y75PbzmqSk" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
+        <node concept="1BupzO" id="1y75PbzmqSw" role="3bR31x">
+          <property role="3ZfqAx" value="models" />
+          <property role="1Hdu6h" value="true" />
+          <property role="1HemKv" value="true" />
+          <node concept="3LXTmp" id="1y75PbzmqSx" role="1HemKq">
+            <node concept="398BVA" id="1y75PbzmqSl" role="3LXTmr">
+              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
+              <node concept="2Ry0Ak" id="1y75PbzmqSm" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="1y75PbzmqSn" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mpsbasics.project.utils" />
+                  <node concept="2Ry0Ak" id="1y75PbzmqSo" role="2Ry0An">
+                    <property role="2Ry0Am" value="models" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3qWCbU" id="1y75PbzmqSy" role="3LXTna">
+              <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2G$12M" id="42jqVeFkUv2" role="3989C9">
       <property role="TrG5h" value="com.mbeddr.formal.nusmv" />
@@ -1691,6 +1729,11 @@
             <ref role="3bR37D" node="6hyv0iVPlFJ" resolve="com.mpsbasics.snode.utils" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1y75Pbzmri4" role="3bR37C">
+          <node concept="3bR9La" id="1y75Pbzmri5" role="1SiIV1">
+            <ref role="3bR37D" node="1y75PbzmpKi" resolve="com.mpsbasics.project.utils" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="42jqVeFkUub" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -4358,6 +4401,11 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbJt" resolve="jetbrains.mps.ide.platform" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1y75PbzmoNi" role="3bR37C">
+          <node concept="3bR9La" id="1y75PbzmoNj" role="1SiIV1">
+            <ref role="3bR37D" to="al5i:lse_ua97Px" resolve="com.mbeddr.mpsutil.smodule.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="1V$lRyiUHLD" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -5035,16 +5083,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="4G23_lMx9Sk" role="3bR37C">
-          <node concept="3bR9La" id="4G23_lMx9Sl" role="1SiIV1">
-            <ref role="3bR37D" node="42jqVeFkUuP" resolve="com.mbeddr.formal.base.tooling" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4G23_lMx9Sm" role="3bR37C">
-          <node concept="3bR9La" id="4G23_lMx9Sn" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4G23_lMx9So" role="3bR37C">
           <node concept="3bR9La" id="4G23_lMx9Sp" role="1SiIV1">
             <ref role="3bR37D" node="6glUKoNR9Tl" resolve="com.mbeddr.formal.nusmv.source" />
@@ -5055,26 +5093,11 @@
             <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
           </node>
         </node>
-        <node concept="1SiIV0" id="4G23_lMx9Ss" role="3bR37C">
-          <node concept="3bR9La" id="4G23_lMx9St" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4G23_lMx9Su" role="3bR37C">
           <node concept="3bR9La" id="4G23_lMx9Sv" role="1SiIV1">
             <ref role="3bR37D" node="1V$lRyiUHLD" resolve="com.mbeddr.formal.nusmv.pluginSolution" />
           </node>
         </node>
-        <node concept="1SiIV0" id="4G23_lMx9Sw" role="3bR37C">
-          <node concept="3bR9La" id="4G23_lMx9Sx" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="4G23_lMx9Sy" role="3bR37C">
-          <node concept="3bR9La" id="4G23_lMx9Sz" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4G23_lMx9S$" role="3bR37C">
           <node concept="3bR9La" id="4G23_lMx9S_" role="1SiIV1">
             <ref role="3bR37D" node="6adXBxxUwrY" resolve="com.mbeddr.formal.base.pluginSolution" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/com.mbeddr.formal.nusmv.cbd.pluginSolution.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/com.mbeddr.formal.nusmv.cbd.pluginSolution.msd
index 9f0d188f8..985a0607e 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/com.mbeddr.formal.nusmv.cbd.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/com.mbeddr.formal.nusmv.cbd.pluginSolution.msd
@@ -27,11 +27,12 @@
   </dependencies>
   <languageVersions>
     <language slang="l:56e5a668-082e-4be5-801a-e7bae425ee68:com.mbeddr.formal.nusmv.ag.flatten" version="0" />
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <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" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/models/analyzer.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/models/analyzer.mps
index 117759c94..9d5adc48c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/models/analyzer.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/models/analyzer.mps
@@ -5,10 +5,11 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
@@ -238,9 +239,6 @@
     </language>
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
       <concept id="6451706574537082687" name="com.mbeddr.mpsutil.blutil.structure.ShortStaticMethodCall" flags="ng" index="NRdvd" />
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
       <concept id="5753587520027641499" name="com.mbeddr.mpsutil.blutil.structure.SafeReadAction" flags="ng" index="3kxDZ6">
         <child id="1423104411234567454" name="repo" index="ukAjM" />
         <child id="5753587520027644759" name="body" index="3kxCCa" />
@@ -265,6 +263,20 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="6332851714983831325" name="jetbrains.mps.baseLanguage.logging.structure.MsgStatement" flags="ng" index="2xdQw9">
         <property id="6332851714983843871" name="severity" index="2xdLsb" />
@@ -397,8 +409,12 @@
       <node concept="3uibUv" id="1wu5Hv6f_vi" role="1tU5fm">
         <ref role="3uigEE" to="2ocj:5A94f9EE$RB" resolve="MPSToolAdapter" />
       </node>
-      <node concept="NWlO9" id="5uY69zuQO8o" role="lGtFl">
-        <property role="NWlVz" value="Tool adapter." />
+      <node concept="z59LJ" id="1y75Pbzy7UY" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7UW" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7UX" role="1dT_Ay">
+            <property role="1dT_AB" value="Tool adapter." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1U03KaUJfh8" role="jymVt" />
@@ -409,8 +425,12 @@
       <node concept="3uibUv" id="vbJ3AuJmr8" role="1tU5fm">
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
-      <node concept="NWlO9" id="5KHBa6l32_L" role="lGtFl">
-        <property role="NWlVz" value="Model repository." />
+      <node concept="z59LJ" id="1y75Pbzy7V1" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7UZ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7V0" role="1dT_Ay">
+            <property role="1dT_AB" value="Model repository." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7mSH3Wn59zF" role="jymVt" />
@@ -422,10 +442,14 @@
       <node concept="3Tqbb2" id="7mSH3Wn59RV" role="1tU5fm">
         <ref role="ehGHo" to="3whv:7RhjhI7$lgU" resolve="ComponentAssembly" />
       </node>
-      <node concept="NWlO9" id="7mSH3Wn5a7t" role="lGtFl">
-        <property role="NWlVz" value="Analyzed module" />
-      </node>
       <node concept="3Tmbuc" id="7mSH3Wn5aeP" role="1B3o_S" />
+      <node concept="z59LJ" id="1y75Pbzy7V4" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7V2" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7V3" role="1dT_Ay">
+            <property role="1dT_AB" value="Analyzed module" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="7mSH3Wn48hB" role="jymVt" />
     <node concept="3clFbW" id="7mSH3Wn4kz0" role="jymVt">
@@ -490,8 +514,12 @@
           <ref role="ehGHo" to="3whv:7RhjhI7$lgU" resolve="ComponentAssembly" />
         </node>
       </node>
-      <node concept="NWlO9" id="7mSH3Wn4kQP" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75Pbzy7V7" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7V5" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7V6" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7mSH3Wn4mtk" role="jymVt" />
@@ -535,8 +563,12 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="NWlO9" id="7mSH3Wn5b_$" role="lGtFl">
-      <property role="NWlVz" value="Factory for NuSMV-based AG analyses." />
+    <node concept="3UR2Jj" id="1y75Pbzy7Va" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy7V8" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy7V9" role="1dT_Ay">
+          <property role="1dT_AB" value="Factory for NuSMV-based AG analyses." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="7mSH3Wn48yg">
@@ -552,8 +584,12 @@
       <node concept="3Tqbb2" id="7mSH3Wn4A1N" role="1tU5fm">
         <ref role="ehGHo" to="3whv:7RhjhI7$lgU" resolve="ComponentAssembly" />
       </node>
-      <node concept="NWlO9" id="7mSH3Wn4AI8" role="lGtFl">
-        <property role="NWlVz" value="Component-assembly node which will be analyzed." />
+      <node concept="z59LJ" id="1y75Pbzy7Vd" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7Vb" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7Vc" role="1dT_Ay">
+            <property role="1dT_AB" value="Component-assembly node which will be analyzed." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7mSH3Wn4Axz" role="jymVt" />
@@ -608,8 +644,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="7mSH3Wn48YV" role="1B3o_S" />
-      <node concept="NWlO9" id="7mSH3Wn4q8z" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75Pbzy7Vg" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7Ve" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7Vf" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7mSH3Wn492i" role="jymVt" />
@@ -1110,12 +1150,16 @@
     </node>
     <node concept="2tJIrI" id="1ZsZb$iSKc9" role="jymVt" />
     <node concept="2tJIrI" id="1NcemxVIyJn" role="jymVt" />
-    <node concept="NWlO9" id="7mSH3Wn4pYv" role="lGtFl">
-      <property role="NWlVz" value="Analyzer for running NuSMV to check Assume/Guarantees." />
-    </node>
     <node concept="3uibUv" id="1ZsZb$iRrnf" role="1zkMxy">
       <ref role="3uigEE" to="4c75:1ZsZb$iRm$D" resolve="NuSMVAnalyzerBase" />
     </node>
+    <node concept="3UR2Jj" id="1y75Pbzy7Vj" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy7Vh" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy7Vi" role="1dT_Ay">
+          <property role="1dT_AB" value="Analyzer for running NuSMV to check Assume/Guarantees." />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="1EKbsQQY5wF">
     <property role="TrG5h" value="AGResultsLifter" />
@@ -1131,8 +1175,12 @@
         <property role="Xl_RC" value="all contracts passed the BMC with given depth" />
       </node>
       <node concept="3Tm1VV" id="6xNJt7lCCFU" role="1B3o_S" />
-      <node concept="NWlO9" id="6xNJt7lCVv4" role="lGtFl">
-        <property role="NWlVz" value="Message that all contracts were verified successfully by BMC." />
+      <node concept="z59LJ" id="1y75Pbzy7Vm" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7Vk" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7Vl" role="1dT_Ay">
+            <property role="1dT_AB" value="Message that all contracts were verified successfully by BMC." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4gtLUSMIqW_" role="jymVt" />
@@ -1146,8 +1194,12 @@
         <property role="Xl_RC" value="no contracts found" />
       </node>
       <node concept="3Tm1VV" id="4gtLUSMIpQb" role="1B3o_S" />
-      <node concept="NWlO9" id="4gtLUSMIpQc" role="lGtFl">
-        <property role="NWlVz" value="Message that no contracts were found." />
+      <node concept="z59LJ" id="1y75Pbzy7Vp" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7Vn" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7Vo" role="1dT_Ay">
+            <property role="1dT_AB" value="Message that no contracts were found." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1EKbsQQY5zf" role="jymVt" />
@@ -2004,8 +2056,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="1EKbsQQYHDp" role="1B3o_S" />
-      <node concept="NWlO9" id="1EKbsQQYKu7" role="lGtFl">
-        <property role="NWlVz" value="Lifts a list of results from &quot;general NuSMV results&quot; to AG specific results." />
+      <node concept="P$JXv" id="1y75Pbzy7Vs" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7Vq" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7Vr" role="1dT_Ay">
+            <property role="1dT_AB" value="Lifts a list of results from &quot;general NuSMV results&quot; to AG specific results." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1EKbsQQY5zi" role="jymVt" />
@@ -2477,8 +2533,12 @@
         <ref role="ehGHo" to="3whv:7RhjhI7zUWm" resolve="Port" />
       </node>
       <node concept="3Tm6S6" id="1EKbsQQYW3i" role="1B3o_S" />
-      <node concept="NWlO9" id="1EKbsQRavXz" role="lGtFl">
-        <property role="NWlVz" value="Returns a port represented by this fully qualified name." />
+      <node concept="P$JXv" id="1y75Pbzy7Vv" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7Vt" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7Vu" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns a port represented by this fully qualified name." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1EKbsQQZK6A" role="jymVt" />
@@ -2848,8 +2908,12 @@
         <ref role="ehGHo" to="3whv:7RhjhI7$lgV" resolve="Connection" />
       </node>
       <node concept="3Tm6S6" id="1EKbsQRbjmo" role="1B3o_S" />
-      <node concept="NWlO9" id="1EKbsQRbjmp" role="lGtFl">
-        <property role="NWlVz" value="Returns a connection which starts from this port and instance" />
+      <node concept="P$JXv" id="1y75Pbzy7Vy" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7Vw" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7Vx" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns a connection which starts from this port and instance" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1EKbsQRblQ9" role="jymVt" />
@@ -3739,8 +3803,12 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="1EKbsQQY5wG" role="1B3o_S" />
-    <node concept="NWlO9" id="1EKbsQQYLgb" role="lGtFl">
-      <property role="NWlVz" value="Lifter of NuSMV results to AG results." />
+    <node concept="3UR2Jj" id="1y75Pbzy7V_" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy7Vz" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy7V$" role="1dT_Ay">
+          <property role="1dT_AB" value="Lifter of NuSMV results to AG results." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="1EKbsQRa7_e">
@@ -3750,9 +3818,6 @@
     <node concept="3uibUv" id="1EKbsQRa7FN" role="1zkMxy">
       <ref role="3uigEE" to="mc3u:3fsZMFLI1jW" resolve="SimulationStepPerformerBase" />
     </node>
-    <node concept="NWlO9" id="1EKbsQRa7Gt" role="lGtFl">
-      <property role="NWlVz" value="Simulation performer for CBD." />
-    </node>
     <node concept="2tJIrI" id="1EKbsQRa7GJ" role="jymVt" />
     <node concept="Wx3nA" id="3fsZMFLIy84" role="jymVt">
       <property role="2dlcS1" value="false" />
@@ -3768,8 +3833,12 @@
           <ref role="HV5vE" node="1EKbsQRa7_e" resolve="CBDSimulationStepPerformer" />
         </node>
       </node>
-      <node concept="NWlO9" id="3fsZMFLIAdE" role="lGtFl">
-        <property role="NWlVz" value="Unique instance." />
+      <node concept="z59LJ" id="1y75Pbzy7VF" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7VD" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7VE" role="1dT_Ay">
+            <property role="1dT_AB" value="Unique instance." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1EKbsQRadWo" role="jymVt" />
@@ -3848,6 +3917,13 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="3UR2Jj" id="1y75Pbzy7VC" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy7VA" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy7VB" role="1dT_Ay">
+          <property role="1dT_AB" value="Simulation performer for CBD." />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="2l5A0OFaLuL">
     <property role="TrG5h" value="RefinementAnalyzer" />
@@ -3862,8 +3938,12 @@
       <node concept="3Tqbb2" id="2l5A0OFaLuP" role="1tU5fm">
         <ref role="ehGHo" to="vzqj:2l5A0OF7cwg" resolve="Refine" />
       </node>
-      <node concept="NWlO9" id="2l5A0OFaLuQ" role="lGtFl">
-        <property role="NWlVz" value="Refinement node which will be analyzed." />
+      <node concept="z59LJ" id="1y75Pbzy7VI" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7VG" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7VH" role="1dT_Ay">
+            <property role="1dT_AB" value="Refinement node which will be analyzed." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2l5A0OFaLuR" role="jymVt" />
@@ -3918,8 +3998,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="2l5A0OFaLvb" role="1B3o_S" />
-      <node concept="NWlO9" id="2l5A0OFaLvc" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75Pbzy7VL" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7VJ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7VK" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2l5A0OFaLvd" role="jymVt" />
@@ -4344,12 +4428,16 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="NWlO9" id="2l5A0OFaLwV" role="lGtFl">
-      <property role="NWlVz" value="Analyzer for running NuSMV to check the refinement between a ComponentInterface and Module implmenting it." />
-    </node>
     <node concept="3uibUv" id="2l5A0OFaLwW" role="1zkMxy">
       <ref role="3uigEE" to="4c75:1ZsZb$iRm$D" resolve="NuSMVAnalyzerBase" />
     </node>
+    <node concept="3UR2Jj" id="1y75Pbzy7VO" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy7VM" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy7VN" role="1dT_Ay">
+          <property role="1dT_AB" value="Analyzer for running NuSMV to check the refinement between a ComponentInterface and Module implmenting it." />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="2l5A0OFb7t7">
     <property role="TrG5h" value="RefinementAnalyzerFactory" />
@@ -4366,8 +4454,12 @@
       <node concept="3uibUv" id="2l5A0OFb7td" role="1tU5fm">
         <ref role="3uigEE" to="2ocj:5A94f9EE$RB" resolve="MPSToolAdapter" />
       </node>
-      <node concept="NWlO9" id="2l5A0OFb7te" role="lGtFl">
-        <property role="NWlVz" value="Tool adapter." />
+      <node concept="z59LJ" id="1y75Pbzy7VR" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7VP" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7VQ" role="1dT_Ay">
+            <property role="1dT_AB" value="Tool adapter." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2l5A0OFb7tf" role="jymVt" />
@@ -4378,8 +4470,12 @@
       <node concept="3uibUv" id="2l5A0OFb7ti" role="1tU5fm">
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
-      <node concept="NWlO9" id="2l5A0OFb7tj" role="lGtFl">
-        <property role="NWlVz" value="Model repository." />
+      <node concept="z59LJ" id="1y75Pbzy7VU" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7VS" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7VT" role="1dT_Ay">
+            <property role="1dT_AB" value="Model repository." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2l5A0OFb7tk" role="jymVt" />
@@ -4391,10 +4487,14 @@
       <node concept="3Tqbb2" id="2l5A0OFb7tm" role="1tU5fm">
         <ref role="ehGHo" to="vzqj:2l5A0OF7cwg" resolve="Refine" />
       </node>
-      <node concept="NWlO9" id="2l5A0OFb7tn" role="lGtFl">
-        <property role="NWlVz" value="Analyzed refinement." />
-      </node>
       <node concept="3Tmbuc" id="2l5A0OFb7to" role="1B3o_S" />
+      <node concept="z59LJ" id="1y75Pbzy7VX" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7VV" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7VW" role="1dT_Ay">
+            <property role="1dT_AB" value="Analyzed refinement." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="2l5A0OFb7tp" role="jymVt" />
     <node concept="3clFbW" id="2l5A0OFb7tq" role="jymVt">
@@ -4459,8 +4559,12 @@
           <ref role="ehGHo" to="vzqj:2l5A0OF7cwg" resolve="Refine" />
         </node>
       </node>
-      <node concept="NWlO9" id="2l5A0OFb7tQ" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75Pbzy7W0" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy7VY" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy7VZ" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2l5A0OFb7tR" role="jymVt" />
@@ -4504,8 +4608,12 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="NWlO9" id="2l5A0OFb7u6" role="lGtFl">
-      <property role="NWlVz" value="Factory for NuSMV-based analyses of the refinement of component-interfaces and NuSMV modules." />
+    <node concept="3UR2Jj" id="1y75Pbzy7W3" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy7W1" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy7W2" role="1dT_Ay">
+          <property role="1dT_AB" value="Factory for NuSMV-based analyses of the refinement of component-interfaces and NuSMV modules." />
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/com.mbeddr.formal.nusmv.importer.rt.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/com.mbeddr.formal.nusmv.importer.rt.msd
index c1be23614..5c912ad48 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/com.mbeddr.formal.nusmv.importer.rt.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/com.mbeddr.formal.nusmv.importer.rt.msd
@@ -36,7 +36,7 @@
     <dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/models/importer.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/models/importer.mps
index 55ade18d5..3f11490df 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/models/importer.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/models/importer.mps
@@ -7,7 +7,7 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
   </languages>
   <imports>
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/com.mbeddr.formal.nusmv.pluginSolution.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/com.mbeddr.formal.nusmv.pluginSolution.msd
index 3a27fa137..d374f7f90 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/com.mbeddr.formal.nusmv.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/com.mbeddr.formal.nusmv.pluginSolution.msd
@@ -33,12 +33,13 @@
     <dependency reexport="false">81f6a079-965e-4523-87c3-8e6194f66585(com.fasten.base.msc)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:1fc20ffe-f35b-4791-a0b7-d706bad5c49a:com.mbeddr.mpsutil.refactoring" 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" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/plugin.mps
index 6ba9d9b19..2d60c4efa 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/plugin.mps
@@ -8,10 +8,11 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="1fc20ffe-f35b-4791-a0b7-d706bad5c49a" name="com.mbeddr.mpsutil.refactoring" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="gioj" ref="r:a6dee7e9-c79f-4293-b631-7c366a8877df(com.mbeddr.formal.nusmv.structure)" />
@@ -272,17 +273,24 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
-    </language>
     <language id="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="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="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="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
       <concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
       <concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
@@ -819,8 +827,12 @@
           <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
         </node>
       </node>
-      <node concept="NWlO9" id="7mSH3Wn5wlT" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycQf" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQd" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQe" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7mSH3Wn5rMM" role="jymVt" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/runner.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/runner.mps
index 714c7e8d3..b18f3296f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/runner.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/runner.mps
@@ -4,12 +4,13 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="xygl" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.progress(MPS.IDEA/)" />
@@ -269,9 +270,6 @@
     </language>
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
       <concept id="6451706574537082687" name="com.mbeddr.mpsutil.blutil.structure.ShortStaticMethodCall" flags="ng" index="NRdvd" />
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
       <concept id="5753587520027641499" name="com.mbeddr.mpsutil.blutil.structure.SafeReadAction" flags="ng" index="3kxDZ6">
         <child id="1423104411234567454" name="repo" index="ukAjM" />
         <child id="5753587520027644759" name="body" index="3kxCCa" />
@@ -283,6 +281,20 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="6332851714983831325" name="jetbrains.mps.baseLanguage.logging.structure.MsgStatement" flags="ng" index="2xdQw9">
         <property id="6332851714983843871" name="severity" index="2xdLsb" />
@@ -480,8 +492,12 @@
           <ref role="3uigEE" to="xygl:~ProgressIndicator" resolve="ProgressIndicator" />
         </node>
       </node>
-      <node concept="NWlO9" id="6mm$FLYTze$" role="lGtFl">
-        <property role="NWlVz" value="Runs NuSMV on a given file." />
+      <node concept="P$JXv" id="1y75PbzycQi" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQg" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQh" role="1dT_Ay">
+            <property role="1dT_AB" value="Runs NuSMV on a given file." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4Hts7PYtYdS" role="jymVt" />
@@ -584,8 +600,12 @@
         <property role="TrG5h" value="bmcLen" />
         <node concept="10Oyi0" id="4Hts7PYuaDk" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="4Hts7PYua5y" role="lGtFl">
-        <property role="NWlVz" value="Runs NuSMV on a given file." />
+      <node concept="P$JXv" id="1y75PbzycQl" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQj" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQk" role="1dT_Ay">
+            <property role="1dT_AB" value="Runs NuSMV on a given file." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4Hts7PYu9HU" role="jymVt" />
@@ -752,8 +772,12 @@
           <node concept="17QB3L" id="4Hts7PYu1UB" role="_ZDj9" />
         </node>
       </node>
-      <node concept="NWlO9" id="4Hts7PYtZ_O" role="lGtFl">
-        <property role="NWlVz" value="Runs NuSMV on a given file and with additional arguments." />
+      <node concept="P$JXv" id="1y75PbzycQo" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQm" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQn" role="1dT_Ay">
+            <property role="1dT_AB" value="Runs NuSMV on a given file and with additional arguments." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="HmUOIG_52U" role="jymVt" />
@@ -978,8 +1002,12 @@
         <property role="TrG5h" value="stepsNumber" />
         <node concept="10Oyi0" id="2xeYpNCf9Iu" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="2xeYpNCeuGA" role="lGtFl">
-        <property role="NWlVz" value="Runs NuSMV to simulate a given file." />
+      <node concept="P$JXv" id="1y75PbzycQr" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQp" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQq" role="1dT_Ay">
+            <property role="1dT_AB" value="Runs NuSMV to simulate a given file." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2xeYpNCfaC4" role="jymVt" />
@@ -1242,8 +1270,12 @@
           <ref role="3uigEE" to="xygl:~ProgressIndicator" resolve="ProgressIndicator" />
         </node>
       </node>
-      <node concept="NWlO9" id="6glUKoNPEDP" role="lGtFl">
-        <property role="NWlVz" value="Runs NuSMV to run a source." />
+      <node concept="P$JXv" id="1y75PbzycQu" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQs" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQt" role="1dT_Ay">
+            <property role="1dT_AB" value="Runs NuSMV to run a source." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6glUKoNPEoe" role="jymVt" />
@@ -1316,8 +1348,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="2xeYpNCfnmV" role="lGtFl">
-        <property role="NWlVz" value="Build a result containing the runtime error." />
+      <node concept="P$JXv" id="1y75PbzycQx" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQv" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQw" role="1dT_Ay">
+            <property role="1dT_AB" value="Build a result containing the runtime error." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2xeYpNCeP9F" role="jymVt" />
@@ -1509,8 +1545,12 @@
       <node concept="3uibUv" id="2xeYpNCeZg0" role="Sfmx6">
         <ref role="3uigEE" to="guwi:~IOException" resolve="IOException" />
       </node>
-      <node concept="NWlO9" id="2xeYpNCfmwz" role="lGtFl">
-        <property role="NWlVz" value="Builds the file containing NuSMV commands." />
+      <node concept="P$JXv" id="1y75PbzycQ$" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQy" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQz" role="1dT_Ay">
+            <property role="1dT_AB" value="Builds the file containing NuSMV commands." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2xeYpNCeuB9" role="jymVt" />
@@ -1616,13 +1656,21 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="2xeYpNCeHYD" role="lGtFl">
-        <property role="NWlVz" value="Rund NuSMV." />
+      <node concept="P$JXv" id="1y75PbzycQB" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQ_" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQA" role="1dT_Ay">
+            <property role="1dT_AB" value="Rund NuSMV." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="4kcU3YrkdpO" role="1B3o_S" />
-    <node concept="NWlO9" id="6mm$FLYTzde" role="lGtFl">
-      <property role="NWlVz" value="Run NuSMV." />
+    <node concept="3UR2Jj" id="1y75PbzycQE" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycQC" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycQD" role="1dT_Ay">
+          <property role="1dT_AB" value="Run NuSMV." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="7mSH3Wn47W5">
@@ -1639,8 +1687,12 @@
       <node concept="3uibUv" id="1wu5Hv6f_vi" role="1tU5fm">
         <ref role="3uigEE" to="2ocj:5A94f9EE$RB" resolve="MPSToolAdapter" />
       </node>
-      <node concept="NWlO9" id="5uY69zuQO8o" role="lGtFl">
-        <property role="NWlVz" value="Tool adapter." />
+      <node concept="z59LJ" id="1y75PbzycQH" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQF" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQG" role="1dT_Ay">
+            <property role="1dT_AB" value="Tool adapter." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1U03KaUJfh8" role="jymVt" />
@@ -1651,8 +1703,12 @@
       <node concept="3uibUv" id="vbJ3AuJmr8" role="1tU5fm">
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
-      <node concept="NWlO9" id="5KHBa6l32_L" role="lGtFl">
-        <property role="NWlVz" value="Model repository." />
+      <node concept="z59LJ" id="1y75PbzycQK" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQI" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQJ" role="1dT_Ay">
+            <property role="1dT_AB" value="Model repository." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7mSH3Wn59zF" role="jymVt" />
@@ -1664,10 +1720,14 @@
       <node concept="3Tqbb2" id="7mSH3Wn59RV" role="1tU5fm">
         <ref role="ehGHo" to="gioj:6NmtaR1SUJl" resolve="System" />
       </node>
-      <node concept="NWlO9" id="7mSH3Wn5a7t" role="lGtFl">
-        <property role="NWlVz" value="Analyzed system" />
-      </node>
       <node concept="3Tmbuc" id="7mSH3Wn5aeP" role="1B3o_S" />
+      <node concept="z59LJ" id="1y75PbzycQN" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQL" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQM" role="1dT_Ay">
+            <property role="1dT_AB" value="Analyzed system" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="312cEg" id="51BLvmHufnG" role="jymVt">
       <property role="TrG5h" value="myOriginalModel" />
@@ -1751,8 +1811,12 @@
           <ref role="ehGHo" to="gioj:6NmtaR1SUJl" resolve="System" />
         </node>
       </node>
-      <node concept="NWlO9" id="7mSH3Wn4kQP" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycQQ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQO" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQP" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3clFbW" id="51BLvmHueR2" role="jymVt">
@@ -1831,8 +1895,12 @@
         <property role="TrG5h" value="originalModel" />
         <node concept="H_c77" id="51BLvmHufiL" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="51BLvmHueRu" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycQT" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQR" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQS" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7mSH3Wn4mtk" role="jymVt" />
@@ -1879,8 +1947,12 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="NWlO9" id="7mSH3Wn5b_$" role="lGtFl">
-      <property role="NWlVz" value="Factory for NuSMV-based analyses." />
+    <node concept="3UR2Jj" id="1y75PbzycQW" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycQU" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycQV" role="1dT_Ay">
+          <property role="1dT_AB" value="Factory for NuSMV-based analyses." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="7mSH3Wn48yg">
@@ -1895,10 +1967,14 @@
       <node concept="3Tqbb2" id="7mSH3Wn4A1N" role="1tU5fm">
         <ref role="ehGHo" to="gioj:6NmtaR1SUJl" resolve="System" />
       </node>
-      <node concept="NWlO9" id="7mSH3Wn4AI8" role="lGtFl">
-        <property role="NWlVz" value="NuSMV root node which will be analyzed." />
-      </node>
       <node concept="3Tmbuc" id="CmOUmcb7Ys" role="1B3o_S" />
+      <node concept="z59LJ" id="1y75PbzycQZ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycQX" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycQY" role="1dT_Ay">
+            <property role="1dT_AB" value="NuSMV root node which will be analyzed." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="312cEg" id="51BLvmHtBBW" role="jymVt">
       <property role="TrG5h" value="myOriginalModel" />
@@ -1971,8 +2047,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="7mSH3Wn48YV" role="1B3o_S" />
-      <node concept="NWlO9" id="7mSH3Wn4q8z" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycR2" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycR0" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycR1" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3clFbW" id="51BLvmHt_Nd" role="jymVt">
@@ -2040,8 +2120,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="51BLvmHt_Nw" role="1B3o_S" />
-      <node concept="NWlO9" id="51BLvmHt_Nx" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycR5" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycR3" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycR4" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7mSH3Wn492i" role="jymVt" />
@@ -2223,12 +2307,16 @@
         </node>
       </node>
     </node>
-    <node concept="NWlO9" id="7mSH3Wn4pYv" role="lGtFl">
-      <property role="NWlVz" value="Analyzer for running NuSMV." />
-    </node>
     <node concept="3uibUv" id="1ZsZb$iRrnf" role="1zkMxy">
       <ref role="3uigEE" node="1ZsZb$iRm$D" resolve="NuSMVAnalyzerBase" />
     </node>
+    <node concept="3UR2Jj" id="1y75PbzycR8" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycR6" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycR7" role="1dT_Ay">
+          <property role="1dT_AB" value="Analyzer for running NuSMV." />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="7mSH3Wn4c5n">
     <property role="TrG5h" value="NuSMVLiftedResult" />
@@ -2309,10 +2397,14 @@
       <property role="TrG5h" value="analyzedNode" />
       <property role="3TUv4t" value="false" />
       <node concept="3Tqbb2" id="1ZsZb$iTUXP" role="1tU5fm" />
-      <node concept="NWlO9" id="1uIpCUurGwp" role="lGtFl">
-        <property role="NWlVz" value="The node for which the analysis result is created (e.g. a Spec, TestCase, etc)" />
-      </node>
       <node concept="3Tmbuc" id="6hWVnwAOgZj" role="1B3o_S" />
+      <node concept="z59LJ" id="1y75PbzycRb" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycR9" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycRa" role="1dT_Ay">
+            <property role="1dT_AB" value="The node for which the analysis result is created (e.g. a Spec, TestCase, etc)" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="1uIpCUurLLD" role="jymVt" />
     <node concept="312cEg" id="1uIpCUurCQs" role="jymVt">
@@ -2321,10 +2413,14 @@
       <property role="TrG5h" value="analysisStartingPoint" />
       <property role="3TUv4t" value="false" />
       <node concept="3Tqbb2" id="1uIpCUurBTi" role="1tU5fm" />
-      <node concept="NWlO9" id="1uIpCUurMRi" role="lGtFl">
-        <property role="NWlVz" value="The node on which analysis was started (e.g. main-mod, TestCase). The simulation bar will be attached to it." />
-      </node>
       <node concept="3Tmbuc" id="6hWVnwAOhlX" role="1B3o_S" />
+      <node concept="z59LJ" id="1y75PbzycRe" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycRc" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycRd" role="1dT_Ay">
+            <property role="1dT_AB" value="The node on which analysis was started (e.g. main-mod, TestCase). The simulation bar will be attached to it." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="1ZsZb$iTWzV" role="jymVt" />
     <node concept="3clFbW" id="7mSH3Wn4J5_" role="jymVt">
@@ -2679,8 +2775,12 @@
         <property role="TrG5h" value="spec" />
         <node concept="17QB3L" id="2l5A0OFcYJi" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="2l5A0OFd4tJ" role="lGtFl">
-        <property role="NWlVz" value="A copy constructor with a lifted name." />
+      <node concept="P$JXv" id="1y75PbzycRh" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycRf" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycRg" role="1dT_Ay">
+            <property role="1dT_AB" value="A copy constructor with a lifted name." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6mm$FLYPxnl" role="jymVt" />
@@ -3562,8 +3662,12 @@
       </node>
     </node>
     <node concept="2tJIrI" id="2xeYpNCbnwK" role="jymVt" />
-    <node concept="NWlO9" id="2l5A0OFd4IK" role="lGtFl">
-      <property role="NWlVz" value="Lifted result of a NuSMV-based analysis." />
+    <node concept="3UR2Jj" id="1y75PbzycRk" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycRi" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycRj" role="1dT_Ay">
+          <property role="1dT_AB" value="Lifted result of a NuSMV-based analysis." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="1ZsZb$iMIJb">
@@ -3579,8 +3683,12 @@
       <node concept="3uibUv" id="2xeYpNCcOso" role="1tU5fm">
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
-      <node concept="NWlO9" id="1ZsZb$iMIJl" role="lGtFl">
-        <property role="NWlVz" value="Test-Case/Test-Collection/model which will be analyzed." />
+      <node concept="z59LJ" id="1y75PbzycRn" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycRl" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycRm" role="1dT_Ay">
+            <property role="1dT_AB" value="Test-Case/Test-Collection/model which will be analyzed." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1ZsZb$iMIJm" role="jymVt" />
@@ -3635,8 +3743,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="1ZsZb$iMIJD" role="1B3o_S" />
-      <node concept="NWlO9" id="1ZsZb$iMIJE" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycRq" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycRo" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycRp" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1ZsZb$iMIJF" role="jymVt" />
@@ -4283,12 +4395,16 @@
         <ref role="3uigEE" node="7mSH3Wn4c5n" resolve="NuSMVLiftedResult" />
       </node>
     </node>
-    <node concept="NWlO9" id="1ZsZb$iMIKq" role="lGtFl">
-      <property role="NWlVz" value="Analyzer for running NuSMV over a TestCase." />
-    </node>
     <node concept="3uibUv" id="1ZsZb$iRp8x" role="1zkMxy">
       <ref role="3uigEE" node="1ZsZb$iRm$D" resolve="NuSMVAnalyzerBase" />
     </node>
+    <node concept="3UR2Jj" id="1y75PbzycRt" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycRr" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycRs" role="1dT_Ay">
+          <property role="1dT_AB" value="Analyzer for running NuSMV over a TestCase." />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="1ZsZb$iMQSG">
     <property role="TrG5h" value="NuSMVTestAnalyzerFactory" />
@@ -4305,8 +4421,12 @@
       <node concept="3uibUv" id="1ZsZb$iMQSM" role="1tU5fm">
         <ref role="3uigEE" to="2ocj:5A94f9EE$RB" resolve="MPSToolAdapter" />
       </node>
-      <node concept="NWlO9" id="1ZsZb$iMQSN" role="lGtFl">
-        <property role="NWlVz" value="Tool adapter." />
+      <node concept="z59LJ" id="1y75PbzycRw" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycRu" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycRv" role="1dT_Ay">
+            <property role="1dT_AB" value="Tool adapter." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1ZsZb$iMQSO" role="jymVt" />
@@ -4317,8 +4437,12 @@
       <node concept="3uibUv" id="1ZsZb$iMQSR" role="1tU5fm">
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
-      <node concept="NWlO9" id="1ZsZb$iMQSS" role="lGtFl">
-        <property role="NWlVz" value="Model repository." />
+      <node concept="z59LJ" id="1y75PbzycRz" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycRx" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycRy" role="1dT_Ay">
+            <property role="1dT_AB" value="Model repository." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1ZsZb$iMQST" role="jymVt" />
@@ -4330,10 +4454,14 @@
       <node concept="3uibUv" id="2xeYpNCdxQr" role="1tU5fm">
         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
       </node>
-      <node concept="NWlO9" id="1ZsZb$iMQSW" role="lGtFl">
-        <property role="NWlVz" value="Analyzed system - TestCase, TestCollection or model containing tests" />
-      </node>
       <node concept="3Tmbuc" id="1ZsZb$iMQSX" role="1B3o_S" />
+      <node concept="z59LJ" id="1y75PbzycRA" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycR$" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycR_" role="1dT_Ay">
+            <property role="1dT_AB" value="Analyzed system - TestCase, TestCollection or model containing tests" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="1ZsZb$iMQSY" role="jymVt" />
     <node concept="3clFbW" id="1ZsZb$iMQSZ" role="jymVt">
@@ -4398,8 +4526,12 @@
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
       </node>
-      <node concept="NWlO9" id="1ZsZb$iMQTr" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycRD" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycRB" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycRC" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1ZsZb$iMQTs" role="jymVt" />
@@ -4443,8 +4575,12 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="NWlO9" id="1ZsZb$iMQTF" role="lGtFl">
-      <property role="NWlVz" value="Factory for NuSMV-based running of tests." />
+    <node concept="3UR2Jj" id="1y75PbzycRG" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycRE" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycRF" role="1dT_Ay">
+          <property role="1dT_AB" value="Factory for NuSMV-based running of tests." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="1ZsZb$iRm$D">
@@ -4556,8 +4692,12 @@
         </node>
       </node>
     </node>
-    <node concept="NWlO9" id="1ZsZb$iRo5A" role="lGtFl">
-      <property role="NWlVz" value="Base class for running " />
+    <node concept="3UR2Jj" id="1y75PbzycRJ" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycRH" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycRI" role="1dT_Ay">
+          <property role="1dT_AB" value="Base class for running " />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="1ZsZb$iRrIC">
@@ -4640,8 +4780,12 @@
       <node concept="Xl_RD" id="5PdLXX5Rq93" role="33vP2m">
         <property role="Xl_RC" value="-- LTL specification" />
       </node>
-      <node concept="NWlO9" id="5PdLXX5Rura" role="lGtFl">
-        <property role="NWlVz" value="NuXMV specifications." />
+      <node concept="z59LJ" id="1y75PbzycRM" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycRK" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycRL" role="1dT_Ay">
+            <property role="1dT_AB" value="NuXMV specifications." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5PdLXX5Ru4A" role="jymVt" />
@@ -5240,8 +5384,12 @@
           <ref role="3uigEE" to="2avh:4CtHBqNlszi" resolve="ToolRunner.ToolRunResult" />
         </node>
       </node>
-      <node concept="NWlO9" id="6XKrTzkKVKW" role="lGtFl">
-        <property role="NWlVz" value="This function accesses the model and should be called from a read-action." />
+      <node concept="P$JXv" id="1y75PbzycRP" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycRN" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycRO" role="1dT_Ay">
+            <property role="1dT_AB" value="This function accesses the model and should be called from a read-action." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="59AZjhg2Qg3" role="jymVt" />
@@ -5790,8 +5938,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="2xeYpNCgspO" role="lGtFl">
-        <property role="NWlVz" value="Lifts the current line of the witness." />
+      <node concept="P$JXv" id="1y75PbzycRS" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycRQ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycRR" role="1dT_Ay">
+            <property role="1dT_AB" value="Lifts the current line of the witness." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2mjHtwToR0U" role="jymVt" />
@@ -5892,8 +6044,12 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="1ZsZb$iRrID" role="1B3o_S" />
-    <node concept="NWlO9" id="1ZsZb$iRyg8" role="lGtFl">
-      <property role="NWlVz" value="Lift the result." />
+    <node concept="3UR2Jj" id="1y75PbzycRV" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycRT" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycRU" role="1dT_Ay">
+          <property role="1dT_AB" value="Lift the result." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="1ZsZb$iS3xC">
@@ -6547,8 +6703,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="2xeYpNCeptv" role="1B3o_S" />
-      <node concept="NWlO9" id="2xeYpNCeptw" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycRY" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycRW" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycRX" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2xeYpNCepsG" role="jymVt" />
@@ -6732,8 +6892,12 @@
       </node>
     </node>
     <node concept="2tJIrI" id="2xeYpNCesPB" role="jymVt" />
-    <node concept="NWlO9" id="6Kf5KB6TqI2" role="lGtFl">
-      <property role="NWlVz" value="Simulates the trace from test-case." />
+    <node concept="3UR2Jj" id="1y75PbzycS1" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycRZ" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycS0" role="1dT_Ay">
+          <property role="1dT_AB" value="Simulates the trace from test-case." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="2xeYpNCfDJV">
@@ -6751,8 +6915,12 @@
       <node concept="3uibUv" id="2xeYpNCfDK1" role="1tU5fm">
         <ref role="3uigEE" to="2ocj:5A94f9EE$RB" resolve="MPSToolAdapter" />
       </node>
-      <node concept="NWlO9" id="2xeYpNCfDK2" role="lGtFl">
-        <property role="NWlVz" value="Tool adapter." />
+      <node concept="z59LJ" id="1y75PbzycS4" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycS2" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycS3" role="1dT_Ay">
+            <property role="1dT_AB" value="Tool adapter." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2xeYpNCfDK3" role="jymVt" />
@@ -6763,8 +6931,12 @@
       <node concept="3uibUv" id="2xeYpNCfDK6" role="1tU5fm">
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
-      <node concept="NWlO9" id="2xeYpNCfDK7" role="lGtFl">
-        <property role="NWlVz" value="Model repository." />
+      <node concept="z59LJ" id="1y75PbzycS7" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycS5" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycS6" role="1dT_Ay">
+            <property role="1dT_AB" value="Model repository." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2xeYpNCfDK8" role="jymVt" />
@@ -6776,10 +6948,14 @@
       <node concept="3Tqbb2" id="2xeYpNCfDKa" role="1tU5fm">
         <ref role="ehGHo" to="fnq2:43FRfGJUEtT" resolve="TestCase" />
       </node>
-      <node concept="NWlO9" id="2xeYpNCfDKb" role="lGtFl">
-        <property role="NWlVz" value="Simulated test case." />
-      </node>
       <node concept="3Tmbuc" id="2xeYpNCfDKc" role="1B3o_S" />
+      <node concept="z59LJ" id="1y75PbzycSa" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycS8" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycS9" role="1dT_Ay">
+            <property role="1dT_AB" value="Simulated test case." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="2xeYpNCfDKd" role="jymVt" />
     <node concept="3clFbW" id="2xeYpNCfDKe" role="jymVt">
@@ -6844,8 +7020,12 @@
           <ref role="ehGHo" to="fnq2:43FRfGJUEtT" resolve="TestCase" />
         </node>
       </node>
-      <node concept="NWlO9" id="2xeYpNCfDKE" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycSd" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSb" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycSc" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2xeYpNCfDKF" role="jymVt" />
@@ -6889,8 +7069,12 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="NWlO9" id="2xeYpNCfDKU" role="lGtFl">
-      <property role="NWlVz" value="Factory for NuSMV-based simulations." />
+    <node concept="3UR2Jj" id="1y75PbzycSg" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycSe" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycSf" role="1dT_Ay">
+          <property role="1dT_AB" value="Factory for NuSMV-based simulations." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="2xeYpNCxxWg">
@@ -6911,8 +7095,12 @@
           <ref role="HV5vE" node="2xeYpNCxxWg" resolve="NuSMVSimulationStepPerformer" />
         </node>
       </node>
-      <node concept="NWlO9" id="3fsZMFLIAdE" role="lGtFl">
-        <property role="NWlVz" value="Unique instance." />
+      <node concept="z59LJ" id="1y75PbzycSj" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSh" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycSi" role="1dT_Ay">
+            <property role="1dT_AB" value="Unique instance." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3fsZMFLIwHO" role="jymVt" />
@@ -6920,8 +7108,12 @@
       <node concept="3cqZAl" id="3fsZMFLI_c3" role="3clF45" />
       <node concept="3clFbS" id="3fsZMFLI_c5" role="3clF47" />
       <node concept="3Tm6S6" id="3fsZMFLI$G4" role="1B3o_S" />
-      <node concept="NWlO9" id="3fsZMFLIAss" role="lGtFl">
-        <property role="NWlVz" value="Prevent instantiation." />
+      <node concept="P$JXv" id="1y75PbzycSm" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSk" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycSl" role="1dT_Ay">
+            <property role="1dT_AB" value="Prevent instantiation." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3fsZMFLMMV7" role="jymVt" />
@@ -6966,8 +7158,12 @@
       <node concept="2AHcQZ" id="3fsZMFLMNjm" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="3fsZMFLMSVI" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycSp" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSn" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycSo" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3fsZMFLMMz7" role="jymVt" />
@@ -7137,12 +7333,16 @@
         </node>
       </node>
       <node concept="3Tmbuc" id="3fsZMFLI81Q" role="1B3o_S" />
-      <node concept="NWlO9" id="3fsZMFLIAuR" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
-      </node>
       <node concept="2AHcQZ" id="3fsZMFLMSDI" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
+      <node concept="P$JXv" id="1y75PbzycSs" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSq" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycSr" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="2mjHtwTnkjB" role="jymVt" />
     <node concept="3clFb_" id="3fsZMFLIla9" role="jymVt">
@@ -7361,8 +7561,12 @@
     <node concept="3uibUv" id="3fsZMFLI1r7" role="1zkMxy">
       <ref role="3uigEE" to="mc3u:3fsZMFLI1jW" resolve="SimulationStepPerformerBase" />
     </node>
-    <node concept="NWlO9" id="3fsZMFLI_Wi" role="lGtFl">
-      <property role="NWlVz" value="Performs the simulation steps." />
+    <node concept="3UR2Jj" id="1y75PbzycSv" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycSt" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycSu" role="1dT_Ay">
+          <property role="1dT_AB" value="Performs the simulation steps." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="2xeYpNCxFMj">
@@ -7487,8 +7691,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="15PPQjZdbu4" role="lGtFl">
-        <property role="NWlVz" value="Runtime-error / Canceled." />
+      <node concept="P$JXv" id="1y75PbzycSy" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSw" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycSx" role="1dT_Ay">
+            <property role="1dT_AB" value="Runtime-error / Canceled." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1EKbsQR8Mjc" role="jymVt" />
@@ -8472,8 +8680,12 @@
       <node concept="3Tqbb2" id="6glUKoNQ4wW" role="1tU5fm">
         <ref role="ehGHo" to="rcfd:6glUKoNLGxu" resolve="Source" />
       </node>
-      <node concept="NWlO9" id="6glUKoNQ4wX" role="lGtFl">
-        <property role="NWlVz" value="NuSMV source node which will be analyzed." />
+      <node concept="z59LJ" id="1y75PbzycS_" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSz" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycS$" role="1dT_Ay">
+            <property role="1dT_AB" value="NuSMV source node which will be analyzed." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6glUKoNQ4wY" role="jymVt" />
@@ -8528,8 +8740,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="6glUKoNQ4xi" role="1B3o_S" />
-      <node concept="NWlO9" id="6glUKoNQ4xj" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycSC" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSA" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycSB" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6glUKoNQ4xk" role="jymVt" />
@@ -8753,12 +8969,16 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6glUKoNQ4y3" role="jymVt" />
-    <node concept="NWlO9" id="6glUKoNQ4y4" role="lGtFl">
-      <property role="NWlVz" value="Analyzer for running NuSMV on source." />
-    </node>
     <node concept="3uibUv" id="6glUKoNQ4y5" role="1zkMxy">
       <ref role="3uigEE" node="1ZsZb$iRm$D" resolve="NuSMVAnalyzerBase" />
     </node>
+    <node concept="3UR2Jj" id="1y75PbzycSF" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycSD" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycSE" role="1dT_Ay">
+          <property role="1dT_AB" value="Analyzer for running NuSMV on source." />
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="6glUKoNQfYu">
     <property role="TrG5h" value="NuSMVSourceAnalyzerFactory" />
@@ -8774,8 +8994,12 @@
       <node concept="3uibUv" id="6glUKoNQfY$" role="1tU5fm">
         <ref role="3uigEE" to="2ocj:5A94f9EE$RB" resolve="MPSToolAdapter" />
       </node>
-      <node concept="NWlO9" id="6glUKoNQfY_" role="lGtFl">
-        <property role="NWlVz" value="Tool adapter." />
+      <node concept="z59LJ" id="1y75PbzycSI" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSG" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycSH" role="1dT_Ay">
+            <property role="1dT_AB" value="Tool adapter." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6glUKoNQfYA" role="jymVt" />
@@ -8786,8 +9010,12 @@
       <node concept="3uibUv" id="6glUKoNQfYD" role="1tU5fm">
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
-      <node concept="NWlO9" id="6glUKoNQfYE" role="lGtFl">
-        <property role="NWlVz" value="Model repository." />
+      <node concept="z59LJ" id="1y75PbzycSL" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSJ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycSK" role="1dT_Ay">
+            <property role="1dT_AB" value="Model repository." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6glUKoNQfYF" role="jymVt" />
@@ -8799,10 +9027,14 @@
       <node concept="3Tqbb2" id="6glUKoNQfYH" role="1tU5fm">
         <ref role="ehGHo" to="rcfd:6glUKoNLGxu" resolve="Source" />
       </node>
-      <node concept="NWlO9" id="6glUKoNQfYI" role="lGtFl">
-        <property role="NWlVz" value="Analyzed source" />
-      </node>
       <node concept="3Tmbuc" id="6glUKoNQfYJ" role="1B3o_S" />
+      <node concept="z59LJ" id="1y75PbzycSO" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSM" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycSN" role="1dT_Ay">
+            <property role="1dT_AB" value="Analyzed source" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="6glUKoNQfYK" role="jymVt" />
     <node concept="3clFbW" id="6glUKoNQfYL" role="jymVt">
@@ -8867,8 +9099,12 @@
           <ref role="ehGHo" to="rcfd:6glUKoNLGxu" resolve="Source" />
         </node>
       </node>
-      <node concept="NWlO9" id="6glUKoNQfZd" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycSR" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSP" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycSQ" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6glUKoNQfZe" role="jymVt" />
@@ -8912,8 +9148,12 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
-    <node concept="NWlO9" id="6glUKoNQfZt" role="lGtFl">
-      <property role="NWlVz" value="Factory for NuSMV-based analyses based on sources." />
+    <node concept="3UR2Jj" id="1y75PbzycSU" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycSS" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycST" role="1dT_Ay">
+          <property role="1dT_AB" value="Factory for NuSMV-based analyses based on sources." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="4Hts7PYsVqs">
@@ -9872,8 +10112,12 @@
         <property role="TrG5h" value="resultLine" />
         <node concept="17QB3L" id="6bK0Ak3D5wD" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="6bK0Ak3GOWJ" role="lGtFl">
-        <property role="NWlVz" value="Finds the original node if possible, otherwise the analyzedSystem is returned." />
+      <node concept="P$JXv" id="1y75PbzycSX" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSV" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycSW" role="1dT_Ay">
+            <property role="1dT_AB" value="Finds the original node if possible, otherwise the analyzedSystem is returned." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6bK0Ak3Dke2" role="jymVt" />
@@ -10119,8 +10363,12 @@
           <node concept="17QB3L" id="6bK0Ak3DkRl" role="_ZDj9" />
         </node>
       </node>
-      <node concept="NWlO9" id="6bK0Ak3DkGW" role="lGtFl">
-        <property role="NWlVz" value="Performs the search." />
+      <node concept="P$JXv" id="1y75PbzycT0" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycSY" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycSZ" role="1dT_Ay">
+            <property role="1dT_AB" value="Performs the search." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6bK0Ak3Ery8" role="jymVt" />
@@ -10506,8 +10754,12 @@
         <property role="TrG5h" value="resultLine" />
         <node concept="17QB3L" id="6bK0Ak3Estc" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="6bK0Ak3Er5I" role="lGtFl">
-        <property role="NWlVz" value="Finds the spec in the module" />
+      <node concept="P$JXv" id="1y75PbzycT3" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycT1" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycT2" role="1dT_Ay">
+            <property role="1dT_AB" value="Finds the spec in the module" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6XKrTzk_bjn" role="jymVt" />
@@ -10704,8 +10956,12 @@
       <node concept="17QB3L" id="6XKrTzk_c5H" role="3clF45" />
     </node>
     <node concept="3Tm1VV" id="6bK0Ak3D8jB" role="1B3o_S" />
-    <node concept="NWlO9" id="6bK0Ak3GOM8" role="lGtFl">
-      <property role="NWlVz" value="Finder for the node which represents the specification." />
+    <node concept="3UR2Jj" id="1y75PbzycT6" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycT4" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycT5" role="1dT_Ay">
+          <property role="1dT_AB" value="Finder for the node which represents the specification." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="1uIpCUulOXG">
@@ -11094,8 +11350,12 @@
         </node>
       </node>
     </node>
-    <node concept="NWlO9" id="1uIpCUum4W6" role="lGtFl">
-      <property role="NWlVz" value="Lifter for test results considering the (dis-)allowed scenarios." />
+    <node concept="3UR2Jj" id="1y75PbzycT9" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycT7" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycT8" role="1dT_Ay">
+          <property role="1dT_AB" value="Lifter for test results considering the (dis-)allowed scenarios." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="6XKrTzkzJpR">
@@ -11742,8 +12002,12 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="6XKrTzkzJpS" role="1B3o_S" />
-    <node concept="NWlO9" id="6XKrTzkNk7H" role="lGtFl">
-      <property role="NWlVz" value="Use the information from show_property and the given name of the spec to find the property." />
+    <node concept="3UR2Jj" id="1y75PbzycTc" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycTa" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycTb" role="1dT_Ay">
+          <property role="1dT_AB" value="Use the information from show_property and the given name of the spec to find the property." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="5PdLXX5Q6p$">
@@ -11771,8 +12035,12 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="5PdLXX5Q6p_" role="1B3o_S" />
-    <node concept="NWlO9" id="5PdLXX5Q6sC" role="lGtFl">
-      <property role="NWlVz" value="Chooses between NuSMV and nuXmv and adds nuXmv specific arguments." />
+    <node concept="3UR2Jj" id="1y75PbzycTf" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycTd" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycTe" role="1dT_Ay">
+          <property role="1dT_AB" value="Chooses between NuSMV and nuXmv and adds nuXmv specific arguments." />
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/ui.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/ui.mps
index ef19b9e14..92775c7a0 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/ui.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/ui.mps
@@ -4,8 +4,9 @@
   <languages>
     <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="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
@@ -208,17 +209,26 @@
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
-    </language>
     <language id="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="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
@@ -273,8 +283,12 @@
       <node concept="3uibUv" id="6izRX53q3SM" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JTextArea" resolve="JTextArea" />
       </node>
-      <node concept="NWlO9" id="3Ymokd9HQBw" role="lGtFl">
-        <property role="NWlVz" value="Text area containing the raw output." />
+      <node concept="z59LJ" id="1y75PbzycTi" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTg" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTh" role="1dT_Ay">
+            <property role="1dT_AB" value="Text area containing the raw output." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="71901EGG$FD" role="jymVt" />
@@ -287,8 +301,12 @@
       <node concept="3uibUv" id="4kcU3YrmsGn" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JTextArea" resolve="JTextArea" />
       </node>
-      <node concept="NWlO9" id="4kcU3YrmsGo" role="lGtFl">
-        <property role="NWlVz" value="Text area containing the raw stderr." />
+      <node concept="z59LJ" id="1y75PbzycTl" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTj" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTk" role="1dT_Ay">
+            <property role="1dT_AB" value="Text area containing the raw stderr." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4kcU3YrmsuJ" role="jymVt" />
@@ -301,8 +319,12 @@
       <node concept="3uibUv" id="4$9c1ZyAb8X" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JTextArea" resolve="JTextArea" />
       </node>
-      <node concept="NWlO9" id="4$9c1ZyA7DT" role="lGtFl">
-        <property role="NWlVz" value="Text area containing the ran command." />
+      <node concept="z59LJ" id="1y75PbzycTo" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTm" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTn" role="1dT_Ay">
+            <property role="1dT_AB" value="Text area containing the ran command." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4$9c1ZyA5FH" role="jymVt" />
@@ -503,8 +525,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="6izRX53yf5q" role="1B3o_S" />
-      <node concept="NWlO9" id="3Ymokd9HQkG" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycTr" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTp" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTq" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6izRX53qwpx" role="jymVt" />
@@ -600,8 +626,12 @@
         <property role="TrG5h" value="err" />
         <node concept="17QB3L" id="4kcU3YrmuPd" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="3Ymokd9HPTu" role="lGtFl">
-        <property role="NWlVz" value="Presents the output." />
+      <node concept="P$JXv" id="1y75PbzycTu" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTs" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTt" role="1dT_Ay">
+            <property role="1dT_AB" value="Presents the output." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3DDJouLH7Ns" role="jymVt" />
@@ -631,13 +661,21 @@
       <node concept="2AHcQZ" id="3DDJouLH8uF" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="3DDJouLHbPr" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycTx" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTv" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTw" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="6izRX53pUdd" role="1B3o_S" />
-    <node concept="NWlO9" id="3Ymokd9HQTr" role="lGtFl">
-      <property role="NWlVz" value="UI for presenting the raw output." />
+    <node concept="3UR2Jj" id="1y75PbzycT$" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycTy" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycTz" role="1dT_Ay">
+          <property role="1dT_AB" value="UI for presenting the raw output." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="4_pSipqUB$z">
@@ -656,8 +694,12 @@
       <node concept="3uibUv" id="7XCY$_ra2R4" role="1tU5fm">
         <ref role="3uigEE" node="31nZcrlJSwS" resolve="NuSMVCexTableModel" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHb8gS" role="lGtFl">
-        <property role="NWlVz" value="Table model for the counterexample." />
+      <node concept="z59LJ" id="1y75PbzycTB" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycT_" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTA" role="1dT_Ay">
+            <property role="1dT_AB" value="Table model for the counterexample." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZHcFHJ" role="jymVt" />
@@ -670,8 +712,12 @@
       <node concept="3uibUv" id="3_HSwtcTkCY" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JButton" resolve="JButton" />
       </node>
-      <node concept="NWlO9" id="7YdkGnq2wg" role="lGtFl">
-        <property role="NWlVz" value="Re-run last analysis." />
+      <node concept="z59LJ" id="1y75PbzycTE" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTC" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTD" role="1dT_Ay">
+            <property role="1dT_AB" value="Re-run last analysis." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7YdkGnq1ng" role="jymVt" />
@@ -684,8 +730,12 @@
       <node concept="3uibUv" id="6Kf5KB70wXp" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JButton" resolve="JButton" />
       </node>
-      <node concept="NWlO9" id="6Kf5KB70wXq" role="lGtFl">
-        <property role="NWlVz" value="Simulate current trace." />
+      <node concept="z59LJ" id="1y75PbzycTH" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTF" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTG" role="1dT_Ay">
+            <property role="1dT_AB" value="Simulate current trace." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1wencriOrwh" role="jymVt" />
@@ -698,8 +748,12 @@
       <node concept="3uibUv" id="1wencriOo8C" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JButton" resolve="JButton" />
       </node>
-      <node concept="NWlO9" id="1wencriOo8D" role="lGtFl">
-        <property role="NWlVz" value="Shows MSC on the current trace." />
+      <node concept="z59LJ" id="1y75PbzycTK" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTI" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTJ" role="1dT_Ay">
+            <property role="1dT_AB" value="Shows MSC on the current trace." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="71H03GAXFEP" role="jymVt" />
@@ -712,8 +766,12 @@
       <node concept="3uibUv" id="1ZsZb$iTpU4" role="1tU5fm">
         <ref role="3uigEE" node="6izRX53pUdc" resolve="NuSMVRawOutputUI" />
       </node>
-      <node concept="NWlO9" id="5ONlem$s5u_" role="lGtFl">
-        <property role="NWlVz" value="RawOutput table so it can be updated based on the selected assertion in the SpinLifted table" />
+      <node concept="z59LJ" id="1y75PbzycTN" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTL" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTM" role="1dT_Ay">
+            <property role="1dT_AB" value="RawOutput table so it can be updated based on the selected assertion in the SpinLifted table" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="71H03GAZMr8" role="jymVt" />
@@ -724,8 +782,12 @@
       <node concept="3uibUv" id="1ZsZb$iTHrX" role="1tU5fm">
         <ref role="3uigEE" to="4c75:7mSH3Wn4c5n" resolve="NuSMVLiftedResult" />
       </node>
-      <node concept="NWlO9" id="6Kf5KB70WAN" role="lGtFl">
-        <property role="NWlVz" value="Result which is currently selected." />
+      <node concept="z59LJ" id="1y75PbzycTQ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTO" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTP" role="1dT_Ay">
+            <property role="1dT_AB" value="Result which is currently selected." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6Kf5KB70Nll" role="jymVt" />
@@ -894,8 +956,12 @@
       <node concept="2AHcQZ" id="2k2dPZH6kvp" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2k2dPZH6nTp" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycTT" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTR" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTS" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZH6swo" role="jymVt" />
@@ -1294,12 +1360,16 @@
       <node concept="3uibUv" id="2k2dPZH6$tI" role="Sfmx6">
         <ref role="3uigEE" to="z60i:~HeadlessException" resolve="HeadlessException" />
       </node>
-      <node concept="NWlO9" id="2k2dPZH6JhS" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
-      </node>
       <node concept="2AHcQZ" id="2k2dPZHd9xi" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
+      <node concept="P$JXv" id="1y75PbzycTW" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTU" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTV" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZH4yjh" role="jymVt" />
     <node concept="3clFb_" id="2k2dPZH4hbZ" role="jymVt">
@@ -1608,12 +1678,16 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="2k2dPZH4_DN" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
-      </node>
       <node concept="2AHcQZ" id="2k2dPZH8xSh" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
+      <node concept="P$JXv" id="1y75PbzycTZ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycTX" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycTY" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="5PkarIFUHcb" role="jymVt" />
     <node concept="3clFb_" id="1H8VqTw5HWK" role="jymVt">
@@ -1641,8 +1715,12 @@
       <node concept="2AHcQZ" id="2k2dPZH9FUb" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2k2dPZH9Iak" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycU2" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycU0" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycU1" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1H8VqTw5G5M" role="jymVt" />
@@ -1824,8 +1902,12 @@
       <node concept="2AHcQZ" id="2k2dPZHaHHh" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHaJO8" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycU5" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycU3" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycU4" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="12GRGX_ddSm" role="jymVt" />
@@ -1879,8 +1961,12 @@
       <node concept="2AHcQZ" id="2k2dPZHcgIi" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHcpV1" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycU8" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycU6" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycU7" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="71H03GAY479" role="jymVt" />
@@ -1913,8 +1999,12 @@
           <ref role="3uigEE" node="6izRX53pUdc" resolve="NuSMVRawOutputUI" />
         </node>
       </node>
-      <node concept="NWlO9" id="5ONlem$srbr" role="lGtFl">
-        <property role="NWlVz" value="used for setting the RawTable so it can be accessed here" />
+      <node concept="P$JXv" id="1y75PbzycUb" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycU9" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUa" role="1dT_Ay">
+            <property role="1dT_AB" value="used for setting the RawTable so it can be accessed here" />
+          </node>
+        </node>
       </node>
     </node>
   </node>
@@ -1945,8 +2035,12 @@
       <node concept="2AHcQZ" id="7XCY$_ra0py" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="7XCY$_ra0G5" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycUe" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUc" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUd" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="12GRGX_agHw" role="jymVt" />
@@ -2026,8 +2120,12 @@
       <node concept="2AHcQZ" id="2lN4cj_T2GE" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2lN4cj_T39R" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycUh" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUf" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUg" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7FuIjruQLhE" role="jymVt" />
@@ -2138,8 +2236,12 @@
       <node concept="2AHcQZ" id="1EZfgaQo16g" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="1EZfgaQo20$" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycUk" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUi" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUj" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1GgrF83gmaz" role="jymVt" />
@@ -2206,8 +2308,12 @@
       <node concept="2AHcQZ" id="2lN4cj_T474" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2lN4cj_T4$S" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycUn" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUl" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUm" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1d23YaE_Gzg" role="jymVt" />
@@ -2235,8 +2341,12 @@
       <node concept="2AHcQZ" id="3kLBXRr$3oN" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2lN4cj_T52m" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycUq" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUo" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUp" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5C7jL_4BOga" role="jymVt" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/utils.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/utils.mps
index 7f4fdd478..5c9507f6c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/utils.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/models/utils.mps
@@ -7,7 +7,8 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
@@ -91,13 +92,22 @@
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
       <concept id="5753587520027641499" name="com.mbeddr.mpsutil.blutil.structure.SafeReadAction" flags="ng" index="3kxDZ6">
         <child id="5753587520027644759" name="body" index="3kxCCa" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </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>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -639,8 +649,12 @@
         <node concept="17QB3L" id="407WgdWZrVr" role="1tU5fm" />
       </node>
     </node>
-    <node concept="NWlO9" id="407WgdWZiKu" role="lGtFl">
-      <property role="NWlVz" value="Provides the NuSMV keywords." />
+    <node concept="3UR2Jj" id="1y75PbzycUt" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycUr" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycUs" role="1dT_Ay">
+          <property role="1dT_AB" value="Provides the NuSMV keywords." />
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd
index b9190bf7e..23a4a6289 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd
@@ -18,13 +18,16 @@
     <dependency reexport="true">86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps
index bbcb86104..a7a4aa439 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/models/plugin.mps
@@ -4,8 +4,9 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
@@ -127,11 +128,6 @@
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
-    </language>
     <language id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml">
       <concept id="2133624044437898907" name="jetbrains.mps.core.xml.structure.XmlDoctypeDeclaration" flags="ng" index="29q25o">
         <property id="2133624044437898910" name="doctypeName" index="29q25t" />
@@ -169,6 +165,18 @@
         <child id="6666499814681299060" name="prolog" index="2pNm8Q" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </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="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" />
@@ -206,8 +214,12 @@
       <node concept="Xl_RD" id="1uIpCUufwut" role="33vP2m">
         <property role="Xl_RC" value="tutorial" />
       </node>
-      <node concept="NWlO9" id="1uIpCUufwN6" role="lGtFl">
-        <property role="NWlVz" value="The directory in the FASTEN installation where the tutorial is located." />
+      <node concept="z59LJ" id="1y75PbzycUw" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUu" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUv" role="1dT_Ay">
+            <property role="1dT_AB" value="The directory in the FASTEN installation where the tutorial is located." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1uIpCUufw_g" role="jymVt" />
@@ -757,8 +769,12 @@
       <node concept="Xl_RD" id="7Y21hZBa7gB" role="33vP2m">
         <property role="Xl_RC" value="tutorial-safety" />
       </node>
-      <node concept="NWlO9" id="7Y21hZBa7gC" role="lGtFl">
-        <property role="NWlVz" value="The directory in the FASTEN installation where the safety-tutorial is located." />
+      <node concept="z59LJ" id="1y75PbzycUz" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUx" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUy" role="1dT_Ay">
+            <property role="1dT_AB" value="The directory in the FASTEN installation where the safety-tutorial is located." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7Y21hZBa7gD" role="jymVt" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/base@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/base@tests.mps
index 5ca2ce967..75b5e9500 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/base@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/base@tests.mps
@@ -9,7 +9,7 @@
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
   </languages>
   <imports>
     <import index="4c75" ref="r:088add12-8a36-47c2-b0d2-7180a8a2a891(com.mbeddr.formal.nusmv.pluginSolution.runner)" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/cbd@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/cbd@tests.mps
index 9e41221e1..74856e535 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/cbd@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/cbd@tests.mps
@@ -7,7 +7,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <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="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="58bd9c99-ba42-4205-b3c9-ce445fd870e6" name="com.mbeddr.formal.nusmv.cbd" version="1" />
     <use id="001b2375-3bd5-4d5e-9958-6b3f62dc8548" name="com.mbeddr.formal.nusmv" version="0" />
     <use id="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f" name="com.mbeddr.formal.base.expressions" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_ext@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_ext@tests.mps
index 4dda97d5a..300426a7e 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_ext@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_ext@tests.mps
@@ -9,7 +9,7 @@
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="001b2375-3bd5-4d5e-9958-6b3f62dc8548" name="com.mbeddr.formal.nusmv" version="0" />
     <use id="c0e6afd4-e20f-4e33-9970-004cf26b9bf6" name="com.mbeddr.formal.nusmv.ext" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_importer@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_importer@tests.mps
index 2f758cb4a..c0c052cef 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_importer@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_importer@tests.mps
@@ -9,10 +9,11 @@
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <use id="d3a0fd26-445a-466c-900e-10444ddfed52" name="com.mbeddr.mpsutil.filepicker" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="82db" ref="r:d9e70cd7-5bba-4146-b9d2-6eab353213c5(test.mbeddr.formal.nusmv.tests)" />
@@ -182,9 +183,6 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
       <concept id="5753587520027641499" name="com.mbeddr.mpsutil.blutil.structure.SafeReadAction" flags="ng" index="3kxDZ6">
         <child id="5753587520027644759" name="body" index="3kxCCa" />
       </concept>
@@ -195,6 +193,18 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </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="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="361130699826193248" name="jetbrains.mps.lang.modelapi.structure.ModelPointer" flags="ng" index="1dCxOl">
         <property id="1863527487546097494" name="modelId" index="1XweGQ" />
@@ -599,8 +609,12 @@
       <node concept="10P_77" id="44HlJomgZJa" role="1tU5fm" />
       <node concept="3Tm6S6" id="44HlJomgZJ9" role="1B3o_S" />
       <node concept="3clFbT" id="44HlJomgZJb" role="33vP2m" />
-      <node concept="NWlO9" id="44HlJomh2L8" role="lGtFl">
-        <property role="NWlVz" value="This should be normally FALSE since the grammar should be good enough to parse our tests." />
+      <node concept="z59LJ" id="1y75PbzycUA" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycU$" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycU_" role="1dT_Ay">
+            <property role="1dT_AB" value="This should be normally FALSE since the grammar should be good enough to parse our tests." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="L6k24q5o72" role="jymVt" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_runs@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_runs@tests.mps
index 9a845e188..7026d767e 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_runs@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/nusmv_runs@tests.mps
@@ -9,7 +9,7 @@
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.counterexample@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.counterexample@tests.mps
index fab6bfe18..109d6ab1a 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.counterexample@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/test.mbeddr.formal.nusmv.counterexample@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_source@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_source@tests.mps
index 0166fe02a..68d48072d 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_source@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tests_source@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tl_patterns_tests@tests.mps b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tl_patterns_tests@tests.mps
index b9375c795..9d935dd97 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tl_patterns_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/models/tl_patterns_tests@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <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="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd
index 8788ea516..6d2a1bf60 100644
--- a/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd
@@ -31,6 +31,8 @@
     <dependency reexport="false">22a84bd5-d947-48ae-b9f6-8288eea41dce(com.mbeddr.formal.nusmv.arch)</dependency>
   </dependencies>
   <languageVersions>
+    <language slang="l:3b22dedc-d6cf-4626-9445-6e9909b3e04a:com.fasten.base.arch.msc" version="0" />
+    <language slang="l:81f6a079-965e-4523-87c3-8e6194f66585:com.fasten.base.msc" version="0" />
     <language slang="l:83ed2dfe-f724-46cc-852a-dce086daee3f:com.mbeddr.formal.base" version="0" />
     <language slang="l:71797868-de95-425c-8470-36aa52c8ebc4:com.mbeddr.formal.base.arch" version="1" />
     <language slang="l:b0b65429-cd22-4e2a-83e7-cd58bc6dd72f:com.mbeddr.formal.base.expressions" version="0" />
@@ -48,13 +50,14 @@
     <language slang="l:450c81f1-1811-41ac-a9c8-8fda59f778ca:com.mbeddr.formal.nusmv.tabular" version="0" />
     <language slang="l:cac6875e-14fd-4552-a69e-b3168e27e2ff:com.mbeddr.formal.nusmv.tests" version="0" />
     <language slang="l:0da073b7-14da-42e6-8db1-df42c803e079:com.mbeddr.formal.nusmv.verification_cases" version="-1" />
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" 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" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd
index 9315de7a5..703367d0a 100644
--- a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd
@@ -20,11 +20,12 @@
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <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" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
diff --git a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/models/com.mbeddr.formal.prism.pluginSolution.runner.mps b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/models/com.mbeddr.formal.prism.pluginSolution.runner.mps
index f6defbb7d..582a01385 100644
--- a/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/models/com.mbeddr.formal.prism.pluginSolution.runner.mps
+++ b/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/models/com.mbeddr.formal.prism.pluginSolution.runner.mps
@@ -7,7 +7,8 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="2avh" ref="r:d71bd9ec-2dae-496f-9887-8fb9facf61b7(com.mbeddr.formal.base.tooling.tools)" />
@@ -107,9 +108,16 @@
       <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" />
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="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="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -257,8 +265,12 @@
           <node concept="17QB3L" id="4Hts7PYu1UB" role="_ZDj9" />
         </node>
       </node>
-      <node concept="NWlO9" id="4Hts7PYtZ_O" role="lGtFl">
-        <property role="NWlVz" value="Runs Prism on a given file and with additional arguments." />
+      <node concept="P$JXv" id="1y75PbzycUD" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUB" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUC" role="1dT_Ay">
+            <property role="1dT_AB" value="Runs Prism on a given file and with additional arguments." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1xpXAu0NY81" role="jymVt" />
@@ -368,8 +380,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="2xeYpNCeHYD" role="lGtFl">
-        <property role="NWlVz" value="Rund Prism." />
+      <node concept="P$JXv" id="1y75PbzycUG" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUE" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUF" role="1dT_Ay">
+            <property role="1dT_AB" value="Rund Prism." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1xpXAu0NY8e" role="jymVt" />
diff --git a/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/models/test.com.mbeddr.formal.prism._010_smoke.mps b/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/models/test.com.mbeddr.formal.prism._010_smoke.mps
index c17f9a295..b27723d94 100644
--- a/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/models/test.com.mbeddr.formal.prism._010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/models/test.com.mbeddr.formal.prism._010_smoke.mps
@@ -155,7 +155,7 @@
         <node concept="112hEE" id="ZaBFheNc6A" role="112hEJ">
           <node concept="113wzp" id="ZaBFheNc6B" role="113wzu">
             <node concept="112hFX" id="ZaBFheNc72" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="ZaBFheNc78" role="113wz4">
               <property role="2IPVms" value="1" />
@@ -168,7 +168,7 @@
         <node concept="112hEE" id="1rXrB7iRZXF" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iRZXG" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShfw" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShfA" role="113wz4">
               <property role="2IPVms" value="2" />
@@ -183,7 +183,7 @@
             <property role="2IPVms" value="0" />
           </node>
           <node concept="112hFX" id="ZaBFheNc7c" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+            <ref role="112hCK" node="ZaBFheM00U" />
           </node>
         </node>
       </node>
@@ -191,7 +191,7 @@
         <node concept="112hEE" id="1rXrB7iShgJ" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShgK" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShgL" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShgM" role="113wz4">
               <property role="2IPVms" value="3" />
@@ -204,7 +204,7 @@
         <node concept="112hEE" id="1rXrB7iShgO" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShgP" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShgQ" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShgR" role="113wz4">
               <property role="2IPVms" value="4" />
@@ -219,7 +219,7 @@
             <property role="2IPVms" value="1" />
           </node>
           <node concept="112hFX" id="1rXrB7iShgV" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+            <ref role="112hCK" node="ZaBFheM00U" />
           </node>
         </node>
       </node>
@@ -227,7 +227,7 @@
         <node concept="112hEE" id="1rXrB7iShhS" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShhT" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShhU" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShhV" role="113wz4">
               <property role="2IPVms" value="5" />
@@ -240,7 +240,7 @@
         <node concept="112hEE" id="1rXrB7iShhX" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShhY" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShhZ" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShi0" role="113wz4">
               <property role="2IPVms" value="6" />
@@ -255,7 +255,7 @@
             <property role="2IPVms" value="2" />
           </node>
           <node concept="112hFX" id="1rXrB7iShi4" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+            <ref role="112hCK" node="ZaBFheM00U" />
           </node>
         </node>
       </node>
@@ -263,7 +263,7 @@
         <node concept="112hEE" id="1rXrB7iShj3" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShj4" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShj5" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShj6" role="113wz4">
               <property role="2IPVms" value="1" />
@@ -276,7 +276,7 @@
         <node concept="112hEE" id="1rXrB7iShj8" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShj9" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShja" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShjb" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -284,7 +284,7 @@
           </node>
           <node concept="113wzp" id="1rXrB7iShkr" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShk$" role="113wzq">
-              <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
+              <ref role="112hCK" node="ZaBFheMfar" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShkF" role="113wz4">
               <property role="2IPVms" value="1" />
@@ -299,7 +299,7 @@
             <property role="2IPVms" value="3" />
           </node>
           <node concept="112hFX" id="1rXrB7iShjf" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+            <ref role="112hCK" node="ZaBFheM00U" />
           </node>
         </node>
       </node>
@@ -307,7 +307,7 @@
         <node concept="112hEE" id="1rXrB7iShkI" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShkJ" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShkK" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShkL" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -315,7 +315,7 @@
           </node>
           <node concept="113wzp" id="1rXrB7iShmt" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShmA" role="113wzq">
-              <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
+              <ref role="112hCK" node="ZaBFheMfar" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShmH" role="113wz4">
               <property role="2IPVms" value="2" />
@@ -328,7 +328,7 @@
         <node concept="112hEE" id="1rXrB7iShkN" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShkO" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShkP" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShkQ" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -336,7 +336,7 @@
           </node>
           <node concept="113wzp" id="1rXrB7iShkR" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShkS" role="113wzq">
-              <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
+              <ref role="112hCK" node="ZaBFheMfar" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShkT" role="113wz4">
               <property role="2IPVms" value="3" />
@@ -351,7 +351,7 @@
             <property role="2IPVms" value="4" />
           </node>
           <node concept="112hFX" id="1rXrB7iShkX" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+            <ref role="112hCK" node="ZaBFheM00U" />
           </node>
         </node>
       </node>
@@ -359,7 +359,7 @@
         <node concept="112hEE" id="1rXrB7iShnk" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShnl" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShnm" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShnn" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -367,7 +367,7 @@
           </node>
           <node concept="113wzp" id="1rXrB7iShno" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShnp" role="113wzq">
-              <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
+              <ref role="112hCK" node="ZaBFheMfar" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShnq" role="113wz4">
               <property role="2IPVms" value="4" />
@@ -380,7 +380,7 @@
         <node concept="112hEE" id="1rXrB7iShns" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShnt" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShnu" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShnv" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -388,7 +388,7 @@
           </node>
           <node concept="113wzp" id="1rXrB7iShnw" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShnx" role="113wzq">
-              <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
+              <ref role="112hCK" node="ZaBFheMfar" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShny" role="113wz4">
               <property role="2IPVms" value="5" />
@@ -403,7 +403,7 @@
             <property role="2IPVms" value="5" />
           </node>
           <node concept="112hFX" id="1rXrB7iShnA" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+            <ref role="112hCK" node="ZaBFheM00U" />
           </node>
         </node>
       </node>
@@ -411,7 +411,7 @@
         <node concept="112hEE" id="1rXrB7iShpu" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShpv" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShpw" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShpx" role="113wz4">
               <property role="2IPVms" value="2" />
@@ -424,7 +424,7 @@
         <node concept="112hEE" id="1rXrB7iShpA" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iShpB" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShpC" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShpD" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -432,7 +432,7 @@
           </node>
           <node concept="113wzp" id="1rXrB7iShpE" role="113wzu">
             <node concept="112hFX" id="1rXrB7iShpF" role="113wzq">
-              <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
+              <ref role="112hCK" node="ZaBFheMfar" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iShpG" role="113wz4">
               <property role="2IPVms" value="6" />
@@ -447,7 +447,7 @@
             <property role="2IPVms" value="6" />
           </node>
           <node concept="112hFX" id="1rXrB7iShpK" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+            <ref role="112hCK" node="ZaBFheM00U" />
           </node>
         </node>
       </node>
@@ -455,7 +455,7 @@
         <node concept="112hEE" id="1rXrB7iSySp" role="112hEJ">
           <node concept="113wzp" id="1rXrB7iSySq" role="113wzu">
             <node concept="112hFX" id="1rXrB7iSyUS" role="113wzq">
-              <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+              <ref role="112hCK" node="ZaBFheM00U" />
             </node>
             <node concept="2IPVmt" id="1rXrB7iSyUY" role="113wz4">
               <property role="2IPVms" value="7" />
@@ -467,7 +467,7 @@
             <property role="2IPVms" value="7" />
           </node>
           <node concept="112hFX" id="1rXrB7iSyUB" role="2H9Iav">
-            <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+            <ref role="112hCK" node="ZaBFheM00U" />
           </node>
         </node>
       </node>
@@ -476,7 +476,7 @@
   </node>
   <node concept="2oyOwK" id="1xpXAu0Q0D5">
     <property role="TrG5h" value="_010_die_spec" />
-    <ref role="2oGCQt" node="ZaBFheK9QZ" resolve="_010_die" />
+    <ref role="2oGCQt" node="ZaBFheK9QZ" />
     <node concept="2ozijr" id="1xpXAu0Q0D6" role="2oyNpA">
       <property role="TrG5h" value="x" />
       <node concept="2owvKH" id="1xpXAu0QqIZ" role="112KhV" />
@@ -491,7 +491,7 @@
           <node concept="2oJwby" id="1xpXAu0X$cy" role="32OYtT">
             <node concept="110AQS" id="1xpXAu0X$cz" role="2H9Iav">
               <node concept="112hFX" id="1xpXAu0X$c$" role="2H9Iav">
-                <ref role="112hCK" node="ZaBFheM00U" resolve="s" />
+                <ref role="112hCK" node="ZaBFheM00U" />
               </node>
               <node concept="2IPVmt" id="1xpXAu0X$c_" role="2H9Ial">
                 <property role="2IPVms" value="7" />
@@ -499,10 +499,10 @@
             </node>
             <node concept="110AQS" id="1xpXAu0X$cA" role="2H9Ial">
               <node concept="112hFX" id="1xpXAu0X$cB" role="2H9Ial">
-                <ref role="112hCK" node="1xpXAu0Q0D6" resolve="x" />
+                <ref role="112hCK" node="1xpXAu0Q0D6" />
               </node>
               <node concept="112hFX" id="1xpXAu0X$cC" role="2H9Iav">
-                <ref role="112hCK" node="ZaBFheMfar" resolve="d" />
+                <ref role="112hCK" node="ZaBFheMfar" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/.mps/migration.xml b/code/languages/com.mbeddr.formal.repo_admin/.mps/migration.xml
new file mode 100644
index 000000000..a7d5049db
--- /dev/null
+++ b/code/languages/com.mbeddr.formal.repo_admin/.mps/migration.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MigrationProperties">
+    <entry key="jetbrains.mps.ide.mpsmigration.v182.ReapplyPatternMigration" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v191.SaveAllJavaStubMethodRefsToShortForeignFormat" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v191.UpdateJavaStubMethodRefs" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2019_3.DefaultFacetExplicitPersistence" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2021_2.SplitMPSCoreStub" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
+    <entry key="project.migrated.version" value="222" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.formal.repo_admin/.mps/modules.xml b/code/languages/com.mbeddr.formal.repo_admin/.mps/modules.xml
index b8306399f..6024b60cf 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/.mps/modules.xml
+++ b/code/languages/com.mbeddr.formal.repo_admin/.mps/modules.xml
@@ -4,6 +4,194 @@
     <projectModules>
       <modulePath path="$PROJECT_DIR$/solutions/com.fasten.meta.all/com.fasten.meta.all.msd" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd" folder="" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.fasten.symo/languages/com.fasten.symo.hw/com.fasten.symo.hw.mpl" folder="com.fasten.symo" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/com.symo.sysml.ibd.mpl" folder="com.fasten.symo" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/com.fasten.symo.hw.sandbox.msd" folder="com.fasten.symo" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.fasten.symo/solutions/com.symo.sysml.ibd.sandbox/com.symo.sysml.ibd.sandbox.msd" folder="com.fasten.symo" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.cprover/solutions/com.mbeddr.formal.cbmc.rt/com.mbeddr.formal.cbmc.rt.msd" folder="com.mbeddr.formal.cprover" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.cprover/solutions/test.com.mbeddr.formal.cbmc/test.com.mbeddr.formal.cbmc.msd" folder="com.mbeddr.formal.cprover" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/devkits/fasten.nusmv/fasten.nusmv.devkit" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/devkits/fasten.nuxmv/fasten.nuxmv.devkit" folder="com.mbeddr.formal.nusmv.lang.nuxmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/com.fasten.base.activity.mpl" folder="com.mbeddr.formal.nusmv.lang.base.activity" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.arch.msc/com.fasten.base.arch.msc.mpl" folder="com.mbeddr.formal.nusmv.lang.base.msc" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/com.fasten.base.git.mpl" folder="com.mbeddr.formal.nusmv.lang.base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.msc/com.fasten.base.msc.mpl" folder="com.mbeddr.formal.nusmv.lang.base.msc" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.analyses/com.mbeddr.formal.base.analyses.mpl" folder="com.mbeddr.formal.nusmv.lang.base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.arch/com.mbeddr.formal.base.arch.mpl" folder="com.mbeddr.formal.nusmv.lang.base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.expressions/com.mbeddr.formal.base.expressions.mpl" folder="com.mbeddr.formal.nusmv.lang.base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.operatorspanel/com.mbeddr.formal.base.operatorspanel.mpl" folder="com.mbeddr.formal.nusmv.lang.base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base.tabular/com.mbeddr.formal.base.tabular.mpl" folder="com.mbeddr.formal.nusmv.lang.base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/com.mbeddr.formal.base.mpl" folder="com.mbeddr.formal.nusmv.lang.base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.arch/com.mbeddr.formal.nusmv.arch.mpl" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.ext/com.mbeddr.formal.nusmv.ext.mpl" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.importer/com.mbeddr.formal.nusmv.importer.mpl" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.operatorspanel/com.mbeddr.formal.nusmv.operatorspanel.mpl" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.sm/com.mbeddr.formal.nusmv.sm.mpl" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.source/com.mbeddr.formal.nusmv.source.mpl" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.spec.patterns/com.mbeddr.formal.nusmv.spec.patterns.mpl" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tabular/com.mbeddr.formal.nusmv.tabular.mpl" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.tests/com.mbeddr.formal.nusmv.tests.mpl" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.verification_cases/com.mbeddr.formal.nusmv.verification_cases.mpl" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv/com.mbeddr.formal.nusmv.mpl" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv.source/com.mbeddr.formal.nuxmv.source.mpl" folder="com.mbeddr.formal.nusmv.lang.nuxmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nuxmv/com.mbeddr.formal.nuxmv.mpl" folder="com.mbeddr.formal.nusmv.lang.nuxmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/com.mbeddr.formal.ocra.mpl" folder="com.mbeddr.formal.nusmv.lang.ocra" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/com.mbeddr.formal.ocra.sandbox.msd" folder="com.mbeddr.formal.nusmv.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.activity.sandbox/com.fasten.base.activity.sandbox.msd" folder="com.mbeddr.formal.nusmv.lang.base.activity" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/solutions/com.fasten.base.msc.sandbox/com.fasten.base.msc.sandbox.msd" folder="com.mbeddr.formal.nusmv.lang.base.msc" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.operatorspanel.rt/com.mbeddr.formal.base.operatorspanel.rt.msd" folder="com.mbeddr.formal.nusmv.lang.base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.pluginSolution/com.mbeddr.formal.base.pluginSolution.msd" folder="com.mbeddr.formal.nusmv.lang.base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd" folder="com.mbeddr.formal.nusmv.lang.base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/com.mbeddr.formal.nusmv.build.msd" folder="com.mbeddr.formal.nusmv.build" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.cbd.pluginSolution/com.mbeddr.formal.nusmv.cbd.pluginSolution.msd" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.importer.rt/com.mbeddr.formal.nusmv.importer.rt.msd" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.pluginSolution/com.mbeddr.formal.nusmv.pluginSolution.msd" folder="com.mbeddr.formal.nusmv.lang.nusmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nuxmv.pluginSolution/com.mbeddr.formal.nuxmv.pluginSolution.msd" folder="com.mbeddr.formal.nusmv.lang.nuxmv" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/com.mbeddr.formal.rcp.pluginSolution.msd" folder="com.mbeddr.formal.nusmv.rcp" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tips_and_tricks/com.mbeddr.formal.rcp.tips_and_tricks.msd" folder="com.mbeddr.formal.nusmv.rcp" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd" folder="com.mbeddr.formal.nusmv.rcp" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/tests/com.mbeddr.formal.nusmv.sandbox/com.mbeddr.formal.nusmv.sandbox.msd" folder="com.mbeddr.formal.nusmv.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/tests/test.fasten.base/test.fasten.base.msd" folder="com.mbeddr.formal.nusmv.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd" folder="com.mbeddr.formal.nusmv.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.nusmv/tests/test.mbeddr.formal.nuxmv/test.mbeddr.formal.nuxmv.msd" folder="com.mbeddr.formal.nusmv.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.prism/languages/com.mbeddr.formal.prism/com.mbeddr.formal.prism.mpl" folder="com.mbeddr.formal.prism.lan" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.prism/solutions/com.mbeddr.formal.prism.pluginSolution/com.mbeddr.formal.prism.pluginSolution.msd" folder="com.mbeddr.formal.prism.lan" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.prism/tests/test.com.mbeddr.formal.prism/test.com.mbeddr.formal.prism.msd" folder="com.mbeddr.formal.prism.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/devkits/fasten.requirements.formal/fasten.requirements.formal.devkit" folder="com.mbeddr.formal.req.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/devkits/fasten.requirements/fasten.requirements.devkit" folder="com.mbeddr.formal.req.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/com.fasten.req.odd.mpl" folder="com.mbeddr.formal.req.lang.odd" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/com.fasten.req.ontology.mpl" folder="com.mbeddr.formal.req.lang.ontology" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.arch/com.mbeddr.formal.req.arch.mpl" folder="com.mbeddr.formal.req.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/com.mbeddr.formal.req.base.mpl" folder="com.mbeddr.formal.req.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.msc/com.mbeddr.formal.req.msc.mpl" folder="com.mbeddr.formal.req.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.nusmv/com.mbeddr.formal.req.nusmv.mpl" folder="com.mbeddr.formal.req.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.scenarios/com.mbeddr.formal.req.scenarios.mpl" folder="com.mbeddr.formal.req.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.arch/com.mbeddr.formal.req.tl_patterns.arch.mpl" folder="com.mbeddr.formal.req.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/com.mbeddr.formal.req.tl_patterns.nusmv.mpl" folder="com.mbeddr.formal.req.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/com.mbeddr.formal.req.tl_patterns.mpl" folder="com.mbeddr.formal.req.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.odd.sandbox/com.fasten.req.odd.sandbox.msd" folder="com.mbeddr.formal.req.lang.odd" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.lib/com.fasten.req.ontology.lib.msd" folder="com.mbeddr.formal.req.lang.ontology" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/solutions/com.fasten.req.ontology.pluginSolution/com.fasten.req.ontology.pluginSolution.msd" folder="com.mbeddr.formal.req.lang.ontology" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/com.mbeddr.formal.req.base.pluginSolution.msd" folder="com.mbeddr.formal.req.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.sandbox/com.mbeddr.formal.req.sandbox.msd" folder="com.mbeddr.formal.req.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.msd" folder="com.mbeddr.formal.req.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.req/tests/test.com.mbeddr.formal.req.tl_patterns/test.com.mbeddr.formal.req.tl_patterns.msd" folder="com.mbeddr.formal.req.test" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.fmea.arch/fasten.safety.fmea.arch.devkit" folder="com.mbeddr.formal.safety" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.fmea/fasten.safety.fmea.devkit" folder="com.mbeddr.formal.safety" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.ft/fasten.safety.ft.devkit" folder="com.mbeddr.formal.safety" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.artefacts/fasten.safety.gsn.artefacts.devkit" folder="com.mbeddr.formal.safety" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.confidence/fasten.safety.gsn.confidence.devkit" folder="com.mbeddr.formal.safety" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.doc/fasten.safety.gsn.doc.devkit" folder="com.mbeddr.formal.safety" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.ext/fasten.safety.gsn.ext.devkit" folder="com.mbeddr.formal.safety" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.formal/fasten.safety.gsn.formal.devkit" folder="com.mbeddr.formal.safety" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.modelquery/fasten.safety.gsn.modelquery.devkit" folder="com.mbeddr.formal.safety" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.patterns/fasten.safety.gsn.patterns.devkit" folder="com.mbeddr.formal.safety" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn/fasten.safety.gsn.devkit" folder="com.mbeddr.formal.safety" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety.hara/fasten.safety.hara.devkit" folder="com.mbeddr.formal.safety" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/devkits/fasten.safety/fasten.safety.devkit" folder="com.mbeddr.formal.safety" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/com.fasten.process.review.mpl" folder="com.mbeddr.formal.safety.process" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl" folder="com.mbeddr.formal.safety.bayesian" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/com.fasten.safety.fmea.arch.mpl" folder="com.mbeddr.formal.safety.fmea" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/com.fasten.safety.fmea.iso26262.mpl" folder="com.mbeddr.formal.safety.fmea" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl" folder="com.mbeddr.formal.safety.fmea" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/com.fasten.safety.ft.xfta_gen.mpl" folder="com.mbeddr.formal.safety.ft" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl" folder="com.mbeddr.formal.safety.ft" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop.iso26262/com.fasten.safety.hazop.iso26262.mpl" folder="com.mbeddr.formal.safety.hara.hazop" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hazop/com.fasten.safety.hazop.mpl" folder="com.mbeddr.formal.safety.hara.hazop" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/com.fasten.safety.hiphops.arch.mpl" folder="com.mbeddr.formal.safety.fmea_hiphops" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/com.fasten.safety.hiphops.mpl" folder="com.mbeddr.formal.safety.fmea_hiphops" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl" folder="com.mbeddr.formal.safety.gsn._050_modelquery" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/com.mbeddr.formal.safety.argument.process.artefacts.mpl" folder="com.mbeddr.formal.safety.gsn._030_process" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process/com.mbeddr.formal.safety.argument.process.mpl" folder="com.mbeddr.formal.safety.gsn._030_process" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/com.mbeddr.formal.safety.argument.runtime.mpl" folder="com.mbeddr.formal.safety.gsn._060_runtime" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.ext/com.mbeddr.formal.safety.cae.ext.mpl" folder="com.mbeddr.formal.safety.gsn._010_base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae.external_evidence/com.mbeddr.formal.safety.cae.external_evidence.mpl" folder="com.mbeddr.formal.safety.gsn._010_base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.cae/com.mbeddr.formal.safety.cae.mpl" folder="com.mbeddr.formal.safety.gsn._010_base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.acp/com.mbeddr.formal.safety.gsn.confidence.acp.mpl" folder="com.mbeddr.formal.safety.gsn._040_confidence" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.mpl" folder="com.mbeddr.formal.safety.gsn._040_confidence" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl" folder="com.mbeddr.formal.safety.gsn._020_doc" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl" folder="com.mbeddr.formal.safety.gsn._010_base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl" folder="com.mbeddr.formal.safety.gsn._010_base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.importer/com.mbeddr.formal.safety.gsn.importer.mpl" folder="com.mbeddr.formal.safety.gsn._010_base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/com.mbeddr.formal.safety.gsn.odd.mpl" folder="com.mbeddr.formal.safety.gsn._100_checkable_patterns" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/com.mbeddr.formal.safety.gsn.patterns.mpl" folder="com.mbeddr.formal.safety.gsn._100_checkable_patterns" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.pdfexport/com.mbeddr.formal.safety.gsn.pdfexport.mpl" folder="com.mbeddr.formal.safety.gsn._020_doc" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/com.mbeddr.formal.safety.gsn.smv.mpl" folder="com.mbeddr.formal.safety.gsn._100_checkable_patterns" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.web/com.mbeddr.formal.safety.gsn.web.mpl" folder="com.mbeddr.formal.safety.gsn._110_web" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.xml_gen/com.mbeddr.formal.safety.gsn.xml_gen.mpl" folder="com.mbeddr.formal.safety.gsn._010_base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl" folder="com.mbeddr.formal.safety.gsn._010_base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl" folder="com.mbeddr.formal.safety.hara" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl" folder="com.mbeddr.formal.safety.hara.iso26262" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/com.mbeddr.formal.safety.req.mpl" folder="com.mbeddr.formal.safety.req" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp.ext/com.mbeddr.formal.safety.stamp.ext.mpl" folder="com.mbeddr.formal.safety.hara.stamp" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl" folder="com.mbeddr.formal.safety.hara.stamp" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/com.fasten.assurance.build.msd" folder="com.mbeddr.formal.safety.build" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.process.review.sandbox/com.fasten.process.review.sandbox.msd" folder="com.mbeddr.formal.safety.process" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.bayesian_network.sandbox/com.fasten.safety.bayesian_network.sandbox.msd" folder="com.mbeddr.formal.safety.bayesian" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/com.fasten.safety.doc2word.msd" folder="com.mbeddr.formal.safety.doc2word" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.fmea.sandbox/com.fasten.safety.fmea.sandbox.msd" folder="com.mbeddr.formal.safety.fmea" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.pluginSolution/com.fasten.safety.ft.pluginSolution.msd" folder="com.mbeddr.formal.safety.ft" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.sandbox/com.fasten.safety.ft.sandbox.msd" folder="com.mbeddr.formal.safety.ft" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd" folder="com.mbeddr.formal.safety.ft" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hara.sandbox/com.fasten.safety.hara.sandbox.msd" folder="com.mbeddr.formal.safety.hara" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hazop.sandbox/com.fasten.safety.hazop.sandbox.msd" folder="com.mbeddr.formal.safety.hara.hazop" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/com.fasten.safety.hiphops.sandbox.msd" folder="com.mbeddr.formal.safety.fmea_hiphops" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.rcp.pluginSolution/com.fasten.safety.rcp.pluginSolution.msd" folder="com.mbeddr.formal.safety.rcp" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.modelquery.genplan/com.mbeddr.formal.safety.argument.modelquery.genplan.msd" folder="com.mbeddr.formal.safety.gsn._050_modelquery" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.process.sandbox/com.mbeddr.formal.safety.argument.process.sandbox.msd" folder="com.mbeddr.formal.safety.gsn._030_process" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/com.mbeddr.formal.safety.argument.runtime.pluginSolution.msd" folder="com.mbeddr.formal.safety.gsn._060_runtime" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.sandbox/com.mbeddr.formal.safety.argument.runtime.sandbox.msd" folder="com.mbeddr.formal.safety.gsn._060_runtime" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/com.mbeddr.formal.safety.build.msd" folder="com.mbeddr.formal.safety.build" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.cae.sandbox/com.mbeddr.formal.safety.cae.sandbox.msd" folder="com.mbeddr.formal.safety.gsn._010_base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.msd" folder="com.mbeddr.formal.safety.gsn._100_checkable_patterns" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.patterns.lib/com.mbeddr.formal.safety.gsn.patterns.lib.msd" folder="com.mbeddr.formal.safety.gsn._100_checkable_patterns" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.pluginSolution/com.mbeddr.formal.safety.gsn.pluginSolution.msd" folder="com.mbeddr.formal.safety.gsn._010_base" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd" folder="com.mbeddr.formal.safety.gsn" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd" folder="com.mbeddr.formal.safety.gsn._100_checkable_patterns" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd" folder="com.mbeddr.formal.safety.gsn._100_checkable_patterns" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/com.mbeddr.formal.safety.gsn.web.rt.msd" folder="com.mbeddr.formal.safety.gsn._110_web" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.sandbox/com.mbeddr.formal.safety.gsn.web.sandbox.msd" folder="com.mbeddr.formal.safety.gsn._110_web" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.pluginSolution/com.mbeddr.formal.safety.stamp.pluginSolution.msd" folder="com.mbeddr.formal.safety.hara.stamp" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.stamp.sandbox/com.mbeddr.formal.safety.stamp.sandbox.msd" folder="com.mbeddr.formal.safety.hara.stamp" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/solutions/test.com.mbeddr.formal.safety.argument.runtime/test.com.mbeddr.formal.safety.argument.runtime.msd" folder="com.mbeddr.formal.safety.gsn._060_runtime" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd" folder="com.mbeddr.formal.safety.doc2word" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/test.com.fasten.safety.ft.xfta.msd" folder="com.mbeddr.formal.safety.ft.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd" folder="com.mbeddr.formal.safety.ft.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/tests/test.com.mbeddr.formal.safety.stamp/test.com.mbeddr.formal.safety.stamp.msd" folder="com.mbeddr.formal.safety.hara.stamp" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/test.fasten.safety.hiphops.msd" folder="com.mbeddr.formal.safety.fmea_hiphops.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/test.mbeddr.formal.gsn.patterns.msd" folder="com.mbeddr.formal.safety.gsn._100_checkable_patterns.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd" folder="com.mbeddr.formal.safety.gsn._010_base.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.safety.argument.modelquery/test.mbeddr.formal.safety.argument.modelquery.msd" folder="com.mbeddr.formal.safety.gsn._050_modelquery.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/com.mbeddr.formal.smtlib.synthesis.mpl" folder="com.mbeddr.formal.smt.lang.experimental" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib/com.mbeddr.formal.smtlib.mpl" folder="com.mbeddr.formal.smt.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.lib/com.mbeddr.formal.smtlib.z3.lib.msd" folder="com.mbeddr.formal.smt.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/com.mbeddr.formal.smtlib.z3.rt.msd" folder="com.mbeddr.formal.smt.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/test.com.mbeddr.formal.smtlib.synthesis.msd" folder="com.mbeddr.formal.smt.test.experimental" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/test.com.mbeddr.formal.smtlib.msd" folder="com.mbeddr.formal.smt.test" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.spin/devkits/fasten.spin/fasten.spin.devkit" folder="com.mbeddr.formal.spin.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.analyses/com.mbeddr.formal.spin.analyses.mpl" folder="com.mbeddr.formal.spin.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.c.core/com.mbeddr.formal.spin.c.core.mpl" folder="com.mbeddr.formal.spin.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.ext/com.mbeddr.formal.spin.ext.mpl" folder="com.mbeddr.formal.spin.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl" folder="com.mbeddr.formal.spin.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl" folder="com.mbeddr.formal.spin.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.genplan/com.mbeddr.formal.spin.genplan.msd" folder="com.mbeddr.formal.spin.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/com.mbeddr.formal.spin.pluginSolution.msd" folder="com.mbeddr.formal.spin.lang" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.sandbox/com.mbeddr.formal.spin.sandbox.msd" folder="com.mbeddr.formal.spin.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/test.mbeddr.formal.spin.msd" folder="com.mbeddr.formal.spin.tests" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/com.mpsbasics.pdfexporter.mpl" folder="com.mpsbasics.pdfbox" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mpsbasics/solutions/com.mpsbasics.build/com.mpsbasics.build.msd" folder="com.mpsbasics" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/com.mpsbasics.docx4j.core.msd" folder="com.mpsbasics.docx4j" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd" folder="com.mpsbasics.docx4j" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd" folder="com.mpsbasics.docx4j" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.sandbox/com.mpsbasics.docx4j.sandbox.msd" folder="com.mpsbasics.docx4j" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd" folder="com.mpsbasics.docx4j" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/com.mpsbasics.editor.utils.msd" folder="com.mpsbasics" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox.sandbox/com.mpsbasics.pdfbox.sandbox.msd" folder="com.mpsbasics.pdfbox" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/com.mpsbasics.pdfbox.msd" folder="com.mpsbasics.pdfbox" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mpsbasics/solutions/com.mpsbasics.project.utils/com.mpsbasics.project.utils.msd" folder="com.mpsbasics" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/com.mpsbasics/solutions/com.mpsbasics.snode.utils/com.mpsbasics.snode.utils.msd" folder="com.mpsbasics" />
+      <modulePath path="${mbeddr.formal.home}/code/languages/repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd" folder="com.mbeddr.formal.safety" />
     </projectModules>
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.all/com.fasten.meta.all.msd b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.all/com.fasten.meta.all.msd
index aff5a30a9..3a86915fa 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.all/com.fasten.meta.all.msd
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.all/com.fasten.meta.all.msd
@@ -20,6 +20,7 @@
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:de1ad86d-6e50-4a02-b306-d4d17f64c375:jetbrains.mps.console.base" version="0" />
     <language slang="l:f26691d2-0def-4c06-aec6-2cb90c4af0a4:jetbrains.mps.console.scripts" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@@ -34,7 +35,6 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="3737e80e-d4db-4d99-a0b8-8dd1a24a1d9e(com.fasten.meta.all)" version="0" />
-    <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
     <module reference="79c13063-8a7d-4070-aaba-966b36d6e0c4(org.mpsqa.base.lib)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.all/models/com.fasten.meta.all.scripts.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.all/models/com.fasten.meta.all.scripts.mps
index ffe96fe0a..3b07450b2 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.all/models/com.fasten.meta.all.scripts.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.all/models/com.fasten.meta.all.scripts.mps
@@ -7,6 +7,7 @@
     <use id="f26691d2-0def-4c06-aec6-2cb90c4af0a4" name="jetbrains.mps.console.scripts" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
@@ -117,6 +118,11 @@
         <child id="1734392475491235551" name="command" index="1MOzCr" />
       </concept>
     </language>
+    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
+      <concept id="6332851714983831325" name="jetbrains.mps.baseLanguage.logging.structure.MsgStatement" flags="ng" index="2xdQw9">
+        <child id="5721587534047265374" name="message" index="9lYJi" />
+      </concept>
+    </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -638,6 +644,21 @@
                 </node>
               </node>
             </node>
+            <node concept="2xdQw9" id="1y75PbziWYa" role="3cqZAp">
+              <node concept="3cpWs3" id="1y75PbziXCb" role="9lYJi">
+                <node concept="2OqwBi" id="1y75PbziXOz" role="3uHU7w">
+                  <node concept="37vLTw" id="1y75PbziXCF" role="2Oq$k0">
+                    <ref role="3cqZAo" node="6r0uA12NdbN" resolve="modulesFile" />
+                  </node>
+                  <node concept="liA8E" id="1y75PbziYkU" role="2OqNvi">
+                    <ref role="37wK5l" to="guwi:~File.getAbsolutePath()" resolve="getAbsolutePath" />
+                  </node>
+                </node>
+                <node concept="Xl_RD" id="1y75PbziWYc" role="3uHU7B">
+                  <property role="Xl_RC" value="wrote lines in " />
+                </node>
+              </node>
+            </node>
           </node>
         </node>
       </node>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
index 6e32f868e..3800b9c96 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
@@ -45,7 +45,7 @@
     <ref role="2wR3oD" to="mjm5:1WMZ_AZ2QHN" resolve="not_updated_resolve_info" />
   </node>
   <node concept="2wR3oc" id="6wRVFFwzf93">
-    <ref role="2wR3oD" to="mjm5:ST9rMmXyNm" resolve="root_nodes_without_children" />
+    <ref role="2wR3oD" to="mjm5:ST9rMmXyNm" resolve="empty_root_nodes" />
   </node>
   <node concept="2wR3oc" id="4lfwJVE_q9k">
     <property role="2oM2pl" value="1c_Dn$lNzd7/WARNING" />
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps
index 41585a172..fd7d69854 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps
@@ -45,7 +45,7 @@
     <ref role="2wR3oD" to="mjm5:1WMZ_AZ2QHN" resolve="not_updated_resolve_info" />
   </node>
   <node concept="2wR3oc" id="6wRVFFwyrDH">
-    <ref role="2wR3oD" to="mjm5:ST9rMmXyNm" resolve="root_nodes_without_children" />
+    <ref role="2wR3oD" to="mjm5:ST9rMmXyNm" resolve="empty_root_nodes" />
   </node>
   <node concept="2wR3oc" id="4lfwJVE_q9k">
     <property role="2oM2pl" value="1c_Dn$lNzd7/WARNING" />
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.msd b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.msd
index 4f36d98d8..ab11f95d5 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.msd
@@ -28,7 +28,7 @@
     <dependency reexport="false">5ff577d1-1817-495b-9d6c-ff7b52c68609(com.mbeddr.formal.req.tl_patterns)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <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.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.utils.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.utils.mps
index 4f3d2533c..cddaf93c6 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.utils.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.utils.mps
@@ -5,7 +5,7 @@
     <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="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
   </languages>
   <imports>
     <import index="7gut" ref="r:a2a23a30-67b2-48a3-878f-fb5cb8f590da(com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.analyzer)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl
index 9a2791fbf..5eba5c520 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/com.mbeddr.formal.safety.gsn.doc.mpl
@@ -32,7 +32,7 @@
       <languageVersions>
         <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
         <language slang="l:2374bc90-7e37-41f1-a9c4-c2e35194c36a:com.mbeddr.doc" version="4" />
-        <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+        <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
         <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
         <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
         <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl
index 658326d45..ad5af68ee 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/com.mbeddr.formal.safety.gsn.ext.mpl
@@ -28,7 +28,7 @@
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
     <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps
index c1b22c33b..40f4ccda6 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.editor.mps
@@ -5,7 +5,7 @@
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="52733268-be24-4f5f-ab84-a73b7c0c03b0" name="de.slisson.mps.richtext.customcell" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl
index ad3c4ddbe..0df754836 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl
@@ -29,7 +29,7 @@
     <dependency reexport="false">6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
     <language slang="l:c73b17af-16a1-4490-8072-8a84937c5206:com.mbeddr.mpsutil.treenotation" version="0" />
     <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
@@ -87,6 +87,7 @@
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
+    <module reference="6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)" version="0" />
     <module reference="8da51702-0e05-44c8-96db-8f11d1457c0c(com.mpsbasics.snode.utils)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
index d71313a5a..fe508a1f7 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="f89904fb-9486-43a1-865e-5ad0375a8a88" name="de.itemis.mps.editor.bool" version="0" />
     <use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
@@ -14,6 +14,7 @@
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="31c91def-a131-41a1-9018-102874f49a12" name="de.slisson.mps.editor.multiline" version="0" />
+    <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>
@@ -466,11 +467,6 @@
         <reference id="3175313036448544057" name="extensionPoint" index="Sf$Xr" />
       </concept>
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
-    </language>
     <language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
       <concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
       <concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
@@ -490,6 +486,19 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
         <reference id="5455284157994012188" name="link" index="2pIpSl" />
@@ -3747,8 +3756,12 @@
           <ref role="ehGHo" to="py52:3GRi4m$qS5k" resolve="GoalStructureElementBase" />
         </node>
       </node>
-      <node concept="NWlO9" id="WKGDODP4RK" role="lGtFl">
-        <property role="NWlVz" value="Make sure that corresponding connections are deleted." />
+      <node concept="P$JXv" id="1y75Pbzy1u4" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1u2" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1u3" role="1dT_Ay">
+            <property role="1dT_AB" value="Make sure that corresponding connections are deleted." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="WKGDODPiMF" role="jymVt" />
@@ -6118,8 +6131,12 @@
       <node concept="3uibUv" id="696iakkwCk" role="EKbjA">
         <ref role="3uigEE" to="nkm5:6clvLV1YfKy" resolve="IConnectionEndpoint" />
       </node>
-      <node concept="NWlO9" id="696iakoDeN" role="lGtFl">
-        <property role="NWlVz" value="Fake implementation of IConnectionEndpoint to be able to use the connection-factories." />
+      <node concept="3UR2Jj" id="1y75Pbzy1u7" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1u5" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1u6" role="1dT_Ay">
+            <property role="1dT_AB" value="Fake implementation of IConnectionEndpoint to be able to use the connection-factories." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="696iakku3y" role="1B3o_S" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd
index 0e5ff1021..30eb74920 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/com.fasten.safety.ft.xfta.pluginSolution.msd
@@ -23,7 +23,7 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <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" />
@@ -57,6 +57,7 @@
     <module reference="091b20ea-7bf0-41d6-8e6e-4460a9bd8121(com.fasten.safety.ft.xfta_gen)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)" version="0" />
+    <module reference="8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.plugin.mps
index e437e3075..eb06bad02 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.plugin.mps
@@ -6,7 +6,7 @@
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="f3347d8a-0e79-4f35-8ac9-1574f25c986f" name="jetbrains.mps.execution.commands" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.runner.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.runner.mps
index 264515daf..d0bbc1f76 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.runner.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.runner.mps
@@ -2,9 +2,10 @@
 <model ref="r:6e99ad70-095a-4dfc-9cd7-6fd79b5cd071(com.fasten.safety.ft.xfta.pluginSolution.runner)">
   <persistence version="9" />
   <languages>
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+    <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>
@@ -140,9 +141,16 @@
       <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" />
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="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="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
@@ -360,8 +368,12 @@
           <node concept="17QB3L" id="4Hts7PYu1UB" role="_ZDj9" />
         </node>
       </node>
-      <node concept="NWlO9" id="4Hts7PYtZ_O" role="lGtFl">
-        <property role="NWlVz" value="Runs XFTA on a given file and with additional arguments." />
+      <node concept="P$JXv" id="1y75PbzycUJ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUH" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUI" role="1dT_Ay">
+            <property role="1dT_AB" value="Runs XFTA on a given file and with additional arguments." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7YOjUbFpYgD" role="jymVt" />
@@ -468,8 +480,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="2xeYpNCeHYD" role="lGtFl">
-        <property role="NWlVz" value="Rund XFTA" />
+      <node concept="P$JXv" id="1y75PbzycUM" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUK" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUL" role="1dT_Ay">
+            <property role="1dT_AB" value="Rund XFTA" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7YOjUbFpURb" role="jymVt" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.ui.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.ui.mps
index f0c1ba118..db2fd3cba 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.ui.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.ft.xfta.pluginSolution/models/com.fasten.safety.ft.xfta.pluginSolution.ui.mps
@@ -4,7 +4,8 @@
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
@@ -133,10 +134,19 @@
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
       </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </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">
@@ -173,8 +183,12 @@
       <node concept="3uibUv" id="6izRX53q3SM" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JTextArea" resolve="JTextArea" />
       </node>
-      <node concept="NWlO9" id="3Ymokd9HQBw" role="lGtFl">
-        <property role="NWlVz" value="Text area containing the raw output." />
+      <node concept="z59LJ" id="1y75PbzycUP" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUN" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUO" role="1dT_Ay">
+            <property role="1dT_AB" value="Text area containing the raw output." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="71901EGG$FD" role="jymVt" />
@@ -187,8 +201,12 @@
       <node concept="3uibUv" id="4kcU3YrmsGn" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JTextArea" resolve="JTextArea" />
       </node>
-      <node concept="NWlO9" id="4kcU3YrmsGo" role="lGtFl">
-        <property role="NWlVz" value="Text area containing the raw stderr." />
+      <node concept="z59LJ" id="1y75PbzycUS" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUQ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUR" role="1dT_Ay">
+            <property role="1dT_AB" value="Text area containing the raw stderr." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4kcU3YrmsuJ" role="jymVt" />
@@ -201,8 +219,12 @@
       <node concept="3uibUv" id="4$9c1ZyAb8X" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JTextArea" resolve="JTextArea" />
       </node>
-      <node concept="NWlO9" id="4$9c1ZyA7DT" role="lGtFl">
-        <property role="NWlVz" value="Text area containing the ran command." />
+      <node concept="z59LJ" id="1y75PbzycUV" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUT" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUU" role="1dT_Ay">
+            <property role="1dT_AB" value="Text area containing the ran command." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3R_yAtWnF7h" role="jymVt" />
@@ -215,8 +237,12 @@
       <node concept="3uibUv" id="3R_yAtWnE8Z" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JTextArea" resolve="JTextArea" />
       </node>
-      <node concept="NWlO9" id="3R_yAtWnE90" role="lGtFl">
-        <property role="NWlVz" value="Text area containing the lifted result." />
+      <node concept="z59LJ" id="1y75PbzycUY" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUW" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycUX" role="1dT_Ay">
+            <property role="1dT_AB" value="Text area containing the lifted result." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4$9c1ZyA5FH" role="jymVt" />
@@ -453,8 +479,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="6izRX53yf5q" role="1B3o_S" />
-      <node concept="NWlO9" id="3Ymokd9HQkG" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycV1" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycUZ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycV0" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6izRX53qwpx" role="jymVt" />
@@ -587,8 +617,12 @@
         <property role="TrG5h" value="err" />
         <node concept="17QB3L" id="4kcU3YrmuPd" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="3Ymokd9HPTu" role="lGtFl">
-        <property role="NWlVz" value="Presents the output." />
+      <node concept="P$JXv" id="1y75PbzycV4" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycV2" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycV3" role="1dT_Ay">
+            <property role="1dT_AB" value="Presents the output." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3DDJouLH7Ns" role="jymVt" />
@@ -618,13 +652,21 @@
       <node concept="2AHcQZ" id="3DDJouLH8uF" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="3DDJouLHbPr" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycV7" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycV5" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycV6" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="6izRX53pUdd" role="1B3o_S" />
-    <node concept="NWlO9" id="3Ymokd9HQTr" role="lGtFl">
-      <property role="NWlVz" value="UI for presenting the raw output." />
+    <node concept="3UR2Jj" id="1y75PbzycVa" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycV8" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycV9" role="1dT_Ay">
+          <property role="1dT_AB" value="UI for presenting the raw output." />
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/com.mbeddr.formal.safety.argument.runtime.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/com.mbeddr.formal.safety.argument.runtime.pluginSolution.msd
index aad53ffe4..3c4592b36 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/com.mbeddr.formal.safety.argument.runtime.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/com.mbeddr.formal.safety.argument.runtime.pluginSolution.msd
@@ -25,7 +25,7 @@
     <dependency reexport="false">d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <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.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui.mps
index 17b0d39a7..8fc78a0ca 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.argument.runtime.pluginSolution/models/com.mbeddr.formal.safety.argument.runtime.pluginSolution.ui.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd
index beed764ed..4dfd09c4c 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/com.mbeddr.formal.safety.gsn.sandbox.msd
@@ -67,7 +67,7 @@
     <language slang="l:434b2bfb-bd7a-47c9-bced-b445035e6d96:com.mbeddr.formal.safety.req" version="1" />
     <language slang="l:7e777b53-0a6b-4719-b36d-10475788d49f:com.mbeddr.formal.safety.stamp" version="2" />
     <language slang="l:ad8d48af-022b-40dc-8979-2b76074fb438:com.mbeddr.formal.spin" version="0" />
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
     <language slang="l:92f195b6-a209-4804-ad65-f5248ecd5873:com.mbeddr.mpsutil.margincell" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd
index c1b3fc250..ed9d4b13f 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/com.mbeddr.formal.safety.gsn.smv.pluginSolution.msd
@@ -28,11 +28,12 @@
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <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" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers.mps
index 25d98f1c9..1f6effb5c 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.analyzers.mps
@@ -6,8 +6,9 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="25x5" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.text(JDK/)" />
@@ -159,9 +160,6 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
       <concept id="5753587520027641499" name="com.mbeddr.mpsutil.blutil.structure.SafeReadAction" flags="ng" index="3kxDZ6">
         <child id="1423104411234567454" name="repo" index="ukAjM" />
         <child id="5753587520027644759" name="body" index="3kxCCa" />
@@ -180,6 +178,20 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -259,8 +271,12 @@
       <node concept="3Tqbb2" id="CmOUmcbec2" role="1tU5fm">
         <ref role="ehGHo" to="bsp8:2_iMKAX4lX5" resolve="SmvSpecGoal" />
       </node>
-      <node concept="NWlO9" id="CmOUmcboND" role="lGtFl">
-        <property role="NWlVz" value="The goal which is under analysis." />
+      <node concept="z59LJ" id="1y75PbzycVd" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVb" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVc" role="1dT_Ay">
+            <property role="1dT_AB" value="The goal which is under analysis." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="CmOUmcbeZT" role="jymVt" />
@@ -818,8 +834,12 @@
       <node concept="3Tqbb2" id="CmOUmcbv4y" role="1tU5fm">
         <ref role="ehGHo" to="bsp8:4qaoH_Q49c" resolve="SmvGoalBase" />
       </node>
-      <node concept="NWlO9" id="CmOUmcbvhR" role="lGtFl">
-        <property role="NWlVz" value="Analyzed goal." />
+      <node concept="z59LJ" id="1y75PbzycVg" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVe" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVf" role="1dT_Ay">
+            <property role="1dT_AB" value="Analyzed goal." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="CmOUmcbuQd" role="jymVt" />
@@ -885,8 +905,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="CmOUmcbVyw" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycVj" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVh" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVi" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="CmOUmcbuEc" role="jymVt" />
@@ -894,9 +918,6 @@
     <node concept="3uibUv" id="CmOUmcbtL9" role="1zkMxy">
       <ref role="3uigEE" to="4c75:7mSH3Wn4c5n" resolve="NuSMVLiftedResult" />
     </node>
-    <node concept="NWlO9" id="CmOUmcbuFN" role="lGtFl">
-      <property role="NWlVz" value="Lifted result for goals." />
-    </node>
     <node concept="3clFb_" id="CmOUmcbuGX" role="jymVt">
       <property role="TrG5h" value="getUserFriendlyMessage" />
       <property role="od$2w" value="false" />
@@ -946,8 +967,19 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="CmOUmcbvlr" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycVp" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVn" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVo" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3UR2Jj" id="1y75PbzycVm" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycVk" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycVl" role="1dT_Ay">
+          <property role="1dT_AB" value="Lifted result for goals." />
+        </node>
       </node>
     </node>
   </node>
@@ -961,8 +993,12 @@
       <node concept="3Tqbb2" id="CmOUmcc54c" role="1tU5fm">
         <ref role="ehGHo" to="bsp8:4qaoH_Q49c" resolve="SmvGoalBase" />
       </node>
-      <node concept="NWlO9" id="CmOUmcc54d" role="lGtFl">
-        <property role="NWlVz" value="The goal which is under analysis." />
+      <node concept="z59LJ" id="1y75PbzycVs" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVq" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVr" role="1dT_Ay">
+            <property role="1dT_AB" value="The goal which is under analysis." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="CmOUmcehf7" role="jymVt" />
@@ -972,8 +1008,12 @@
       <node concept="3Tqbb2" id="CmOUmcegAx" role="1tU5fm">
         <ref role="ehGHo" to="gioj:6NmtaR1SUJl" resolve="System" />
       </node>
-      <node concept="NWlO9" id="CmOUmcegAy" role="lGtFl">
-        <property role="NWlVz" value="The system which is under analysis." />
+      <node concept="z59LJ" id="1y75PbzycVv" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVt" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVu" role="1dT_Ay">
+            <property role="1dT_AB" value="The system which is under analysis." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="CmOUmcc54e" role="jymVt" />
@@ -1098,8 +1138,12 @@
       <node concept="3Tqbb2" id="CmOUmccbbQ" role="1tU5fm">
         <ref role="ehGHo" to="bsp8:4qaoH_PPfz" resolve="SmvTestsGoal" />
       </node>
-      <node concept="NWlO9" id="CmOUmccbbR" role="lGtFl">
-        <property role="NWlVz" value="The goal which is under analysis." />
+      <node concept="z59LJ" id="1y75PbzycVy" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVw" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVx" role="1dT_Ay">
+            <property role="1dT_AB" value="The goal which is under analysis." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="CmOUmccbbS" role="jymVt" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps
index 089f305a5..a78823461 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps
@@ -9,7 +9,7 @@
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd
index 4318114e7..fe0fe456f 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/com.mbeddr.formal.safety.gsn.spin.pluginSolution.msd
@@ -21,7 +21,7 @@
     <dependency reexport="false">80ea7e60-3c36-4583-be96-3e7d3ad3504e(com.mbeddr.formal.spin.analyses)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <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.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/models/com.mbeddr.formal.safety.gsn.spin.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/models/com.mbeddr.formal.safety.gsn.spin.pluginSolution.plugin.mps
index 744673e62..ea921f9ee 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/models/com.mbeddr.formal.safety.gsn.spin.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.spin.pluginSolution/models/com.mbeddr.formal.safety.gsn.spin.pluginSolution.plugin.mps
@@ -8,7 +8,7 @@
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
   </languages>
   <imports>
     <import index="25x5" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.text(JDK/)" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd
index d8010c682..64e3d3792 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test.com.fasten.safety.doc2word.msd
@@ -39,7 +39,7 @@
     <language slang="l:5e7ffa70-8e23-49f4-8c13-a887bba14c36:com.mbeddr.formal.safety.gsn.external_evidence" version="0" />
     <language slang="l:a7775cc7-19db-41cf-a724-3212ac4437b9:com.mbeddr.formal.safety.gsn.importer" version="0" />
     <language slang="l:ca32bc98-ea47-4b42-82e1-76bebf8a4e7d:com.mbeddr.formal.safety.gsn.xml_gen" version="0" />
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
     <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_tests@tests.mps
index ff699048f..488fedd11 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_tests@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps
index 23f70134c..2b8acb5cc 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps
index b771718f0..a2fed26c0 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps
@@ -6,7 +6,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd
index 7cc2f8778..db3a93f8c 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/test.mbeddr.formal.gsn.msd
@@ -64,7 +64,7 @@
     <language slang="l:7f3eac5a-7f9a-4fbe-8264-f69c70ece985:com.mbeddr.formal.safety.gsn.smv" version="9" />
     <language slang="l:ca32bc98-ea47-4b42-82e1-76bebf8a4e7d:com.mbeddr.formal.safety.gsn.xml_gen" version="0" />
     <language slang="l:ad8d48af-022b-40dc-8979-2b76074fb438:com.mbeddr.formal.spin" version="0" />
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:8ca79d43-eb45-4791-bdd4-0d6130ff895b:de.itemis.mps.editor.diagram.layout" version="0" />
     <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/com.mbeddr.formal.smtlib.synthesis.mpl b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/com.mbeddr.formal.smtlib.synthesis.mpl
index 44af879ca..38b581f6a 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/com.mbeddr.formal.smtlib.synthesis.mpl
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/com.mbeddr.formal.smtlib.synthesis.mpl
@@ -78,7 +78,7 @@
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:7e450f4e-1ac3-41ef-a851-4598161bdb94:de.slisson.mps.tables" 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" />
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/generator/template/main@generator.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/generator/template/main@generator.mps
index e63a7b35f..26634dac9 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/generator/template/main@generator.mps
@@ -300,7 +300,7 @@
             <node concept="1Uau1d" id="1MFSGJpnCLg" role="11AoXW">
               <node concept="1UfkGm" id="1MFSGJpnCLr" role="1UfoCz">
                 <node concept="11ACyy" id="1MFSGJpnCLE" role="1U5zfR">
-                  <ref role="11ACyx" node="1MFSGJpnCKu" resolve="a" />
+                  <ref role="11ACyx" node="1MFSGJpnCKu" />
                   <node concept="1ZhdrF" id="1MFSGJpod9R" role="lGtFl">
                     <property role="P3scX" value="9e54e509-552a-4f20-9b96-12a273367cff/7139183404079772121/7139183404079772122" />
                     <property role="2qtEX8" value="var" />
@@ -364,7 +364,7 @@
               </node>
               <node concept="1UfkGm" id="1MFSGJpnCLP" role="1UfoCz">
                 <node concept="11ACyy" id="1MFSGJpnCM7" role="1U5zfR">
-                  <ref role="11ACyx" node="1MFSGJpnCKI" resolve="b" />
+                  <ref role="11ACyx" node="1MFSGJpnCKI" />
                   <node concept="1ZhdrF" id="1MFSGJpoH0y" role="lGtFl">
                     <property role="P3scX" value="9e54e509-552a-4f20-9b96-12a273367cff/7139183404079772121/7139183404079772122" />
                     <property role="2qtEX8" value="var" />
@@ -878,9 +878,9 @@
               <node concept="1UfpLS" id="1MFSGJppwk4" role="11ARNb">
                 <node concept="1Uau1c" id="1MFSGJppwkn" role="1U5zfR">
                   <node concept="11BOot" id="1MFSGJppwmG" role="1UfoCz">
-                    <ref role="11BOos" node="1MFSGJppwlc" resolve="test_fun" />
+                    <ref role="11BOos" node="1MFSGJppwlc" />
                     <node concept="11ACyy" id="1MFSGJppwno" role="11yxzb">
-                      <ref role="11ACyx" node="1MFSGJppwiW" resolve="a" />
+                      <ref role="11ACyx" node="1MFSGJppwiW" />
                       <node concept="1WS0z7" id="1MFSGJppN5b" role="lGtFl">
                         <node concept="3JmXsc" id="1MFSGJppN5c" role="3Jn$fo">
                           <node concept="3clFbS" id="1MFSGJppN5d" role="2VODD2">
@@ -920,7 +920,7 @@
                       </node>
                     </node>
                     <node concept="11ACyy" id="1MFSGJprOHd" role="11yxzb">
-                      <ref role="11ACyx" node="1MFSGJppwjk" resolve="b" />
+                      <ref role="11ACyx" node="1MFSGJppwjk" />
                       <node concept="1WS0z7" id="1MFSGJprOHe" role="lGtFl">
                         <node concept="3JmXsc" id="1MFSGJprOHf" role="3Jn$fo">
                           <node concept="3clFbS" id="1MFSGJprOHg" role="2VODD2">
@@ -1007,9 +1007,9 @@
                   </node>
                 </node>
                 <node concept="11BOot" id="1MFSGJppQH3" role="1U5zfT">
-                  <ref role="11BOos" node="1MFSGJppwh1" resolve="fun" />
+                  <ref role="11BOos" node="1MFSGJppwh1" />
                   <node concept="11ACyy" id="1MFSGJpqJWC" role="11yxzb">
-                    <ref role="11ACyx" node="1MFSGJppwiW" resolve="a" />
+                    <ref role="11ACyx" node="1MFSGJppwiW" />
                     <node concept="1WS0z7" id="1MFSGJpqJWD" role="lGtFl">
                       <node concept="3JmXsc" id="1MFSGJpqJWE" role="3Jn$fo">
                         <node concept="3clFbS" id="1MFSGJpqJWF" role="2VODD2">
@@ -1049,7 +1049,7 @@
                     </node>
                   </node>
                   <node concept="11ACyy" id="1MFSGJprGfX" role="11yxzb">
-                    <ref role="11ACyx" node="1MFSGJppwjk" resolve="b" />
+                    <ref role="11ACyx" node="1MFSGJppwjk" />
                     <node concept="1WS0z7" id="1MFSGJprGz1" role="lGtFl">
                       <node concept="3JmXsc" id="1MFSGJprGz2" role="3Jn$fo">
                         <node concept="3clFbS" id="1MFSGJprGz3" role="2VODD2">
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/translator.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/translator.mps
index f19a47c5a..da0b190f1 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/translator.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/translator.mps
@@ -2,7 +2,7 @@
 <model ref="r:a79d84b9-1052-4e0b-bc24-45a64e76155e(com.mbeddr.formal.smtlib.synthesis.translator)">
   <persistence version="9" />
   <languages>
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/util.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/util.mps
index 9c29f2d4f..32c67ab22 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/util.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/util.mps
@@ -2,11 +2,12 @@
 <model ref="r:49ff2f56-dc9d-4ede-bfda-a242d3695abf(com.mbeddr.formal.smtlib.synthesis.util)">
   <persistence version="9" />
   <languages>
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
+    <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>
@@ -141,9 +142,19 @@
     </language>
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
       <concept id="6451706574537082687" name="com.mbeddr.mpsutil.blutil.structure.ShortStaticMethodCall" flags="ng" index="NRdvd" />
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
+    </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
       </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
       <concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
@@ -855,8 +866,12 @@
           <ref role="ehGHo" to="ehqg:6NmtaR1V301" resolve="Expression" />
         </node>
       </node>
-      <node concept="NWlO9" id="7vEzmJ3DizR" role="lGtFl">
-        <property role="NWlVz" value="Replaces Nary altrnatives from this term with cascades of if-then-else" />
+      <node concept="P$JXv" id="1y75Pbzy1ub" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1u9" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1ua" role="1dT_Ay">
+            <property role="1dT_AB" value="Replaces Nary altrnatives from this term with cascades of if-then-else" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7vEzmJ3DgXz" role="jymVt" />
@@ -1170,8 +1185,12 @@
           <ref role="ehGHo" to="ar9q:7vEzmJ3C3CH" resolve="NaryAlternatives" />
         </node>
       </node>
-      <node concept="NWlO9" id="7vEzmJ3DfHR" role="lGtFl">
-        <property role="NWlVz" value="Replaces an ITE-nary with a cascaded tree of ITEs." />
+      <node concept="P$JXv" id="1y75Pbzy1ue" role="lGtFl">
+        <node concept="TZ5HA" id="1y75Pbzy1uc" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75Pbzy1ud" role="1dT_Ay">
+            <property role="1dT_AB" value="Replaces an ITE-nary with a cascaded tree of ITEs." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7vEzmJ3C6Of" role="jymVt" />
@@ -1181,8 +1200,12 @@
     <node concept="2tJIrI" id="7vEzmJ3Ca_J" role="jymVt" />
     <node concept="2tJIrI" id="7vEzmJ3C6uF" role="jymVt" />
     <node concept="3Tm1VV" id="104dc5EbsRp" role="1B3o_S" />
-    <node concept="NWlO9" id="7vEzmJ3C2vq" role="lGtFl">
-      <property role="NWlVz" value="Synthethiser for terms." />
+    <node concept="3UR2Jj" id="1y75Pbzy1uh" role="lGtFl">
+      <node concept="TZ5HA" id="1y75Pbzy1uf" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75Pbzy1ug" role="1dT_Ay">
+          <property role="1dT_AB" value="Synthethiser for terms." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="1MFSGJpp2E7">
diff --git a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/com.mbeddr.formal.smtlib.z3.rt.msd b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/com.mbeddr.formal.smtlib.z3.rt.msd
index c6cb06b1a..76c7d256d 100644
--- a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/com.mbeddr.formal.smtlib.z3.rt.msd
+++ b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/com.mbeddr.formal.smtlib.z3.rt.msd
@@ -20,7 +20,7 @@
     <dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:3eada220-3310-4fd3-b794-ff924add7d8a:com.mbeddr.mpsutil.smodule" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
diff --git a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/runner.mps b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/runner.mps
index 7c549dbff..4cd038f3b 100644
--- a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/runner.mps
+++ b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/runner.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/translator.mps b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/translator.mps
index bdd2f53a8..f5233f74c 100644
--- a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/translator.mps
+++ b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/translator.mps
@@ -5,7 +5,7 @@
     <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="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_output.mps b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_output.mps
index a141048c6..14f0e669d 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_output.mps
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/_010_simple_output.mps
@@ -79,22 +79,22 @@
         </node>
         <node concept="35L7W5" id="3908G2fy9iO" role="1U5zfT">
           <node concept="1U5_Ed" id="3908G2fy9iH" role="35L7Wp">
-            <ref role="1U5_Ec" node="3908G2fy9iF" resolve="terminal_4" />
+            <ref role="1U5_Ec" node="3908G2fy9iF" />
           </node>
           <node concept="1UfqsA" id="3908G2fy9iI" role="35L7Wu">
             <node concept="1U5_Ed" id="3908G2fy9iJ" role="1UfoCz">
-              <ref role="1U5_Ec" node="3908G2fy9ir" resolve="terminal_0" />
+              <ref role="1U5_Ec" node="3908G2fy9ir" />
             </node>
             <node concept="1U5_Ed" id="3908G2fy9iK" role="1UfoCz">
-              <ref role="1U5_Ec" node="3908G2fy9iv" resolve="terminal_1" />
+              <ref role="1U5_Ec" node="3908G2fy9iv" />
             </node>
           </node>
           <node concept="1UfqsD" id="3908G2fy9iL" role="35L7Wh">
             <node concept="1U5_Ed" id="3908G2fy9iM" role="1U5zfR">
-              <ref role="1U5_Ec" node="3908G2fy9iz" resolve="terminal_2" />
+              <ref role="1U5_Ec" node="3908G2fy9iz" />
             </node>
             <node concept="1U5_Ed" id="3908G2fy9iN" role="1U5zfT">
-              <ref role="1U5_Ec" node="3908G2fy9iB" resolve="terminal_3" />
+              <ref role="1U5_Ec" node="3908G2fy9iB" />
             </node>
           </node>
         </node>
diff --git a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/sandbox._010_smoke_synth.mps b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/sandbox._010_smoke_synth.mps
index b05c19999..750e3d107 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/sandbox._010_smoke_synth.mps
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib.synthesis/models/sandbox._010_smoke_synth.mps
@@ -135,14 +135,14 @@
       <node concept="1U5apb" id="1MFSGJprTJ3" role="11zN3m" />
       <node concept="1UfkGm" id="1MFSGJppp7h" role="11AoXW">
         <node concept="11ACyy" id="1MFSGJprFo4" role="1U5zfR">
-          <ref role="11ACyx" node="1MFSGJpr2Cl" resolve="b" />
+          <ref role="11ACyx" node="1MFSGJpr2Cl" />
         </node>
         <node concept="1UfqsA" id="1MFSGJppp7j" role="1U5zfT">
           <node concept="11ACyy" id="1MFSGJprFo9" role="1UfoCz">
-            <ref role="11ACyx" node="1MFSGJpr2C5" resolve="a" />
+            <ref role="11ACyx" node="1MFSGJpr2C5" />
           </node>
           <node concept="1U5_Ed" id="1MFSGJppp7l" role="1UfoCz">
-            <ref role="1U5_Ec" node="104dc5EbthM" resolve="GAP" />
+            <ref role="1U5_Ec" node="104dc5EbthM" />
           </node>
         </node>
       </node>
@@ -169,14 +169,14 @@
       </node>
       <node concept="1UfkGm" id="7xXCuh1D$pe" role="11AoXW">
         <node concept="11ACyy" id="7xXCuh1EkE4" role="1U5zfR">
-          <ref role="11ACyx" node="7xXCuh1EkDB" resolve="b1" />
+          <ref role="11ACyx" node="7xXCuh1EkDB" />
         </node>
         <node concept="1UfqsA" id="7xXCuh1D$p_" role="1U5zfT">
           <node concept="11ACyy" id="7xXCuh1EkDX" role="1UfoCz">
-            <ref role="11ACyx" node="7xXCuh1EkDn" resolve="a1" />
+            <ref role="11ACyx" node="7xXCuh1EkDn" />
           </node>
           <node concept="1U5_Ed" id="7xXCuh1D$pB" role="1UfoCz">
-            <ref role="1U5_Ec" node="6cjunGyyaJ9" resolve="GAP" />
+            <ref role="1U5_Ec" node="6cjunGyyaJ9" />
           </node>
         </node>
       </node>
@@ -197,7 +197,7 @@
       <node concept="1Uau1d" id="1MFSGJp8vhR" role="11AoXW">
         <node concept="1UfkGm" id="1MFSGJp8vib" role="1UfoCz">
           <node concept="11ACyy" id="1MFSGJp8viw" role="1U5zfR">
-            <ref role="11ACyx" node="7xXCuh1EkAz" resolve="a2" />
+            <ref role="11ACyx" node="7xXCuh1EkAz" />
           </node>
           <node concept="2IPVmt" id="1MFSGJp8vid" role="1U5zfT">
             <property role="2IPVms" value="2" />
@@ -208,7 +208,7 @@
             <property role="2IPVms" value="3" />
           </node>
           <node concept="11ACyy" id="1MFSGJp8viB" role="1U5zfR">
-            <ref role="11ACyx" node="7xXCuh1EkAN" resolve="b2" />
+            <ref role="11ACyx" node="7xXCuh1EkAN" />
           </node>
         </node>
       </node>
@@ -227,7 +227,7 @@
       <node concept="1Uau1d" id="1MFSGJp8viF" role="11AoXW">
         <node concept="1UfkGm" id="1MFSGJp8viG" role="1UfoCz">
           <node concept="11ACyy" id="1MFSGJp8vj3" role="1U5zfR">
-            <ref role="11ACyx" node="1MFSGJp8vcD" resolve="a3" />
+            <ref role="11ACyx" node="1MFSGJp8vcD" />
           </node>
           <node concept="2IPVmt" id="1MFSGJp8viI" role="1U5zfT">
             <property role="2IPVms" value="3" />
@@ -238,7 +238,7 @@
             <property role="2IPVms" value="4" />
           </node>
           <node concept="11ACyy" id="1MFSGJp8vja" role="1U5zfR">
-            <ref role="11ACyx" node="1MFSGJp8vcF" resolve="b3" />
+            <ref role="11ACyx" node="1MFSGJp8vcF" />
           </node>
         </node>
       </node>
@@ -257,7 +257,7 @@
       <node concept="1Uau1d" id="1MFSGJp8vjh" role="11AoXW">
         <node concept="1UfkGm" id="1MFSGJp8vji" role="1UfoCz">
           <node concept="11ACyy" id="1MFSGJp8vjD" role="1U5zfR">
-            <ref role="11ACyx" node="1MFSGJp8veZ" resolve="a4" />
+            <ref role="11ACyx" node="1MFSGJp8veZ" />
           </node>
           <node concept="2IPVmt" id="1MFSGJp8vjk" role="1U5zfT">
             <property role="2IPVms" value="4" />
@@ -268,7 +268,7 @@
             <property role="2IPVms" value="15" />
           </node>
           <node concept="11ACyy" id="1MFSGJp8vjK" role="1U5zfR">
-            <ref role="11ACyx" node="1MFSGJp8vf1" resolve="b4" />
+            <ref role="11ACyx" node="1MFSGJp8vf1" />
           </node>
         </node>
       </node>
@@ -286,40 +286,40 @@
         </node>
         <node concept="1UfpLS" id="6cjunGyyEVo" role="11ARNb">
           <node concept="11BOot" id="6cjunGyzgZl" role="1U5zfT">
-            <ref role="11BOos" node="7xXCuh1D$mP" resolve="initialFormula" />
+            <ref role="11BOos" node="7xXCuh1D$mP" />
             <node concept="11ACyy" id="7xXCuh1EkGo" role="11yxzb">
-              <ref role="11ACyx" node="6cjunGyyaLA" resolve="a" />
+              <ref role="11ACyx" node="6cjunGyyaLA" />
             </node>
             <node concept="11ACyy" id="7xXCuh1EkGz" role="11yxzb">
-              <ref role="11ACyx" node="6cjunGyyaLY" resolve="b" />
+              <ref role="11ACyx" node="6cjunGyyaLY" />
             </node>
           </node>
           <node concept="1Uau1c" id="1MFSGJp8vjV" role="1U5zfR">
             <node concept="11BOot" id="1MFSGJp8vkz" role="1UfoCz">
-              <ref role="11BOos" node="7xXCuh1D$vh" resolve="t1" />
+              <ref role="11BOos" node="7xXCuh1D$vh" />
               <node concept="11ACyy" id="1MFSGJp8vkY" role="11yxzb">
-                <ref role="11ACyx" node="6cjunGyyaLA" resolve="a" />
+                <ref role="11ACyx" node="6cjunGyyaLA" />
               </node>
               <node concept="11ACyy" id="1MFSGJp8vl9" role="11yxzb">
-                <ref role="11ACyx" node="6cjunGyyaLY" resolve="b" />
+                <ref role="11ACyx" node="6cjunGyyaLY" />
               </node>
             </node>
             <node concept="11BOot" id="1MFSGJp8vlf" role="1UfoCz">
-              <ref role="11BOos" node="1MFSGJp8vcC" resolve="t2" />
+              <ref role="11BOos" node="1MFSGJp8vcC" />
               <node concept="11ACyy" id="1MFSGJp8vlg" role="11yxzb">
-                <ref role="11ACyx" node="6cjunGyyaLA" resolve="a" />
+                <ref role="11ACyx" node="6cjunGyyaLA" />
               </node>
               <node concept="11ACyy" id="1MFSGJp8vlh" role="11yxzb">
-                <ref role="11ACyx" node="6cjunGyyaLY" resolve="b" />
+                <ref role="11ACyx" node="6cjunGyyaLY" />
               </node>
             </node>
             <node concept="11BOot" id="1MFSGJp8vlu" role="1UfoCz">
-              <ref role="11BOos" node="1MFSGJp8veY" resolve="t3" />
+              <ref role="11BOos" node="1MFSGJp8veY" />
               <node concept="11ACyy" id="1MFSGJp8vlv" role="11yxzb">
-                <ref role="11ACyx" node="6cjunGyyaLA" resolve="a" />
+                <ref role="11ACyx" node="6cjunGyyaLA" />
               </node>
               <node concept="11ACyy" id="1MFSGJp8vlw" role="11yxzb">
-                <ref role="11ACyx" node="6cjunGyyaLY" resolve="b" />
+                <ref role="11ACyx" node="6cjunGyyaLY" />
               </node>
             </node>
           </node>
@@ -379,11 +379,11 @@
       <node concept="1U5apb" id="1MFSGJprTPN" role="11zN3m" />
       <node concept="1UfkGm" id="1MFSGJprTPO" role="11AoXW">
         <node concept="11ACyy" id="1MFSGJprTPP" role="1U5zfR">
-          <ref role="11ACyx" node="1MFSGJprTPL" resolve="b" />
+          <ref role="11ACyx" node="1MFSGJprTPL" />
         </node>
         <node concept="1UfqsA" id="1MFSGJprTPQ" role="1U5zfT">
           <node concept="11ACyy" id="1MFSGJprTPR" role="1UfoCz">
-            <ref role="11ACyx" node="1MFSGJprTPJ" resolve="a" />
+            <ref role="11ACyx" node="1MFSGJprTPJ" />
           </node>
           <node concept="1UbFQc" id="1MFSGJprTQe" role="1UfoCz" />
         </node>
diff --git a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke.mps b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke.mps
index c890d117d..81224ab82 100644
--- a/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.smt/tests/test.com.mbeddr.formal.smtlib/models/_010_smoke.mps
@@ -122,7 +122,7 @@
     <node concept="1U56EO" id="104dc5E4ctq" role="1U2RmC">
       <node concept="1U5ao_" id="104dc5E4zQ4" role="1U56ET">
         <node concept="1U5_Ed" id="104dc5E4Is4" role="1U5zfR">
-          <ref role="1U5_Ec" node="104dc5E499u" resolve="aDeclaredConst" />
+          <ref role="1U5_Ec" node="104dc5E499u" />
         </node>
         <node concept="2IPVmt" id="104dc5E4Isb" role="1U5zfT">
           <property role="2IPVms" value="9" />
@@ -132,7 +132,7 @@
     <node concept="1U56EO" id="104dc5E6un_" role="1U2RmC">
       <node concept="1U4LMg" id="104dc5E6uo4" role="1U56ET">
         <node concept="1U5_Ed" id="104dc5E6uoi" role="1U5zfR">
-          <ref role="1U5_Ec" node="104dc5E499u" resolve="aDeclaredConst" />
+          <ref role="1U5_Ec" node="104dc5E499u" />
         </node>
         <node concept="2IPVmt" id="104dc5E6uoq" role="1U5zfT">
           <property role="2IPVms" value="8" />
@@ -150,11 +150,11 @@
     <node concept="1U56EO" id="4tZ7POS58mr" role="1U2RmC">
       <node concept="35L7W5" id="4tZ7POS58n9" role="1U56ET">
         <node concept="1U5_Ed" id="4tZ7POS58nx" role="35L7Wp">
-          <ref role="1U5_Ec" node="4tZ7POS58lF" resolve="iteCond" />
+          <ref role="1U5_Ec" node="4tZ7POS58lF" />
         </node>
         <node concept="1UfkGm" id="4tZ7POS58nC" role="35L7Wu">
           <node concept="1U5_Ed" id="4tZ7POS58nU" role="1U5zfR">
-            <ref role="1U5_Ec" node="104dc5E499u" resolve="aDeclaredConst" />
+            <ref role="1U5_Ec" node="104dc5E499u" />
           </node>
           <node concept="2IPVmt" id="4tZ7POS58o2" role="1U5zfT">
             <property role="2IPVms" value="8" />
@@ -179,7 +179,7 @@
       <node concept="1U5aqE" id="6cjunGyBWnw" role="11zN3m" />
       <node concept="1UfqsA" id="6cjunGyCXa_" role="11AoXW">
         <node concept="11ACyy" id="6cjunGyCXaN" role="1UfoCz">
-          <ref role="11ACyx" node="6cjunGyBWng" resolve="par1" />
+          <ref role="11ACyx" node="6cjunGyBWng" />
         </node>
         <node concept="2IPVmt" id="6cjunGyCXb0" role="1UfoCz">
           <property role="2IPVms" value="1" />
@@ -193,9 +193,9 @@
     <node concept="1U56EO" id="6cjunGyBWm9" role="1U2RmC">
       <node concept="1UfkGm" id="6cjunGyBWqy" role="1U56ET">
         <node concept="11BOot" id="6cjunGyBWqL" role="1U5zfR">
-          <ref role="11BOos" node="6cjunGyBWmI" resolve="foo" />
+          <ref role="11BOos" node="6cjunGyBWmI" />
           <node concept="1U5_Ed" id="6cjunGyBWqX" role="11yxzb">
-            <ref role="1U5_Ec" node="6cjunGyBWm2" resolve="aConst" />
+            <ref role="1U5_Ec" node="6cjunGyBWm2" />
           </node>
         </node>
         <node concept="2IPVmt" id="6cjunGyBWmc" role="1U5zfT">
@@ -222,9 +222,9 @@
     <node concept="1U56EO" id="2l5A0OF1WWq" role="1U2RmC">
       <node concept="1UfkGm" id="2l5A0OF1WWr" role="1U56ET">
         <node concept="11BOot" id="2l5A0OF1WWs" role="1U5zfR">
-          <ref role="11BOos" node="2l5A0OF1WXc" resolve="foo" />
+          <ref role="11BOos" node="2l5A0OF1WXc" />
           <node concept="1U5_Ed" id="2l5A0OF1WWt" role="11yxzb">
-            <ref role="1U5_Ec" node="2l5A0OF1WWo" resolve="aConst" />
+            <ref role="1U5_Ec" node="2l5A0OF1WWo" />
           </node>
         </node>
         <node concept="2IPVmt" id="2l5A0OF1WWu" role="1U5zfT">
@@ -251,13 +251,13 @@
     <node concept="1U56EO" id="2l5A0OF69o0" role="1U2RmC">
       <node concept="1UfkGm" id="2l5A0OF69o1" role="1U56ET">
         <node concept="11BOot" id="2l5A0OF69o2" role="1U5zfR">
-          <ref role="11BOos" node="2l5A0OF69nT" resolve="foo" />
+          <ref role="11BOos" node="2l5A0OF69nT" />
           <node concept="1U5_Ed" id="2l5A0OF69o3" role="11yxzb">
-            <ref role="1U5_Ec" node="2l5A0OF69nX" resolve="aConst" />
+            <ref role="1U5_Ec" node="2l5A0OF69nX" />
           </node>
         </node>
         <node concept="1U5_Ed" id="2l5A0OF69om" role="1U5zfT">
-          <ref role="1U5_Ec" node="2l5A0OF69nX" resolve="aConst" />
+          <ref role="1U5_Ec" node="2l5A0OF69nX" />
         </node>
       </node>
     </node>
@@ -276,7 +276,7 @@
           <node concept="engXH" id="2_LXzlpuXeU" role="engYz">
             <property role="TrG5h" value="pred" />
             <node concept="mKvrX" id="6MrCApUnpto" role="engXD">
-              <ref role="mKvtK" node="2l5A0OF6OA6" resolve="Nat" />
+              <ref role="mKvtK" node="2l5A0OF6OA6" />
             </node>
           </node>
         </node>
@@ -286,14 +286,14 @@
       <property role="TrG5h" value="p" />
       <node concept="1U5apb" id="6MrCApUnpuB" role="1U56Ci" />
       <node concept="mKvrX" id="6MrCApUnpux" role="1U56Cg">
-        <ref role="mKvtK" node="2l5A0OF6OA6" resolve="Nat" />
+        <ref role="mKvtK" node="2l5A0OF6OA6" />
       </node>
     </node>
     <node concept="1U56EO" id="6MrCApUnpvh" role="1U2RmC">
       <node concept="11BOot" id="6MrCApUnpw7" role="1U56ET">
-        <ref role="11BOos" node="6MrCApUnptW" resolve="p" />
+        <ref role="11BOos" node="6MrCApUnptW" />
         <node concept="mYNaY" id="6MrCApUpU$s" role="11yxzb">
-          <ref role="mYNcP" node="2l5A0OF6PZv" resolve="zero" />
+          <ref role="mYNcP" node="2l5A0OF6PZv" />
         </node>
       </node>
     </node>
@@ -302,23 +302,23 @@
         <node concept="11ARNU" id="6MrCApUpU_Z" role="11ARNT">
           <property role="TrG5h" value="x" />
           <node concept="mKvrX" id="6MrCApUpUAg" role="11ARNN">
-            <ref role="mKvtK" node="2l5A0OF6OA6" resolve="Nat" />
+            <ref role="mKvtK" node="2l5A0OF6OA6" />
           </node>
         </node>
         <node concept="1UfpLS" id="6MrCApUpUAw" role="11ARNb">
           <node concept="11BOot" id="6MrCApUpUAI" role="1U5zfR">
-            <ref role="11BOos" node="6MrCApUnptW" resolve="p" />
+            <ref role="11BOos" node="6MrCApUnptW" />
             <node concept="mZ0x0" id="6MrCApUqOlf" role="11yxzb">
-              <ref role="mZ0z7" node="2_LXzlpuXeU" resolve="pred" />
+              <ref role="mZ0z7" node="2_LXzlpuXeU" />
               <node concept="11ACyy" id="7xXCuh1D$hA" role="mWesK">
-                <ref role="11ACyx" node="6MrCApUpU_Z" resolve="x" />
+                <ref role="11ACyx" node="6MrCApUpU_Z" />
               </node>
             </node>
           </node>
           <node concept="11BOot" id="6MrCApUrQjO" role="1U5zfT">
-            <ref role="11BOos" node="6MrCApUnptW" resolve="p" />
+            <ref role="11BOos" node="6MrCApUnptW" />
             <node concept="11ACyy" id="6MrCApUrQk2" role="11yxzb">
-              <ref role="11ACyx" node="6MrCApUpU_Z" resolve="x" />
+              <ref role="11ACyx" node="6MrCApUpU_Z" />
             </node>
           </node>
         </node>
@@ -330,13 +330,13 @@
           <node concept="11ARNU" id="6MrCApUrQmt" role="11ARNT">
             <property role="TrG5h" value="x" />
             <node concept="mKvrX" id="6MrCApUrQmI" role="11ARNN">
-              <ref role="mKvtK" node="2l5A0OF6OA6" resolve="Nat" />
+              <ref role="mKvtK" node="2l5A0OF6OA6" />
             </node>
           </node>
           <node concept="11BOot" id="6MrCApUrQn5" role="11ARNb">
-            <ref role="11BOos" node="6MrCApUnptW" resolve="p" />
+            <ref role="11BOos" node="6MrCApUnptW" />
             <node concept="11ACyy" id="1MFSGJpf4Dr" role="11yxzb">
-              <ref role="11ACyx" node="6MrCApUrQmt" resolve="x" />
+              <ref role="11ACyx" node="6MrCApUrQmt" />
             </node>
           </node>
         </node>
@@ -359,17 +359,17 @@
       <node concept="1U5aqE" id="1MFSGJpcpGc" role="11zN3m" />
       <node concept="1UfqsA" id="1MFSGJpcpGd" role="11AoXW">
         <node concept="11ACyy" id="1MFSGJpcpGe" role="1UfoCz">
-          <ref role="11ACyx" node="1MFSGJpcpGa" resolve="par1" />
+          <ref role="11ACyx" node="1MFSGJpcpGa" />
         </node>
         <node concept="11ACyy" id="1MFSGJpcpHD" role="1UfoCz">
-          <ref role="11ACyx" node="1MFSGJpcpH5" resolve="par2" />
+          <ref role="11ACyx" node="1MFSGJpcpH5" />
         </node>
       </node>
     </node>
     <node concept="1U56EO" id="1MFSGJpcpGk" role="1U2RmC">
       <node concept="1UfkGm" id="1MFSGJpcpGl" role="1U56ET">
         <node concept="11BOot" id="1MFSGJpcpGm" role="1U5zfR">
-          <ref role="11BOos" node="1MFSGJpcpG9" resolve="add" />
+          <ref role="11BOos" node="1MFSGJpcpG9" />
           <node concept="2IPVmt" id="1MFSGJpcpIk" role="11yxzb">
             <property role="2IPVms" value="1" />
           </node>
@@ -399,13 +399,13 @@
         </node>
         <node concept="1UfkGm" id="1MFSGJpdnnj" role="11ARNb">
           <node concept="11BOot" id="1MFSGJpdnnk" role="1U5zfR">
-            <ref role="11BOos" node="1MFSGJpdnnb" resolve="foo" />
+            <ref role="11BOos" node="1MFSGJpdnnb" />
             <node concept="11ACyy" id="1MFSGJpdnoM" role="11yxzb">
-              <ref role="11ACyx" node="1MFSGJpdno4" resolve="p" />
+              <ref role="11ACyx" node="1MFSGJpdno4" />
             </node>
           </node>
           <node concept="11ACyy" id="7vEzmJ3BNV$" role="1U5zfT">
-            <ref role="11ACyx" node="1MFSGJpdno4" resolve="p" />
+            <ref role="11ACyx" node="1MFSGJpdno4" />
           </node>
         </node>
       </node>
@@ -432,31 +432,31 @@
     <node concept="1U2Rm_" id="2FrZhHbXF9T" role="1U2RmC">
       <property role="TrG5h" value="x" />
       <node concept="mKvrX" id="2FrZhHbXFa9" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHbXF9d" resolve="Enum" />
+        <ref role="mKvtK" node="2FrZhHbXF9d" />
       </node>
     </node>
     <node concept="1U2Rm_" id="2FrZhHbXFaf" role="1U2RmC">
       <property role="TrG5h" value="y" />
       <node concept="mKvrX" id="2FrZhHbXFag" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHbXF9d" resolve="Enum" />
+        <ref role="mKvtK" node="2FrZhHbXF9d" />
       </node>
     </node>
     <node concept="1U2Rm_" id="2FrZhHbXFav" role="1U2RmC">
       <property role="TrG5h" value="z" />
       <node concept="mKvrX" id="2FrZhHbXFaw" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHbXF9d" resolve="Enum" />
+        <ref role="mKvtK" node="2FrZhHbXF9d" />
       </node>
     </node>
     <node concept="1U56EO" id="2FrZhHbXFb0" role="1U2RmC">
       <node concept="1xbkZQ" id="2FrZhHbYMgD" role="1U56ET">
         <node concept="1U5_Ed" id="2FrZhHbYMgN" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHbXF9T" resolve="x" />
+          <ref role="1U5_Ec" node="2FrZhHbXF9T" />
         </node>
         <node concept="1U5_Ed" id="2FrZhHbYMgV" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHbXFaf" resolve="y" />
+          <ref role="1U5_Ec" node="2FrZhHbXFaf" />
         </node>
         <node concept="1U5_Ed" id="2FrZhHbYMh7" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHbXFav" resolve="z" />
+          <ref role="1U5_Ec" node="2FrZhHbXFav" />
         </node>
       </node>
     </node>
@@ -482,40 +482,40 @@
     <node concept="1U2Rm_" id="2FrZhHc0DBX" role="1U2RmC">
       <property role="TrG5h" value="x" />
       <node concept="mKvrX" id="2FrZhHc0DBY" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHc0DBT" resolve="Enum" />
+        <ref role="mKvtK" node="2FrZhHc0DBT" />
       </node>
     </node>
     <node concept="1U2Rm_" id="2FrZhHc0DBZ" role="1U2RmC">
       <property role="TrG5h" value="y" />
       <node concept="mKvrX" id="2FrZhHc0DC0" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHc0DBT" resolve="Enum" />
+        <ref role="mKvtK" node="2FrZhHc0DBT" />
       </node>
     </node>
     <node concept="1U2Rm_" id="2FrZhHc0DC1" role="1U2RmC">
       <property role="TrG5h" value="z" />
       <node concept="mKvrX" id="2FrZhHc0DC2" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHc0DBT" resolve="Enum" />
+        <ref role="mKvtK" node="2FrZhHc0DBT" />
       </node>
     </node>
     <node concept="1U2Rm_" id="2FrZhHc0DC3" role="1U2RmC">
       <property role="TrG5h" value="w" />
       <node concept="mKvrX" id="2FrZhHc0DC4" role="1U56Fq">
-        <ref role="mKvtK" node="2FrZhHc0DBT" resolve="Enum" />
+        <ref role="mKvtK" node="2FrZhHc0DBT" />
       </node>
     </node>
     <node concept="1U56EO" id="2FrZhHc0DC5" role="1U2RmC">
       <node concept="1xbkZQ" id="2FrZhHc0DC6" role="1U56ET">
         <node concept="1U5_Ed" id="2FrZhHc0DC7" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHc0DBX" resolve="x" />
+          <ref role="1U5_Ec" node="2FrZhHc0DBX" />
         </node>
         <node concept="1U5_Ed" id="2FrZhHc0DC8" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHc0DBZ" resolve="y" />
+          <ref role="1U5_Ec" node="2FrZhHc0DBZ" />
         </node>
         <node concept="1U5_Ed" id="2FrZhHc0DC9" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHc0DC1" resolve="z" />
+          <ref role="1U5_Ec" node="2FrZhHc0DC1" />
         </node>
         <node concept="1U5_Ed" id="2FrZhHc0DCw" role="1UfoCz">
-          <ref role="1U5_Ec" node="2FrZhHc0DC3" resolve="w" />
+          <ref role="1U5_Ec" node="2FrZhHc0DC3" />
         </node>
       </node>
     </node>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl
index cd9a7a746..1c804e5ea 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/com.mbeddr.formal.spin.hdl.mpl
@@ -155,7 +155,7 @@
     <dependency reexport="false">ef89f137-f966-4966-a202-ab9ea26e79fe(com.mbeddr.formal.spin.c.core)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
     <language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
     <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/plugin.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/plugin.mps
index 301b75c7e..621365335 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/plugin.mps
@@ -8,7 +8,7 @@
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="95f8a3e6-f994-4ca0-a65e-763c9bae2d3b" name="jetbrains.mps.make.script" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl
index 0c5bf4e81..79934a9a7 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/com.mbeddr.formal.spin.mpl
@@ -84,7 +84,7 @@
     <dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
     <language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/plugin.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/plugin.mps
index 48bfb1f98..75b9d66ba 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/plugin.mps
@@ -8,7 +8,7 @@
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
     <use id="95f8a3e6-f994-4ca0-a65e-763c9bae2d3b" name="jetbrains.mps.make.script" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/com.mbeddr.formal.spin.pluginSolution.msd b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/com.mbeddr.formal.spin.pluginSolution.msd
index 564cee368..ac279d130 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/com.mbeddr.formal.spin.pluginSolution.msd
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/com.mbeddr.formal.spin.pluginSolution.msd
@@ -23,7 +23,7 @@
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <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.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.model.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.model.mps
index 2b5194d48..d5b7b1e47 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.model.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.model.mps
@@ -3,8 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
@@ -135,10 +136,19 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
       </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
@@ -320,8 +330,12 @@
       <property role="3TUv4t" value="false" />
       <node concept="3Tm6S6" id="1vcsY83_iPr" role="1B3o_S" />
       <node concept="17QB3L" id="1vcsY83_jx9" role="1tU5fm" />
-      <node concept="NWlO9" id="1vcsY83_l33" role="lGtFl">
-        <property role="NWlVz" value="If trail reading was performed, the command to do that." />
+      <node concept="z59LJ" id="1y75PbzycWW" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWU" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWV" role="1dT_Ay">
+            <property role="1dT_AB" value="If trail reading was performed, the command to do that." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1vcsY83_knj" role="jymVt" />
@@ -338,8 +352,12 @@
         <ref role="3uigEE" node="1wu5Hv6fnnb" resolve="SpinRawResult" />
       </node>
       <node concept="3Tm6S6" id="7XCY$_rbcOO" role="1B3o_S" />
-      <node concept="NWlO9" id="7XCY$_rbdle" role="lGtFl">
-        <property role="NWlVz" value="The lifted raw-result." />
+      <node concept="z59LJ" id="1y75PbzycWZ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWX" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWY" role="1dT_Ay">
+            <property role="1dT_AB" value="The lifted raw-result." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7XCY$_rbeVN" role="jymVt" />
@@ -352,8 +370,12 @@
         <ref role="3uigEE" node="7XCY$_rbc8D" resolve="SPIN_RESULT_KIND" />
       </node>
       <node concept="3Tm6S6" id="7XCY$_rbd0h" role="1B3o_S" />
-      <node concept="NWlO9" id="7XCY$_rbf8S" role="lGtFl">
-        <property role="NWlVz" value="Result kind." />
+      <node concept="z59LJ" id="1y75PbzycX2" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycX0" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycX1" role="1dT_Ay">
+            <property role="1dT_AB" value="Result kind." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7XCY$_rahjN" role="jymVt" />
@@ -364,8 +386,12 @@
       <property role="3TUv4t" value="false" />
       <node concept="3Tm6S6" id="7XCY$_rbnms" role="1B3o_S" />
       <node concept="17QB3L" id="7XCY$_rbnAM" role="1tU5fm" />
-      <node concept="NWlO9" id="7XCY$_rbo0s" role="lGtFl">
-        <property role="NWlVz" value="Usser friendly message." />
+      <node concept="z59LJ" id="1y75PbzycX5" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycX3" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycX4" role="1dT_Ay">
+            <property role="1dT_AB" value="Usser friendly message." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7XCY$_rbp1E" role="jymVt" />
@@ -376,8 +402,12 @@
       <property role="3TUv4t" value="false" />
       <node concept="3Tm6S6" id="7XCY$_rbxZh" role="1B3o_S" />
       <node concept="3cpWsb" id="7XCY$_rbyh3" role="1tU5fm" />
-      <node concept="NWlO9" id="7XCY$_rbyG9" role="lGtFl">
-        <property role="NWlVz" value="The elapsed time for this analysis." />
+      <node concept="z59LJ" id="1y75PbzycX8" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycX6" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycX7" role="1dT_Ay">
+            <property role="1dT_AB" value="The elapsed time for this analysis." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7XCY$_rbxHy" role="jymVt" />
@@ -388,8 +418,12 @@
       <property role="3TUv4t" value="false" />
       <node concept="3Tm6S6" id="71901EGHIGW" role="1B3o_S" />
       <node concept="17QB3L" id="71901EGHJ5s" role="1tU5fm" />
-      <node concept="NWlO9" id="71901EGHMzq" role="lGtFl">
-        <property role="NWlVz" value="Text containing information about the input vector which caused the failure and the output of the SUV." />
+      <node concept="z59LJ" id="1y75PbzycXb" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycX9" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXa" role="1dT_Ay">
+            <property role="1dT_AB" value="Text containing information about the input vector which caused the failure and the output of the SUV." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="71901EGHJBg" role="jymVt" />
@@ -402,8 +436,12 @@
       <node concept="3Tqbb2" id="2lN4cj_NWO0" role="1tU5fm">
         <ref role="ehGHo" to="o3hv:1ZejHLm44jU" resolve="IPromelaModelLike" />
       </node>
-      <node concept="NWlO9" id="2lN4cj_O0g$" role="lGtFl">
-        <property role="NWlVz" value="Analyzed model." />
+      <node concept="z59LJ" id="1y75PbzycXe" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXc" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXd" role="1dT_Ay">
+            <property role="1dT_AB" value="Analyzed model." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2lN4cj_NY5C" role="jymVt" />
@@ -418,8 +456,12 @@
           <ref role="3uigEE" node="4ZxQD5yuhrn" resolve="ISpinWitnessEntry" />
         </node>
       </node>
-      <node concept="NWlO9" id="2lN4cj_OXxf" role="lGtFl">
-        <property role="NWlVz" value="Whitness entries." />
+      <node concept="z59LJ" id="1y75PbzycXh" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXf" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXg" role="1dT_Ay">
+            <property role="1dT_AB" value="Whitness entries." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2lN4cj_OYyN" role="jymVt" />
@@ -546,8 +588,12 @@
           <ref role="ehGHo" to="o3hv:1ZejHLm44jU" resolve="IPromelaModelLike" />
         </node>
       </node>
-      <node concept="NWlO9" id="7XCY$_rbg0M" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycXk" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXi" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXj" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1vcsY83_gYi" role="jymVt" />
@@ -635,8 +681,12 @@
         <property role="TrG5h" value="trailCommand" />
         <node concept="17QB3L" id="1vcsY83_i6l" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="1vcsY83_ghe" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycXn" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXl" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXm" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7XCY$_ramz6" role="jymVt" />
@@ -657,8 +707,12 @@
       <node concept="3uibUv" id="7XCY$_rany0" role="3clF45">
         <ref role="3uigEE" node="1wu5Hv6fnnb" resolve="SpinRawResult" />
       </node>
-      <node concept="NWlO9" id="7XCY$_rbhXk" role="lGtFl">
-        <property role="NWlVz" value="Returns the raw result." />
+      <node concept="P$JXv" id="1y75PbzycXq" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXo" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXp" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the raw result." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7XCY$_ragLh" role="jymVt" />
@@ -760,8 +814,12 @@
           <ref role="3uigEE" node="4ZxQD5yuhrn" resolve="ISpinWitnessEntry" />
         </node>
       </node>
-      <node concept="NWlO9" id="2lN4cj_PJFT" role="lGtFl">
-        <property role="NWlVz" value="Returns the whitness." />
+      <node concept="P$JXv" id="1y75PbzycXt" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXr" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXs" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the whitness." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7XCY$_rabRy" role="jymVt" />
@@ -977,8 +1035,12 @@
       <node concept="3Tm1VV" id="1vcsY83_yUs" role="1B3o_S" />
       <node concept="17QB3L" id="1vcsY83_z$p" role="3clF45" />
     </node>
-    <node concept="NWlO9" id="7XCY$_rbd9N" role="lGtFl">
-      <property role="NWlVz" value="Lifted result of an analysis with Spin." />
+    <node concept="3UR2Jj" id="1y75PbzycXw" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycXu" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycXv" role="1dT_Ay">
+          <property role="1dT_AB" value="Lifted result of an analysis with Spin." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="7XCY$_r9H8M">
@@ -1008,8 +1070,12 @@
       <property role="3TUv4t" value="false" />
       <node concept="3Tm6S6" id="2lN4cj_MEvP" role="1B3o_S" />
       <node concept="17QB3L" id="2lN4cj_MExH" role="1tU5fm" />
-      <node concept="NWlO9" id="2lN4cj_MFdu" role="lGtFl">
-        <property role="NWlVz" value="Expression of the LHS as string." />
+      <node concept="z59LJ" id="1y75PbzycXz" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXx" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXy" role="1dT_Ay">
+            <property role="1dT_AB" value="Expression of the LHS as string." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2lN4cj_ME$E" role="jymVt" />
@@ -1020,8 +1086,12 @@
       <property role="3TUv4t" value="false" />
       <node concept="3Tm6S6" id="2lN4cj_MECw" role="1B3o_S" />
       <node concept="17QB3L" id="2lN4cj_MEEw" role="1tU5fm" />
-      <node concept="NWlO9" id="2lN4cj_MF8m" role="lGtFl">
-        <property role="NWlVz" value="String representing the RHS." />
+      <node concept="z59LJ" id="1y75PbzycXA" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycX$" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycX_" role="1dT_Ay">
+            <property role="1dT_AB" value="String representing the RHS." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2lN4cj_MEH_" role="jymVt" />
@@ -1032,8 +1102,12 @@
       <property role="3TUv4t" value="false" />
       <node concept="3Tm6S6" id="2lN4cj_MELF" role="1B3o_S" />
       <node concept="3Tqbb2" id="2lN4cj_MENN" role="1tU5fm" />
-      <node concept="NWlO9" id="2lN4cj_MER0" role="lGtFl">
-        <property role="NWlVz" value="The current node from which this entry originates." />
+      <node concept="z59LJ" id="1y75PbzycXD" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXB" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXC" role="1dT_Ay">
+            <property role="1dT_AB" value="The current node from which this entry originates." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2lN4cj_MEin" role="jymVt" />
@@ -1090,8 +1164,12 @@
         <property role="TrG5h" value="n" />
         <node concept="3Tqbb2" id="2lN4cj_MEt$" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="2lN4cj_MGfe" role="lGtFl">
-        <property role="NWlVz" value="Constructor" />
+      <node concept="P$JXv" id="1y75PbzycXG" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXE" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXF" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2lN4cj_MGj8" role="jymVt" />
@@ -1110,8 +1188,12 @@
       </node>
       <node concept="3Tm1VV" id="2lN4cj_MGte" role="1B3o_S" />
       <node concept="17QB3L" id="2lN4cj_MGym" role="3clF45" />
-      <node concept="NWlO9" id="2lN4cj_MHXs" role="lGtFl">
-        <property role="NWlVz" value="Returns the LHS." />
+      <node concept="P$JXv" id="1y75PbzycXJ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXH" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXI" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the LHS." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2lN4cj_MEjP" role="jymVt" />
@@ -1130,8 +1212,12 @@
       </node>
       <node concept="3Tm1VV" id="2lN4cj_MGSv" role="1B3o_S" />
       <node concept="17QB3L" id="2lN4cj_MGSw" role="3clF45" />
-      <node concept="NWlO9" id="2lN4cj_MKJp" role="lGtFl">
-        <property role="NWlVz" value="Returns the RHS." />
+      <node concept="P$JXv" id="1y75PbzycXM" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXK" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXL" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the RHS." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2lN4cj_MGSx" role="jymVt" />
@@ -1150,8 +1236,12 @@
       </node>
       <node concept="3Tm1VV" id="2lN4cj_MH4F" role="1B3o_S" />
       <node concept="3Tqbb2" id="2lN4cj_MHDj" role="3clF45" />
-      <node concept="NWlO9" id="2lN4cj_MLjX" role="lGtFl">
-        <property role="NWlVz" value="Returns the node from which this assignment originates." />
+      <node concept="P$JXv" id="1y75PbzycXP" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXN" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXO" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the node from which this assignment originates." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2lN4cj_MGMV" role="jymVt" />
@@ -1189,13 +1279,21 @@
       <node concept="2AHcQZ" id="7XCY$_r9MIy" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="7XCY$_r9MP0" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycXS" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXQ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXR" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7XCY$_r9MIg" role="jymVt" />
-    <node concept="NWlO9" id="7XCY$_r9MNP" role="lGtFl">
-      <property role="NWlVz" value="A state in the counterexample of Spin." />
+    <node concept="3UR2Jj" id="1y75PbzycXV" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycXT" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycXU" role="1dT_Ay">
+          <property role="1dT_AB" value="A state in the counterexample of Spin." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="Qs71p" id="7XCY$_rbc8D">
@@ -1439,8 +1537,12 @@
       <node concept="3clFbS" id="4ZxQD5yunze" role="3clF47" />
       <node concept="3Tm1VV" id="4ZxQD5yunzh" role="1B3o_S" />
       <node concept="17QB3L" id="4ZxQD5yunzi" role="3clF45" />
-      <node concept="NWlO9" id="4ZxQD5yunzj" role="lGtFl">
-        <property role="NWlVz" value="Returns the LHS." />
+      <node concept="P$JXv" id="1y75PbzycXY" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXW" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycXX" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the LHS." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4ZxQD5yunzl" role="jymVt" />
@@ -1452,8 +1554,12 @@
       <node concept="3clFbS" id="4ZxQD5yunzn" role="3clF47" />
       <node concept="3Tm1VV" id="4ZxQD5yunzq" role="1B3o_S" />
       <node concept="17QB3L" id="4ZxQD5yunzr" role="3clF45" />
-      <node concept="NWlO9" id="4ZxQD5yunzs" role="lGtFl">
-        <property role="NWlVz" value="Returns the RHS." />
+      <node concept="P$JXv" id="1y75PbzycY1" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycXZ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycY0" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the RHS." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4ZxQD5yujmh" role="jymVt" />
@@ -1462,8 +1568,12 @@
       <node concept="3clFbS" id="4ZxQD5yv72V" role="3clF47" />
       <node concept="3Tm1VV" id="4ZxQD5yv72W" role="1B3o_S" />
       <node concept="3Tqbb2" id="4ZxQD5yv6pP" role="3clF45" />
-      <node concept="NWlO9" id="4ZxQD5yv73O" role="lGtFl">
-        <property role="NWlVz" value="Returns the node." />
+      <node concept="P$JXv" id="1y75PbzycY4" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycY2" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycY3" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the node." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="4ZxQD5yuhro" role="1B3o_S" />
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.mps
index 4a8690cdc..5268e253d 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.mps
@@ -4,10 +4,11 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="xygl" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.progress(MPS.IDEA/)" />
@@ -257,9 +258,6 @@
       </concept>
     </language>
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
       <concept id="5753587520027641499" name="com.mbeddr.mpsutil.blutil.structure.SafeReadAction" flags="ng" index="3kxDZ6">
         <child id="1423104411234567454" name="repo" index="ukAjM" />
         <child id="5753587520027644759" name="body" index="3kxCCa" />
@@ -271,6 +269,20 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
       <concept id="6332851714983831325" name="jetbrains.mps.baseLanguage.logging.structure.MsgStatement" flags="ng" index="2xdQw9">
         <property id="6332851714983843871" name="severity" index="2xdLsb" />
@@ -432,8 +444,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="5uY69zuYsSy" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycV_" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVz" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycV$" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1wu5Hv6foLS" role="jymVt" />
@@ -682,12 +698,20 @@
       <node concept="2AHcQZ" id="1wu5Hv6foPc" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="7Rf0$0HT39Y" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycVC" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVA" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVB" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
-    <node concept="NWlO9" id="7Rf0$0HT2MT" role="lGtFl">
-      <property role="NWlVz" value="Assertions analyzer for Spin models." />
+    <node concept="3UR2Jj" id="1y75PbzycVF" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycVD" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycVE" role="1dT_Ay">
+          <property role="1dT_AB" value="Assertions analyzer for Spin models." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="1wu5Hv6f$2N">
@@ -761,8 +785,12 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
-      <node concept="NWlO9" id="5uY69zuQOtB" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycVI" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVG" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVH" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1wu5Hv6f$4x" role="jymVt" />
@@ -807,16 +835,24 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="5uY69zuRM56" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycVL" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVJ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVK" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="1wu5Hv6f$2O" role="1B3o_S" />
     <node concept="3uibUv" id="5uY69zuQMBE" role="1zkMxy">
       <ref role="3uigEE" node="5uY69zuQJv8" resolve="SpinAnalyzerFactory" />
     </node>
-    <node concept="NWlO9" id="5uY69zuQSbx" role="lGtFl">
-      <property role="NWlVz" value="Factory for the assertions analyses based on Spin." />
+    <node concept="3UR2Jj" id="1y75PbzycVO" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycVM" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycVN" role="1dT_Ay">
+          <property role="1dT_AB" value="Factory for the assertions analyses based on Spin." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="1wu5Hv6fAKo">
@@ -830,8 +866,12 @@
         <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
       </node>
       <node concept="3Tm6S6" id="3_HSwtcSve4" role="1B3o_S" />
-      <node concept="NWlO9" id="3_HSwtcSyAq" role="lGtFl">
-        <property role="NWlVz" value="Last project of the run analysis." />
+      <node concept="z59LJ" id="1y75PbzycVR" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVP" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVQ" role="1dT_Ay">
+            <property role="1dT_AB" value="Last project of the run analysis." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3_HSwtcSvL$" role="jymVt" />
@@ -842,8 +882,12 @@
         <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
       </node>
       <node concept="3Tm6S6" id="3_HSwtcSvqG" role="1B3o_S" />
-      <node concept="NWlO9" id="3_HSwtcSxOu" role="lGtFl">
-        <property role="NWlVz" value="Last model of the run analysis." />
+      <node concept="z59LJ" id="1y75PbzycVU" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVS" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVT" role="1dT_Ay">
+            <property role="1dT_AB" value="Last model of the run analysis." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3_HSwtcWxtx" role="jymVt" />
@@ -854,8 +898,12 @@
         <ref role="3uigEE" to="2ocj:5A94f9EE$RB" resolve="MPSToolAdapter" />
       </node>
       <node concept="3Tm6S6" id="3_HSwtcWxhy" role="1B3o_S" />
-      <node concept="NWlO9" id="3_HSwtcWxhz" role="lGtFl">
-        <property role="NWlVz" value="Last tool adapter." />
+      <node concept="z59LJ" id="1y75PbzycVX" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVV" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVW" role="1dT_Ay">
+            <property role="1dT_AB" value="Last tool adapter." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3_HSwtcWxHn" role="jymVt" />
@@ -866,8 +914,12 @@
         <ref role="ehGHo" to="9yqz:4_pH3zvozx3" resolve="SpinBasedAnalysis" />
       </node>
       <node concept="3Tm6S6" id="3_HSwtcWxTt" role="1B3o_S" />
-      <node concept="NWlO9" id="3_HSwtcWxTu" role="lGtFl">
-        <property role="NWlVz" value="Last analysis config." />
+      <node concept="z59LJ" id="1y75PbzycW0" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycVY" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycVZ" role="1dT_Ay">
+            <property role="1dT_AB" value="Last analysis config." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7YdkGnuwJv" role="jymVt" />
@@ -1087,12 +1139,16 @@
       </node>
       <node concept="3Tm1VV" id="3_HSwtcS$YV" role="1B3o_S" />
       <node concept="3cqZAl" id="3_HSwtcS$YW" role="3clF45" />
-      <node concept="NWlO9" id="3_HSwtcS$Z3" role="lGtFl">
-        <property role="NWlVz" value="Rerun last analysis." />
-      </node>
       <node concept="3uibUv" id="3_HSwtcSBJw" role="Sfmx6">
         <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
       </node>
+      <node concept="P$JXv" id="1y75PbzycW3" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycW1" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycW2" role="1dT_Ay">
+            <property role="1dT_AB" value="Rerun last analysis." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="7YdkGnuxcU" role="jymVt" />
     <node concept="3Tm1VV" id="1wu5Hv6fAKp" role="1B3o_S" />
@@ -1120,9 +1176,6 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="7XCY$_rajB4" role="1B3o_S" />
-    <node concept="NWlO9" id="7XCY$_rajCc" role="lGtFl">
-      <property role="NWlVz" value="Lifter for Spin results." />
-    </node>
     <node concept="Wx3nA" id="71901EGHkiP" role="jymVt">
       <property role="TrG5h" value="WHITENESS_STRING_MARKER" />
       <property role="3TUv4t" value="true" />
@@ -2498,8 +2551,12 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
-      <node concept="NWlO9" id="6jYTukVVCz6" role="lGtFl">
-        <property role="NWlVz" value="Lifts a raw result." />
+      <node concept="P$JXv" id="1y75PbzycW9" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycW7" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycW8" role="1dT_Ay">
+            <property role="1dT_AB" value="Lifts a raw result." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6jYTukVVdxR" role="jymVt" />
@@ -2686,8 +2743,12 @@
         <property role="TrG5h" value="lineWithAssertionViolationInfo" />
         <node concept="17QB3L" id="6jYTukVVe9v" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="6jYTukVVBlv" role="lGtFl">
-        <property role="NWlVz" value="Extracts the text representing the assertion violation expression." />
+      <node concept="P$JXv" id="1y75PbzycWc" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWa" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWb" role="1dT_Ay">
+            <property role="1dT_AB" value="Extracts the text representing the assertion violation expression." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2lN4cj_M$0u" role="jymVt" />
@@ -2767,8 +2828,19 @@
           <ref role="ehGHo" to="o3hv:1ZejHLm44jU" resolve="IPromelaModelLike" />
         </node>
       </node>
-      <node concept="NWlO9" id="2lN4cj_MCkg" role="lGtFl">
-        <property role="NWlVz" value="Lifts the whitness as text to an object model." />
+      <node concept="P$JXv" id="1y75PbzycWf" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWd" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWe" role="1dT_Ay">
+            <property role="1dT_AB" value="Lifts the whitness as text to an object model." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3UR2Jj" id="1y75PbzycW6" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycW4" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycW5" role="1dT_Ay">
+          <property role="1dT_AB" value="Lifter for Spin results." />
+        </node>
       </node>
     </node>
   </node>
@@ -2951,8 +3023,12 @@
         <property role="TrG5h" value="originalNode" />
         <node concept="3Tqbb2" id="2lN4cj_NvWV" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="2lN4cj_NvXk" role="lGtFl">
-        <property role="NWlVz" value="Encodes the whitness as string." />
+      <node concept="P$JXv" id="1y75PbzycWi" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWg" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWh" role="1dT_Ay">
+            <property role="1dT_AB" value="Encodes the whitness as string." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5hi7ucOtrRa" role="jymVt" />
@@ -3064,8 +3140,12 @@
         <property role="TrG5h" value="originalNode" />
         <node concept="3Tqbb2" id="5hi7ucOtr_8" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="5hi7ucOtr_9" role="lGtFl">
-        <property role="NWlVz" value="Encodes simple message as string." />
+      <node concept="P$JXv" id="1y75PbzycWl" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWj" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWk" role="1dT_Ay">
+            <property role="1dT_AB" value="Encodes simple message as string." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2lN4cj_NvSD" role="jymVt" />
@@ -3349,13 +3429,21 @@
           <ref role="ehGHo" to="o3hv:1ZejHLm44jU" resolve="IPromelaModelLike" />
         </node>
       </node>
-      <node concept="NWlO9" id="2lN4cj_NBAi" role="lGtFl">
-        <property role="NWlVz" value="Dencodes the whitness from string." />
+      <node concept="P$JXv" id="1y75PbzycWo" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWm" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWn" role="1dT_Ay">
+            <property role="1dT_AB" value="Dencodes the whitness from string." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2lN4cj_NBzB" role="jymVt" />
-    <node concept="NWlO9" id="2lN4cj_NvT1" role="lGtFl">
-      <property role="NWlVz" value="Encoder and decoder functionality for the whitness." />
+    <node concept="3UR2Jj" id="1y75PbzycWr" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycWp" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycWq" role="1dT_Ay">
+          <property role="1dT_AB" value="Encoder and decoder functionality for the whitness." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="5uY69zuQJv8">
@@ -3370,8 +3458,12 @@
       <node concept="3Tqbb2" id="1wu5Hv6f$b4" role="1tU5fm">
         <ref role="ehGHo" to="9yqz:4_pH3zvozx3" resolve="SpinBasedAnalysis" />
       </node>
-      <node concept="NWlO9" id="5uY69zuQNtW" role="lGtFl">
-        <property role="NWlVz" value="The analysis." />
+      <node concept="z59LJ" id="1y75PbzycWu" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWs" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWt" role="1dT_Ay">
+            <property role="1dT_AB" value="The analysis." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5uY69zuQNaa" role="jymVt" />
@@ -3382,8 +3474,12 @@
       <node concept="3uibUv" id="4_pH3zvoHst" role="1tU5fm">
         <ref role="3uigEE" to="2ocj:5A94f9EE$RB" resolve="MPSToolAdapter" />
       </node>
-      <node concept="NWlO9" id="5uY69zuQO8o" role="lGtFl">
-        <property role="NWlVz" value="Tool adapter." />
+      <node concept="z59LJ" id="1y75PbzycWx" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWv" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWw" role="1dT_Ay">
+            <property role="1dT_AB" value="Tool adapter." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1U03KaUJfh8" role="jymVt" />
@@ -3394,8 +3490,12 @@
       <node concept="3uibUv" id="vbJ3AuJmr8" role="1tU5fm">
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
-      <node concept="NWlO9" id="5KHBa6l32_L" role="lGtFl">
-        <property role="NWlVz" value="Model repository." />
+      <node concept="z59LJ" id="1y75PbzycW$" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWy" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWz" role="1dT_Ay">
+            <property role="1dT_AB" value="Model repository." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5uY69zuQQFT" role="jymVt" />
@@ -3416,8 +3516,12 @@
       <node concept="3uibUv" id="vbJ3AuJjg$" role="1tU5fm">
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
-      <node concept="NWlO9" id="vbJ3AuJjLd" role="lGtFl">
-        <property role="NWlVz" value="Model repository" />
+      <node concept="z59LJ" id="1y75PbzycWB" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycW_" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWA" role="1dT_Ay">
+            <property role="1dT_AB" value="Model repository" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5uY69zuRdhs" role="jymVt" />
@@ -3430,8 +3534,12 @@
       <node concept="3Tqbb2" id="3lXW7OZ7mNR" role="1tU5fm">
         <ref role="ehGHo" to="o3hv:1ZejHLm44jU" resolve="IPromelaModelLike" />
       </node>
-      <node concept="NWlO9" id="3lXW7OZ7n4p" role="lGtFl">
-        <property role="NWlVz" value="Promela model to be analyzed" />
+      <node concept="z59LJ" id="1y75PbzycWE" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWC" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWD" role="1dT_Ay">
+            <property role="1dT_AB" value="Promela model to be analyzed" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5uY69zuYmmI" role="jymVt" />
@@ -3442,8 +3550,12 @@
       <node concept="3Tqbb2" id="1wu5Hv6fvDp" role="1tU5fm">
         <ref role="ehGHo" to="9yqz:4_pH3zvozx3" resolve="SpinBasedAnalysis" />
       </node>
-      <node concept="NWlO9" id="7Rf0$0HT304" role="lGtFl">
-        <property role="NWlVz" value="The analyzed configuration." />
+      <node concept="z59LJ" id="1y75PbzycWH" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWF" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWG" role="1dT_Ay">
+            <property role="1dT_AB" value="The analyzed configuration." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5uY69zuYuur" role="jymVt" />
@@ -3534,8 +3646,12 @@
           <ref role="ehGHo" to="9yqz:4_pH3zvozx3" resolve="SpinBasedAnalysis" />
         </node>
       </node>
-      <node concept="NWlO9" id="5uY69zuRfv8" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycWK" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWI" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWJ" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="5uY69zuR3fA" role="jymVt" />
@@ -3553,8 +3669,12 @@
         </node>
       </node>
     </node>
-    <node concept="NWlO9" id="5uY69zuR3jE" role="lGtFl">
-      <property role="NWlVz" value="Base class for Spin-based analyzers." />
+    <node concept="3UR2Jj" id="1y75PbzycWN" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycWL" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycWM" role="1dT_Ay">
+          <property role="1dT_AB" value="Base class for Spin-based analyzers." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="2yuIwRzjd20">
@@ -4418,8 +4538,12 @@
           <ref role="ehGHo" to="o3hv:1ZejHLm44jU" resolve="IPromelaModelLike" />
         </node>
       </node>
-      <node concept="NWlO9" id="4ZxQD5ye2Hn" role="lGtFl">
-        <property role="NWlVz" value="Lifts the whitness as text to an object model." />
+      <node concept="P$JXv" id="1y75PbzycWQ" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycWO" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycWP" role="1dT_Ay">
+            <property role="1dT_AB" value="Lifts the whitness as text to an object model." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4ZxQD5ye0S3" role="jymVt" />
@@ -4686,8 +4810,12 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="4ZxQD5ydZAs" role="1B3o_S" />
-    <node concept="NWlO9" id="4ZxQD5ye4qy" role="lGtFl">
-      <property role="NWlVz" value="Lifts the witness provided by Spin." />
+    <node concept="3UR2Jj" id="1y75PbzycWT" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycWR" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycWS" role="1dT_Ay">
+          <property role="1dT_AB" value="Lifts the witness provided by Spin." />
+        </node>
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.runner.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.runner.mps
index be9f75e8d..e2580e775 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.runner.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.runner.mps
@@ -2,7 +2,7 @@
 <model ref="r:051a08a3-bd4e-4f65-9fad-0d3503acd291(com.mbeddr.formal.spin.runner)">
   <persistence version="9" />
   <languages>
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="-1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.testing_utils.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.testing_utils.mps
index 5c583063d..1f8bbda34 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.testing_utils.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.testing_utils.mps
@@ -6,8 +6,9 @@
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
@@ -160,9 +161,6 @@
     </language>
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
       <concept id="6451706574537082687" name="com.mbeddr.mpsutil.blutil.structure.ShortStaticMethodCall" flags="ng" index="NRdvd" />
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
-      </concept>
       <concept id="5753587520027641499" name="com.mbeddr.mpsutil.blutil.structure.SafeReadAction" flags="ng" index="3kxDZ6">
         <child id="1423104411234567454" name="repo" index="ukAjM" />
         <child id="5753587520027644759" name="body" index="3kxCCa" />
@@ -174,6 +172,19 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
     <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
       <concept id="8427750732757990717" name="jetbrains.mps.baseLanguage.unitTest.structure.BinaryAssert" flags="nn" index="3tpDYu">
         <child id="8427750732757990725" name="actual" index="3tpDZA" />
@@ -240,9 +251,6 @@
   </registry>
   <node concept="312cEu" id="4QGaVz5ry$K">
     <property role="TrG5h" value="SpinTestingUtils" />
-    <node concept="NWlO9" id="5yxSA$IRHKm" role="lGtFl">
-      <property role="NWlVz" value="Utility for running tests." />
-    </node>
     <node concept="2tJIrI" id="4QGaVz5ry_i" role="jymVt" />
     <node concept="2YIFZL" id="4QGaVz5ryAm" role="jymVt">
       <property role="TrG5h" value="checkModel" />
@@ -252,9 +260,6 @@
       <node concept="3uibUv" id="_jsMICpJ4F" role="3clF45">
         <ref role="3uigEE" to="imq8:7XCY$_raa_8" resolve="SpinLiftedResult" />
       </node>
-      <node concept="NWlO9" id="5yxSA$IRH$V" role="lGtFl">
-        <property role="NWlVz" value="Check and return a lifted result." />
-      </node>
       <node concept="37vLTG" id="6BM8NjXd_zo" role="3clF46">
         <property role="TrG5h" value="model" />
         <node concept="3uibUv" id="6BM8NjXd_zp" role="1tU5fm">
@@ -429,6 +434,13 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="4QGaVz5ryA6" role="1B3o_S" />
+      <node concept="P$JXv" id="1y75PbzycYj" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYh" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYi" role="1dT_Ay">
+            <property role="1dT_AB" value="Check and return a lifted result." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="5yxSA$IRHum" role="jymVt" />
     <node concept="2YIFZL" id="_jsMICrMgd" role="jymVt">
@@ -477,12 +489,16 @@
       <node concept="3uibUv" id="_jsMICrNHd" role="3clF45">
         <ref role="3uigEE" to="imq8:1wu5Hv6fnnb" resolve="SpinRawResult" />
       </node>
-      <node concept="NWlO9" id="5yxSA$IRHz6" role="lGtFl">
-        <property role="NWlVz" value="Check and return the raw result." />
-      </node>
       <node concept="2AHcQZ" id="5yxSA$IRHEB" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
       </node>
+      <node concept="P$JXv" id="1y75PbzycYm" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYk" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYl" role="1dT_Ay">
+            <property role="1dT_AB" value="Check and return the raw result." />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="5yxSA$IRGTi" role="jymVt" />
     <node concept="2YIFZL" id="5yxSA$IRHT2" role="jymVt">
@@ -621,8 +637,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="5yxSA$IRHTe" role="1B3o_S" />
-      <node concept="NWlO9" id="5yxSA$IRHTg" role="lGtFl">
-        <property role="NWlVz" value="Check the SpinBasedAnalysis." />
+      <node concept="P$JXv" id="1y75PbzycYp" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYn" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYo" role="1dT_Ay">
+            <property role="1dT_AB" value="Check the SpinBasedAnalysis." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4l47ydyeB5K" role="jymVt" />
@@ -774,8 +794,12 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="5yxSA$IRGY0" role="lGtFl">
-        <property role="NWlVz" value="Performs the checking." />
+      <node concept="P$JXv" id="1y75PbzycYs" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYq" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYr" role="1dT_Ay">
+            <property role="1dT_AB" value="Performs the checking." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="63QgsF$OBCZ" role="jymVt" />
@@ -951,8 +975,12 @@
         <ref role="3uigEE" to="imq8:7XCY$_raa_8" resolve="SpinLiftedResult" />
       </node>
       <node concept="3Tm1VV" id="63QgsF$OU1y" role="1B3o_S" />
-      <node concept="NWlO9" id="63QgsF$OTKH" role="lGtFl">
-        <property role="NWlVz" value="Returns the first result with a given user friendly message." />
+      <node concept="P$JXv" id="1y75PbzycYv" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYt" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYu" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the first result with a given user friendly message." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7M$OvLQdDqj" role="jymVt" />
@@ -1064,6 +1092,13 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="4QGaVz5ry$L" role="1B3o_S" />
+    <node concept="3UR2Jj" id="1y75PbzycYg" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycYe" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycYf" role="1dT_Ay">
+          <property role="1dT_AB" value="Utility for running tests." />
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.ui.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.ui.mps
index 02014512e..4bb70d432 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.ui.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.ui.mps
@@ -3,8 +3,9 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="-1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
@@ -202,10 +203,19 @@
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
       </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
@@ -258,8 +268,12 @@
       <node concept="3uibUv" id="6izRX53q3SM" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JTextArea" resolve="JTextArea" />
       </node>
-      <node concept="NWlO9" id="3Ymokd9HQBw" role="lGtFl">
-        <property role="NWlVz" value="Text area containing the raw output." />
+      <node concept="z59LJ" id="1y75PbzycYy" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYw" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYx" role="1dT_Ay">
+            <property role="1dT_AB" value="Text area containing the raw output." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6izRX53pUZ6" role="jymVt" />
@@ -272,8 +286,12 @@
       <node concept="3uibUv" id="7Rf0$0HTcyN" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JTextArea" resolve="JTextArea" />
       </node>
-      <node concept="NWlO9" id="7Rf0$0HTcyO" role="lGtFl">
-        <property role="NWlVz" value="Text area containing the .trail file." />
+      <node concept="z59LJ" id="1y75PbzycY_" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYz" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycY$" role="1dT_Ay">
+            <property role="1dT_AB" value="Text area containing the .trail file." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7Rf0$0HTclk" role="jymVt" />
@@ -286,8 +304,12 @@
       <node concept="3uibUv" id="71901EGG_9r" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JTextArea" resolve="JTextArea" />
       </node>
-      <node concept="NWlO9" id="71901EGG_9s" role="lGtFl">
-        <property role="NWlVz" value="Text area containing the whiteness (e.g. inputs and outputs of SUT)." />
+      <node concept="z59LJ" id="1y75PbzycYC" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYA" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYB" role="1dT_Ay">
+            <property role="1dT_AB" value="Text area containing the whiteness (e.g. inputs and outputs of SUT)." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="71901EGG$FD" role="jymVt" />
@@ -300,8 +322,12 @@
       <node concept="3uibUv" id="4kcU3YrmsGn" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JTextArea" resolve="JTextArea" />
       </node>
-      <node concept="NWlO9" id="4kcU3YrmsGo" role="lGtFl">
-        <property role="NWlVz" value="Text area containing the raw stderr." />
+      <node concept="z59LJ" id="1y75PbzycYF" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYD" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYE" role="1dT_Ay">
+            <property role="1dT_AB" value="Text area containing the raw stderr." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4kcU3YrmsuJ" role="jymVt" />
@@ -314,8 +340,12 @@
       <node concept="3uibUv" id="4$9c1ZyAb8X" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JTextArea" resolve="JTextArea" />
       </node>
-      <node concept="NWlO9" id="4$9c1ZyA7DT" role="lGtFl">
-        <property role="NWlVz" value="Text area containing the ran command." />
+      <node concept="z59LJ" id="1y75PbzycYI" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYG" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYH" role="1dT_Ay">
+            <property role="1dT_AB" value="Text area containing the ran command." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4$9c1ZyA5FH" role="jymVt" />
@@ -590,8 +620,12 @@
         </node>
       </node>
       <node concept="3Tm1VV" id="6izRX53yf5q" role="1B3o_S" />
-      <node concept="NWlO9" id="3Ymokd9HQkG" role="lGtFl">
-        <property role="NWlVz" value="Constructor." />
+      <node concept="P$JXv" id="1y75PbzycYL" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYJ" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYK" role="1dT_Ay">
+            <property role="1dT_AB" value="Constructor." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6izRX53qwpx" role="jymVt" />
@@ -743,8 +777,12 @@
         <property role="TrG5h" value="err" />
         <node concept="17QB3L" id="4kcU3YrmuPd" role="1tU5fm" />
       </node>
-      <node concept="NWlO9" id="3Ymokd9HPTu" role="lGtFl">
-        <property role="NWlVz" value="Presents the output." />
+      <node concept="P$JXv" id="1y75PbzycYO" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYM" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYN" role="1dT_Ay">
+            <property role="1dT_AB" value="Presents the output." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3DDJouLH7Ns" role="jymVt" />
@@ -774,13 +812,21 @@
       <node concept="2AHcQZ" id="3DDJouLH8uF" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="3DDJouLHbPr" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycYR" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYP" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYQ" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="3Tm1VV" id="6izRX53pUdd" role="1B3o_S" />
-    <node concept="NWlO9" id="3Ymokd9HQTr" role="lGtFl">
-      <property role="NWlVz" value="UI for presenting the raw output." />
+    <node concept="3UR2Jj" id="1y75PbzycYU" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycYS" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycYT" role="1dT_Ay">
+          <property role="1dT_AB" value="UI for presenting the raw output." />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="4_pSipqUB$z">
@@ -799,8 +845,12 @@
       <node concept="3uibUv" id="7XCY$_ra2R4" role="1tU5fm">
         <ref role="3uigEE" node="31nZcrlJSwS" resolve="SpinCexTableModel" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHb8gS" role="lGtFl">
-        <property role="NWlVz" value="Table model for the counterexample." />
+      <node concept="z59LJ" id="1y75PbzycYX" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYV" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYW" role="1dT_Ay">
+            <property role="1dT_AB" value="Table model for the counterexample." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZHcFHJ" role="jymVt" />
@@ -813,8 +863,12 @@
       <node concept="3uibUv" id="3_HSwtcTkCY" role="1tU5fm">
         <ref role="3uigEE" to="dxuu:~JButton" resolve="JButton" />
       </node>
-      <node concept="NWlO9" id="7YdkGnq2wg" role="lGtFl">
-        <property role="NWlVz" value="Re-run last analysis." />
+      <node concept="z59LJ" id="1y75PbzycZ0" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYY" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYZ" role="1dT_Ay">
+            <property role="1dT_AB" value="Re-run last analysis." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7YdkGnq1ng" role="jymVt" />
@@ -827,8 +881,12 @@
         <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
       </node>
       <node concept="3Tm1VV" id="JsaLOcr6IU" role="1B3o_S" />
-      <node concept="NWlO9" id="7YdkGnq3gJ" role="lGtFl">
-        <property role="NWlVz" value="Current project." />
+      <node concept="z59LJ" id="1y75PbzycZ3" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZ1" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZ2" role="1dT_Ay">
+            <property role="1dT_AB" value="Current project." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="71H03GAXFEP" role="jymVt" />
@@ -841,8 +899,12 @@
       <node concept="3uibUv" id="71H03GAY2zj" role="1tU5fm">
         <ref role="3uigEE" node="6izRX53pUdc" resolve="SpinRawOutputUI" />
       </node>
-      <node concept="NWlO9" id="5ONlem$s5u_" role="lGtFl">
-        <property role="NWlVz" value="RawOutput table so it can be updated based on the selected assertion in the SpinLifted table" />
+      <node concept="z59LJ" id="1y75PbzycZ6" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZ4" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZ5" role="1dT_Ay">
+            <property role="1dT_AB" value="RawOutput table so it can be updated based on the selected assertion in the SpinLifted table" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="71H03GAZMr8" role="jymVt" />
@@ -909,8 +971,12 @@
       <node concept="2AHcQZ" id="2k2dPZH6kvp" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2k2dPZH6nTp" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycZ9" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZ7" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZ8" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZH6swo" role="jymVt" />
@@ -1027,12 +1093,16 @@
       <node concept="3uibUv" id="2k2dPZH6$tI" role="Sfmx6">
         <ref role="3uigEE" to="z60i:~HeadlessException" resolve="HeadlessException" />
       </node>
-      <node concept="NWlO9" id="2k2dPZH6JhS" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
-      </node>
       <node concept="2AHcQZ" id="2k2dPZHd9xi" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
+      <node concept="P$JXv" id="1y75PbzycZc" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZa" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZb" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="2k2dPZH4yjh" role="jymVt" />
     <node concept="3clFb_" id="2k2dPZH4hbZ" role="jymVt">
@@ -1483,12 +1553,16 @@
           </node>
         </node>
       </node>
-      <node concept="NWlO9" id="2k2dPZH4_DN" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
-      </node>
       <node concept="2AHcQZ" id="2k2dPZH8xSh" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
+      <node concept="P$JXv" id="1y75PbzycZf" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZd" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZe" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="5PkarIFUHcb" role="jymVt" />
     <node concept="3clFb_" id="1H8VqTw5HWK" role="jymVt">
@@ -1516,8 +1590,12 @@
       <node concept="2AHcQZ" id="2k2dPZH9FUb" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2k2dPZH9Iak" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycZi" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZg" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZh" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1H8VqTw5G5M" role="jymVt" />
@@ -1722,8 +1800,12 @@
       <node concept="2AHcQZ" id="2k2dPZHaHHh" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHaJO8" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycZl" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZj" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZk" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="12GRGX_ddSm" role="jymVt" />
@@ -1807,8 +1889,12 @@
       <node concept="2AHcQZ" id="2k2dPZHcgIi" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2k2dPZHcpV1" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycZo" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZm" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZn" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="71H03GAY479" role="jymVt" />
@@ -1841,8 +1927,12 @@
           <ref role="3uigEE" node="6izRX53pUdc" resolve="SpinRawOutputUI" />
         </node>
       </node>
-      <node concept="NWlO9" id="5ONlem$srbr" role="lGtFl">
-        <property role="NWlVz" value="used for setting the RawTable so it can be accessed here" />
+      <node concept="P$JXv" id="1y75PbzycZr" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZp" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZq" role="1dT_Ay">
+            <property role="1dT_AB" value="used for setting the RawTable so it can be accessed here" />
+          </node>
+        </node>
       </node>
     </node>
   </node>
@@ -1873,8 +1963,12 @@
       <node concept="2AHcQZ" id="7XCY$_ra0py" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="7XCY$_ra0G5" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycZu" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZs" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZt" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="12GRGX_agHw" role="jymVt" />
@@ -1954,8 +2048,12 @@
       <node concept="2AHcQZ" id="2lN4cj_T2GE" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2lN4cj_T39R" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycZx" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZv" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZw" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7FuIjruQLhE" role="jymVt" />
@@ -1979,8 +2077,12 @@
       <node concept="2AHcQZ" id="1EZfgaQo16g" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="1EZfgaQo20$" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycZ$" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZy" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZz" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1GgrF83gmaz" role="jymVt" />
@@ -2047,8 +2149,12 @@
       <node concept="2AHcQZ" id="2lN4cj_T474" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2lN4cj_T4$S" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycZB" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZ_" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZA" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="1d23YaE_Gzg" role="jymVt" />
@@ -2076,8 +2182,12 @@
       <node concept="2AHcQZ" id="3kLBXRr$3oN" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
-      <node concept="NWlO9" id="2lN4cj_T52m" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
+      <node concept="P$JXv" id="1y75PbzycZE" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycZC" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycZD" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
       </node>
     </node>
   </node>
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.utils.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.utils.mps
index d8874c659..618e4c94c 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.utils.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.utils.mps
@@ -5,7 +5,8 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports />
   <registry>
@@ -68,10 +69,17 @@
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
-    <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
       </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>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </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">
@@ -113,9 +121,6 @@
       <node concept="3Tm1VV" id="407WgdX3EJA" role="1B3o_S" />
     </node>
     <node concept="3Tm1VV" id="407WgdX3Evd" role="1B3o_S" />
-    <node concept="NWlO9" id="407WgdX3ER2" role="lGtFl">
-      <property role="NWlVz" value="Keywords of the Promela language." />
-    </node>
     <node concept="Wx3nA" id="407WgdX3EVp" role="jymVt">
       <property role="TrG5h" value="promelaCIntegration" />
       <property role="3TUv4t" value="false" />
@@ -401,6 +406,13 @@
         <node concept="17QB3L" id="407WgdX3LTv" role="1tU5fm" />
       </node>
     </node>
+    <node concept="3UR2Jj" id="1y75PbzycZH" role="lGtFl">
+      <node concept="TZ5HA" id="1y75PbzycZF" role="TZ5H$">
+        <node concept="1dT_AC" id="1y75PbzycZG" role="1dT_Ay">
+          <property role="1dT_AB" value="Keywords of the Promela language." />
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/plugin.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/plugin.mps
index 136370e7c..b7e4c146f 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/plugin.mps
@@ -9,8 +9,9 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
     <import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
@@ -264,8 +265,17 @@
     </language>
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
       <concept id="6451706574537082687" name="com.mbeddr.mpsutil.blutil.structure.ShortStaticMethodCall" flags="ng" index="NRdvd" />
-      <concept id="6451706574539345403" name="com.mbeddr.mpsutil.blutil.structure.MethodLineDoc" flags="ng" index="NWlO9">
-        <property id="6451706574539345425" name="text" index="NWlVz" />
+    </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="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="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
@@ -731,9 +741,6 @@
       <property role="TrG5h" value="appendResult" />
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
-      <node concept="NWlO9" id="7XCY$_raVG_" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
-      </node>
       <node concept="3clFbS" id="7F8$WoVMof4" role="3clF47">
         <node concept="3cpWs8" id="7XCY$_raV9f" role="3cqZAp">
           <node concept="3cpWsn" id="7XCY$_raV9g" role="3cpWs9">
@@ -837,6 +844,13 @@
       <node concept="2AHcQZ" id="7F8$WoVVmUn" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
+      <node concept="P$JXv" id="1y75PbzycY7" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycY5" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycY6" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="7F8$WoW2$45" role="jymVt" />
     <node concept="3clFb_" id="7F8$WoW2$AJ" role="jymVt">
@@ -844,9 +858,6 @@
       <property role="TrG5h" value="presentResults" />
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
-      <node concept="NWlO9" id="7XCY$_raVQ7" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
-      </node>
       <node concept="3clFbS" id="7F8$WoW2$AK" role="3clF47">
         <node concept="3clFbJ" id="6izRX53r8Hs" role="3cqZAp">
           <node concept="3clFbS" id="6izRX53r8Ht" role="3clFbx">
@@ -894,6 +905,13 @@
       <node concept="2AHcQZ" id="7F8$WoW2$AU" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
+      <node concept="P$JXv" id="1y75PbzycYa" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycY8" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycY9" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="2UdJgvCNHo4" role="jymVt" />
     <node concept="3clFb_" id="2UdJgvCNFe3" role="jymVt">
@@ -901,9 +919,6 @@
       <property role="TrG5h" value="clearResults" />
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
-      <node concept="NWlO9" id="7XCY$_raVZp" role="lGtFl">
-        <property role="NWlVz" value="{@inheritDoc}" />
-      </node>
       <node concept="3clFbS" id="2UdJgvCNFe4" role="3clF47">
         <node concept="3clFbF" id="1wu5Hv6fLPL" role="3cqZAp">
           <node concept="2OqwBi" id="1wu5Hv6fLS5" role="3clFbG">
@@ -946,6 +961,13 @@
       <node concept="2AHcQZ" id="2UdJgvCNFec" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
+      <node concept="P$JXv" id="1y75PbzycYd" role="lGtFl">
+        <node concept="TZ5HA" id="1y75PbzycYb" role="TZ5H$">
+          <node concept="1dT_AC" id="1y75PbzycYc" role="1dT_Ay">
+            <property role="1dT_AB" value="{@inheritDoc}" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="3uibUv" id="2UdJgvD7znj" role="EKbjA">
       <ref role="3uigEE" to="2ocj:5A94f9EE$RB" resolve="MPSToolAdapter" />
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_tests@tests.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_tests@tests.mps
index 85a0b7bda..31c779c9b 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_010_promela_tests@tests.mps
@@ -7,7 +7,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
   </languages>
   <imports>
     <import index="hr62" ref="r:0f006508-b2f4-4b98-82de-5b32de29d868(com.mbeddr.formal.spin.testing_utils)" />
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests_gen@tests.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests_gen@tests.mps
index dd985ffdc..d90a7e134 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests_gen@tests.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests_gen@tests.mps
@@ -6,7 +6,7 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
   </languages>
   <imports>
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests@tests.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests@tests.mps
index db2077018..b75fae349 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests@tests.mps
@@ -6,7 +6,7 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests_gen@tests.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests_gen@tests.mps
index 42a1009ce..117bc6424 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests_gen@tests.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests_gen@tests.mps
@@ -6,7 +6,7 @@
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="1" />
+    <use id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil" version="3" />
   </languages>
   <imports>
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/test.mbeddr.formal.spin.msd b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/test.mbeddr.formal.spin.msd
index 4ecd8bec1..b2f209fc5 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/test.mbeddr.formal.spin.msd
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/test.mbeddr.formal.spin.msd
@@ -33,7 +33,7 @@
     <language slang="l:ef89f137-f966-4966-a202-ab9ea26e79fe:com.mbeddr.formal.spin.c.core" version="0" />
     <language slang="l:bd54ef69-17ec-411b-8f49-485702e74565:com.mbeddr.formal.spin.ext" version="0" />
     <language slang="l:628c1bba-6b54-4c71-927c-3cff044349e4:com.mbeddr.formal.spin.hdl" version="0" />
-    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" 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" />
diff --git a/gradle.lockfile b/gradle.lockfile
index d41654a23..389f0ab8f 100644
--- a/gradle.lockfile
+++ b/gradle.lockfile
@@ -3,11 +3,11 @@
 # This file is expected to be part of source control.
 com.jetbrains.jdk:jbr_jcef:17.0.6-b653.34=jbrLinux,jbrMac,jbrWin
 com.jetbrains:mps:2022.2.2=mps
-com.mbeddr:platform:2022.2.24226.5efe184=languageLibs
+com.mbeddr:platform:2022.2.24468.27ff94f=languageLibs
 junit:junit:4.12=antLib
 org.apache.ant:ant-junit:1.10.6=antLib
 org.apache.ant:ant-launcher:1.10.6=antLib
 org.apache.ant:ant:1.10.6=antLib
 org.hamcrest:hamcrest-core:1.3=antLib
-org.mpsqa:all-in-one:2022.2.280.2af29a4=languageLibs
+org.mpsqa:all-in-one:2022.2.388.b42aa19=languageLibs
 empty=