From 3abb81718614e2917b922a67dabe894e27e81bb7 Mon Sep 17 00:00:00 2001
From: danielratiu <ratiud@googlemail.com>
Date: Sun, 12 Jan 2025 21:59:02 +0100
Subject: [PATCH] cleanup deprecated code; improved linters; updated dependency
 to mpsqa (#133)

* cleanup deprecated code

* req.odd: cleanup

* req.odd: cleanup

* repo_admin: added new linters
gradle.lockfile: updated dependency to mpsqa

* safety.tutorial: fixed empty line in ontology definitions

* safety: cleanup code to get green linters

* build: fixed dependencies

* build: temporary commented out the test "test.com.fasten.safety.doc2word"

---------

Co-authored-by: ratiud <extern.daniel.ratiu@volkswagen.de>
---
 ...m.fasten.meta.linters.filesystem_level.mps |  81 +++++++-
 ....linters.landev_aspects.behavior_level.mps |  56 +++++-
 ...inters.landev_aspects.expression_level.mps |  17 +-
 ...linters.landev_aspects.generator_level.mps |  32 ++-
 .../com.fasten.meta.linters.model_level.mps   |  65 +++++-
 .../com.fasten.meta.linters.module_level.mps  | 144 +++++++++++++-
 .../models/com.fasten.req.odd.editor.mps      | 188 ++----------------
 .../models/com.fasten.req.odd.structure.mps   | 151 +-------------
 .../com.fasten.safety.bayesian_network.mpl    |   5 +-
 ....fasten.safety.bayesian_network.editor.mps |   1 -
 ...com.fasten.safety.fmea.iso26262.editor.mps |   1 -
 .../com.fasten.safety.fmea.mpl                |   4 +-
 .../models/com.fasten.safety.fmea.editor.mps  |   1 -
 ...om.fasten.safety.hiphops.arch.behavior.mps |  54 ++++-
 ...eddr.formal.safety.argument.modelquery.mpl |   1 -
 ...rmal.safety.argument.modelquery.editor.mps |   1 -
 ...r.formal.safety.argument.visualisation.mpl |   3 +-
 ...l.safety.argument.visualisation.editor.mps |   1 -
 ....mbeddr.formal.safety.gsn.ext.behavior.mps |   1 -
 .../com.mbeddr.formal.safety.iso26262.mpl     |   4 +-
 ...m.mbeddr.formal.safety.iso26262.editor.mps |   1 -
 .../models/com.fasten.assurance.build.mps     |  30 +--
 ...sten.safety.hiphops.sandbox._010_smoke.mps |  44 ++--
 .../models/com.mbeddr.formal.safety.build.mps |  38 +---
 ...y.doc2word._100_gsn_documents_testdata.mps |   2 +-
 ...m.mpsbasics.editor.utils.notifications.mps |   3 +-
 ...mpsbasics.project.utils.project_finder.mps |  39 +++-
 ...rnecki_operational_world_model_for_ads.mps |  68 +++----
 ..._odd.ontologies.phil_koopman_odd_paper.mps |   6 +-
 gradle.lockfile                               |   2 +-
 30 files changed, 543 insertions(+), 501 deletions(-)

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 f80933191..0960cb680 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
@@ -12,6 +12,11 @@
     <import index="mjm5" ref="r:1cfdc492-ba5c-44bc-987a-7d4e55b9c1ad(org.mpsqa.lint.generic.linters_library.nodes)" />
   </imports>
   <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+    </language>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
       <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
@@ -23,12 +28,18 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
-        <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
-      </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
         <reference id="3786325089106496690" name="script" index="2wR3oD" />
       </concept>
+      <concept id="7223240310078271419" name="org.mpsqa.lint.generic.structure.ILinterResultsContainer" flags="ngI" index="3dgnlL">
+        <property id="7223240310078527797" name="failOnlyOnNewResults" index="3dJkfZ" />
+        <child id="7223240310078271420" name="violations" index="3dgnlQ" />
+      </concept>
+      <concept id="7223240310078271416" name="org.mpsqa.lint.generic.structure.ResultEntry" flags="ng" index="3dgnlM">
+        <property id="7223240310078271417" name="result" index="3dgnlN" />
+        <property id="8230153551040655111" name="resultNodeModelId" index="3qxsSb" />
+        <property id="8230153551040654991" name="resultNodeId" index="3qxsY3" />
+      </concept>
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
@@ -48,7 +59,7 @@
     <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" />
+    <property role="3dJkfZ" value="true" />
     <ref role="2wR3oD" to="54p5:4lfwJVEz_X5" resolve="not_used_linters" />
     <node concept="2j1LYv" id="4lfwJVE_q9l" role="2j1YRv">
       <node concept="2j1LYi" id="4lfwJVE_q9m" role="2j1YQj">
@@ -60,6 +71,68 @@
         </node>
       </node>
     </node>
+    <node concept="3dgnlM" id="59o88jXkrEt" role="3dgnlQ">
+      <property role="3dgnlN" value="The Script is not re-used" />
+      <property role="3qxsY3" value="8129340851655595064" />
+      <property role="3qxsSb" value="r:1cfdc492-ba5c-44bc-987a-7d4e55b9c1ad(org.mpsqa.lint.generic.linters_library.nodes)" />
+    </node>
+  </node>
+  <node concept="2wR3oc" id="33N0Tlwri2j">
+    <ref role="2wR3oD" to="54p5:652KpqR3Kk5" resolve="skipped_evaluation_linters" />
+    <node concept="2j1LYv" id="33N0Tlwrit2" role="2j1YRv">
+      <node concept="2j1LYi" id="33N0Tlwrit3" role="2j1YQj">
+        <ref role="2j1LYj" to="54p5:652KpqR3Kk6" resolve="thisNode" />
+      </node>
+      <node concept="2tJFMh" id="33N0Tlwrn3G" role="2j1LYg">
+        <node concept="ZC_QK" id="33N0TlwrncH" role="2tJFKM">
+          <ref role="2aWVGs" node="33N0Tlwri2j" resolve="skipped_evaluation_linters" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="2wR3oc" id="59o88jXknTy">
+    <ref role="2wR3oD" to="mjm5:7x_pNDEe0ZH" resolve="named_root_nodes_with_same_name_in_same_model" />
+  </node>
+  <node concept="2wR3oc" id="59o88jXkokh">
+    <property role="3dJkfZ" value="true" />
+    <ref role="2wR3oD" to="mjm5:30a3800NEqs" resolve="root_node_name_contains_only_ascii_characters" />
+    <node concept="3dgnlM" id="59o88jXkupE" role="3dgnlQ">
+      <property role="3dgnlN" value="The root node contains invalid characters. Allowed characters are: '[a-zA-Z0-9_ .-]+'" />
+      <property role="3qxsY3" value="9296093159908589" />
+      <property role="3qxsSb" value="r:d0c90e07-6fcc-4e69-9139-5c3fe98e4772(com.mbeddr.formal.safety.gsn.doc.migration)" />
+    </node>
+    <node concept="3dgnlM" id="59o88jXkupF" role="3dgnlQ">
+      <property role="3dgnlN" value="The root node contains invalid characters. Allowed characters are: '[a-zA-Z0-9_ .-]+'" />
+      <property role="3qxsY3" value="5649897883596794487" />
+      <property role="3qxsSb" value="r:d7458d19-60ce-4f7a-a838-9ee1ecb1ba89(com.fasten.safety.hiphops.sandbox._010_smoke)" />
+    </node>
+    <node concept="3dgnlM" id="59o88jXkupG" role="3dgnlQ">
+      <property role="3dgnlN" value="The root node contains invalid characters. Allowed characters are: '[a-zA-Z0-9_ .-]+'" />
+      <property role="3qxsY3" value="5649897883596809288" />
+      <property role="3qxsSb" value="r:d7458d19-60ce-4f7a-a838-9ee1ecb1ba89(com.fasten.safety.hiphops.sandbox._010_smoke)" />
+    </node>
+    <node concept="3dgnlM" id="59o88jXkupH" role="3dgnlQ">
+      <property role="3dgnlN" value="The root node contains invalid characters. Allowed characters are: '[a-zA-Z0-9_ .-]+'" />
+      <property role="3qxsY3" value="3731513482755160528" />
+      <property role="3qxsSb" value="r:d7272d49-be4c-48bc-8ddb-711079cdb64b(test.fasten.safety.hiphops._010_arch_models)" />
+    </node>
+  </node>
+  <node concept="2wR3oc" id="59o88jXkoEz">
+    <ref role="2wR3oD" to="mjm5:7e2zrEq$4i5" resolve="nodes_commented_out_but_referenced_from_non_commented_models" />
+  </node>
+  <node concept="2wR3oc" id="59o88jXkp5i">
+    <ref role="2wR3oD" to="mjm5:3bllPAaXzR6" resolve="root_nodes_with_too_many_descendants" />
+    <node concept="2j1LYv" id="59o88jXkqrY" role="2j1YRv">
+      <node concept="2j1LYi" id="59o88jXkqrZ" role="2j1YQj">
+        <ref role="2j1LYj" to="mjm5:3bllPAaX_eB" resolve="maxNumberOfDecendants" />
+      </node>
+      <node concept="3cmrfG" id="59o88jXkqw_" role="2j1LYg">
+        <property role="3cmrfH" value="20000" />
+      </node>
+    </node>
+  </node>
+  <node concept="2wR3oc" id="59o88jXkres">
+    <ref role="2wR3oD" to="mjm5:5FxxG02Td7T" resolve="node_with_smodelattribute_other_than_attribute" />
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps
index 42c803ce9..3bf3b07a0 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps
@@ -12,6 +12,11 @@
     <import index="54p5" ref="r:3e5efb66-1a16-46d1-89d2-26142a5dcdaa(org.mpsqa.lint.generic.linters_library.meta)" />
   </imports>
   <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+    </language>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
       <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
@@ -23,12 +28,12 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
-        <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
-      </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
         <reference id="3786325089106496690" name="script" index="2wR3oD" />
       </concept>
+      <concept id="7223240310078271419" name="org.mpsqa.lint.generic.structure.ILinterResultsContainer" flags="ngI" index="3dgnlL">
+        <property id="7223240310078527797" name="failOnlyOnNewResults" index="3dJkfZ" />
+      </concept>
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
@@ -45,7 +50,7 @@
     <ref role="2wR3oD" to="i8ub:3pz5R1DHoLR" resolve="behavior_methods_with_same_signature" />
   </node>
   <node concept="2wR3oc" id="4lfwJVE_q9k">
-    <property role="2oM2pl" value="1c_Dn$lNzd7/WARNING" />
+    <property role="3dJkfZ" value="true" />
     <ref role="2wR3oD" to="54p5:4lfwJVEz_X5" resolve="not_used_linters" />
     <node concept="2j1LYv" id="4lfwJVE_q9l" role="2j1YRv">
       <node concept="2j1LYi" id="4lfwJVE_q9m" role="2j1YQj">
@@ -58,5 +63,48 @@
       </node>
     </node>
   </node>
+  <node concept="2wR3oc" id="33N0Tlwri2j">
+    <ref role="2wR3oD" to="54p5:652KpqR3Kk5" resolve="skipped_evaluation_linters" />
+    <node concept="2j1LYv" id="33N0Tlwrit2" role="2j1YRv">
+      <node concept="2j1LYi" id="33N0Tlwrit3" role="2j1YQj">
+        <ref role="2j1LYj" to="54p5:652KpqR3Kk6" resolve="thisNode" />
+      </node>
+      <node concept="2tJFMh" id="33N0Tlwrn3G" role="2j1LYg">
+        <node concept="ZC_QK" id="33N0TlwrncH" role="2tJFKM">
+          <ref role="2aWVGs" node="33N0Tlwri2j" resolve="skipped_evaluation_linters" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="2wR3oc" id="33N0TlwszwB">
+    <ref role="2wR3oD" to="i8ub:3bllPAaPI3W" resolve="empty_behavior_aspects" />
+  </node>
+  <node concept="2wR3oc" id="59o88jXjprO">
+    <ref role="2wR3oD" to="i8ub:3cj_LrgPwdF" resolve="mandatory_virtual_method_override" />
+    <node concept="2j1LYv" id="59o88jXjrZ5" role="2j1YRv">
+      <node concept="2j1LYi" id="59o88jXjrZ6" role="2j1YQj">
+        <ref role="2j1LYj" to="i8ub:3cj_LrgPwgC" resolve="methodName" />
+      </node>
+      <node concept="Xl_RD" id="59o88jXjrZ7" role="2j1LYg">
+        <property role="Xl_RC" value="renderReadable" />
+      </node>
+    </node>
+    <node concept="2j1LYv" id="59o88jXjrzT" role="2j1YRv">
+      <node concept="2j1LYi" id="59o88jXjrzU" role="2j1YQj">
+        <ref role="2j1LYj" to="i8ub:3cj_LrgPwgE" resolve="parentConceptName" />
+      </node>
+      <node concept="Xl_RD" id="59o88jXjrzV" role="2j1LYg">
+        <property role="Xl_RC" value="Expression" />
+      </node>
+    </node>
+    <node concept="2j1LYv" id="59o88jXjpHG" role="2j1YRv">
+      <node concept="2j1LYi" id="59o88jXjpHH" role="2j1YQj">
+        <ref role="2j1LYj" to="i8ub:3cj_LrgP$aX" resolve="languageName" />
+      </node>
+      <node concept="Xl_RD" id="59o88jXjpVf" role="2j1LYg">
+        <property role="Xl_RC" value="com.mbeddr.formal.base.expressions" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps
index e547d9c73..2f4062b91 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps
@@ -23,9 +23,6 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
-        <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
-      </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
         <reference id="3786325089106496690" name="script" index="2wR3oD" />
       </concept>
@@ -45,7 +42,6 @@
     <ref role="2wR3oD" to="ewdl:3pz5R1DPwMT" resolve="cast_to_specific_SNodeType" />
   </node>
   <node concept="2wR3oc" id="4lfwJVE_q9k">
-    <property role="2oM2pl" value="1c_Dn$lNzd7/WARNING" />
     <ref role="2wR3oD" to="54p5:4lfwJVEz_X5" resolve="not_used_linters" />
     <node concept="2j1LYv" id="4lfwJVE_q9l" role="2j1YRv">
       <node concept="2j1LYi" id="4lfwJVE_q9m" role="2j1YQj">
@@ -58,5 +54,18 @@
       </node>
     </node>
   </node>
+  <node concept="2wR3oc" id="33N0Tlwri2j">
+    <ref role="2wR3oD" to="54p5:652KpqR3Kk5" resolve="skipped_evaluation_linters" />
+    <node concept="2j1LYv" id="33N0Tlwrit2" role="2j1YRv">
+      <node concept="2j1LYi" id="33N0Tlwrit3" role="2j1YQj">
+        <ref role="2j1LYj" to="54p5:652KpqR3Kk6" resolve="thisNode" />
+      </node>
+      <node concept="2tJFMh" id="33N0Tlwrn3G" role="2j1LYg">
+        <node concept="ZC_QK" id="33N0TlwrncH" role="2tJFKM">
+          <ref role="2aWVGs" node="33N0Tlwri2j" resolve="skipped_evaluation_linters" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps
index 84b2e236b..600862dea 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps
@@ -23,12 +23,18 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
-        <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
-      </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
         <reference id="3786325089106496690" name="script" index="2wR3oD" />
       </concept>
+      <concept id="7223240310078271419" name="org.mpsqa.lint.generic.structure.ILinterResultsContainer" flags="ngI" index="3dgnlL">
+        <property id="7223240310078527797" name="failOnlyOnNewResults" index="3dJkfZ" />
+        <child id="7223240310078271420" name="violations" index="3dgnlQ" />
+      </concept>
+      <concept id="7223240310078271416" name="org.mpsqa.lint.generic.structure.ResultEntry" flags="ng" index="3dgnlM">
+        <property id="7223240310078271417" name="result" index="3dgnlN" />
+        <property id="8230153551040655111" name="resultNodeModelId" index="3qxsSb" />
+        <property id="8230153551040654991" name="resultNodeId" index="3qxsY3" />
+      </concept>
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
@@ -45,7 +51,7 @@
     <ref role="2wR3oD" to="vi29:4aEqBbbsVSI" resolve="empty_generators" />
   </node>
   <node concept="2wR3oc" id="4lfwJVE_q9k">
-    <property role="2oM2pl" value="1c_Dn$lNzd7/WARNING" />
+    <property role="3dJkfZ" value="true" />
     <ref role="2wR3oD" to="54p5:4lfwJVEz_X5" resolve="not_used_linters" />
     <node concept="2j1LYv" id="4lfwJVE_q9l" role="2j1YRv">
       <node concept="2j1LYi" id="4lfwJVE_q9m" role="2j1YQj">
@@ -57,6 +63,24 @@
         </node>
       </node>
     </node>
+    <node concept="3dgnlM" id="59o88jXkHO6" role="3dgnlQ">
+      <property role="3dgnlN" value="The Script is not re-used" />
+      <property role="3qxsY3" value="1024891882118332503" />
+      <property role="3qxsSb" value="r:bad17717-3824-425b-aeb4-5578f6caf605(org.mpsqa.lint.mps_lang.linters_library.generator_aspect)" />
+    </node>
+  </node>
+  <node concept="2wR3oc" id="33N0Tlwri2j">
+    <ref role="2wR3oD" to="54p5:652KpqR3Kk5" resolve="skipped_evaluation_linters" />
+    <node concept="2j1LYv" id="33N0Tlwrit2" role="2j1YRv">
+      <node concept="2j1LYi" id="33N0Tlwrit3" role="2j1YQj">
+        <ref role="2j1LYj" to="54p5:652KpqR3Kk6" resolve="thisNode" />
+      </node>
+      <node concept="2tJFMh" id="33N0Tlwrn3G" role="2j1LYg">
+        <node concept="ZC_QK" id="33N0TlwrncH" role="2tJFKM">
+          <ref role="2aWVGs" node="33N0Tlwri2j" resolve="skipped_evaluation_linters" />
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps
index e3ca40220..9ca54e6c6 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps
@@ -22,12 +22,18 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
-        <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
-      </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
         <reference id="3786325089106496690" name="script" index="2wR3oD" />
       </concept>
+      <concept id="7223240310078271419" name="org.mpsqa.lint.generic.structure.ILinterResultsContainer" flags="ngI" index="3dgnlL">
+        <property id="7223240310078527797" name="failOnlyOnNewResults" index="3dJkfZ" />
+        <child id="7223240310078271420" name="violations" index="3dgnlQ" />
+      </concept>
+      <concept id="7223240310078271416" name="org.mpsqa.lint.generic.structure.ResultEntry" flags="ng" index="3dgnlM">
+        <property id="7223240310078271417" name="result" index="3dgnlN" />
+        <property id="8230153551040655111" name="resultNodeModelId" index="3qxsSb" />
+        <property id="8230153551040654991" name="resultNodeId" index="3qxsY3" />
+      </concept>
     </language>
     <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
       <concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
@@ -50,7 +56,7 @@
     <ref role="2wR3oD" to="emnw:3jiJ$OUDXsn" resolve="models_in_same_project_with_same_IDs" />
   </node>
   <node concept="2wR3oc" id="4lfwJVE_q9k">
-    <property role="2oM2pl" value="1c_Dn$lNzd7/WARNING" />
+    <property role="3dJkfZ" value="true" />
     <ref role="2wR3oD" to="54p5:4lfwJVEz_X5" resolve="not_used_linters" />
     <node concept="2j1LYv" id="4lfwJVE_q9l" role="2j1YRv">
       <node concept="2j1LYi" id="4lfwJVE_q9m" role="2j1YQj">
@@ -62,6 +68,57 @@
         </node>
       </node>
     </node>
+    <node concept="3dgnlM" id="33N0TlwroUo" role="3dgnlQ">
+      <property role="3dgnlN" value="The Script is not re-used" />
+      <property role="3qxsY3" value="7223240310078078703" />
+      <property role="3qxsSb" value="r:161dadb5-0fef-403d-8aac-88c1e026ee75(org.mpsqa.lint.generic.linters_library.models)" />
+    </node>
+    <node concept="3dgnlM" id="33N0TlwroUp" role="3dgnlQ">
+      <property role="3dgnlN" value="The Script is not re-used" />
+      <property role="3qxsY3" value="7223240310077936294" />
+      <property role="3qxsSb" value="r:161dadb5-0fef-403d-8aac-88c1e026ee75(org.mpsqa.lint.generic.linters_library.models)" />
+    </node>
+    <node concept="3dgnlM" id="33N0TlwroUq" role="3dgnlQ">
+      <property role="3dgnlN" value="The Script is not re-used" />
+      <property role="3qxsY3" value="8110417213840767695" />
+      <property role="3qxsSb" value="r:161dadb5-0fef-403d-8aac-88c1e026ee75(org.mpsqa.lint.generic.linters_library.models)" />
+    </node>
+    <node concept="3dgnlM" id="33N0TlwroUr" role="3dgnlQ">
+      <property role="3dgnlN" value="The Script is not re-used" />
+      <property role="3qxsY3" value="1807439458653774565" />
+      <property role="3qxsSb" value="r:161dadb5-0fef-403d-8aac-88c1e026ee75(org.mpsqa.lint.generic.linters_library.models)" />
+    </node>
+    <node concept="3dgnlM" id="33N0TlwroUs" role="3dgnlQ">
+      <property role="3dgnlN" value="The Script is not re-used" />
+      <property role="3qxsY3" value="9045894802594373958" />
+      <property role="3qxsSb" value="r:161dadb5-0fef-403d-8aac-88c1e026ee75(org.mpsqa.lint.generic.linters_library.models)" />
+    </node>
+    <node concept="3dgnlM" id="33N0TlwroUt" role="3dgnlQ">
+      <property role="3dgnlN" value="The Script is not re-used" />
+      <property role="3qxsY3" value="2086369935147081530" />
+      <property role="3qxsSb" value="r:161dadb5-0fef-403d-8aac-88c1e026ee75(org.mpsqa.lint.generic.linters_library.models)" />
+    </node>
+    <node concept="3dgnlM" id="33N0TlwroUu" role="3dgnlQ">
+      <property role="3dgnlN" value="The Script is not re-used" />
+      <property role="3qxsY3" value="4746002316342300821" />
+      <property role="3qxsSb" value="r:161dadb5-0fef-403d-8aac-88c1e026ee75(org.mpsqa.lint.generic.linters_library.models)" />
+    </node>
+  </node>
+  <node concept="2wR3oc" id="33N0Tlwri2j">
+    <ref role="2wR3oD" to="54p5:652KpqR3Kk5" resolve="skipped_evaluation_linters" />
+    <node concept="2j1LYv" id="33N0Tlwrit2" role="2j1YRv">
+      <node concept="2j1LYi" id="33N0Tlwrit3" role="2j1YQj">
+        <ref role="2j1LYj" to="54p5:652KpqR3Kk6" resolve="thisNode" />
+      </node>
+      <node concept="2tJFMh" id="33N0Tlwrn3G" role="2j1LYg">
+        <node concept="ZC_QK" id="33N0TlwrncH" role="2tJFKM">
+          <ref role="2aWVGs" node="33N0Tlwri2j" resolve="skipped_evaluation_linters" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="2wR3oc" id="33N0Tlwrn$q">
+    <ref role="2wR3oD" to="emnw:30a3800NEqs" resolve="model_name_contains_only_ascii_characters" />
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
index 42f8055f0..d52179ef9 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
@@ -11,6 +11,14 @@
     <import index="54p5" ref="r:3e5efb66-1a16-46d1-89d2-26142a5dcdaa(org.mpsqa.lint.generic.linters_library.meta)" />
   </imports>
   <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+    </language>
     <language id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic">
       <concept id="7741759128795045742" name="org.mpsqa.lint.generic.structure.IScriptsParametersAware" flags="ngI" index="2j1LY6">
         <child id="7741759128795065655" name="parValues" index="2j1YRv" />
@@ -22,9 +30,6 @@
         <child id="7741759128795045752" name="exp" index="2j1LYg" />
         <child id="7741759128795065723" name="paramRef" index="2j1YQj" />
       </concept>
-      <concept id="1024891882119954681" name="org.mpsqa.lint.generic.structure.ISeverityLevelAwareChecker" flags="ngI" index="2oM2l5">
-        <property id="1024891882119955433" name="reportLevel" index="2oM2pl" />
-      </concept>
       <concept id="3786325089106496663" name="org.mpsqa.lint.generic.structure.ReuseCheckableScript" flags="ng" index="2wR3oc">
         <reference id="3786325089106496690" name="script" index="2wR3oD" />
       </concept>
@@ -68,12 +73,20 @@
   </node>
   <node concept="2wR3oc" id="6wRVFFwyqlL">
     <ref role="2wR3oD" to="wpu7:3$9W3co2Xpl" resolve="modules_in_project_directory_on_harddisk_but_not_added_to_project" />
+    <node concept="2j1LYv" id="1TpxQu7g5JN" role="2j1YRv">
+      <node concept="2j1LYi" id="1TpxQu7g5JO" role="2j1YQj">
+        <ref role="2j1LYj" to="wpu7:5$DH147CJBE" resolve="checkPathsFromRootRegex" />
+      </node>
+      <node concept="Xl_RD" id="1TpxQu7g61L" role="2j1LYg">
+        <property role="Xl_RC" value=".*" />
+      </node>
+    </node>
   </node>
   <node concept="2wR3oc" id="6wRVFFwyqlM">
     <ref role="2wR3oD" to="wpu7:3jiJ$OUGH7s" resolve="modules_in_same_project_with_same_IDs" />
   </node>
   <node concept="2wR3oc" id="4lfwJVE_q9k">
-    <property role="2oM2pl" value="1c_Dn$lNzd7/WARNING" />
+    <property role="3dJkfZ" value="true" />
     <ref role="2wR3oD" to="54p5:4lfwJVEz_X5" resolve="not_used_linters" />
     <node concept="2j1LYv" id="4lfwJVE_q9l" role="2j1YRv">
       <node concept="2j1LYi" id="4lfwJVE_q9m" role="2j1YQj">
@@ -85,6 +98,129 @@
         </node>
       </node>
     </node>
+    <node concept="3dgnlM" id="59o88jXkVQD" role="3dgnlQ">
+      <property role="3dgnlN" value="The Script is not re-used" />
+      <property role="3qxsY3" value="2274076883838964712" />
+      <property role="3qxsSb" value="r:cadc46fc-2365-43d7-bda1-08e980cf970d(org.mpsqa.lint.generic.linters_library.modules)" />
+    </node>
+    <node concept="3dgnlM" id="59o88jXkVQE" role="3dgnlQ">
+      <property role="3dgnlN" value="The Script is not re-used" />
+      <property role="3qxsY3" value="5731233839534037106" />
+      <property role="3qxsSb" value="r:cadc46fc-2365-43d7-bda1-08e980cf970d(org.mpsqa.lint.generic.linters_library.modules)" />
+    </node>
+  </node>
+  <node concept="2wR3oc" id="33N0Tlwri2j">
+    <ref role="2wR3oD" to="54p5:652KpqR3Kk5" resolve="skipped_evaluation_linters" />
+    <node concept="2j1LYv" id="33N0Tlwrit2" role="2j1YRv">
+      <node concept="2j1LYi" id="33N0Tlwrit3" role="2j1YQj">
+        <ref role="2j1LYj" to="54p5:652KpqR3Kk6" resolve="thisNode" />
+      </node>
+      <node concept="2tJFMh" id="33N0Tlwrn3G" role="2j1LYg">
+        <node concept="ZC_QK" id="33N0TlwrncH" role="2tJFKM">
+          <ref role="2aWVGs" node="33N0Tlwri2j" resolve="skipped_evaluation_linters" />
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="2wR3oc" id="33N0TlwrwVz">
+    <ref role="2wR3oD" to="wpu7:4aEqBbb$5Kh" resolve="cyclic_module_dependencies" />
+    <node concept="2j1LYv" id="33N0Tlwrxdp" role="2j1YRv">
+      <node concept="2j1LYi" id="33N0Tlwrxdq" role="2j1YQj">
+        <ref role="2j1LYj" to="wpu7:47tbZooQUks" resolve="cycleLength" />
+      </node>
+      <node concept="3cmrfG" id="33N0Tlwr_Wz" role="2j1LYg">
+        <property role="3cmrfH" value="3" />
+      </node>
+    </node>
+    <node concept="3dgnlM" id="33N0Tlwr_Ny" role="3dgnlQ">
+      <property role="3dgnlN" value="Cyclic dependency with length 2 found: com.mbeddr.formal.safety.argument.runtime [language], com.mbeddr.formal.safety.argument.runtime.pluginSolution [solution]" />
+      <property role="3qxsY3" value="3527166873264066275" />
+      <property role="3qxsSb" value="r:54059a0b-024a-42ab-b8cd-2453fed4f7ff(com.fasten.meta.linters.module_level)" />
+    </node>
+  </node>
+  <node concept="2wR3oc" id="33N0TlwrB9P">
+    <property role="3dJkfZ" value="true" />
+    <ref role="2wR3oD" to="wpu7:7CQ_Wpsik$H" resolve="languages_not_part_of_any_devkit" />
+    <node concept="3dgnlM" id="1TpxQu7gc4J" role="3dgnlQ">
+      <property role="3dgnlN" value="Language is not part of any devkit" />
+      <property role="3qxsY3" value="3527166873264091765" />
+      <property role="3qxsSb" value="r:54059a0b-024a-42ab-b8cd-2453fed4f7ff(com.fasten.meta.linters.module_level)" />
+      <property role="2hbMIX" value="14289527-ae82-48f0-ab60-380cec6ac506(com.fasten.safety.bayesian_network)" />
+    </node>
+    <node concept="3dgnlM" id="1TpxQu7gc4K" role="3dgnlQ">
+      <property role="3dgnlN" value="Language is not part of any devkit" />
+      <property role="3qxsY3" value="3527166873264091765" />
+      <property role="3qxsSb" value="r:54059a0b-024a-42ab-b8cd-2453fed4f7ff(com.fasten.meta.linters.module_level)" />
+      <property role="2hbMIX" value="f610e51f-b05d-4ea8-a354-7ee51a81bcbc(com.fasten.safety.hazop.iso26262)" />
+    </node>
+    <node concept="3dgnlM" id="1TpxQu7gc4L" role="3dgnlQ">
+      <property role="3dgnlN" value="Language is not part of any devkit" />
+      <property role="3qxsY3" value="3527166873264091765" />
+      <property role="3qxsSb" value="r:54059a0b-024a-42ab-b8cd-2453fed4f7ff(com.fasten.meta.linters.module_level)" />
+      <property role="2hbMIX" value="7af989c3-8042-42ae-bf04-8bcfa8f9dbf9(com.fasten.safety.hazop)" />
+    </node>
+    <node concept="3dgnlM" id="1TpxQu7gc4M" role="3dgnlQ">
+      <property role="3dgnlN" value="Language is not part of any devkit" />
+      <property role="3qxsY3" value="3527166873264091765" />
+      <property role="3qxsSb" value="r:54059a0b-024a-42ab-b8cd-2453fed4f7ff(com.fasten.meta.linters.module_level)" />
+      <property role="2hbMIX" value="0ca42a58-5150-4a55-89be-ba447ef72356(com.mbeddr.formal.safety.gsn.web)" />
+    </node>
+    <node concept="3dgnlM" id="1TpxQu7gc4N" role="3dgnlQ">
+      <property role="3dgnlN" value="Language is not part of any devkit" />
+      <property role="3qxsY3" value="3527166873264091765" />
+      <property role="3qxsSb" value="r:54059a0b-024a-42ab-b8cd-2453fed4f7ff(com.fasten.meta.linters.module_level)" />
+      <property role="2hbMIX" value="eccaed1c-88f4-4a5c-9ad8-d1b8c9f330e9(com.mbeddr.formal.safety.stamp.ext)" />
+    </node>
+  </node>
+  <node concept="2wR3oc" id="33N0TlwrBrE">
+    <property role="3dJkfZ" value="true" />
+    <ref role="2wR3oD" to="wpu7:30a3800NEqs" resolve="module_name_contains_only_ascii_characters" />
+    <node concept="3dgnlM" id="59o88jXkEwu" role="3dgnlQ">
+      <property role="3dgnlN" value="Module name contains invalid characters. Allowed characters are: '[a-zA-Z0-9_.-]+'" />
+      <property role="3qxsY3" value="3527166873264092906" />
+      <property role="3qxsSb" value="r:54059a0b-024a-42ab-b8cd-2453fed4f7ff(com.fasten.meta.linters.module_level)" />
+      <property role="2hbMIX" value="0940b90d-aea1-4339-be5b-c8084d7ead33(com.fasten.safety.ft.xfta_gen#01)" />
+    </node>
+    <node concept="3dgnlM" id="59o88jXkEwv" role="3dgnlQ">
+      <property role="3dgnlN" value="Module name contains invalid characters. Allowed characters are: '[a-zA-Z0-9_.-]+'" />
+      <property role="3qxsY3" value="3527166873264092906" />
+      <property role="3qxsSb" value="r:54059a0b-024a-42ab-b8cd-2453fed4f7ff(com.fasten.meta.linters.module_level)" />
+      <property role="2hbMIX" value="0cd4968b-4ddc-4835-aa0f-2a9e87b43fae(com.mbeddr.formal.safety.gsn.odd#01)" />
+    </node>
+    <node concept="3dgnlM" id="59o88jXkEww" role="3dgnlQ">
+      <property role="3dgnlN" value="Module name contains invalid characters. Allowed characters are: '[a-zA-Z0-9_.-]+'" />
+      <property role="3qxsY3" value="3527166873264092906" />
+      <property role="3qxsSb" value="r:54059a0b-024a-42ab-b8cd-2453fed4f7ff(com.fasten.meta.linters.module_level)" />
+      <property role="2hbMIX" value="31b0df10-2d1f-4744-8de7-461666d7c2d1(com.mbeddr.formal.safety.gsn.web#01)" />
+    </node>
+  </node>
+  <node concept="2wR3oc" id="33N0TlwrBHv">
+    <ref role="2wR3oD" to="wpu7:2dSiT1hKT_t" resolve="modules_and_file_system_layout_consistency" />
+  </node>
+  <node concept="2wR3oc" id="33N0TlwrC8e">
+    <ref role="2wR3oD" to="wpu7:4Wm$DJ9hQK9" resolve="modules_deleted_from_disk_but_referenced_in_project" />
+  </node>
+  <node concept="2wR3oc" id="33N0TlwrCyX">
+    <ref role="2wR3oD" to="wpu7:44nYoQPiwgG" resolve="strongly_connected_modules_dependencies" />
+    <node concept="2j1LYv" id="33N0TlwrCTg" role="2j1YRv">
+      <node concept="2j1LYi" id="33N0TlwrCTh" role="2j1YQj">
+        <ref role="2j1LYj" to="wpu7:44nYoQPiwgH" resolve="stronglyConnectedComponentSize" />
+      </node>
+      <node concept="3cmrfG" id="33N0TlwrEP$" role="2j1LYg">
+        <property role="3cmrfH" value="2" />
+      </node>
+    </node>
+  </node>
+  <node concept="2wR3oc" id="59o88jXkWhz">
+    <ref role="2wR3oD" to="wpu7:2uhEaMUkNtd" resolve="modules_containing_too_many_nodes" />
+    <node concept="2j1LYv" id="59o88jXkWBQ" role="2j1YRv">
+      <node concept="2j1LYi" id="59o88jXkWBR" role="2j1YQj">
+        <ref role="2j1LYj" to="wpu7:6CE1TgLsNRG" resolve="numberOfNodesTreshold" />
+      </node>
+      <node concept="3cmrfG" id="59o88jXkWKU" role="2j1LYg">
+        <property role="3cmrfH" value="50000" />
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps
index 1eb2c1a84..9d0fc6828 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.editor.mps
@@ -11,9 +11,8 @@
   <imports>
     <import index="u2ih" ref="r:ab00bc1f-8fc9-4bdf-9a87-1e2713aafade(com.fasten.req.odd.structure)" />
     <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
-    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" implicit="true" />
-    <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -29,7 +28,6 @@
       <concept id="1597643335227097138" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_TransformationMenu_node" flags="ng" index="7Obwk" />
       <concept id="6516520003787916624" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Condition" flags="ig" index="27VH4U" />
       <concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
-        <property id="1140524450557" name="separatorText" index="2czwfO" />
         <child id="1176897874615" name="nodeFactory" index="4_6I_" />
         <child id="1140524464360" name="cellLayout" index="2czzBx" />
       </concept>
@@ -65,8 +63,6 @@
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
-      <concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
-      <concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
       <concept id="3360401466585705291" name="jetbrains.mps.lang.editor.structure.CellModel_ContextAssistant" flags="ng" index="18a60v" />
       <concept id="5692353713941573329" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_ActionLabelText" flags="ig" index="1hCUdq" />
       <concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
@@ -188,49 +184,6 @@
       </concept>
     </language>
   </registry>
-  <node concept="24kQdi" id="3Jn$RV31nMw">
-    <property role="3GE5qa" value="odd_parameter" />
-    <ref role="1XX52x" to="u2ih:3Jn$RV31nMt" resolve="ODDAttribute" />
-    <node concept="3EZMnI" id="3Jn$RV31q$s" role="2wV5jI">
-      <node concept="2iRkQZ" id="3Jn$RV31q$t" role="2iSdaV" />
-      <node concept="3EZMnI" id="3Jn$RV31nMy" role="3EZMnx">
-        <node concept="3F0ifn" id="3Jn$RV31nMN" role="3EZMnx">
-          <property role="3F0ifm" value="odd parameter:" />
-        </node>
-        <node concept="3F0A7n" id="3Jn$RV31nMH" role="3EZMnx">
-          <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-        </node>
-        <node concept="2iRfu4" id="3Jn$RV31nM_" role="2iSdaV" />
-      </node>
-      <node concept="3EZMnI" id="1wKSXwEBhDa" role="3EZMnx">
-        <node concept="VPM3Z" id="1wKSXwEBhDc" role="3F10Kt" />
-        <node concept="3XFhqQ" id="1wKSXwEBhDv" role="3EZMnx" />
-        <node concept="3F0ifn" id="1wKSXwEBhD_" role="3EZMnx">
-          <property role="3F0ifm" value="mapped ontology concepts:" />
-        </node>
-        <node concept="3F2HdR" id="1wKSXwEBhDP" role="3EZMnx">
-          <property role="2czwfO" value="," />
-          <ref role="1NtTu8" to="u2ih:1wKSXwEBhCU" resolve="concepts" />
-          <node concept="2iRfu4" id="1wKSXwEBhDR" role="2czzBx" />
-        </node>
-        <node concept="2iRfu4" id="1wKSXwEBhDf" role="2iSdaV" />
-      </node>
-      <node concept="3F0ifn" id="1UJ51yZ$qzN" role="3EZMnx" />
-      <node concept="3EZMnI" id="3Jn$RV31q$I" role="3EZMnx">
-        <node concept="VPM3Z" id="3Jn$RV31q$K" role="3F10Kt" />
-        <node concept="3XFhqQ" id="3Jn$RV31q$Z" role="3EZMnx" />
-        <node concept="3F2HdR" id="3Jn$RV31q_9" role="3EZMnx">
-          <ref role="1NtTu8" to="u2ih:3Jn$RV31pil" resolve="dimensions" />
-          <node concept="2iRkQZ" id="3Jn$RV31q_f" role="2czzBx" />
-        </node>
-        <node concept="2iRfu4" id="3Jn$RV31q$N" role="2iSdaV" />
-      </node>
-      <node concept="3F0ifn" id="3Jn$RV31rRF" role="3EZMnx">
-        <property role="3F0ifm" value="¶" />
-        <ref role="1k5W1q" to="xnej:41_NtXJnxMU" resolve="FASTENEndOfNodeMarker" />
-      </node>
-    </node>
-  </node>
   <node concept="24kQdi" id="3Jn$RV31nVR">
     <ref role="1XX52x" to="u2ih:3Jn$RV31nMq" resolve="ODD" />
     <node concept="3EZMnI" id="3Jn$RV31nVT" role="2wV5jI">
@@ -241,68 +194,21 @@
       <node concept="3F2HdR" id="3Jn$RV31nW9" role="3EZMnx">
         <ref role="1NtTu8" to="u2ih:3Jn$RV31nMR" resolve="content" />
         <node concept="2iRkQZ" id="3Jn$RV31nWb" role="2czzBx" />
+        <node concept="4$FPG" id="59o88jXiEOZ" role="4_6I_">
+          <node concept="3clFbS" id="59o88jXiEP0" role="2VODD2">
+            <node concept="3clFbF" id="59o88jXiERA" role="3cqZAp">
+              <node concept="2pJPEk" id="59o88jXiER$" role="3clFbG">
+                <node concept="2pJPED" id="59o88jXiER_" role="2pJPEn">
+                  <ref role="2pJxaS" to="u2ih:7gUa1Zsy25o" resolve="EmptyLine" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="2iRkQZ" id="3Jn$RV31nVW" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="3Jn$RV31p8P">
-    <property role="3GE5qa" value="odd_parameter" />
-    <ref role="1XX52x" to="u2ih:3Jn$RV31p8M" resolve="ODDAttributeDimension" />
-    <node concept="3EZMnI" id="3Jn$RV31p8R" role="2wV5jI">
-      <node concept="3F0ifn" id="3Jn$RV31p8Y" role="3EZMnx">
-        <property role="3F0ifm" value="dimension:" />
-      </node>
-      <node concept="3F0A7n" id="3Jn$RV31p94" role="3EZMnx">
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-      </node>
-      <node concept="3F0ifn" id="3Jn$RV31ub3" role="3EZMnx">
-        <property role="3F0ifm" value="-" />
-      </node>
-      <node concept="3F2HdR" id="3Jn$RV31ubd" role="3EZMnx">
-        <property role="2czwfO" value="," />
-        <ref role="1NtTu8" to="u2ih:3Jn$RV31uaX" resolve="alternatives" />
-        <node concept="2iRfu4" id="3Jn$RV31ubf" role="2czzBx" />
-      </node>
-      <node concept="2iRfu4" id="3Jn$RV31p8U" role="2iSdaV" />
-    </node>
-    <node concept="3EZMnI" id="1UJ51yZ_N2c" role="6VMZX">
-      <node concept="3F0ifn" id="1UJ51yZ_N2d" role="3EZMnx">
-        <property role="3F0ifm" value="Mapped ontology concepts:" />
-      </node>
-      <node concept="3EZMnI" id="1UJ51yZ_N2e" role="3EZMnx">
-        <node concept="VPM3Z" id="1UJ51yZ_N2f" role="3F10Kt" />
-        <node concept="3XFhqQ" id="1UJ51yZ_N2g" role="3EZMnx" />
-        <node concept="3F2HdR" id="1UJ51yZ_N2h" role="3EZMnx">
-          <ref role="1NtTu8" to="u2ih:1UJ51yZ_N2a" resolve="concepts" />
-          <node concept="2iRkQZ" id="1UJ51yZ_N2i" role="2czzBx" />
-        </node>
-        <node concept="2iRfu4" id="1UJ51yZ_N2j" role="2iSdaV" />
-      </node>
-      <node concept="2iRkQZ" id="1UJ51yZ_N2k" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="3Jn$RV31uaS">
-    <property role="3GE5qa" value="odd_parameter" />
-    <ref role="1XX52x" to="u2ih:3Jn$RV31uaP" resolve="DimensionAlternative" />
-    <node concept="3F0A7n" id="3Jn$RV31uaU" role="2wV5jI">
-      <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-    </node>
-    <node concept="3EZMnI" id="1UJ51yZ_YiC" role="6VMZX">
-      <node concept="3F0ifn" id="1UJ51yZ_YiD" role="3EZMnx">
-        <property role="3F0ifm" value="Mapped ontology concepts:" />
-      </node>
-      <node concept="3EZMnI" id="1UJ51yZ_YiE" role="3EZMnx">
-        <node concept="VPM3Z" id="1UJ51yZ_YiF" role="3F10Kt" />
-        <node concept="3XFhqQ" id="1UJ51yZ_YiG" role="3EZMnx" />
-        <node concept="3F2HdR" id="1UJ51yZ_YiH" role="3EZMnx">
-          <ref role="1NtTu8" to="u2ih:1UJ51yZ_YiA" resolve="concepts" />
-          <node concept="2iRkQZ" id="1UJ51yZ_YiI" role="2czzBx" />
-        </node>
-        <node concept="2iRfu4" id="1UJ51yZ_YiJ" role="2iSdaV" />
-      </node>
-      <node concept="2iRkQZ" id="1UJ51yZ_YiK" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="3Jn$RV31w1$">
     <property role="3GE5qa" value="ontology" />
     <ref role="1XX52x" to="u2ih:3Jn$RV31w1o" resolve="OntologyConcept_old" />
@@ -451,76 +357,6 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="1wKSXwECALv">
-    <property role="3GE5qa" value="odd_parameter" />
-    <ref role="1XX52x" to="u2ih:1wKSXwECACA" resolve="ODDAttributeWordRef" />
-    <node concept="3EZMnI" id="1wKSXwECAL_" role="2wV5jI">
-      <node concept="PMmxH" id="1wKSXwECALK" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="xnej:KwKRgpDZHZ" resolve="FASTENBaseLanguageKeyword" />
-      </node>
-      <node concept="3F0ifn" id="1wKSXwECALP" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <node concept="11L4FC" id="1wKSXwECLNZ" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="11LMrY" id="1wKSXwECLO4" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="1iCGBv" id="1wKSXwECAM2" role="3EZMnx">
-        <ref role="1NtTu8" to="u2ih:1wKSXwECALm" resolve="param" />
-        <node concept="1sVBvm" id="1wKSXwECAM4" role="1sWHZn">
-          <node concept="3F0A7n" id="1wKSXwECAMv" role="2wV5jI">
-            <property role="1Intyy" value="true" />
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="1wKSXwECAMn" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <node concept="11L4FC" id="1wKSXwECLO8" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="2iRfu4" id="1wKSXwECALC" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="NY_g42e1PO">
-    <property role="3GE5qa" value="odd_parameter" />
-    <ref role="1XX52x" to="u2ih:NY_g42e1PC" resolve="ODDAttributeDimensionWordRef" />
-    <node concept="3EZMnI" id="NY_g42e1PQ" role="2wV5jI">
-      <node concept="PMmxH" id="NY_g42e1PR" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-        <ref role="1k5W1q" to="xnej:KwKRgpDZHZ" resolve="FASTENBaseLanguageKeyword" />
-      </node>
-      <node concept="3F0ifn" id="NY_g42e1PS" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <node concept="11L4FC" id="NY_g42e1PT" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="11LMrY" id="NY_g42e1PU" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="1iCGBv" id="NY_g42e1PV" role="3EZMnx">
-        <ref role="1NtTu8" to="u2ih:NY_g42e1PF" resolve="dim" />
-        <node concept="1sVBvm" id="NY_g42e1PW" role="1sWHZn">
-          <node concept="3F0A7n" id="NY_g42e1PX" role="2wV5jI">
-            <property role="1Intyy" value="true" />
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="NY_g42e1PY" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <node concept="11L4FC" id="NY_g42e1PZ" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="2iRfu4" id="NY_g42e1Q0" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="7gUa1Zsy25s">
     <ref role="1XX52x" to="u2ih:7gUa1Zsy25o" resolve="EmptyLine" />
     <node concept="3F0ifn" id="7gUa1Zsy25u" role="2wV5jI">
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.structure.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.structure.mps
index 426c3047f..18712e985 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.structure.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.odd/models/com.fasten.req.odd.structure.mps
@@ -123,92 +123,6 @@
       </node>
     </node>
   </node>
-  <node concept="1TIwiD" id="3Jn$RV31nMt">
-    <property role="EcuMT" value="4312077340877618333" />
-    <property role="TrG5h" value="ODDAttribute" />
-    <property role="34LRSv" value="attribute" />
-    <property role="3GE5qa" value="odd_attribute" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="PrWs8" id="3Jn$RV31nMu" role="PzmwI">
-      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
-    </node>
-    <node concept="PrWs8" id="3RNDPbLZSof" role="PzmwI">
-      <ref role="PrY4T" node="3RNDPbLZSob" resolve="IODDContent" />
-    </node>
-    <node concept="1TJgyj" id="3Jn$RV31pil" role="1TKVEi">
-      <property role="IQ2ns" value="4312077340877624469" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="dimensions" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="1wKSXwEBX_e" resolve="IODDParameterDimensionLike" />
-    </node>
-    <node concept="1TJgyj" id="1wKSXwEBhCU" role="1TKVEi">
-      <property role="IQ2ns" value="1743143573359761978" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="concepts" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" to="6wa3:1wKSXwEBhCv" resolve="OntologyConceptRef" />
-    </node>
-    <node concept="1TJgyj" id="2_d9ZRvW8tn" role="1TKVEi">
-      <property role="IQ2ns" value="2976078900099057495" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <property role="20kJfa" value="oddAttributeRelations" />
-      <ref role="20lvS9" node="2_d9ZRvW8sM" resolve="ODDAttributeRef" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="3Jn$RV31p8M">
-    <property role="EcuMT" value="4312077340877623858" />
-    <property role="TrG5h" value="ODDAttributeDimension" />
-    <property role="34LRSv" value="dimension" />
-    <property role="3GE5qa" value="odd_attribute" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="PrWs8" id="3Jn$RV31tXH" role="PzmwI">
-      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
-    </node>
-    <node concept="PrWs8" id="1wKSXwEBX_i" role="PzmwI">
-      <ref role="PrY4T" node="1wKSXwEBX_e" resolve="IODDParameterDimensionLike" />
-    </node>
-    <node concept="1TJgyj" id="1UJ51yZ_N2a" role="1TKVEi">
-      <property role="IQ2ns" value="2211008038588330122" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="concepts" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" to="6wa3:1wKSXwEBhCv" resolve="OntologyConceptRef" />
-    </node>
-    <node concept="1TJgyi" id="2_d9ZRvRytm" role="1TKVEl">
-      <property role="IQ2nx" value="2976078900097853270" />
-      <property role="TrG5h" value="note" />
-      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="3Jn$RV31uaP">
-    <property role="EcuMT" value="4312077340877644469" />
-    <property role="TrG5h" value="DimensionAlternative" />
-    <property role="34LRSv" value="alternative" />
-    <property role="3GE5qa" value="odd_attribute" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="PrWs8" id="3Jn$RV31uaQ" role="PzmwI">
-      <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
-    </node>
-    <node concept="1TJgyj" id="1UJ51yZ_YiA" role="1TKVEi">
-      <property role="IQ2ns" value="2211008038588376230" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="concepts" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" to="6wa3:1wKSXwEBhCv" resolve="OntologyConceptRef" />
-    </node>
-    <node concept="1TJgyi" id="2_d9ZRvTmT7" role="1TKVEl">
-      <property role="IQ2nx" value="2976078900098330183" />
-      <property role="TrG5h" value="note" />
-      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
-    </node>
-    <node concept="1TJgyi" id="2_d9ZRvTmTM" role="1TKVEl">
-      <property role="IQ2nx" value="2976078900098330226" />
-      <property role="TrG5h" value="included" />
-      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="3Jn$RV31w1l">
     <property role="EcuMT" value="4312077340877652053" />
     <property role="TrG5h" value="Ontology_old" />
@@ -305,49 +219,6 @@
       <property role="YLQ7P" value="The concept was moved to language &quot;com.fasten.req.ontology&quot;" />
     </node>
   </node>
-  <node concept="PlHQZ" id="1wKSXwEBX_e">
-    <property role="EcuMT" value="1743143573359941966" />
-    <property role="TrG5h" value="IODDParameterDimensionLike" />
-    <node concept="1TJgyj" id="3Jn$RV31uaX" role="1TKVEi">
-      <property role="IQ2ns" value="4312077340877644477" />
-      <property role="20lmBu" value="fLJjDmT/aggregation" />
-      <property role="20kJfa" value="alternatives" />
-      <property role="20lbJX" value="fLJekj5/_0__n" />
-      <ref role="20lvS9" node="3Jn$RV31uaP" resolve="DimensionAlternative" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="1wKSXwECACA">
-    <property role="EcuMT" value="1743143573360110118" />
-    <property role="TrG5h" value="ODDAttributeWordRef" />
-    <property role="34LRSv" value="@odd-attribute" />
-    <property role="3GE5qa" value="odd_attribute" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="PrWs8" id="1wKSXwECALk" role="PzmwI">
-      <ref role="PrY4T" to="87nw:2dWzqxEBBFG" resolve="IWord" />
-    </node>
-    <node concept="1TJgyj" id="1wKSXwECALm" role="1TKVEi">
-      <property role="IQ2ns" value="1743143573360110678" />
-      <property role="20kJfa" value="param" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="3Jn$RV31nMt" resolve="ODDAttribute" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="NY_g42e1PC">
-    <property role="EcuMT" value="936349604104379752" />
-    <property role="TrG5h" value="ODDAttributeDimensionWordRef" />
-    <property role="34LRSv" value="@odd-dimension" />
-    <property role="3GE5qa" value="odd_attribute" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="PrWs8" id="NY_g42e1PD" role="PzmwI">
-      <ref role="PrY4T" to="87nw:2dWzqxEBBFG" resolve="IWord" />
-    </node>
-    <node concept="1TJgyj" id="NY_g42e1PF" role="1TKVEi">
-      <property role="IQ2ns" value="936349604104379755" />
-      <property role="20kJfa" value="dim" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="3Jn$RV31p8M" resolve="ODDAttributeDimension" />
-    </node>
-  </node>
   <node concept="PlHQZ" id="7gUa1Zsy25c">
     <property role="EcuMT" value="8375050574357864780" />
     <property role="TrG5h" value="IOntologyContent_old" />
@@ -361,7 +232,7 @@
     <property role="TrG5h" value="EmptyLine" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="7gUa1Zsy25p" role="PzmwI">
-      <ref role="PrY4T" to="6wa3:7gUa1Zsy25c" resolve="IOntologyContent" />
+      <ref role="PrY4T" node="3RNDPbLZSob" resolve="IODDContent" />
     </node>
   </node>
   <node concept="PlHQZ" id="3RNDPbLZSob">
@@ -397,9 +268,6 @@
     <property role="TrG5h" value="ODDSentenceBase" />
     <property role="R5$K7" value="true" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="PrWs8" id="3RNDPbM04SA" role="PzmwI">
-      <ref role="PrY4T" node="3RNDPbLZSob" resolve="IODDContent" />
-    </node>
     <node concept="1TJgyj" id="3RNDPbM04Sa" role="1TKVEi">
       <property role="IQ2ns" value="4464095630343556618" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -498,23 +366,6 @@
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
   </node>
-  <node concept="1TIwiD" id="2_d9ZRvW8sM">
-    <property role="EcuMT" value="2976078900099057458" />
-    <property role="3GE5qa" value="odd_attribute" />
-    <property role="TrG5h" value="ODDAttributeRef" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="1TJgyj" id="2_d9ZRvW8sP" role="1TKVEi">
-      <property role="IQ2ns" value="2976078900099057461" />
-      <property role="20kJfa" value="oddAttribute" />
-      <property role="20lbJX" value="fLJekj4/_1" />
-      <ref role="20lvS9" node="3Jn$RV31nMt" resolve="ODDAttribute" />
-    </node>
-    <node concept="1TJgyi" id="2_d9ZRvW8tG" role="1TKVEl">
-      <property role="IQ2nx" value="2976078900099057516" />
-      <property role="TrG5h" value="relationType" />
-      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="opo3atlsiK">
     <property role="EcuMT" value="439488209149609136" />
     <property role="TrG5h" value="OntologyRelationTargetDotTarget" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl
index fd2f668c1..bcb7f826c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/com.fasten.safety.bayesian_network.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.fasten.safety.bayesian_network" uuid="14289527-ae82-48f0-ab60-380cec6ac506" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -12,10 +12,10 @@
   </facets>
   <accessoryModels />
   <dependencies>
-    <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
+    <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
@@ -62,7 +62,6 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="14289527-ae82-48f0-ab60-380cec6ac506(com.fasten.safety.bayesian_network)" version="0" />
-    <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps
index 967c5cd7f..55388b0a5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.bayesian_network/models/com.fasten.safety.bayesian_network.editor.mps
@@ -9,7 +9,6 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps
index 2313f41c9..6e74ce3eb 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.iso26262/models/com.fasten.safety.fmea.iso26262.editor.mps
@@ -3,7 +3,6 @@
   <persistence version="9" />
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
-    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="7e450f4e-1ac3-41ef-a851-4598161bdb94" name="de.slisson.mps.tables" 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.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl
index 4a53f517f..9d6644004 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/com.fasten.safety.fmea.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.fasten.safety.fmea" uuid="b43c548b-f75f-46e2-ad24-de9edd93e95e" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -13,7 +13,6 @@
   <accessoryModels />
   <dependencies>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
-    <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
   <languageVersions>
@@ -60,7 +59,6 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="b43c548b-f75f-46e2-ad24-de9edd93e95e(com.fasten.safety.fmea)" version="0" />
-    <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" 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.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps
index 0e0f546e8..aacd08136 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.editor.mps
@@ -10,7 +10,6 @@
   </languages>
   <imports>
     <import index="6k2r" ref="r:caa5c61b-1fdb-4b2d-a184-3bec7eaec4f9(com.fasten.safety.fmea.structure)" />
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="arip" ref="r:05796a31-2f42-44d2-9b5e-7769941d865b(com.fasten.safety.fmea.behavior)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps
index ab9a239a3..a641a250a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.behavior.mps
@@ -16,6 +16,7 @@
     <import index="ii8j" ref="r:a06544ed-39eb-44c0-b516-bb222deb41dc(com.fasten.safety.hiphops.structure)" />
     <import index="7wf3" ref="r:c49134f0-ff6f-4ef4-ad9f-10c1a3f47c1a(com.mbeddr.formal.base.arch.behavior)" />
     <import index="h4ob" ref="r:c1b5027c-c0fd-4ce6-a884-7934c1083045(com.fasten.safety.hiphops.util)" />
+    <import index="ox2v" ref="r:9d0d3f45-3600-4f52-892b-d59f24c624ff(com.mbeddr.formal.base.expressions.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -41,6 +42,9 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
@@ -113,12 +117,6 @@
       </concept>
     </language>
   </registry>
-  <node concept="13h7C7" id="1TeaL8RdRMo">
-    <ref role="13h7C2" to="zsc5:1TeaL8Rdz2m" resolve="LogicalTypeFailureModes" />
-    <node concept="13hLZK" id="1TeaL8RdRMp" role="13h7CW">
-      <node concept="3clFbS" id="1TeaL8RdRMq" role="2VODD2" />
-    </node>
-  </node>
   <node concept="13h7C7" id="1TeaL8Rem0F">
     <ref role="13h7C2" to="zsc5:1TeaL8Rddhw" resolve="IFFMEA" />
     <node concept="13hLZK" id="1TeaL8Rem0G" role="13h7CW">
@@ -240,6 +238,50 @@
       </node>
       <node concept="17QB3L" id="1f_hJh28xoo" role="3clF45" />
     </node>
+    <node concept="13i0hz" id="59o88jXkJNA" role="13h7CS">
+      <property role="TrG5h" value="renderReadable" />
+      <ref role="13i0hy" to="ox2v:4_pH3zvp0Zq" resolve="renderReadable" />
+      <node concept="3Tm1VV" id="59o88jXkJNB" role="1B3o_S" />
+      <node concept="3clFbS" id="59o88jXkJNS" role="3clF47">
+        <node concept="3clFbF" id="59o88jXkLko" role="3cqZAp">
+          <node concept="3cpWs3" id="59o88jXkQVA" role="3clFbG">
+            <node concept="2OqwBi" id="59o88jXkSNF" role="3uHU7w">
+              <node concept="2OqwBi" id="59o88jXkRFJ" role="2Oq$k0">
+                <node concept="13iPFW" id="59o88jXkR0Z" role="2Oq$k0" />
+                <node concept="3TrEf2" id="59o88jXkSpc" role="2OqNvi">
+                  <ref role="3Tt5mk" to="ii8j:1TeaL8RefrY" resolve="failureMode" />
+                </node>
+              </node>
+              <node concept="3TrcHB" id="59o88jXkT68" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+            <node concept="3cpWs3" id="59o88jXkQPd" role="3uHU7B">
+              <node concept="2OqwBi" id="59o88jXkPcI" role="3uHU7B">
+                <node concept="2OqwBi" id="59o88jXkO36" role="2Oq$k0">
+                  <node concept="2OqwBi" id="59o88jXkLzP" role="2Oq$k0">
+                    <node concept="13iPFW" id="59o88jXkLkn" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="59o88jXkNMG" role="2OqNvi">
+                      <ref role="3Tt5mk" to="zsc5:62cfieEOV22" resolve="port" />
+                    </node>
+                  </node>
+                  <node concept="3TrEf2" id="59o88jXkOW4" role="2OqNvi">
+                    <ref role="3Tt5mk" to="3whv:7RhjhI7$li3" resolve="port" />
+                  </node>
+                </node>
+                <node concept="3TrcHB" id="59o88jXkP$q" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                </node>
+              </node>
+              <node concept="Xl_RD" id="59o88jXkQUs" role="3uHU7w">
+                <property role="Xl_RC" value="." />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="59o88jXkJNT" role="3clF45" />
+    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
index de09622b4..cbd97b756 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/com.mbeddr.formal.safety.argument.modelquery.mpl
@@ -83,7 +83,6 @@
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
index 04c01d8a4..7e8d14e5a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.editor.mps
@@ -7,7 +7,6 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="9br2" ref="r:70aadfb3-8246-45ac-bcd1-b345c7f7cfe4(com.mbeddr.formal.safety.argument.modelquery.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
index bd2a74453..9fe23eeee 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/com.mbeddr.formal.safety.argument.visualisation.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.formal.safety.argument.visualisation" uuid="04d81d12-7048-4552-9a53-86a271c0f094" languageVersion="0" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -13,7 +13,6 @@
   <accessoryModels />
   <dependencies>
     <dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
-    <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">56f134c7-a829-428d-9119-715369c69768(org.mpsqa.treemap.lib)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps
index d81636e77..23b6f8cd0 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.visualisation/models/com.mbeddr.formal.safety.argument.visualisation.editor.mps
@@ -8,7 +8,6 @@
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="tlox" ref="56f134c7-a829-428d-9119-715369c69768/java:net.sf.jtreemap.swing.provider(org.mpsqa.treemap.lib/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps
index f87cc0298..9dbcff6a6 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.behavior.mps
@@ -14,7 +14,6 @@
     <import index="w873" ref="r:0de03bcd-6ad8-423c-b85e-ae3dd18ed2b3(com.mbeddr.formal.base.behavior)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
-    <import index="mcvo" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter.structure.language(MPS.Core/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="g3l6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.model(MPS.Core/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
index e6fd48b50..6c0cd8c60 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/com.mbeddr.formal.safety.iso26262.mpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language namespace="com.mbeddr.formal.safety.iso26262" uuid="a798113f-e2cd-4e21-a8e2-ca1903cb9c43" languageVersion="1" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -13,7 +13,6 @@
   <accessoryModels />
   <dependencies>
     <dependency reexport="false">17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)</dependency>
-    <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
     <dependency reexport="false">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
     <dependency reexport="false">792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)</dependency>
   </dependencies>
