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 00e18023..090686bf 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 a7f8023b..cdc921bc 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>