@@ -64,7 +63,6 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
-    <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="17da266c-02d9-4bbd-b69b-8a656b49f45c(com.mbeddr.formal.safety.hara)" version="0" />
     <module reference="a798113f-e2cd-4e21-a8e2-ca1903cb9c43(com.mbeddr.formal.safety.iso26262)" version="0" />
     <module reference="792be022-0a7a-4b28-bfd8-b1b2d347b772(com.mpsbasics.core)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
index b175b3b25..f73d85480 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.iso26262/models/com.mbeddr.formal.safety.iso26262.editor.mps
@@ -9,7 +9,6 @@
   </languages>
   <imports>
     <import index="cjwq" ref="r:7e1f4da1-19b3-4ceb-bcab-0237eb7a50b7(com.mbeddr.formal.safety.hara.structure)" />
-    <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
     <import index="1ks0" ref="r:3f04aa5b-eee7-48ea-a2c7-fc975c7f8656(com.mpsbasics.core.editor)" />
     <import index="1w8j" ref="r:0631ef51-dd11-46fa-a4db-001e68da09c6(com.mbeddr.formal.safety.iso26262.structure)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
index 9b81faaef..4975ab54c 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
@@ -4581,11 +4581,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6Z2HiVHt9t5" role="3bR37C">
-          <node concept="3bR9La" id="6Z2HiVHt9t6" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
         <node concept="1BupzO" id="6Z2HiVHt9ti" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -4629,6 +4624,11 @@
             <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1TpxQu7pSkD" role="3bR37C">
+          <node concept="3bR9La" id="1TpxQu7pSkE" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="6hyv0iVPlEj" role="3989C9">
@@ -5804,11 +5804,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="y1G8y6eYHp" role="3bR37C">
-          <node concept="3bR9La" id="y1G8y6eYHq" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
         <node concept="1BupzO" id="y1G8y6eYHA" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -6422,11 +6417,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="jPgKPEIjIu" role="3bR37C">
-          <node concept="3bR9La" id="jPgKPEIjIv" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
         <node concept="1BupzO" id="jPgKPEIjIF" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -7142,11 +7132,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="6ucyvMUxOqj" role="3bR37C">
-          <node concept="3bR9La" id="6ucyvMUxOqk" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4JYWwihDiuh" role="3bR37C">
           <node concept="3bR9La" id="4JYWwihDiui" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
@@ -7757,11 +7742,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="6lmI$FzXHKE" role="3bR37C">
-          <node concept="3bR9La" id="6lmI$FzXHKF" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
         <node concept="1BupzO" id="6lmI$FzXHKT" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps
index d78d39f7f..8580ca59c 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.hiphops.sandbox/models/com.fasten.safety.hiphops.sandbox._010_smoke.mps
@@ -1125,7 +1125,7 @@
           <property role="gqqTZ" value="12.0" />
           <property role="gqqTW" value="280.0" />
           <property role="gqqTX" value="106.0" />
-          <property role="gqqTy" value="48.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4TCu33h1eDm" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
@@ -1143,7 +1143,7 @@
           <property role="gqqTZ" value="138.0" />
           <property role="gqqTW" value="280.0" />
           <property role="gqqTX" value="111.0" />
-          <property role="gqqTy" value="48.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4TCu33h1eDq" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
@@ -1161,7 +1161,7 @@
           <property role="gqqTZ" value="82.9" />
           <property role="gqqTW" value="12.0" />
           <property role="gqqTX" value="183.0" />
-          <property role="gqqTy" value="48.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4TCu33h1eDu" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
@@ -1178,21 +1178,13 @@
         <node concept="gqqVs" id="4TCu33h1eDw" role="37mO4d">
           <property role="gqqTZ" value="153.95" />
           <property role="gqqTW" value="180.0" />
-          <property role="gqqTX" value="60.0" />
-          <property role="gqqTy" value="60.0" />
+          <property role="gqqTX" value="62.0" />
+          <property role="gqqTy" value="62.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4TCu33h1eDy" role="1pap1a">
             <property role="1pa3iD" value="port" />
             <property role="2gRgW$" value="1259048879" />
           </node>
-          <node concept="1pa3jb" id="4TCu33h1eDz" role="1pap1a">
-            <property role="1pa3iD" value="5649897883596809310" />
-            <property role="2gRgW$" value="1844411357" />
-          </node>
-          <node concept="1pa3jb" id="4TCu33h1eD$" role="1pap1a">
-            <property role="1pa3iD" value="5649897883596809312" />
-            <property role="2gRgW$" value="1376814111" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="4TCu33h1eDA" role="37mRID">
@@ -1201,7 +1193,7 @@
           <property role="gqqTZ" value="17.950000000000003" />
           <property role="gqqTW" value="180.0" />
           <property role="gqqTX" value="116.0" />
-          <property role="gqqTy" value="48.0" />
+          <property role="gqqTy" value="52.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4TCu33h1eDB" role="1pap1a">
             <property role="1pa3iD" value="source_port" />
@@ -1218,21 +1210,13 @@
         <node concept="gqqVs" id="4TCu33h1eDD" role="37mO4d">
           <property role="gqqTZ" value="144.4" />
           <property role="gqqTW" value="80.0" />
-          <property role="gqqTX" value="60.0" />
-          <property role="gqqTy" value="60.0" />
+          <property role="gqqTX" value="62.0" />
+          <property role="gqqTy" value="62.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4TCu33h1eDF" role="1pap1a">
             <property role="1pa3iD" value="port" />
             <property role="2gRgW$" value="1259048879" />
           </node>
-          <node concept="1pa3jb" id="4TCu33h1eDG" role="1pap1a">
-            <property role="1pa3iD" value="5649897883596809313" />
-            <property role="2gRgW$" value="1844411357" />
-          </node>
-          <node concept="1pa3jb" id="4TCu33h1eDH" role="1pap1a">
-            <property role="1pa3iD" value="5649897883596809315" />
-            <property role="2gRgW$" value="1376814111" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="4TCu33h1eDJ" role="37mRID">
@@ -1261,6 +1245,18 @@
           </node>
         </node>
       </node>
+      <node concept="37mRIm" id="59o88jXktUq" role="37mRID">
+        <property role="37mO49" value="5649897883596809310" />
+        <node concept="2VclpC" id="59o88jXktUp" role="37mO4d" />
+      </node>
+      <node concept="37mRIm" id="59o88jXktUs" role="37mRID">
+        <property role="37mO49" value="5649897883596809313" />
+        <node concept="2VclpC" id="59o88jXktUr" role="37mO4d" />
+      </node>
+      <node concept="37mRIm" id="59o88jXktUu" role="37mRID">
+        <property role="37mO49" value="5649897883596809316" />
+        <node concept="2VclpC" id="59o88jXktUt" role="37mO4d" />
+      </node>
     </node>
   </node>
 </model>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
index c3255227e..b6e6fb84f 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
@@ -12351,11 +12351,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="y1G8y6aW2k" role="3bR37C">
-          <node concept="3bR9La" id="y1G8y6aW2l" role="1SiIV1">
-            <ref role="3bR37D" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
         <node concept="1BupzO" id="y1G8y6aW2x" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -12695,11 +12690,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
-        <node concept="1SiIV0" id="jPgKPEIjIu" role="3bR37C">
-          <node concept="3bR9La" id="jPgKPEIjIv" role="1SiIV1">
-            <ref role="3bR37D" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
         <node concept="1BupzO" id="jPgKPEIjIF" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -13124,11 +13114,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="55oVyA0sXc3" role="3bR37C">
-          <node concept="3bR9La" id="55oVyA0sXc4" role="1SiIV1">
-            <ref role="3bR37D" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="4JYWwihDhXh" role="3bR37C">
           <node concept="3bR9La" id="4JYWwihDhXi" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
@@ -13632,11 +13617,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="7ybnZGKpprH" role="3bR37C">
-          <node concept="3bR9La" id="7ybnZGKpprI" role="1SiIV1">
-            <ref role="3bR37D" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="8xY_IhvyZf" role="3bR37C">
           <node concept="3bR9La" id="8xY_IhvyZg" role="1SiIV1">
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
@@ -15184,11 +15164,6 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="6Z2HiVHt9t5" role="3bR37C">
-          <node concept="3bR9La" id="6Z2HiVHt9t6" role="1SiIV1">
-            <ref role="3bR37D" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
-          </node>
-        </node>
         <node concept="1BupzO" id="6Z2HiVHt9ti" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -15232,6 +15207,11 @@
             <ref role="3bR37D" node="4lJSf3LkfPw" resolve="com.mpsbasics.core" />
           </node>
         </node>
+        <node concept="1SiIV0" id="1TpxQu7pTJ_" role="3bR37C">
+          <node concept="3bR9La" id="1TpxQu7pTJA" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6Z2HiVHtdiP" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -20271,8 +20251,12 @@
       <node concept="22LTRM" id="1$9jWFVFLN$" role="22LTRK">
         <ref role="22LTRN" node="1$9jWFVFLHG" resolve="test.com.fasten.safety.ft.xfta" />
       </node>
-      <node concept="22LTRM" id="4ziKDEnkJqu" role="22LTRK">
-        <ref role="22LTRN" node="4ziKDEnkJiX" resolve="test.com.fasten.safety.doc2word" />
+      <node concept="1X3_iC" id="1TpxQu7qrCS" role="lGtFl">
+        <property role="3V$3am" value="modules" />
+        <property role="3V$3ak" value="3600cb0a-44dd-4a5b-9968-22924406419e/4560297596904469357/4560297596904469360" />
+        <node concept="22LTRM" id="4ziKDEnkJqu" role="8Wnug">
+          <ref role="22LTRN" node="4ziKDEnkJiX" resolve="test.com.fasten.safety.doc2word" />
+        </node>
       </node>
       <node concept="22LTRM" id="36k0PnKL7xU" role="22LTRK">
         <ref role="22LTRN" node="36k0PnKL5au" resolve="test.com.fasten.safety.ft" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps
index 77ce281b6..d7e392700 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._100_gsn_documents_testdata.mps
@@ -221,7 +221,7 @@
   </node>
   <node concept="qdN4g" id="3mpcDUdycH1">
     <property role="yApLE" value="1" />
-    <property role="TrG5h" value="_110_argument_over_hazards" />
+    <property role="TrG5h" value="_110_argument_over_hazards_doc" />
     <ref role="qdN4h" node="3mpcDUdya9X" resolve="_110_argument_over_hazards" />
     <ref role="G9hjw" node="3mpcDUdy7QQ" resolve="config" />
     <node concept="1mvXsy" id="3mpcDUdycH7" role="1_0VJ0">
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.notifications.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.notifications.mps
index 85eef701e..6f192c4ed 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.notifications.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.notifications.mps
@@ -185,7 +185,7 @@
             </node>
             <node concept="2ShNRf" id="xCk$O6mj3r" role="33vP2m">
               <node concept="1pGfFk" id="xCk$O6mj3O" role="2ShVmc">
-                <ref role="37wK5l" to="fnpx:~Notification.&lt;init&gt;(java.lang.String,java.lang.String,java.lang.String,com.intellij.notification.NotificationType,com.intellij.notification.NotificationListener)" resolve="Notification" />
+                <ref role="37wK5l" to="fnpx:~Notification.&lt;init&gt;(java.lang.String,java.lang.String,java.lang.String,com.intellij.notification.NotificationType)" resolve="Notification" />
                 <node concept="2OqwBi" id="xCk$O6mjh0" role="37wK5m">
                   <node concept="37vLTw" id="71GfFl7hNEa" role="2Oq$k0">
                     <ref role="3cqZAo" node="71GfFl7hN$8" resolve="fastenBalloonGroup" />
@@ -203,7 +203,6 @@
                 <node concept="37vLTw" id="xCk$O6mjA0" role="37wK5m">
                   <ref role="3cqZAo" node="xCk$O6mjqq" resolve="type" />
                 </node>
-                <node concept="10Nm6u" id="xCk$O6mj3X" role="37wK5m" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.project.utils/models/com.mpsbasics.project.utils.project_finder.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.project.utils/models/com.mpsbasics.project.utils.project_finder.mps
index 0d610ee15..63ac45c2b 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.project.utils/models/com.mpsbasics.project.utils.project_finder.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.project.utils/models/com.mpsbasics.project.utils.project_finder.mps
@@ -22,6 +22,8 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="z1c4" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
+    <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
+    <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -128,6 +130,9 @@
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
@@ -181,6 +186,35 @@
   <node concept="312cEu" id="1fyC0RHIfK6">
     <property role="TrG5h" value="ProjectHelper" />
     <node concept="2tJIrI" id="1fyC0RHIfKA" role="jymVt" />
+    <node concept="2YIFZL" id="7HJqs_aCpYE" role="jymVt">
+      <property role="TrG5h" value="getProjectManager" />
+      <node concept="3clFbS" id="7HJqs_aCpYF" role="3clF47">
+        <node concept="3clFbF" id="7HJqs_aCpYG" role="3cqZAp">
+          <node concept="2OqwBi" id="7HJqs_aCurS" role="3clFbG">
+            <node concept="2OqwBi" id="7HJqs_aCunD" role="2Oq$k0">
+              <node concept="2YIFZM" id="7HJqs_aCttb" role="2Oq$k0">
+                <ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
+                <ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
+              </node>
+              <node concept="liA8E" id="7HJqs_aCunE" role="2OqNvi">
+                <ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
+              </node>
+            </node>
+            <node concept="liA8E" id="7HJqs_aCurT" role="2OqNvi">
+              <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
+              <node concept="3VsKOn" id="7HJqs_aCurU" role="37wK5m">
+                <ref role="3VsUkX" to="z1c3:~ProjectManager" resolve="ProjectManager" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7HJqs_aCpYM" role="1B3o_S" />
+      <node concept="3uibUv" id="7HJqs_aCpYN" role="3clF45">
+        <ref role="3uigEE" to="z1c3:~ProjectManager" resolve="ProjectManager" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="HC5JPazRN_" role="jymVt" />
     <node concept="2YIFZL" id="3SfdbygO2ck" role="jymVt">
       <property role="TrG5h" value="getCurrentlyFocusedMPSProject" />
       <node concept="3clFbS" id="3SfdbygO2cl" role="3clF47">
@@ -194,9 +228,8 @@
               </node>
             </node>
             <node concept="2OqwBi" id="UvPwwl88xh" role="33vP2m">
-              <node concept="2YIFZM" id="UvPwwl88xi" role="2Oq$k0">
-                <ref role="1Pybhc" to="z1c3:~ProjectManager" resolve="ProjectManager" />
-                <ref role="37wK5l" to="z1c3:~ProjectManager.getInstance()" resolve="getInstance" />
+              <node concept="1rXfSq" id="HC5JPazWaR" role="2Oq$k0">
+                <ref role="37wK5l" node="7HJqs_aCpYE" resolve="getProjectManager" />
               </node>
               <node concept="liA8E" id="UvPwwl88xj" role="2OqNvi">
                 <ref role="37wK5l" to="z1c3:~ProjectManager.getOpenedProjects()" resolve="getOpenedProjects" />
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.czarnecki_operational_world_model_for_ads.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.czarnecki_operational_world_model_for_ads.mps
index 00e18023a..090686bf3 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.czarnecki_operational_world_model_for_ads.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.czarnecki_operational_world_model_for_ads.mps
@@ -16,10 +16,8 @@
         <property id="2557074442922438158" name="escapedValue" index="19SUeA" />
       </concept>
     </language>
-    <language id="f52452b6-7f99-441b-98f9-a98c52b92236" name="com.fasten.req.odd">
-      <concept id="8375050574357864792" name="com.fasten.req.odd.structure.EmptyLine" flags="ng" index="2CGw_7" />
-    </language>
     <language id="65ed2ac6-4499-4751-951e-3819684a4b8d" name="com.fasten.req.ontology">
+      <concept id="145334794179050158" name="com.fasten.req.ontology.structure.EmptyLine" flags="ng" index="2IzUYn" />
       <concept id="1743143573359761951" name="com.fasten.req.ontology.structure.OntologyConceptRef" flags="ng" index="MFvB7">
         <reference id="1743143573359761952" name="ontologyConcept" index="MFvBS" />
       </concept>
@@ -671,7 +669,7 @@
       <property role="TrG5h" value="police officer traffic mounted on a horse" />
       <ref role="3SOpc_" node="2cECkJ_kx15" resolve="police officer directing traffic" />
     </node>
-    <node concept="2CGw_7" id="2cECkJ_jZtV" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7o8l_" role="3SOpfD" />
     <node concept="3SOpcA" id="7gUa1Zsy22N" role="3SOpfD">
       <property role="TrG5h" value="Animals" />
       <ref role="3SOpc_" node="7gUa1Zsy22B" resolve="WISE_Lab_TopConcept" />
@@ -705,7 +703,7 @@
       <property role="TrG5h" value="wild animals" />
       <ref role="3SOpc_" node="2cECkJ_kJKi" resolve="unsupervised animals" />
     </node>
-    <node concept="2CGw_7" id="2cECkJ_kKPX" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7o8yX" role="3SOpfD" />
     <node concept="3SOpcA" id="2cECkJ_kLk3" role="3SOpfD">
       <property role="TrG5h" value="Animals size" />
     </node>
@@ -721,7 +719,7 @@
       <property role="TrG5h" value="Large animals" />
       <ref role="3SOpc_" node="2cECkJ_kLk3" resolve="Animals size" />
     </node>
-    <node concept="2CGw_7" id="2cECkJ_kLa0" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7o8Br" role="3SOpfD" />
     <node concept="3SOpcA" id="7gUa1Zsy22S" role="3SOpfD">
       <property role="TrG5h" value="Other obstacles" />
       <ref role="3SOpc_" node="7gUa1Zsy22B" resolve="WISE_Lab_TopConcept" />
@@ -798,7 +796,7 @@
       <property role="TrG5h" value="maliciously placed or dropped objects" />
       <ref role="3SOpc_" node="7gUa1Zsy22S" resolve="Other obstacles" />
     </node>
-    <node concept="2CGw_7" id="5o42uxih0Ay" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7o8XH" role="3SOpfD" />
     <node concept="3SOpcA" id="5o42uxih0AL" role="3SOpfD">
       <property role="TrG5h" value="Road type and capacity" />
       <ref role="3SOpc_" node="7gUa1Zsx7gq" resolve="Road Structure" />
@@ -827,12 +825,12 @@
       <property role="TrG5h" value="Access Roads" />
       <ref role="3SOpc_" node="5o42uxih0Bd" resolve="General Road Classification" />
     </node>
-    <node concept="2CGw_7" id="5o42uxih0D0" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7ojxN" role="3SOpfD" />
     <node concept="3SOpcA" id="5o42uxih0Dv" role="3SOpfD">
       <property role="TrG5h" value="Dead end" />
       <ref role="3SOpc_" node="5o42uxih0Bz" resolve="Local Road" />
     </node>
-    <node concept="2CGw_7" id="5o42uxih1bq" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7ojAh" role="3SOpfD" />
     <node concept="3SOpcA" id="5o42uxih1bX" role="3SOpfD">
       <property role="TrG5h" value="Expressway" />
       <ref role="3SOpc_" node="5o42uxih0CL" resolve="Freeway" />
@@ -845,7 +843,7 @@
       <property role="TrG5h" value="Highway Ramp" />
       <ref role="3SOpc_" node="5o42uxih1eb" resolve="Access Roads" />
     </node>
-    <node concept="2CGw_7" id="5o42uxih0AU" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7ojEJ" role="3SOpfD" />
     <node concept="3SOpcA" id="5o42uxihVSl" role="3SOpfD">
       <property role="TrG5h" value="Road Capacity Attribute" />
     </node>
@@ -870,7 +868,7 @@
         </node>
       </node>
     </node>
-    <node concept="2CGw_7" id="5o42uxihVVm" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7ojNE" role="3SOpfD" />
     <node concept="3SOpcA" id="5o42uxihVWj" role="3SOpfD">
       <property role="TrG5h" value="Road Location by Zone" />
       <ref role="3SOpc_" node="5o42uxih0AL" resolve="Road type and capacity" />
@@ -963,7 +961,7 @@
       <property role="TrG5h" value="Road surface type and quality" />
       <ref role="3SOpc_" node="7gUa1Zsx7gq" resolve="Road Structure" />
     </node>
-    <node concept="2CGw_7" id="5o42uxihWlv" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7ok5v" role="3SOpfD" />
     <node concept="3SOpcA" id="5o42uxiiNQL" role="3SOpfD">
       <property role="TrG5h" value="Road Surface Type" />
       <ref role="3SOpc_" node="5o42uxihWnA" resolve="Road surface type and quality" />
@@ -1032,7 +1030,7 @@
       <property role="TrG5h" value="Cobblestone" />
       <ref role="3SOpc_" node="5o42uxiiNQL" resolve="Road Surface Type" />
     </node>
-    <node concept="2CGw_7" id="1f_hJh21LR$" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7okeq" role="3SOpfD" />
     <node concept="3SOpcA" id="1f_hJh21LzX" role="3SOpfD">
       <property role="TrG5h" value="Horizontal Alignment" />
       <ref role="3SOpc_" node="1f_hJh21Lla" resolve="Road Geometry" />
@@ -1053,7 +1051,7 @@
       <property role="TrG5h" value="Spiral Curves" />
       <ref role="3SOpc_" node="1f_hJh21LzX" resolve="Horizontal Alignment" />
     </node>
-    <node concept="2CGw_7" id="1f_hJh21LYD" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7okrM" role="3SOpfD" />
     <node concept="3SOpcA" id="1f_hJh21LVJ" role="3SOpfD">
       <property role="TrG5h" value="Cross Section Design" />
       <ref role="3SOpc_" node="7gUa1Zsx7gq" resolve="Road Structure" />
@@ -1346,7 +1344,7 @@
       <property role="TrG5h" value="Drainage Channel" />
       <ref role="3SOpc_" node="1f_hJh21Mh2" resolve="Elements of Cross Section Design" />
     </node>
-    <node concept="2CGw_7" id="1f_hJh22ldy" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7okQx" role="3SOpfD" />
     <node concept="3SOpcA" id="1f_hJh22l5D" role="3SOpfD">
       <property role="TrG5h" value="Road Traffic Control Devices" />
       <ref role="3SOpc_" node="7gUa1Zsx7gq" resolve="Road Structure" />
@@ -1359,7 +1357,7 @@
       <property role="TrG5h" value="Regulatory Traffic Signs" />
       <ref role="3SOpc_" node="1f_hJh22AyE" resolve="Traffic Signs (Devices)" />
     </node>
-    <node concept="2CGw_7" id="1f_hJh22CJ$" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7okUZ" role="3SOpfD" />
     <node concept="3SOpcA" id="1f_hJh22BBm" role="3SOpfD">
       <property role="TrG5h" value="Right of Way Control" />
       <ref role="3SOpc_" node="1f_hJh22B43" resolve="Regulatory Traffic Signs" />
@@ -1816,7 +1814,7 @@
       <property role="TrG5h" value="Construction Zone Begins/Ends" />
       <ref role="3SOpc_" node="1f_hJh22CCZ" resolve="Community Safety Zone Signs" />
     </node>
-    <node concept="2CGw_7" id="1f_hJh22CGh" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7olBz" role="3SOpfD" />
     <node concept="3SOpcA" id="I6X7eFAQsT" role="3SOpfD">
       <property role="TrG5h" value="Miscellaneous Control Signs" />
       <ref role="3SOpc_" node="1f_hJh22B43" resolve="Regulatory Traffic Signs" />
@@ -1861,7 +1859,7 @@
       <property role="TrG5h" value="Fasten Seatbelt Compulsory Tab" />
       <ref role="3SOpc_" node="I6X7eFAQsT" resolve="Miscellaneous Control Signs" />
     </node>
-    <node concept="2CGw_7" id="I6X7eFAQng" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7ollI" role="3SOpfD" />
     <node concept="3SOpcA" id="1f_hJh22B6V" role="3SOpfD">
       <property role="TrG5h" value="Warning Traffic Signs" />
       <ref role="3SOpc_" node="1f_hJh22AyE" resolve="Traffic Signs (Devices)" />
@@ -1894,7 +1892,7 @@
       <property role="TrG5h" value="Intermittent Hazards Signs" />
       <ref role="3SOpc_" node="1f_hJh22B6V" resolve="Warning Traffic Signs" />
     </node>
-    <node concept="2CGw_7" id="1f_hJh22CWT" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7olXR" role="3SOpfD" />
     <node concept="3SOpcA" id="1f_hJh22B9N" role="3SOpfD">
       <property role="TrG5h" value="Guide and Information Traffic Signs" />
       <ref role="3SOpc_" node="1f_hJh22AyE" resolve="Traffic Signs (Devices)" />
@@ -1935,7 +1933,7 @@
       <property role="TrG5h" value="Special Signs" />
       <ref role="3SOpc_" node="1f_hJh22B9N" resolve="Guide and Information Traffic Signs" />
     </node>
-    <node concept="2CGw_7" id="1f_hJh22DkJ" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7olOW" role="3SOpfD" />
     <node concept="3SOpcA" id="1f_hJh22BcG" role="3SOpfD">
       <property role="TrG5h" value="Dynamic Traffic Signs" />
       <ref role="3SOpc_" node="1f_hJh22AyE" resolve="Traffic Signs (Devices)" />
@@ -1963,7 +1961,7 @@
       <property role="TrG5h" value="Portable" />
       <ref role="3SOpc_" node="1f_hJh22BfA" resolve="Traffic Signs Attribute" />
     </node>
-    <node concept="2CGw_7" id="1f_hJh22DS0" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7olKu" role="3SOpfD" />
     <node concept="3SOpcA" id="1f_hJh22A_o" role="3SOpfD">
       <property role="TrG5h" value="Traffic Signals" />
       <ref role="3SOpc_" node="1f_hJh22l5D" resolve="Road Traffic Control Devices" />
@@ -2016,7 +2014,7 @@
       <property role="TrG5h" value="Flashing Beacons" />
       <ref role="3SOpc_" node="1f_hJh22A_o" resolve="Traffic Signals" />
     </node>
-    <node concept="2CGw_7" id="1f_hJh22E6x" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7omfG" role="3SOpfD" />
     <node concept="3SOpcA" id="1f_hJh22AC6" role="3SOpfD">
       <property role="TrG5h" value="Roadway Pavement Markings" />
       <ref role="3SOpc_" node="1f_hJh22l5D" resolve="Road Traffic Control Devices" />
@@ -2066,7 +2064,7 @@
         </node>
       </node>
     </node>
-    <node concept="2CGw_7" id="1f_hJh22ER7" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7omoB" role="3SOpfD" />
     <node concept="3SOpcA" id="1f_hJh22AEP" role="3SOpfD">
       <property role="TrG5h" value="Vertical Deflections" />
       <ref role="3SOpc_" node="1f_hJh22l5D" resolve="Road Traffic Control Devices" />
@@ -2087,7 +2085,7 @@
       <property role="TrG5h" value="Speed Tables" />
       <ref role="3SOpc_" node="1f_hJh22AEP" resolve="Vertical Deflections" />
     </node>
-    <node concept="2CGw_7" id="1f_hJh22ZMe" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7omt5" role="3SOpfD" />
     <node concept="3SOpcA" id="1f_hJh22AH_" role="3SOpfD">
       <property role="TrG5h" value="Channelization Devices (e.g. traffic islands)" />
       <ref role="3SOpc_" node="1f_hJh22l5D" resolve="Road Traffic Control Devices" />
@@ -2108,7 +2106,7 @@
       <property role="TrG5h" value="Police" />
       <ref role="3SOpc_" node="1f_hJh22AN8" resolve="Traffic Control Persons" />
     </node>
-    <node concept="2CGw_7" id="1f_hJh22AKm" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7omA0" role="3SOpfD" />
     <node concept="3SOpcA" id="2cECkJ_k7_f" role="3SOpfD">
       <property role="TrG5h" value="Pedacycle characteristic" />
     </node>
@@ -2192,7 +2190,7 @@
       <property role="TrG5h" value="Electric propulsion" />
       <ref role="3SOpc_" node="2cECkJ_k81y" resolve="propulsion" />
     </node>
-    <node concept="2CGw_7" id="2cECkJ_kxEI" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7on0K" role="3SOpfD" />
     <node concept="3SOpcA" id="2cECkJ_kxVv" role="3SOpfD">
       <property role="TrG5h" value="Reason for pedestrian entering the roadway" />
     </node>
@@ -2236,7 +2234,7 @@
       <property role="TrG5h" value="Lying on the pavement" />
       <ref role="3SOpc_" node="2cECkJ_kxVv" resolve="reason for pedestrian entering the roadway" />
     </node>
-    <node concept="2CGw_7" id="2cECkJ_kzMp" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7omRP" role="3SOpfD" />
     <node concept="3SOpcA" id="2cECkJ_k$3C" role="3SOpfD">
       <property role="TrG5h" value="Road user behavior" />
       <node concept="1BN$wR" id="2cECkJ_kJKb" role="1BN$wV">
@@ -2389,7 +2387,7 @@
       <property role="TrG5h" value="Alertness" />
       <ref role="3SOpc_" node="2cECkJ_kBMN" resolve="physical and cognitive capabilities of humans" />
     </node>
-    <node concept="2CGw_7" id="1f_hJh22llv" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7one8" role="3SOpfD" />
     <node concept="3SOpcA" id="2cECkJ_kDW4" role="3SOpfD">
       <property role="TrG5h" value="Road users behaviour influencer" />
     </node>
@@ -2540,7 +2538,7 @@
       <property role="TrG5h" value="Behavioral models" />
       <ref role="3SOpc_" node="2cECkJ_kDW4" resolve="road users behaviour influencer" />
     </node>
-    <node concept="2CGw_7" id="2cECkJ_kPjA" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7onrw" role="3SOpfD" />
     <node concept="3SOpcA" id="2cECkJ_kPCr" role="3SOpfD">
       <property role="TrG5h" value="Environmental Conditions" />
       <ref role="3SOpc_" node="7gUa1Zsy22B" resolve="WISE_Lab_TopConcept" />
@@ -2835,7 +2833,7 @@
       <property role="TrG5h" value="Ice covered" />
       <ref role="3SOpc_" node="2cECkJ_kPXj" resolve="weather-related road surface conditions" />
     </node>
-    <node concept="2CGw_7" id="4GKcJtbmpBK" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7onZa" role="3SOpfD" />
     <node concept="3SOpcA" id="4GKcJtbmpYf" role="3SOpfD">
       <property role="TrG5h" value="Snow visibility attribute" />
     </node>
@@ -2851,7 +2849,7 @@
       <property role="TrG5h" value="Heavy snow" />
       <ref role="3SOpc_" node="4GKcJtbmpYf" resolve="snow visibility attribute" />
     </node>
-    <node concept="2CGw_7" id="4GKcJtbmugU" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7onQf" role="3SOpfD" />
     <node concept="3SOpcA" id="4GKcJtbmuCd" role="3SOpfD">
       <property role="TrG5h" value="Road winter maintenance status attribute" />
     </node>
@@ -2875,14 +2873,6 @@
       <property role="TrG5h" value="Salted and sanded" />
       <ref role="3SOpc_" node="4GKcJtbmuCd" resolve="road winter maintenance status attribute" />
     </node>
-    <node concept="2CGw_7" id="2cECkJ_kEe$" role="3SOpfD" />
-    <node concept="2CGw_7" id="1f_hJh22lgb" role="3SOpfD" />
-    <node concept="2CGw_7" id="1f_hJh21M07" role="3SOpfD" />
-    <node concept="2CGw_7" id="1f_hJh21LSV" role="3SOpfD" />
-    <node concept="2CGw_7" id="5o42uxihWmy" role="3SOpfD" />
-    <node concept="2CGw_7" id="5o42uxihVVO" role="3SOpfD" />
-    <node concept="2CGw_7" id="5o42uxihVR$" role="3SOpfD" />
-    <node concept="2CGw_7" id="5o42uxihVQR" role="3SOpfD" />
   </node>
 </model>
 
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.phil_koopman_odd_paper.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.phil_koopman_odd_paper.mps
index a7f8023be..cdc921bcc 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.phil_koopman_odd_paper.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._015_odd.ontologies.phil_koopman_odd_paper.mps
@@ -16,10 +16,8 @@
         <property id="2557074442922438158" name="escapedValue" index="19SUeA" />
       </concept>
     </language>
-    <language id="f52452b6-7f99-441b-98f9-a98c52b92236" name="com.fasten.req.odd">
-      <concept id="8375050574357864792" name="com.fasten.req.odd.structure.EmptyLine" flags="ng" index="2CGw_7" />
-    </language>
     <language id="65ed2ac6-4499-4751-951e-3819684a4b8d" name="com.fasten.req.ontology">
+      <concept id="145334794179050158" name="com.fasten.req.ontology.structure.EmptyLine" flags="ng" index="2IzUYn" />
       <concept id="4312077340877652056" name="com.fasten.req.ontology.structure.OntologyConcept" flags="ng" index="3SOpcA">
         <reference id="4312077340877652059" name="superConcept" index="3SOpc_" />
       </concept>
@@ -72,7 +70,7 @@
       <property role="TrG5h" value="Air density" />
       <ref role="3SOpc_" node="7gUa1Zsy22Y" resolve="ODD_location_dependent_characteristic" />
     </node>
-    <node concept="2CGw_7" id="5o42uxih0Ae" role="3SOpfD" />
+    <node concept="2IzUYn" id="1TpxQu7oogZ" role="3SOpfD" />
     <node concept="3SOpcA" id="52bCGvYEznC" role="3SOpfD">
       <property role="TrG5h" value="ODD_base" />
     </node>
diff --git a/gradle.lockfile b/gradle.lockfile
index 51ca10063..be9557219 100644
--- a/gradle.lockfile
+++ b/gradle.lockfile
@@ -29,5 +29,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=executeBackend,generateBackend,mo
 org.jetbrains.kotlin:kotlin-stdlib:1.6.21=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
 org.jetbrains.kotlin:kotlin-test:1.6.21=modelcheckBackend
 org.jetbrains:annotations:13.0=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
-org.mpsqa:all-in-one:2023.2.847.4de185f=languageLibs
+org.mpsqa:all-in-one:2023.2.915.c22f22f=languageLibs
 empty=