diff --git a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.typesystem.mps b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.typesystem.mps
index be71a6c3..19dbe4a9 100644
--- a/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.typesystem.mps
+++ b/code/languages/com.fasten.symo/languages/com.symo.sysml.ibd/models/com.symo.sysml.ibd.typesystem.mps
@@ -256,7 +256,7 @@
                       <ref role="37wK5l" to="3o3z:~Multimap.put(java.lang.Object,java.lang.Object)" resolve="put" />
                       <node concept="2OqwBi" id="6eYU0xi7I8j" role="37wK5m">
                         <node concept="37vLTw" id="6eYU0xi7HUX" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36G5YKW" />
+                          <ref role="3cqZAo" node="2hED36G5YKW" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6eYU0xi7In5" role="2OqNvi">
                           <ref role="3Tt5mk" to="4hyq:4PDUeYRxeq$" resolve="instance" />
@@ -264,7 +264,7 @@
                       </node>
                       <node concept="2OqwBi" id="6eYU0xi7IBZ" role="37wK5m">
                         <node concept="37vLTw" id="6eYU0xi7Iz$" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36G5YKW" />
+                          <ref role="3cqZAo" node="2hED36G5YKW" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6eYU0xi7IKS" role="2OqNvi">
                           <ref role="3Tt5mk" to="4hyq:4PDUeYRxeqF" resolve="componentPort" />
@@ -297,7 +297,7 @@
                       <node concept="2OqwBi" id="6eYU0xi7CjE" role="2Oq$k0">
                         <node concept="2OqwBi" id="6eYU0xi7CjF" role="2Oq$k0">
                           <node concept="37vLTw" id="6eYU0xi7CjG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36G5YKY" />
+                            <ref role="3cqZAo" node="2hED36G5YKY" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6eYU0xi7CjH" role="2OqNvi">
                             <ref role="3Tt5mk" to="4hyq:4PDUeYRx7XD" resolve="block" />
@@ -329,12 +329,12 @@
                     <node concept="liA8E" id="6eYU0xi7Juf" role="2OqNvi">
                       <ref role="37wK5l" to="3o3z:~Multimap.containsKey(java.lang.Object)" resolve="containsKey" />
                       <node concept="37vLTw" id="6eYU0xi7JCq" role="37wK5m">
-                        <ref role="3cqZAo" node="2hED36G5YL2" />
+                        <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                       </node>
                     </node>
                   </node>
                   <node concept="37vLTw" id="6eYU0xi7$ie" role="1urrMF">
-                    <ref role="3cqZAo" node="2hED36G5YL2" />
+                    <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                   </node>
                   <node concept="2YIFZM" id="6eYU0xi7$75" role="2MkJ7o">
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
@@ -355,7 +355,7 @@
                         <node concept="2OqwBi" id="6eYU0xi7NWH" role="33vP2m">
                           <node concept="2OqwBi" id="6eYU0xi7NWI" role="2Oq$k0">
                             <node concept="37vLTw" id="6eYU0xi7NWJ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36G5YL2" />
+                              <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                             </node>
                             <node concept="3TrEf2" id="6eYU0xi7NWK" role="2OqNvi">
                               <ref role="3Tt5mk" to="4hyq:4PDUeYRx7XD" resolve="block" />
@@ -383,7 +383,7 @@
                           <node concept="liA8E" id="6eYU0xi7Kz$" role="2OqNvi">
                             <ref role="37wK5l" to="3o3z:~Multimap.get(java.lang.Object)" resolve="get" />
                             <node concept="37vLTw" id="6eYU0xi7Kz_" role="37wK5m">
-                              <ref role="3cqZAo" node="2hED36G5YL2" />
+                              <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                             </node>
                           </node>
                         </node>
@@ -405,12 +405,12 @@
                                   <node concept="liA8E" id="6eYU0xi836z" role="2OqNvi">
                                     <ref role="37wK5l" to="33ny:~Collection.contains(java.lang.Object)" resolve="contains" />
                                     <node concept="37vLTw" id="6eYU0xi83oy" role="37wK5m">
-                                      <ref role="3cqZAo" node="2hED36G5YL0" />
+                                      <ref role="3cqZAo" node="2hED36G5YL0" resolve="it" />
                                     </node>
                                   </node>
                                 </node>
                                 <node concept="37vLTw" id="6eYU0xi8ej8" role="1urrMF">
-                                  <ref role="3cqZAo" node="2hED36G5YL2" />
+                                  <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                                 </node>
                                 <node concept="3cpWs3" id="6eYU0xi8G6k" role="2MkJ7o">
                                   <node concept="Xl_RD" id="6eYU0xi8Gjc" role="3uHU7w">
@@ -424,7 +424,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="6eYU0xi8pl5" role="3uHU7w">
                                           <node concept="37vLTw" id="6eYU0xi8oW9" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="2hED36G5YL0" />
+                                            <ref role="3cqZAo" node="2hED36G5YL0" resolve="it" />
                                           </node>
                                           <node concept="3TrcHB" id="6eYU0xi8pHU" role="2OqNvi">
                                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -437,7 +437,7 @@
                                     </node>
                                     <node concept="2OqwBi" id="6eYU0xi8Fra" role="3uHU7w">
                                       <node concept="37vLTw" id="6eYU0xi8F3N" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2hED36G5YL2" />
+                                        <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                                       </node>
                                       <node concept="3TrcHB" id="6eYU0xi8FSt" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -463,7 +463,7 @@
                     <node concept="liA8E" id="6eYU0xi7JPr" role="2OqNvi">
                       <ref role="37wK5l" to="3o3z:~Multimap.containsKey(java.lang.Object)" resolve="containsKey" />
                       <node concept="37vLTw" id="6eYU0xi7JPs" role="37wK5m">
-                        <ref role="3cqZAo" node="2hED36G5YL2" />
+                        <ref role="3cqZAo" node="2hED36G5YL2" resolve="compInstance" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.migration.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.migration.mps
index 86b78900..60152a6a 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.migration.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.migration.mps
@@ -275,7 +275,7 @@
                               <node concept="2OqwBi" id="5qtcz4Llovr" role="3clFbG">
                                 <node concept="2OqwBi" id="5qtcz4Llovs" role="2Oq$k0">
                                   <node concept="37vLTw" id="5qtcz4Llovt" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2hED36EN4sW" />
+                                    <ref role="3cqZAo" node="2hED36EN4sW" resolve="it" />
                                   </node>
                                   <node concept="3Tsc0h" id="5qtcz4Llovu" role="2OqNvi">
                                     <ref role="3TtcxE" to="6wa3:1UJ51yZ_hOp" resolve="attributes" />
@@ -333,7 +333,7 @@
                                           <ref role="2pIpSl" to="6wa3:5qtcz4LkW_W" resolve="conceptRef" />
                                           <node concept="36biLy" id="5qtcz4LlvZj" role="28nt2d">
                                             <node concept="37vLTw" id="5qtcz4Llwdq" role="36biLW">
-                                              <ref role="3cqZAo" node="2hED36EN4sY" />
+                                              <ref role="3cqZAo" node="2hED36EN4sY" resolve="it" />
                                             </node>
                                           </node>
                                         </node>
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.util.mps b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.util.mps
index b5772edd..90f3a9b3 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.util.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.fasten.req.ontology/models/com.fasten.req.ontology.util.mps
@@ -128,7 +128,7 @@
                       <node concept="2OqwBi" id="1wKSXwEAPy$" role="3clFbG">
                         <node concept="2OqwBi" id="1wKSXwEAP4J" role="2Oq$k0">
                           <node concept="37vLTw" id="1wKSXwEAOOZ" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36EN4sS" />
+                            <ref role="3cqZAo" node="2hED36EN4sS" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7gUa1Zsy7ZM" role="2OqNvi">
                             <ref role="3Tt5mk" to="6wa3:3Jn$RV31w1r" resolve="superConcept" />
@@ -200,7 +200,7 @@
                         </node>
                         <node concept="2OqwBi" id="1wKSXwEB9pU" role="3uHU7B">
                           <node concept="37vLTw" id="1wKSXwEAUGN" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36EN4sU" />
+                            <ref role="3cqZAo" node="2hED36EN4sU" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="7gUa1Zsy8oo" role="2OqNvi">
                             <ref role="3Tt5mk" to="6wa3:3Jn$RV31w1r" resolve="superConcept" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/constraints.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/constraints.mps
index 464562a4..7700799b 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/constraints.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/constraints.mps
@@ -214,7 +214,7 @@
                             <node concept="2OqwBi" id="SmAS9imHMn" role="2Oq$k0">
                               <node concept="2OqwBi" id="SmAS9imFJi" role="2Oq$k0">
                                 <node concept="37vLTw" id="SmAS9imFtV" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36EN4t3" />
+                                  <ref role="3cqZAo" node="2hED36EN4t3" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="SmAS9imG5w" role="2OqNvi">
                                   <ref role="3TtcxE" to="z27p:6VJDb1ZGaw$" resolve="reqRefs" />
@@ -226,7 +226,7 @@
                                     <node concept="3clFbF" id="SmAS9imKV$" role="3cqZAp">
                                       <node concept="2OqwBi" id="SmAS9imLfd" role="3clFbG">
                                         <node concept="37vLTw" id="SmAS9imKVz" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2hED36EN4t1" />
+                                          <ref role="3cqZAo" node="2hED36EN4t1" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="SmAS9imLzp" role="2OqNvi">
                                           <ref role="3Tt5mk" to="z27p:6VJDb1ZGawG" resolve="req" />
@@ -250,7 +250,7 @@
                           <node concept="3clFbC" id="34jvijxyxmj" role="3uHU7B">
                             <node concept="2OqwBi" id="34jvijxyxml" role="3uHU7B">
                               <node concept="37vLTw" id="34jvijxyxmm" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36EN4t3" />
+                                <ref role="3cqZAo" node="2hED36EN4t3" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="34jvijxyxmn" role="2OqNvi">
                                 <ref role="3Tt5mk" to="z27p:pWUwO6BvC7" resolve="req" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/typesystem.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/typesystem.mps
index 056e3e15..1c88dbaf 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.base/models/typesystem.mps
@@ -262,7 +262,7 @@
                         <node concept="2OqwBi" id="SmAS9iiNOV" role="3fr31v">
                           <node concept="2OqwBi" id="SmAS9iiNOW" role="2Oq$k0">
                             <node concept="37vLTw" id="SmAS9iiNOX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36EN4t5" />
+                              <ref role="3cqZAo" node="2hED36EN4t5" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="SmAS9iiNOY" role="2OqNvi">
                               <ref role="3TsBF5" to="z27p:2N7iSwG$CrI" resolve="id" />
@@ -274,7 +274,7 @@
                       <node concept="2OqwBi" id="_wUu$TXR6u" role="3uHU7w">
                         <node concept="2OqwBi" id="_wUu$TXR6v" role="2Oq$k0">
                           <node concept="37vLTw" id="_wUu$TXR6w" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36EN4t5" />
+                            <ref role="3cqZAo" node="2hED36EN4t5" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="_wUu$TXR6x" role="2OqNvi">
                             <ref role="3TsBF5" to="z27p:2N7iSwG$CrI" resolve="id" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/generator/template/com.mbeddr.formal.req.tl_patterns.nusmv.main@generator.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/generator/template/com.mbeddr.formal.req.tl_patterns.nusmv.main@generator.mps
index f06c8c64..3d29435d 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/generator/template/com.mbeddr.formal.req.tl_patterns.nusmv.main@generator.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/generator/template/com.mbeddr.formal.req.tl_patterns.nusmv.main@generator.mps
@@ -689,7 +689,7 @@
                         <node concept="2OqwBi" id="6hWVnwADEWv" role="3clFbG">
                           <node concept="2OqwBi" id="6hWVnwADBpN" role="2Oq$k0">
                             <node concept="37vLTw" id="6hWVnwADB0B" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36EN4tf" />
+                              <ref role="3cqZAo" node="2hED36EN4tf" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="6hWVnwADD7Q" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -772,7 +772,7 @@
                       <node concept="2OqwBi" id="6hWVnwAdViG" role="3clFbG">
                         <node concept="2OqwBi" id="6hWVnwAdOVa" role="2Oq$k0">
                           <node concept="37vLTw" id="6hWVnwAdOwS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36EN4th" />
+                            <ref role="3cqZAo" node="2hED36EN4th" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6hWVnwAdS6a" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -872,7 +872,7 @@
                                 <node concept="3clFbF" id="6hWVnwA$rjo" role="3cqZAp">
                                   <node concept="2OqwBi" id="6hWVnwA$rjp" role="3clFbG">
                                     <node concept="37vLTw" id="6hWVnwA$rjq" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2hED36EN4tj" />
+                                      <ref role="3cqZAo" node="2hED36EN4tj" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="6hWVnwA$rjr" role="2OqNvi">
                                       <ref role="3Tt5mk" to="uu78:6hWVnwA8mNz" resolve="module" />
@@ -1674,7 +1674,7 @@
                       <node concept="3clFbF" id="6hWVnwAEsGw" role="3cqZAp">
                         <node concept="2OqwBi" id="6hWVnwAEsGx" role="3clFbG">
                           <node concept="37vLTw" id="6hWVnwAEsGy" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36EN4tl" />
+                            <ref role="3cqZAo" node="2hED36EN4tl" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6hWVnwAEsGz" role="2OqNvi">
                             <ref role="3Tt5mk" to="uu78:6hWVnwA8mNz" resolve="module" />
@@ -1728,7 +1728,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="6hWVnwAETT5" role="3uHU7B">
                                   <node concept="37vLTw" id="6hWVnwAETT6" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2hED36EN4tn" />
+                                    <ref role="3cqZAo" node="2hED36EN4tn" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="6hWVnwAETT7" role="2OqNvi">
                                     <ref role="3Tt5mk" to="uu78:6hWVnwA8mNz" resolve="module" />
@@ -1751,7 +1751,7 @@
                             <node concept="2OqwBi" id="5uTeY1FmZei" role="3clFbG">
                               <node concept="2OqwBi" id="6hWVnwAETTe" role="2Oq$k0">
                                 <node concept="37vLTw" id="6hWVnwAETTf" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36EN4tp" />
+                                  <ref role="3cqZAo" node="2hED36EN4tp" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="5FhZjqTOKQQ" role="2OqNvi">
                                   <ref role="3TtcxE" to="yyq9:5FhZjqTO19U" resolve="specs" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.utils.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.utils.mps
index 0e31542a..b5b0d4d3 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.utils.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns.nusmv/models/com.mbeddr.formal.req.tl_patterns.nusmv.utils.mps
@@ -149,7 +149,7 @@
                       <node concept="2OqwBi" id="6hWVnwAb4RN" role="3clFbG">
                         <node concept="2OqwBi" id="6hWVnwAb4RO" role="2Oq$k0">
                           <node concept="37vLTw" id="6hWVnwAb4RP" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36EN4tc" />
+                            <ref role="3cqZAo" node="2hED36EN4tc" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6hWVnwAb4RQ" role="2OqNvi">
                             <ref role="3Tt5mk" to="gioj:6NmtaR1SVeb" resolve="type" />
diff --git a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.intentions.mps b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.intentions.mps
index ddef4c2e..28587028 100644
--- a/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.intentions.mps
+++ b/code/languages/com.mbeddr.formal.req/languages/com.mbeddr.formal.req.tl_patterns/models/com.mbeddr.formal.req.tl_patterns.intentions.mps
@@ -215,7 +215,7 @@
                     <node concept="3clFbF" id="3bh1RFvtFBx" role="3cqZAp">
                       <node concept="17QLQc" id="3bh1RFvtMXz" role="3clFbG">
                         <node concept="37vLTw" id="3bh1RFvtFBw" role="3uHU7B">
-                          <ref role="3cqZAo" node="2hED36EN4tr" />
+                          <ref role="3cqZAo" node="2hED36EN4tr" resolve="it" />
                         </node>
                         <node concept="35c_gC" id="3bh1RFvtEur" role="3uHU7w">
                           <ref role="35c_gD" to="yyq9:1Tg5$nepcbz" resolve="Time" />
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/models/com.mbeddr.formal.req.base.pluginSolution.word_serializer.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/models/com.mbeddr.formal.req.base.pluginSolution.word_serializer.mps
index 20f25d5e..9803e44d 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/models/com.mbeddr.formal.req.base.pluginSolution.word_serializer.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.base.pluginSolution/models/com.mbeddr.formal.req.base.pluginSolution.word_serializer.mps
@@ -764,7 +764,7 @@
                           <node concept="2OqwBi" id="38aFq1j6lm9" role="2Oq$k0">
                             <node concept="2OqwBi" id="38aFq1j6gXT" role="2Oq$k0">
                               <node concept="37vLTw" id="38aFq1j6gMB" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36EN4tu" />
+                                <ref role="3cqZAo" node="2hED36EN4tu" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="38aFq1j6hhM" role="2OqNvi">
                                 <ref role="3Tt5mk" to="z27p:2N7iSwGA7QF" resolve="text" />
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.analyzer.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.analyzer.mps
index f9c72bcf..dd58cd7c 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.analyzer.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.analyzer.mps
@@ -255,7 +255,7 @@
                           <node concept="1pGfFk" id="6hWVnwAONq6" role="2ShVmc">
                             <ref role="37wK5l" node="6hWVnwAOhJ_" resolve="NuSMVReqConsistencyAnalysisLiftedResult" />
                             <node concept="37vLTw" id="6hWVnwAONwB" role="37wK5m">
-                              <ref role="3cqZAo" node="2hED36EN4tw" />
+                              <ref role="3cqZAo" node="2hED36EN4tw" resolve="it" />
                             </node>
                           </node>
                         </node>
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.plugin.mps
index ab9a7821..e301e4ce 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.plugin.mps
@@ -305,7 +305,7 @@
                           <node concept="2OqwBi" id="6hWVnwAv2_U" role="1m5AlR">
                             <node concept="2OqwBi" id="6hWVnwAuZZy" role="2Oq$k0">
                               <node concept="37vLTw" id="6hWVnwAuZOI" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36EN4t$" />
+                                <ref role="3cqZAo" node="2hED36EN4t$" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6hWVnwAv0i1" role="2OqNvi">
                                 <ref role="3Tt5mk" to="uu78:6hWVnwA8mNz" resolve="module" />
diff --git a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.utils.mps b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.utils.mps
index 7d8c591f..0edbf998 100644
--- a/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.utils.mps
+++ b/code/languages/com.mbeddr.formal.req/solutions/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution/models/com.mbeddr.formal.req.tl_patterns.nusmv.pluginSolution.utils.mps
@@ -218,7 +218,7 @@
                             <node concept="2OqwBi" id="5uTeY1FknC5" role="3clFbG">
                               <node concept="2OqwBi" id="5uTeY1Fkl4H" role="2Oq$k0">
                                 <node concept="37vLTw" id="5uTeY1FkkSK" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36EN4ty" />
+                                  <ref role="3cqZAo" node="2hED36EN4ty" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5uTeY1FkmhS" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.plugin.mps
index 6bdb850e..2cf3e337 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.process.review/models/com.fasten.process.review.plugin.mps
@@ -147,7 +147,7 @@
                         <node concept="1beSmn" id="5t37uj6C0e5" role="3uHU7w" />
                         <node concept="2OqwBi" id="5t37uj6C0e6" role="3uHU7B">
                           <node concept="37vLTw" id="5t37uj6C0e7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCvH" />
+                            <ref role="3cqZAo" node="2hED36FpCvH" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5t37uj6C0e8" role="2OqNvi">
                             <ref role="3Tt5mk" to="kivz:5t37uj6_AgL" resolve="subject" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.behavior.mps
index 5fc68bbd..a24f2438 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea.arch/models/com.fasten.safety.fmea.arch.behavior.mps
@@ -217,7 +217,7 @@
                         </node>
                         <node concept="2OqwBi" id="GA19r1644w" role="3uHU7B">
                           <node concept="37vLTw" id="GA19r1644x" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCvK" />
+                            <ref role="3cqZAo" node="2hED36FpCvK" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="GA19r1644y" role="2OqNvi">
                             <ref role="3Tt5mk" to="g9vz:42QGQFVn62G" resolve="interface" />
@@ -318,7 +318,7 @@
                         </node>
                         <node concept="2OqwBi" id="22gnu5EUEyg" role="3uHU7B">
                           <node concept="37vLTw" id="22gnu5EUEyh" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCvM" />
+                            <ref role="3cqZAo" node="2hED36FpCvM" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="22gnu5EUEyi" role="2OqNvi">
                             <ref role="3Tt5mk" to="g9vz:42QGQFVn62G" resolve="interface" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.typesystem.mps
index 4e186d50..66e702ae 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.fmea/models/com.fasten.safety.fmea.typesystem.mps
@@ -360,7 +360,7 @@
                   <node concept="3clFbF" id="3x7uzC8sp3t" role="3cqZAp">
                     <node concept="2OqwBi" id="3x7uzC8sp3u" role="3clFbG">
                       <node concept="37vLTw" id="3x7uzC8sp3v" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpCvQ" />
+                        <ref role="3cqZAo" node="2hED36FpCvQ" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="3x7uzC8sp3w" role="2OqNvi">
                         <ref role="3Tt5mk" to="6k2r:31P83hzFOt7" resolve="failureModeDefinition" />
@@ -427,7 +427,7 @@
                       <node concept="3clFbF" id="22gnu5EV2rP" role="3cqZAp">
                         <node concept="2OqwBi" id="22gnu5EV2Fl" role="3clFbG">
                           <node concept="37vLTw" id="22gnu5EV2rO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCvS" />
+                            <ref role="3cqZAo" node="2hED36FpCvS" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="22gnu5EV2Vv" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.behavior.mps
index 6ab8f087..7303e15b 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.behavior.mps
@@ -207,7 +207,7 @@
                           <node concept="13iPFW" id="3oGITgu_M2u" role="3uHU7w" />
                           <node concept="2OqwBi" id="3oGITgu_Lvu" role="3uHU7B">
                             <node concept="37vLTw" id="3oGITgu_LgD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCvV" />
+                              <ref role="3cqZAo" node="2hED36FpCvV" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3oGITgu_Nzo" role="2OqNvi">
                               <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -229,7 +229,7 @@
                     <node concept="3clFbF" id="3oGITgu_N1r" role="3cqZAp">
                       <node concept="2OqwBi" id="3oGITgu_NhH" role="3clFbG">
                         <node concept="37vLTw" id="3oGITgu_N1q" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCvX" />
+                          <ref role="3cqZAo" node="2hED36FpCvX" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="3oGITgu_NDs" role="2OqNvi">
                           <ref role="3Tt5mk" to="spwl:5rwT_JnwiU6" resolve="start" />
@@ -287,7 +287,7 @@
                           <node concept="13iPFW" id="3oGITguAph3" role="3uHU7w" />
                           <node concept="2OqwBi" id="3oGITguAph4" role="3uHU7B">
                             <node concept="37vLTw" id="3oGITguAph5" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCvZ" />
+                              <ref role="3cqZAo" node="2hED36FpCvZ" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="3oGITguAph6" role="2OqNvi">
                               <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -417,7 +417,7 @@
                         <node concept="3clFbC" id="1GpuQySZp47" role="3clFbG">
                           <node concept="2OqwBi" id="1GpuQySZp49" role="3uHU7B">
                             <node concept="37vLTw" id="1GpuQySZp4a" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCw1" />
+                              <ref role="3cqZAo" node="2hED36FpCw1" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6csJveETB7f" role="2OqNvi">
                               <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -476,7 +476,7 @@
                         <node concept="3clFbC" id="12e1nc$3fy$" role="3clFbG">
                           <node concept="2OqwBi" id="12e1nc$3fy_" role="3uHU7B">
                             <node concept="37vLTw" id="12e1nc$3fyA" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCw3" />
+                              <ref role="3cqZAo" node="2hED36FpCw3" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="12e1nc$3fyB" role="2OqNvi">
                               <ref role="3Tt5mk" to="spwl:5rwT_JnwiU6" resolve="start" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.constraints.mps
index 59c3f913..443ff29c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.constraints.mps
@@ -141,7 +141,7 @@
                           <node concept="3fqX7Q" id="6csJveEW4PH" role="3uHU7B">
                             <node concept="2OqwBi" id="6csJveEW4PJ" role="3fr31v">
                               <node concept="37vLTw" id="6csJveEW4PK" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36FpCw5" />
+                                <ref role="3cqZAo" node="2hED36FpCw5" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6csJveEW4PL" role="2OqNvi">
                                 <node concept="chp4Y" id="6csJveEW4PM" role="cj9EA">
@@ -153,7 +153,7 @@
                           <node concept="3fqX7Q" id="6csJveEW4TU" role="3uHU7w">
                             <node concept="2OqwBi" id="6csJveEW4TV" role="3fr31v">
                               <node concept="37vLTw" id="6csJveEW4TW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36FpCw5" />
+                                <ref role="3cqZAo" node="2hED36FpCw5" resolve="it" />
                               </node>
                               <node concept="1mIQ4w" id="6csJveEW4TX" role="2OqNvi">
                                 <node concept="chp4Y" id="6csJveEW521" role="cj9EA">
@@ -208,7 +208,7 @@
                         <node concept="3fqX7Q" id="6csJveEW5sA" role="3clFbG">
                           <node concept="2OqwBi" id="6csJveEW5sB" role="3fr31v">
                             <node concept="37vLTw" id="6csJveEW5sC" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCw7" />
+                              <ref role="3cqZAo" node="2hED36FpCw7" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="6csJveEW5sD" role="2OqNvi">
                               <node concept="chp4Y" id="6csJveEW5Fu" role="cj9EA">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
index 89d3220f..1f52502d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
@@ -2467,7 +2467,7 @@
                         </node>
                         <node concept="2OqwBi" id="1GpuQySZp49" role="3uHU7B">
                           <node concept="37vLTw" id="1GpuQySZp4a" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCw9" />
+                            <ref role="3cqZAo" node="2hED36FpCw9" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6csJveETB7f" role="2OqNvi">
                             <ref role="3Tt5mk" to="spwl:5rwT_JnwiU6" resolve="start" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.intentions.mps
index 73eb002a..2992f445 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.intentions.mps
@@ -513,7 +513,7 @@
                         </node>
                         <node concept="2OqwBi" id="4G_iuUEcMyF" role="3uHU7B">
                           <node concept="37vLTw" id="4G_iuUEcMlB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCwb" />
+                            <ref role="3cqZAo" node="2hED36FpCwb" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6csJveEQt5G" role="2OqNvi">
                             <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -539,7 +539,7 @@
                       </node>
                       <node concept="2OqwBi" id="4G_iuUEcOj2" role="37vLTJ">
                         <node concept="37vLTw" id="4G_iuUEcOdF" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCwd" />
+                          <ref role="3cqZAo" node="2hED36FpCwd" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6csJveEQtJw" role="2OqNvi">
                           <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -918,7 +918,7 @@
                             <node concept="3JPx81" id="6fCPE$QM6F3" role="2OqNvi">
                               <node concept="2OqwBi" id="6fCPE$QM6F4" role="25WWJ7">
                                 <node concept="37vLTw" id="6fCPE$QM6F5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpCwf" />
+                                  <ref role="3cqZAo" node="2hED36FpCwf" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="6csJveEQJwZ" role="2OqNvi">
                                   <ref role="3Tt5mk" to="spwl:5rwT_JnwiU6" resolve="start" />
@@ -968,7 +968,7 @@
                               <node concept="TSZUe" id="6fCPE$QM9YH" role="2OqNvi">
                                 <node concept="2OqwBi" id="6fCPE$QMav5" role="25WWJ7">
                                   <node concept="37vLTw" id="6fCPE$QMabn" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2hED36FpCwh" />
+                                    <ref role="3cqZAo" node="2hED36FpCwh" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="6csJveEQKuX" role="2OqNvi">
                                     <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.plugin.mps
index 59a19c41..f12e306a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.plugin.mps
@@ -582,7 +582,7 @@
                                       <node concept="17R0WA" id="4dyd$$w7ZJS" role="3clFbG">
                                         <node concept="2OqwBi" id="4dyd$$w7ZJT" role="3uHU7B">
                                           <node concept="37vLTw" id="4dyd$$w7ZJU" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="2hED36FpCwj" />
+                                            <ref role="3cqZAo" node="2hED36FpCwj" resolve="it" />
                                           </node>
                                           <node concept="3TrEf2" id="4dyd$$w7ZJV" role="2OqNvi">
                                             <ref role="3Tt5mk" to="spwl:1SpkZ1V83E9" resolve="subtreeStart" />
@@ -623,7 +623,7 @@
                                           </node>
                                           <node concept="TSZUe" id="1r1mR59O$rQ" role="2OqNvi">
                                             <node concept="37vLTw" id="1r1mR59O_S$" role="25WWJ7">
-                                              <ref role="3cqZAo" node="2hED36FpCwl" />
+                                              <ref role="3cqZAo" node="2hED36FpCwl" resolve="it" />
                                             </node>
                                           </node>
                                         </node>
@@ -636,7 +636,7 @@
                                         </node>
                                         <node concept="3JPx81" id="4dyd$$w64u6" role="2OqNvi">
                                           <node concept="37vLTw" id="4dyd$$w64u7" role="25WWJ7">
-                                            <ref role="3cqZAo" node="2hED36FpCwl" />
+                                            <ref role="3cqZAo" node="2hED36FpCwl" resolve="it" />
                                           </node>
                                         </node>
                                       </node>
@@ -722,7 +722,7 @@
                                           </node>
                                           <node concept="3JPx81" id="1r1mR59M8xZ" role="2OqNvi">
                                             <node concept="37vLTw" id="1r1mR59M8y0" role="25WWJ7">
-                                              <ref role="3cqZAo" node="2hED36FpCwn" />
+                                              <ref role="3cqZAo" node="2hED36FpCwn" resolve="it" />
                                             </node>
                                           </node>
                                         </node>
@@ -796,7 +796,7 @@
                                           </node>
                                           <node concept="3JPx81" id="1r1mR59M3lD" role="2OqNvi">
                                             <node concept="37vLTw" id="1r1mR59M3lE" role="25WWJ7">
-                                              <ref role="3cqZAo" node="2hED36FpCwp" />
+                                              <ref role="3cqZAo" node="2hED36FpCwp" resolve="it" />
                                             </node>
                                           </node>
                                         </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.constraints.mps
index 1a10d5cb..d92e2bff 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.constraints.mps
@@ -236,7 +236,7 @@
                             <node concept="2EnYce" id="4kHGjX8PUMo" role="37wK5m">
                               <node concept="2EnYce" id="4kHGjX8PUeG" role="2Oq$k0">
                                 <node concept="37vLTw" id="62cfieEP3hd" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpCwt" />
+                                  <ref role="3cqZAo" node="2hED36FpCwt" resolve="it" />
                                 </node>
                                 <node concept="3TrEf2" id="62cfieEP3he" role="2OqNvi">
                                   <ref role="3Tt5mk" to="zsc5:62cfieENpyv" resolve="tpe" />
@@ -277,7 +277,7 @@
                       <node concept="3clFbF" id="62cfieEP3hs" role="3cqZAp">
                         <node concept="2OqwBi" id="62cfieEP3ht" role="3clFbG">
                           <node concept="37vLTw" id="62cfieEP3hu" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCwv" />
+                            <ref role="3cqZAo" node="2hED36FpCwv" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="62cfieEP3hv" role="2OqNvi">
                             <ref role="3TtcxE" to="ii8j:1TeaL8Rdz2r" resolve="failureModes" />
@@ -405,7 +405,7 @@
                             </node>
                             <node concept="2OqwBi" id="5g1NREKOuyS" role="3uHU7B">
                               <node concept="37vLTw" id="5g1NREKOu6X" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36FpCwx" />
+                                <ref role="3cqZAo" node="2hED36FpCwx" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="5g1NREKOuZx" role="2OqNvi">
                                 <ref role="3Tt5mk" to="g9vz:42QGQFVn62G" resolve="interface" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.util.mps
index 2558f8d3..274e5fb0 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops.arch/models/com.fasten.safety.hiphops.arch.util.mps
@@ -203,7 +203,7 @@
                       </node>
                       <node concept="2OqwBi" id="62cfieENmYf" role="3uHU7B">
                         <node concept="37vLTw" id="62cfieENmIS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCwz" />
+                          <ref role="3cqZAo" node="2hED36FpCwz" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="62cfieENneQ" role="2OqNvi">
                           <ref role="3Tt5mk" to="zsc5:1TeaL8RddiD" resolve="interf" />
@@ -403,7 +403,7 @@
                         </node>
                         <node concept="2OqwBi" id="3bh1RFvB3Ib" role="33vP2m">
                           <node concept="37vLTw" id="3bh1RFvB3Ic" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCw_" />
+                            <ref role="3cqZAo" node="2hED36FpCw_" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="3bh1RFvB3Id" role="2OqNvi">
                             <ref role="3Tt5mk" to="zsc5:62cfieENpyv" resolve="tpe" />
@@ -537,7 +537,7 @@
                     <node concept="3clFbC" id="1f_hJh2erwT" role="3clFbG">
                       <node concept="2OqwBi" id="1f_hJh2erwV" role="3uHU7B">
                         <node concept="37vLTw" id="1f_hJh2erwW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCwB" />
+                          <ref role="3cqZAo" node="2hED36FpCwB" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="1f_hJh2erwX" role="2OqNvi">
                           <ref role="3Tt5mk" to="zsc5:1TeaL8RddiD" resolve="interf" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.util.mps
index a4322280..8850ca0f 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.hiphops/models/com.fasten.safety.hiphops.util.mps
@@ -942,7 +942,7 @@
                       <node concept="2OqwBi" id="5N87GIKinVM" role="3clFbG">
                         <node concept="2OqwBi" id="5N87GIKinVN" role="2Oq$k0">
                           <node concept="37vLTw" id="5N87GIKinVO" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCwE" />
+                            <ref role="3cqZAo" node="2hED36FpCwE" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5N87GIKinVP" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1341,7 +1341,7 @@
                                 <node concept="3clFbF" id="1f_hJh2j_FJ" role="3cqZAp">
                                   <node concept="2OqwBi" id="1f_hJh2j_FK" role="3clFbG">
                                     <node concept="37vLTw" id="1f_hJh2j_FL" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2hED36FpCwG" />
+                                      <ref role="3cqZAo" node="2hED36FpCwG" resolve="it" />
                                     </node>
                                     <node concept="3JPx81" id="1f_hJh2j_FM" role="2OqNvi">
                                       <node concept="2GrUjf" id="1f_hJh2j_FN" role="25WWJ7">
@@ -1386,7 +1386,7 @@
                                     <ref role="3cqZAo" node="5N87GIKdCu_" resolve="port" />
                                   </node>
                                   <node concept="37vLTw" id="1f_hJh2j_G7" role="37wK5m">
-                                    <ref role="3cqZAo" node="2hED36FpCwI" />
+                                    <ref role="3cqZAo" node="2hED36FpCwI" resolve="fm" />
                                   </node>
                                 </node>
                               </node>
@@ -1564,7 +1564,7 @@
                                     <ref role="3cqZAo" node="5N87GIKeaB7" resolve="port" />
                                   </node>
                                   <node concept="37vLTw" id="5N87GIKm5oZ" role="37wK5m">
-                                    <ref role="3cqZAo" node="2hED36FpCwK" />
+                                    <ref role="3cqZAo" node="2hED36FpCwK" resolve="it" />
                                   </node>
                                 </node>
                               </node>
@@ -1728,7 +1728,7 @@
                                   <node concept="3clFbC" id="3bh1RFvEbzT" role="3clFbG">
                                     <node concept="2OqwBi" id="3bh1RFvE7KO" role="3uHU7B">
                                       <node concept="37vLTw" id="3bh1RFvE7KP" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2hED36FpCwM" />
+                                        <ref role="3cqZAo" node="2hED36FpCwM" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="3f8ZVRYc_A7" role="2OqNvi">
                                         <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -1774,7 +1774,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="3bh1RFvE9Xe" role="37vLTJ">
                                     <node concept="37vLTw" id="3bh1RFvE9NW" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2hED36FpCwO" />
+                                      <ref role="3cqZAo" node="2hED36FpCwO" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="3f8ZVRYcAtZ" role="2OqNvi">
                                       <ref role="3Tt5mk" to="spwl:5rwT_JnwiU8" resolve="end" />
@@ -1912,7 +1912,7 @@
                                   <node concept="3clFbC" id="5g1NREKQyHL" role="3clFbG">
                                     <node concept="2OqwBi" id="5g1NREKQyHM" role="3uHU7B">
                                       <node concept="37vLTw" id="5g1NREKQyHN" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2hED36FpCwQ" />
+                                        <ref role="3cqZAo" node="2hED36FpCwQ" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="3f8ZVRYc$An" role="2OqNvi">
                                         <ref role="3Tt5mk" to="spwl:5rwT_JnwiU6" resolve="start" />
@@ -1956,7 +1956,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="5g1NREKQyI5" role="37vLTJ">
                                     <node concept="37vLTw" id="5g1NREKQyI6" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2hED36FpCwS" />
+                                      <ref role="3cqZAo" node="2hED36FpCwS" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="3f8ZVRYc$Wx" role="2OqNvi">
                                       <ref role="3Tt5mk" to="spwl:5rwT_JnwiU6" resolve="start" />
@@ -2540,7 +2540,7 @@
                       <node concept="3cpWs6" id="5N87GIKjGSm" role="3cqZAp">
                         <node concept="2OqwBi" id="5N87GIKjGSo" role="3cqZAk">
                           <node concept="37vLTw" id="5N87GIKjGSp" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCwU" />
+                            <ref role="3cqZAo" node="2hED36FpCwU" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5N87GIKjGSq" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2611,7 +2611,7 @@
                       <node concept="3cpWs6" id="5N87GIKjL4m" role="3cqZAp">
                         <node concept="2OqwBi" id="5N87GIKjL4n" role="3cqZAk">
                           <node concept="37vLTw" id="5N87GIKjL4o" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCwW" />
+                            <ref role="3cqZAo" node="2hED36FpCwW" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5N87GIKjL4p" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2710,7 +2710,7 @@
                             <node concept="2OqwBi" id="5N87GIKnxNm" role="33vP2m">
                               <node concept="2OqwBi" id="5N87GIKnx7j" role="2Oq$k0">
                                 <node concept="37vLTw" id="5N87GIKnwPb" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpCwY" />
+                                  <ref role="3cqZAo" node="2hED36FpCwY" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5N87GIKnxt1" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2721,7 +2721,7 @@
                                 <node concept="2OqwBi" id="5N87GIKnzCF" role="37wK5m">
                                   <node concept="2OqwBi" id="5N87GIKnyIM" role="2Oq$k0">
                                     <node concept="37vLTw" id="5N87GIKnytw" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2hED36FpCwY" />
+                                      <ref role="3cqZAo" node="2hED36FpCwY" resolve="it" />
                                     </node>
                                     <node concept="3TrcHB" id="5N87GIKnyZS" role="2OqNvi">
                                       <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.plugin.mps
index 8b27aeb6..33edaefd 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.plugin.mps
@@ -122,7 +122,7 @@
                         <node concept="1beSmn" id="5t37uj6C0e5" role="3uHU7w" />
                         <node concept="2OqwBi" id="5t37uj6C0e6" role="3uHU7B">
                           <node concept="37vLTw" id="5t37uj6C0e7" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCx1" />
+                            <ref role="3cqZAo" node="2hED36FpCx1" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="5t37uj6C0e8" role="2OqNvi">
                             <ref role="3Tt5mk" to="9br2:1vid6hjrzqr" resolve="gs" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.behavior.mps
index 899f632a..8d04025a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.behavior.mps
@@ -132,7 +132,7 @@
                     <node concept="3clFbF" id="1r1mR59umRt" role="3cqZAp">
                       <node concept="2OqwBi" id="1r1mR59umRu" role="3clFbG">
                         <node concept="37vLTw" id="1r1mR59umRv" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCx3" />
+                          <ref role="3cqZAo" node="2hED36FpCx3" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="1r1mR59umRw" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps
index 94ee9f42..c62896fd 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.editor.mps
@@ -1211,7 +1211,7 @@
                               <node concept="2OqwBi" id="5YWtEMPHmbV" role="2Oq$k0">
                                 <node concept="2JrnkZ" id="5YWtEMPHlS$" role="2Oq$k0">
                                   <node concept="37vLTw" id="5YWtEMPHkgi" role="2JrQYb">
-                                    <ref role="3cqZAo" node="2hED36FpCx5" />
+                                    <ref role="3cqZAo" node="2hED36FpCx5" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="5YWtEMPHmAx" role="2OqNvi">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.util.mps
index 71fa8f2e..e6775910 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.process.artefacts/models/com.mbeddr.formal.safety.argument.process.artefacts.util.mps
@@ -166,7 +166,7 @@
                           <node concept="2OqwBi" id="5YWtEMPH2wh" role="2Oq$k0">
                             <node concept="2JrnkZ" id="5YWtEMPH2wi" role="2Oq$k0">
                               <node concept="37vLTw" id="5YWtEMPH2wj" role="2JrQYb">
-                                <ref role="3cqZAo" node="2hED36FpCx7" />
+                                <ref role="3cqZAo" node="2hED36FpCx7" resolve="it" />
                               </node>
                             </node>
                             <node concept="liA8E" id="5YWtEMPH2wk" role="2OqNvi">
@@ -225,7 +225,7 @@
                         <node concept="2OqwBi" id="5YWtEMPH8Iu" role="2Oq$k0">
                           <node concept="2JrnkZ" id="5YWtEMPH8ki" role="2Oq$k0">
                             <node concept="37vLTw" id="5YWtEMPH7T1" role="2JrQYb">
-                              <ref role="3cqZAo" node="2hED36FpCx9" />
+                              <ref role="3cqZAo" node="2hED36FpCx9" resolve="it" />
                             </node>
                           </node>
                           <node concept="liA8E" id="5YWtEMPH8Tq" role="2OqNvi">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.plugin.mps
index c19a0ed4..11938b9e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.runtime/models/com.mbeddr.formal.safety.argument.runtime.plugin.mps
@@ -754,7 +754,7 @@
                       </node>
                       <node concept="2OqwBi" id="56pBK14$m1Z" role="3uHU7B">
                         <node concept="37vLTw" id="56pBK14$lQk" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCxd" />
+                          <ref role="3cqZAo" node="2hED36FpCxd" resolve="it" />
                         </node>
                         <node concept="liA8E" id="56pBK14$mk8" role="2OqNvi">
                           <ref role="37wK5l" node="56pBK14$0oo" resolve="getAnalyzedNode" />
@@ -1035,7 +1035,7 @@
                                         <node concept="2OqwBi" id="56pBK14_pZE" role="3uHU7B">
                                           <node concept="2OqwBi" id="56pBK14$A0b" role="2Oq$k0">
                                             <node concept="37vLTw" id="56pBK14$A0c" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="2hED36FpCxf" />
+                                              <ref role="3cqZAo" node="2hED36FpCxf" resolve="it" />
                                             </node>
                                             <node concept="3TrcHB" id="56pBK14$A0d" role="2OqNvi">
                                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.intentions.mps
index 5b0dfceb..7799d7e8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.intentions.mps
@@ -347,7 +347,7 @@
                         <node concept="2OqwBi" id="1HYO_kn5VEo" role="3clFbG">
                           <node concept="2OqwBi" id="1HYO_kn5Sfb" role="2Oq$k0">
                             <node concept="37vLTw" id="1HYO_kn5R52" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCxj" />
+                              <ref role="3cqZAo" node="2hED36FpCxj" resolve="it" />
                             </node>
                             <node concept="2qgKlT" id="1HYO_kn5TaZ" role="2OqNvi">
                               <ref role="37wK5l" to="89jy:71GfFl7iCHN" resolve="getInboundConnections" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin.mps
index 83758258..cd96a283 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin.mps
@@ -3772,7 +3772,7 @@
                       <node concept="3clFbF" id="3AZUhOjM$Dg" role="3cqZAp">
                         <node concept="2OqwBi" id="3AZUhOjM$Dh" role="3clFbG">
                           <node concept="37vLTw" id="3AZUhOjM$Di" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCxl" />
+                            <ref role="3cqZAo" node="2hED36FpCxl" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="3AZUhOjM$Dj" role="2OqNvi">
                             <node concept="chp4Y" id="3AZUhOjM$Dk" role="cj9EA">
@@ -3845,7 +3845,7 @@
                             <node concept="2OqwBi" id="3AZUhOjM$DK" role="3clFbG">
                               <node concept="2OqwBi" id="3AZUhOjM$DL" role="2Oq$k0">
                                 <node concept="37vLTw" id="3AZUhOjM$DM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpCxp" />
+                                  <ref role="3cqZAo" node="2hED36FpCxp" resolve="it" />
                                 </node>
                                 <node concept="3Tsc0h" id="3AZUhOjM$DN" role="2OqNvi">
                                   <ref role="3TtcxE" to="py52:3Px2xUV1gzV" resolve="attributes" />
@@ -3857,7 +3857,7 @@
                                     <node concept="3clFbF" id="3AZUhOjM$DR" role="3cqZAp">
                                       <node concept="2OqwBi" id="3AZUhOjM$DS" role="3clFbG">
                                         <node concept="37vLTw" id="3AZUhOjM$DT" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2hED36FpCxn" />
+                                          <ref role="3cqZAo" node="2hED36FpCxn" resolve="it" />
                                         </node>
                                         <node concept="1mIQ4w" id="3AZUhOjM$DU" role="2OqNvi">
                                           <node concept="chp4Y" id="3AZUhOjM$DV" role="cj9EA">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.constraints.mps
index 8b86bdbd..6d89cffd 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.constraints.mps
@@ -258,7 +258,7 @@
                         <node concept="2OqwBi" id="56pBK14wEzH" role="3clFbG">
                           <node concept="2OqwBi" id="56pBK14wEzI" role="2Oq$k0">
                             <node concept="37vLTw" id="56pBK14wEzJ" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCxs" />
+                              <ref role="3cqZAo" node="2hED36FpCxs" resolve="it" />
                             </node>
                             <node concept="liA8E" id="56pBK14wEzK" role="2OqNvi">
                               <ref role="37wK5l" to="c17a:~SAbstractConcept.getConceptAlias()" resolve="getConceptAlias" />
@@ -306,7 +306,7 @@
                           <node concept="3bZ5Sz" id="56pBK14wKaE" role="1tU5fm" />
                           <node concept="2OqwBi" id="56pBK14wKi3" role="33vP2m">
                             <node concept="37vLTw" id="56pBK14wKi4" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCxu" />
+                              <ref role="3cqZAo" node="2hED36FpCxu" resolve="it" />
                             </node>
                             <node concept="2yIwOk" id="56pBK14wKi5" role="2OqNvi" />
                           </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.intentions.mps
index dfd77fb0..5195a891 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.intentions.mps
@@ -821,7 +821,7 @@
                           <node concept="3clFbF" id="6csJveEL7nX" role="3cqZAp">
                             <node concept="2OqwBi" id="6csJveEL7CB" role="3clFbG">
                               <node concept="37vLTw" id="6csJveEL7nW" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36FpCxw" />
+                                <ref role="3cqZAo" node="2hED36FpCxw" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="6csJveEL7Sp" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2002,7 +2002,7 @@
                           <ref role="1Pybhc" node="6csJveEJb9o" resolve="AutomaticLayouterModelNavigationHelper" />
                           <node concept="2OqwBi" id="6K99IwmtT9x" role="37wK5m">
                             <node concept="37vLTw" id="6K99IwmtSLd" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCxy" />
+                              <ref role="3cqZAo" node="2hED36FpCxy" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6K99IwmtUaE" role="2OqNvi">
                               <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -2039,7 +2039,7 @@
                         <node concept="2OqwBi" id="6csJveEMR$4" role="3uHU7w">
                           <node concept="2OqwBi" id="6csJveEMQQ1" role="2Oq$k0">
                             <node concept="37vLTw" id="6csJveEMQEY" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCx$" />
+                              <ref role="3cqZAo" node="2hED36FpCx$" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6csJveEMRcb" role="2OqNvi">
                               <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -2050,7 +2050,7 @@
                         <node concept="2OqwBi" id="6csJveEMPPd" role="3uHU7B">
                           <node concept="2OqwBi" id="6csJveEMPmQ" role="2Oq$k0">
                             <node concept="37vLTw" id="6csJveEMPbW" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCx$" />
+                              <ref role="3cqZAo" node="2hED36FpCx$" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6csJveEMPyY" role="2OqNvi">
                               <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -2072,7 +2072,7 @@
                           <node concept="3JPx81" id="6csJveEMHvb" role="2OqNvi">
                             <node concept="2OqwBi" id="6csJveEMHOA" role="25WWJ7">
                               <node concept="37vLTw" id="6csJveEMHEv" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36FpCx$" />
+                                <ref role="3cqZAo" node="2hED36FpCx$" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6csJveEMI1$" role="2OqNvi">
                                 <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -2092,7 +2092,7 @@
                           <node concept="3JPx81" id="6csJveEMNUS" role="2OqNvi">
                             <node concept="2OqwBi" id="6csJveEMOlw" role="25WWJ7">
                               <node concept="37vLTw" id="6csJveEMO3V" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36FpCx$" />
+                                <ref role="3cqZAo" node="2hED36FpCx$" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6csJveEMOtK" role="2OqNvi">
                                 <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -2478,7 +2478,7 @@
                             <ref role="1Pybhc" node="6csJveEJb9o" resolve="AutomaticLayouterModelNavigationHelper" />
                             <node concept="2OqwBi" id="6K99Iwmu2ED" role="37wK5m">
                               <node concept="37vLTw" id="6K99Iwmu2EE" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36FpCxA" />
+                                <ref role="3cqZAo" node="2hED36FpCxA" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6K99Iwmu2EF" role="2OqNvi">
                                 <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -2490,7 +2490,7 @@
                             <ref role="1Pybhc" node="6csJveEJb9o" resolve="AutomaticLayouterModelNavigationHelper" />
                             <node concept="2OqwBi" id="6K99Iwmu473" role="37wK5m">
                               <node concept="37vLTw" id="6K99Iwmu474" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36FpCxA" />
+                                <ref role="3cqZAo" node="2hED36FpCxA" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="6K99Iwmu475" role="2OqNvi">
                                 <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -3114,7 +3114,7 @@
                           </node>
                           <node concept="2OqwBi" id="4kPUbDDtC5f" role="33vP2m">
                             <node concept="37vLTw" id="4kPUbDDtC5g" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCxG" />
+                              <ref role="3cqZAo" node="2hED36FpCxG" resolve="crtGSEB" />
                             </node>
                             <node concept="2Rf3mk" id="4kPUbDDtC5h" role="2OqNvi">
                               <node concept="1xMEDy" id="4kPUbDDtC5i" role="1xVPHs">
@@ -3164,7 +3164,7 @@
                                   <node concept="3clFbF" id="6csJveELy0r" role="3cqZAp">
                                     <node concept="2OqwBi" id="6csJveELy0s" role="3clFbG">
                                       <node concept="37vLTw" id="6csJveELy0t" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2hED36FpCxC" />
+                                        <ref role="3cqZAo" node="2hED36FpCxC" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="6csJveELy0u" role="2OqNvi">
                                         <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -3189,7 +3189,7 @@
                           </node>
                           <node concept="2OqwBi" id="6csJveEJkjL" role="33vP2m">
                             <node concept="37vLTw" id="6csJveEJkjM" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCxG" />
+                              <ref role="3cqZAo" node="2hED36FpCxG" resolve="crtGSEB" />
                             </node>
                             <node concept="2Rf3mk" id="6csJveEJkjN" role="2OqNvi">
                               <node concept="1xMEDy" id="6csJveEJkjO" role="1xVPHs">
@@ -3219,7 +3219,7 @@
                                       </node>
                                       <node concept="3JPx81" id="4kPUbDDqY3x" role="2OqNvi">
                                         <node concept="37vLTw" id="4kPUbDDqY3y" role="25WWJ7">
-                                          <ref role="3cqZAo" node="2hED36FpCxE" />
+                                          <ref role="3cqZAo" node="2hED36FpCxE" resolve="it" />
                                         </node>
                                       </node>
                                     </node>
@@ -3249,7 +3249,7 @@
                     </node>
                     <node concept="2OqwBi" id="6csJveEJiAw" role="3clFbw">
                       <node concept="37vLTw" id="6csJveEJikh" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpCxG" />
+                        <ref role="3cqZAo" node="2hED36FpCxG" resolve="crtGSEB" />
                       </node>
                       <node concept="1mIQ4w" id="6csJveEJiUB" role="2OqNvi">
                         <node concept="chp4Y" id="6csJveEJj0s" role="cj9EA">
@@ -3271,7 +3271,7 @@
                                 </node>
                                 <node concept="3JPx81" id="6csJveEJ$VB" role="2OqNvi">
                                   <node concept="37vLTw" id="6csJveEJ$VC" role="25WWJ7">
-                                    <ref role="3cqZAo" node="2hED36FpCxG" />
+                                    <ref role="3cqZAo" node="2hED36FpCxG" resolve="crtGSEB" />
                                   </node>
                                 </node>
                               </node>
@@ -3522,7 +3522,7 @@
                         </node>
                         <node concept="2OqwBi" id="6csJveEKsxV" role="3uHU7B">
                           <node concept="37vLTw" id="6csJveEKske" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCxI" />
+                            <ref role="3cqZAo" node="2hED36FpCxI" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6csJveEKtVu" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -3549,7 +3549,7 @@
                       </node>
                       <node concept="2OqwBi" id="6csJveEKxXj" role="33vP2m">
                         <node concept="37vLTw" id="6csJveEKxXk" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCxK" />
+                          <ref role="3cqZAo" node="2hED36FpCxK" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6csJveEKxXl" role="2OqNvi">
                           <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -3636,7 +3636,7 @@
                         <node concept="1rXfSq" id="6K99Iwm_GjP" role="3fr31v">
                           <ref role="37wK5l" node="6K99IwmtHVY" resolve="entityOnEast" />
                           <node concept="37vLTw" id="6K99Iwm_Gx$" role="37wK5m">
-                            <ref role="3cqZAo" node="2hED36FpCxM" />
+                            <ref role="3cqZAo" node="2hED36FpCxM" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -3644,7 +3644,7 @@
                         <node concept="1rXfSq" id="6K99Iwm_F6w" role="3fr31v">
                           <ref role="37wK5l" node="6K99IwmtKxA" resolve="entityOnWest" />
                           <node concept="37vLTw" id="6K99Iwm_F6x" role="37wK5m">
-                            <ref role="3cqZAo" node="2hED36FpCxM" />
+                            <ref role="3cqZAo" node="2hED36FpCxM" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -3790,7 +3790,7 @@
                     <node concept="1rXfSq" id="6K99IwmtJiL" role="3clFbG">
                       <ref role="37wK5l" node="6K99IwmtHVY" resolve="entityOnEast" />
                       <node concept="37vLTw" id="6K99IwmtJuF" role="37wK5m">
-                        <ref role="3cqZAo" node="2hED36FpCxO" />
+                        <ref role="3cqZAo" node="2hED36FpCxO" resolve="it" />
                       </node>
                     </node>
                   </node>
@@ -3836,7 +3836,7 @@
                     <node concept="1rXfSq" id="6K99IwmtN88" role="3clFbG">
                       <ref role="37wK5l" node="6K99IwmtKxA" resolve="entityOnWest" />
                       <node concept="37vLTw" id="6K99IwmtNl2" role="37wK5m">
-                        <ref role="3cqZAo" node="2hED36FpCxQ" />
+                        <ref role="3cqZAo" node="2hED36FpCxQ" resolve="it" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.plugin.mps
index 1480ea82..eeffdcd5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.ext/models/com.mbeddr.formal.safety.gsn.ext.plugin.mps
@@ -473,7 +473,7 @@
                       <node concept="2OqwBi" id="1qrXfdH3Mu3" role="3clFbG">
                         <node concept="2OqwBi" id="1qrXfdH3Mu4" role="2Oq$k0">
                           <node concept="37vLTw" id="1qrXfdH3Mu5" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCxS" />
+                            <ref role="3cqZAo" node="2hED36FpCxS" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="1qrXfdH3Mu6" role="2OqNvi" />
                         </node>
@@ -1669,7 +1669,7 @@
                               <node concept="2OqwBi" id="WKGDODMr5I" role="2Oq$k0">
                                 <node concept="2JrnkZ" id="WKGDODMr5J" role="2Oq$k0">
                                   <node concept="37vLTw" id="WKGDODMr5K" role="2JrQYb">
-                                    <ref role="3cqZAo" node="2hED36FpCxU" />
+                                    <ref role="3cqZAo" node="2hED36FpCxU" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="WKGDODMr5L" role="2OqNvi">
@@ -4099,7 +4099,7 @@
                           <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                           <node concept="2OqwBi" id="x1FXqz9cU" role="37wK5m">
                             <node concept="37vLTw" id="x1FXqz8_P" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCxW" />
+                              <ref role="3cqZAo" node="2hED36FpCxW" resolve="it" />
                             </node>
                             <node concept="liA8E" id="x1FXqza13" role="2OqNvi">
                               <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
@@ -4219,7 +4219,7 @@
                       <node concept="TSZUe" id="x1FXq_058" role="2OqNvi">
                         <node concept="2OqwBi" id="x1FXq_0DY" role="25WWJ7">
                           <node concept="37vLTw" id="x1FXq_0mi" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCxY" />
+                            <ref role="3cqZAo" node="2hED36FpCxY" resolve="it" />
                           </node>
                           <node concept="1$rogu" id="x1FXq_11O" role="2OqNvi" />
                         </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.util.mps
index bf8a9f51..a3577903 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.util.mps
@@ -493,7 +493,7 @@
                     <node concept="3clFbF" id="79zp7zi7B93" role="3cqZAp">
                       <node concept="2OqwBi" id="79zp7zi7B94" role="3clFbG">
                         <node concept="37vLTw" id="79zp7zi7B95" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCy0" />
+                          <ref role="3cqZAo" node="2hED36FpCy0" resolve="it" />
                         </node>
                         <node concept="liA8E" id="79zp7zi7B96" role="2OqNvi">
                           <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.typesystem.mps
index 41859fb3..e6a5e9b3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.typesystem.mps
@@ -199,7 +199,7 @@
                       <node concept="3clFbF" id="4b60pu4yoDU" role="3cqZAp">
                         <node concept="2OqwBi" id="4b60pu4yoDV" role="3clFbG">
                           <node concept="37vLTw" id="4b60pu4yoDW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCy3" />
+                            <ref role="3cqZAo" node="2hED36FpCy3" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4b60pu4yoDX" role="2OqNvi">
                             <ref role="37wK5l" to="23hk:6Kf5KB6G5PF" resolve="variableDeclaration" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.util.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.util.mps
index 936d5d3f..a3539a9f 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.util.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.odd/models/com.mbeddr.formal.safety.gsn.odd.util.mps
@@ -406,7 +406,7 @@
                   <node concept="3clFbF" id="4b60pu4w4QR" role="3cqZAp">
                     <node concept="2OqwBi" id="4b60pu4w4QS" role="3clFbG">
                       <node concept="37vLTw" id="4b60pu4w4QT" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpCy5" />
+                        <ref role="3cqZAo" node="2hED36FpCy5" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4b60pu4w4QU" role="2OqNvi">
                         <ref role="37wK5l" to="23hk:6Kf5KB6G5PF" resolve="variableDeclaration" />
@@ -474,7 +474,7 @@
                     <node concept="3clFbF" id="guJe75HD4O" role="3cqZAp">
                       <node concept="2OqwBi" id="guJe75HD4P" role="3clFbG">
                         <node concept="37vLTw" id="guJe75HD4Q" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCy7" />
+                          <ref role="3cqZAo" node="2hED36FpCy7" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="guJe75HD4R" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.constraints.mps
index d9d4b6ce..380c726a 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.constraints.mps
@@ -344,7 +344,7 @@
                                 <node concept="2OqwBi" id="1Y8zh0m0ayN" role="3clFbG">
                                   <node concept="2OqwBi" id="1Y8zh0m0ayO" role="2Oq$k0">
                                     <node concept="37vLTw" id="1Y8zh0m0ayP" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2hED36FpCya" />
+                                      <ref role="3cqZAo" node="2hED36FpCya" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="1Y8zh0m0ayQ" role="2OqNvi">
                                       <ref role="3Tt5mk" to="3whv:7RhjhI7$liY" resolve="interfaceRef" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.typesystem.mps
index dbc2ffb8..923db0c3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.patterns/models/com.mbeddr.formal.safety.gsn.patterns.typesystem.mps
@@ -252,7 +252,7 @@
                   <node concept="3clFbF" id="6FysnQMUwg3" role="3cqZAp">
                     <node concept="2OqwBi" id="6FysnQMUwg4" role="3clFbG">
                       <node concept="37vLTw" id="6FysnQMUwg5" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpCyc" />
+                        <ref role="3cqZAo" node="2hED36FpCyc" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="3TSGpjyNBWw" role="2OqNvi">
                         <ref role="37wK5l" to="g8ih:1Y8zh0lZmaU" resolve="getHazard" />
@@ -379,7 +379,7 @@
                   <node concept="3clFbF" id="4i__4GxoqNz" role="3cqZAp">
                     <node concept="2OqwBi" id="4i__4GxoqN$" role="3clFbG">
                       <node concept="37vLTw" id="4i__4GxoqN_" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpCye" />
+                        <ref role="3cqZAo" node="2hED36FpCye" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="65LrkjiWUAU" role="2OqNvi">
                         <ref role="37wK5l" to="g8ih:65LrkjiWRoD" resolve="getRequirement" />
@@ -527,7 +527,7 @@
                             <node concept="3clFbF" id="4MR8i$4hfC5" role="3cqZAp">
                               <node concept="2OqwBi" id="4MR8i$4hfC6" role="3clFbG">
                                 <node concept="37vLTw" id="4MR8i$4hfC7" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpCyg" />
+                                  <ref role="3cqZAo" node="2hED36FpCyg" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="4MR8i$4hfC8" role="2OqNvi">
                                   <ref role="37wK5l" to="g8ih:2RlaC$P6pDt" resolve="getComponent" />
@@ -578,7 +578,7 @@
                                 <node concept="2OqwBi" id="4MR8i$4hOLv" role="3clFbG">
                                   <node concept="2OqwBi" id="4MR8i$4hOLw" role="2Oq$k0">
                                     <node concept="37vLTw" id="4MR8i$4hOLx" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2hED36FpCyi" />
+                                      <ref role="3cqZAo" node="2hED36FpCyi" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="4MR8i$4hOLy" role="2OqNvi">
                                       <ref role="3Tt5mk" to="3whv:7RhjhI7$liY" resolve="interfaceRef" />
@@ -632,7 +632,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="4MR8i$4ihAq" role="3uHU7B">
                                     <node concept="37vLTw" id="4MR8i$4ihAr" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2hED36FpCyk" />
+                                      <ref role="3cqZAo" node="2hED36FpCyk" resolve="it" />
                                     </node>
                                     <node concept="2qgKlT" id="4MR8i$4ihAs" role="2OqNvi">
                                       <ref role="37wK5l" to="g8ih:2RlaC$P6pDt" resolve="getComponent" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps
index c21e4f27..e5f03dc6 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.behavior.mps
@@ -207,7 +207,7 @@
                         <node concept="13iPFW" id="79zp7ziepnU" role="3uHU7w" />
                         <node concept="2OqwBi" id="79zp7ziepnV" role="3uHU7B">
                           <node concept="37vLTw" id="79zp7ziepnW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCym" />
+                            <ref role="3cqZAo" node="2hED36FpCym" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="79zp7ziepnX" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -361,7 +361,7 @@
                         <node concept="17R0WA" id="4qaoH_Npdv" role="3clFbG">
                           <node concept="2OqwBi" id="4qaoH_Npdw" role="3uHU7B">
                             <node concept="37vLTw" id="4qaoH_Npdx" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCyo" />
+                              <ref role="3cqZAo" node="2hED36FpCyo" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="4qaoH_Npdy" role="2OqNvi">
                               <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.typesystem.mps
index aab22c09..8f035770 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.smv/models/com.mbeddr.formal.safety.gsn.smv.typesystem.mps
@@ -163,7 +163,7 @@
                       </node>
                       <node concept="2OqwBi" id="4qaoH_FFwY" role="3uHU7B">
                         <node concept="37vLTw" id="4qaoH_FFiB" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCyq" />
+                          <ref role="3cqZAo" node="2hED36FpCyq" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="4qaoH_FIh0" role="2OqNvi">
                           <ref role="3Tt5mk" to="py52:3GRi4m$sIbL" resolve="source" />
@@ -229,7 +229,7 @@
                       </node>
                       <node concept="2OqwBi" id="4qaoH_IstT" role="3uHU7B">
                         <node concept="37vLTw" id="4qaoH_IstU" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCys" />
+                          <ref role="3cqZAo" node="2hED36FpCys" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="4qaoH_IxM4" role="2OqNvi">
                           <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.behavior.mps
index c4853f4e..cda36f54 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.behavior.mps
@@ -327,7 +327,7 @@
                         <node concept="13iPFW" id="6FysnQMUkbu" role="3uHU7w" />
                         <node concept="2OqwBi" id="6FysnQMUkbv" role="3uHU7B">
                           <node concept="37vLTw" id="6FysnQMUkbw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCyv" />
+                            <ref role="3cqZAo" node="2hED36FpCyv" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6FysnQMUkbx" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -357,7 +357,7 @@
                     <node concept="3clFbF" id="6FysnQMV5mJ" role="3cqZAp">
                       <node concept="2OqwBi" id="6FysnQMV5_w" role="3clFbG">
                         <node concept="37vLTw" id="6FysnQMV5mI" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCyx" />
+                          <ref role="3cqZAo" node="2hED36FpCyx" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6FysnQMV62L" role="2OqNvi">
                           <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -427,7 +427,7 @@
                         <node concept="13iPFW" id="4_dUcGNLknu" role="3uHU7w" />
                         <node concept="2OqwBi" id="4_dUcGNLknv" role="3uHU7B">
                           <node concept="37vLTw" id="4_dUcGNLknw" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCyz" />
+                            <ref role="3cqZAo" node="2hED36FpCyz" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="4_dUcGNLknx" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -511,7 +511,7 @@
                         <node concept="13iPFW" id="71GfFl7iEIy" role="3uHU7w" />
                         <node concept="2OqwBi" id="71GfFl7iEIz" role="3uHU7B">
                           <node concept="37vLTw" id="71GfFl7iEI$" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCy_" />
+                            <ref role="3cqZAo" node="2hED36FpCy_" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="71GfFl7iEI_" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -583,7 +583,7 @@
                         <node concept="13iPFW" id="71GfFl7iFXz" role="3uHU7w" />
                         <node concept="2OqwBi" id="71GfFl7iFX$" role="3uHU7B">
                           <node concept="37vLTw" id="71GfFl7iFX_" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCyB" />
+                            <ref role="3cqZAo" node="2hED36FpCyB" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="71GfFl7iGOP" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -1750,7 +1750,7 @@
                     <node concept="22lmx$" id="3Px2xUV5tVd" role="3clFbG">
                       <node concept="2OqwBi" id="3Px2xUV5uEk" role="3uHU7w">
                         <node concept="37vLTw" id="3Px2xUV5ueu" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCyD" />
+                          <ref role="3cqZAo" node="2hED36FpCyD" resolve="it" />
                         </node>
                         <node concept="2Zo12i" id="3Px2xUV5vIu" role="2OqNvi">
                           <node concept="chp4Y" id="3Px2xUV5vZv" role="2Zo12j">
@@ -1761,7 +1761,7 @@
                       <node concept="2OqwBi" id="3Px2xUV5seX" role="3uHU7B">
                         <node concept="2OqwBi" id="3Px2xUV5qQL" role="2Oq$k0">
                           <node concept="37vLTw" id="3Px2xUV5qqG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCyD" />
+                            <ref role="3cqZAo" node="2hED36FpCyD" resolve="it" />
                           </node>
                           <node concept="3n3YKJ" id="3Px2xUV5rld" role="2OqNvi" />
                         </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.constraints.mps
index 0feae624..84a3d8c5 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.constraints.mps
@@ -230,7 +230,7 @@
                             <ref role="3cqZAo" node="4q8AAJKL7G4" resolve="gs" />
                           </node>
                           <node concept="37vLTw" id="4q8AAJKM6J1" role="3uHU7B">
-                            <ref role="3cqZAo" node="2hED36FpCyF" />
+                            <ref role="3cqZAo" node="2hED36FpCyF" resolve="it" />
                           </node>
                         </node>
                       </node>
@@ -259,7 +259,7 @@
                         <node concept="2OqwBi" id="4q8AAJKM9Si" role="3clFbG">
                           <node concept="2OqwBi" id="4q8AAJKM9Sj" role="2Oq$k0">
                             <node concept="37vLTw" id="4q8AAJKM9Sk" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCyJ" />
+                              <ref role="3cqZAo" node="2hED36FpCyJ" resolve="it" />
                             </node>
                             <node concept="2Rf3mk" id="4q8AAJKM9Sl" role="2OqNvi">
                               <node concept="1xMEDy" id="4q8AAJKM9Sm" role="1xVPHs">
@@ -276,7 +276,7 @@
                                   <node concept="2OqwBi" id="4q8AAJKM9Ss" role="3clFbG">
                                     <node concept="2OqwBi" id="4q8AAJKM9St" role="2Oq$k0">
                                       <node concept="37vLTw" id="4q8AAJKM9Su" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2hED36FpCyH" />
+                                        <ref role="3cqZAo" node="2hED36FpCyH" resolve="it" />
                                       </node>
                                       <node concept="2qgKlT" id="4q8AAJKM9Sv" role="2OqNvi">
                                         <ref role="37wK5l" to="89jy:71GfFl7iCHN" resolve="getInboundConnections" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
index 2cafb3ca..180e1f19 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
@@ -3837,7 +3837,7 @@
                       <node concept="3fqX7Q" id="5uFV_KKTntC" role="3clFbG">
                         <node concept="2OqwBi" id="5uFV_KKTntD" role="3fr31v">
                           <node concept="37vLTw" id="5uFV_KKTntE" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCyL" />
+                            <ref role="3cqZAo" node="2hED36FpCyL" resolve="it" />
                           </node>
                           <node concept="1mIQ4w" id="5uFV_KKTntF" role="2OqNvi">
                             <node concept="chp4Y" id="6OmQ$5rs7Pz" role="cj9EA">
@@ -3886,7 +3886,7 @@
                             <ref role="37wK5l" node="2V4rzbp9t$s" resolve="getNeighbouringInboundElement" />
                             <ref role="1Pybhc" node="2V4rzbp94Pn" resolve="GoalStructureFilteredModelAccessCache" />
                             <node concept="37vLTw" id="6hlfxCKWuSF" role="37wK5m">
-                              <ref role="3cqZAo" node="2hED36FpCyN" />
+                              <ref role="3cqZAo" node="2hED36FpCyN" resolve="it" />
                             </node>
                           </node>
                         </node>
@@ -3958,7 +3958,7 @@
                             <ref role="3cqZAo" node="5uFV_KKTnlv" resolve="node" />
                           </node>
                           <node concept="37vLTw" id="71QF$$U1pUE" role="37wK5m">
-                            <ref role="3cqZAo" node="2hED36FpCyP" />
+                            <ref role="3cqZAo" node="2hED36FpCyP" resolve="it" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="71QF$$U9m_m" role="3uHU7w">
@@ -3966,7 +3966,7 @@
                             <ref role="1Pybhc" node="2V4rzbp94Pn" resolve="GoalStructureFilteredModelAccessCache" />
                             <ref role="37wK5l" node="2V4rzbp9nJi" resolve="getNeighbouringOutboundElements" />
                             <node concept="37vLTw" id="71QF$$U9riT" role="37wK5m">
-                              <ref role="3cqZAo" node="2hED36FpCyP" />
+                              <ref role="3cqZAo" node="2hED36FpCyP" resolve="it" />
                             </node>
                           </node>
                           <node concept="3GX2aA" id="71QF$$U9qVn" role="2OqNvi" />
@@ -4070,7 +4070,7 @@
                       <node concept="3clFbC" id="6f7vJBUerfs" role="3clFbG">
                         <node concept="2OqwBi" id="6f7vJBUerft" role="3uHU7B">
                           <node concept="37vLTw" id="6f7vJBUerfu" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCyR" />
+                            <ref role="3cqZAo" node="2hED36FpCyR" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6f7vJBUerfv" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzl" resolve="source" />
@@ -4097,7 +4097,7 @@
                       <ref role="37wK5l" node="6f7vJBUc0Br" resolve="deleteGsnElementBase" />
                       <node concept="2OqwBi" id="6f7vJBUetT1" role="37wK5m">
                         <node concept="37vLTw" id="6f7vJBUetIn" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCyT" />
+                          <ref role="3cqZAo" node="2hED36FpCyT" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="6f7vJBUeubM" role="2OqNvi">
                           <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -4111,7 +4111,7 @@
                   <node concept="3clFbF" id="6f7vJBUerfA" role="3cqZAp">
                     <node concept="2OqwBi" id="6f7vJBUerfB" role="3clFbG">
                       <node concept="37vLTw" id="6f7vJBUerfC" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpCyT" />
+                        <ref role="3cqZAo" node="2hED36FpCyT" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="6f7vJBUerfD" role="2OqNvi" />
                     </node>
@@ -4141,7 +4141,7 @@
                         </node>
                         <node concept="2OqwBi" id="6f7vJBUesYK" role="3uHU7B">
                           <node concept="37vLTw" id="6f7vJBUesYL" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCyV" />
+                            <ref role="3cqZAo" node="2hED36FpCyV" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="6f7vJBUesYM" role="2OqNvi">
                             <ref role="3Tt5mk" to="py52:2ccN23odOzm" resolve="target" />
@@ -4163,7 +4163,7 @@
                   <node concept="3clFbF" id="6f7vJBUesYX" role="3cqZAp">
                     <node concept="2OqwBi" id="6f7vJBUesYY" role="3clFbG">
                       <node concept="37vLTw" id="6f7vJBUesYZ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpCyX" />
+                        <ref role="3cqZAo" node="2hED36FpCyX" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="6f7vJBUesZ0" role="2OqNvi" />
                     </node>
@@ -4687,7 +4687,7 @@
                   <node concept="3clFbF" id="68PMoq4jyTh" role="3cqZAp">
                     <node concept="2OqwBi" id="68PMoq4jyTi" role="3clFbG">
                       <node concept="37vLTw" id="68PMoq4jyTj" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpCyZ" />
+                        <ref role="3cqZAo" node="2hED36FpCyZ" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="68PMoq4jyTk" role="2OqNvi" />
                     </node>
@@ -4717,7 +4717,7 @@
                   <node concept="3clFbF" id="68PMoq4jyTv" role="3cqZAp">
                     <node concept="2OqwBi" id="68PMoq4jyTw" role="3clFbG">
                       <node concept="37vLTw" id="68PMoq4jyTx" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpCz1" />
+                        <ref role="3cqZAo" node="2hED36FpCz1" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="68PMoq4jyTy" role="2OqNvi" />
                     </node>
@@ -5526,7 +5526,7 @@
                         <node concept="1Wc70l" id="696iakmhTo" role="3clFbG">
                           <node concept="2OqwBi" id="696iakmhTp" role="3uHU7B">
                             <node concept="37vLTw" id="696iakmhTq" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCz3" />
+                              <ref role="3cqZAo" node="2hED36FpCz3" resolve="it" />
                             </node>
                             <node concept="liA8E" id="696iakmhTr" role="2OqNvi">
                               <ref role="37wK5l" to="nkm5:45TnPEuxBsF" resolve="isValidStart" />
@@ -5542,7 +5542,7 @@
                           </node>
                           <node concept="2OqwBi" id="696iakmhTv" role="3uHU7w">
                             <node concept="37vLTw" id="696iakmhTw" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCz3" />
+                              <ref role="3cqZAo" node="2hED36FpCz3" resolve="it" />
                             </node>
                             <node concept="liA8E" id="696iakmhTx" role="2OqNvi">
                               <ref role="37wK5l" to="nkm5:7vufT$m7ARQ" resolve="canCreate" />
@@ -5707,7 +5707,7 @@
                       <node concept="1Wc70l" id="696iakmsX3" role="3clFbG">
                         <node concept="2OqwBi" id="696iakmsX4" role="3uHU7B">
                           <node concept="37vLTw" id="696iakmsX5" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCz5" />
+                            <ref role="3cqZAo" node="2hED36FpCz5" resolve="it" />
                           </node>
                           <node concept="liA8E" id="696iakmsX6" role="2OqNvi">
                             <ref role="37wK5l" to="nkm5:45TnPEuxBsF" resolve="isValidStart" />
@@ -5718,7 +5718,7 @@
                         </node>
                         <node concept="2OqwBi" id="696iakmsXa" role="3uHU7w">
                           <node concept="37vLTw" id="696iakmsXb" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCz5" />
+                            <ref role="3cqZAo" node="2hED36FpCz5" resolve="it" />
                           </node>
                           <node concept="liA8E" id="696iakmsXc" role="2OqNvi">
                             <ref role="37wK5l" to="nkm5:7vufT$m7ARQ" resolve="canCreate" />
@@ -6112,7 +6112,7 @@
                         <node concept="3clFbF" id="71GfFl7iM7A" role="3cqZAp">
                           <node concept="2OqwBi" id="71GfFl7iMh2" role="3clFbG">
                             <node concept="37vLTw" id="71GfFl7iM7_" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCz7" />
+                              <ref role="3cqZAo" node="2hED36FpCz7" resolve="it" />
                             </node>
                             <node concept="3YRAZt" id="71GfFl7iMyI" role="2OqNvi" />
                           </node>
@@ -6140,7 +6140,7 @@
                         <node concept="3clFbF" id="71GfFl7iQQ9" role="3cqZAp">
                           <node concept="2OqwBi" id="71GfFl7iQUl" role="3clFbG">
                             <node concept="37vLTw" id="71GfFl7iQQ8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCz9" />
+                              <ref role="3cqZAo" node="2hED36FpCz9" resolve="it" />
                             </node>
                             <node concept="3YRAZt" id="71GfFl7iR51" role="2OqNvi" />
                           </node>
@@ -6424,7 +6424,7 @@
                       <node concept="3fqX7Q" id="5uFV_KKOTmu" role="3clFbG">
                         <node concept="2OqwBi" id="5uFV_KKOTmw" role="3fr31v">
                           <node concept="37vLTw" id="5uFV_KKOTmx" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCzb" />
+                            <ref role="3cqZAo" node="2hED36FpCzb" resolve="it" />
                           </node>
                           <node concept="liA8E" id="5uFV_KKOTmy" role="2OqNvi">
                             <ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
@@ -6986,7 +6986,7 @@
                       <node concept="3clFbF" id="6G8t3lLt2w$" role="3cqZAp">
                         <node concept="2OqwBi" id="6G8t3lLt2w_" role="3clFbG">
                           <node concept="37vLTw" id="6G8t3lLt2wA" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCzd" />
+                            <ref role="3cqZAo" node="2hED36FpCzd" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="6G8t3lLt2wB" role="2OqNvi">
                             <ref role="3TtcxE" to="py52:3GRi4m$sIHx" resolve="connections" />
@@ -7756,7 +7756,7 @@
                     <node concept="3clFbS" id="3uMEL0KuP6W" role="1bW5cS">
                       <node concept="3clFbF" id="3uMEL0KuP6X" role="3cqZAp">
                         <node concept="37vLTw" id="3uMEL0KuP6Y" role="3clFbG">
-                          <ref role="3cqZAo" node="2hED36FpCzf" />
+                          <ref role="3cqZAo" node="2hED36FpCzf" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -7899,7 +7899,7 @@
                         <node concept="3fqX7Q" id="3uMEL0Kw9ck" role="3clFbG">
                           <node concept="3EllGN" id="3uMEL0Kw9cl" role="3fr31v">
                             <node concept="37vLTw" id="3uMEL0Kw9cm" role="3ElVtu">
-                              <ref role="3cqZAo" node="2hED36FpCzh" />
+                              <ref role="3cqZAo" node="2hED36FpCzh" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="3uMEL0Kw9cn" role="3ElQJh">
                               <ref role="3cqZAo" node="3uMEL0KvbDn" resolve="gseb2InfoAboutContainingString" />
@@ -8070,7 +8070,7 @@
                           <node concept="2OqwBi" id="71QF$$U0O_A" role="3clFbG">
                             <node concept="2OqwBi" id="71QF$$U0O_B" role="2Oq$k0">
                               <node concept="37vLTw" id="71QF$$U0O_C" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36FpCzj" />
+                                <ref role="3cqZAo" node="2hED36FpCzj" resolve="it" />
                               </node>
                               <node concept="2qgKlT" id="71QF$$U0O_D" role="2OqNvi">
                                 <ref role="37wK5l" to="w873:1r1mR59uH1f" resolve="asText" />
@@ -8290,7 +8290,7 @@
                     <node concept="3clFbF" id="3uMEL0KvyLq" role="3cqZAp">
                       <node concept="3EllGN" id="3uMEL0Kvzft" role="3clFbG">
                         <node concept="37vLTw" id="3uMEL0Kvz$A" role="3ElVtu">
-                          <ref role="3cqZAo" node="2hED36FpCzl" />
+                          <ref role="3cqZAo" node="2hED36FpCzl" resolve="it" />
                         </node>
                         <node concept="37vLTw" id="3uMEL0KvyLp" role="3ElQJh">
                           <ref role="3cqZAo" node="3uMEL0Kvgn6" resolve="gseb2InfoAboutContainingString" />
@@ -10253,7 +10253,7 @@
                         <ref role="3cqZAo" node="6hlfxCL5ZKC" resolve="original" />
                       </node>
                       <node concept="37vLTw" id="6hlfxCL5ZJZ" role="37wK5m">
-                        <ref role="3cqZAo" node="2hED36FpCzn" />
+                        <ref role="3cqZAo" node="2hED36FpCzn" resolve="it" />
                       </node>
                       <node concept="3clFbT" id="6hlfxCL5ZK0" role="37wK5m" />
                     </node>
@@ -10261,7 +10261,7 @@
                   <node concept="Jncv_" id="6hlfxCL5ZK1" role="3cqZAp">
                     <ref role="JncvD" to="py52:3$Xa1eBcsPD" resolve="ICanBeAwayGoalStructureElement" />
                     <node concept="37vLTw" id="6hlfxCL5ZK2" role="JncvB">
-                      <ref role="3cqZAo" node="2hED36FpCzn" />
+                      <ref role="3cqZAo" node="2hED36FpCzn" resolve="it" />
                     </node>
                     <node concept="3clFbS" id="6hlfxCL5ZK3" role="Jncv$">
                       <node concept="3clFbJ" id="6hlfxCL5ZK4" role="3cqZAp">
@@ -11799,7 +11799,7 @@
                       </node>
                       <node concept="2OqwBi" id="2p23w$deMiK" role="3uHU7B">
                         <node concept="37vLTw" id="2p23w$deM2p" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCzp" />
+                          <ref role="3cqZAo" node="2hED36FpCzp" resolve="it" />
                         </node>
                         <node concept="3TrEf2" id="2p23w$deML9" role="2OqNvi">
                           <ref role="3Tt5mk" to="py52:4q8AAJKJQzF" resolve="goalDefinition" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.intentions.mps
index 3341a1c0..4db8f9ab 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.intentions.mps
@@ -740,7 +740,7 @@
                         </node>
                         <node concept="2OqwBi" id="4G_iuUEcMyF" role="3uHU7B">
                           <node concept="37vLTw" id="4G_iuUEcMlB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCzr" />
+                            <ref role="3cqZAo" node="2hED36FpCzr" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4G_iuUEcMBV" role="2OqNvi">
                             <ref role="37wK5l" to="89jy:4G_iuUEcuhm" resolve="getDownstreamElement" />
@@ -762,7 +762,7 @@
                   <node concept="3clFbF" id="4G_iuUEcOdG" role="3cqZAp">
                     <node concept="2OqwBi" id="4G_iuUEcOj2" role="3clFbG">
                       <node concept="37vLTw" id="4G_iuUEcOdF" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpCzt" />
+                        <ref role="3cqZAo" node="2hED36FpCzt" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4G_iuUEcO_J" role="2OqNvi">
                         <ref role="37wK5l" to="89jy:4G_iuUEcCKJ" resolve="setDownstreamElement" />
@@ -1171,7 +1171,7 @@
                             <node concept="3JPx81" id="6fCPE$QM6F3" role="2OqNvi">
                               <node concept="2OqwBi" id="6fCPE$QM6F4" role="25WWJ7">
                                 <node concept="37vLTw" id="6fCPE$QM6F5" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpCzv" />
+                                  <ref role="3cqZAo" node="2hED36FpCzv" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="4G_iuUEcALF" role="2OqNvi">
                                   <ref role="37wK5l" to="89jy:4G_iuUEct$e" resolve="getUpstreamElement" />
@@ -1221,7 +1221,7 @@
                               <node concept="TSZUe" id="6fCPE$QM9YH" role="2OqNvi">
                                 <node concept="2OqwBi" id="6fCPE$QMav5" role="25WWJ7">
                                   <node concept="37vLTw" id="6fCPE$QMabn" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2hED36FpCzx" />
+                                    <ref role="3cqZAo" node="2hED36FpCzx" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="4G_iuUEcBLl" role="2OqNvi">
                                     <ref role="37wK5l" to="89jy:4G_iuUEcuhm" resolve="getDownstreamElement" />
@@ -1415,7 +1415,7 @@
                             <node concept="2OqwBi" id="5pJnDA9hrMF" role="3clFbG">
                               <node concept="2OqwBi" id="5pJnDA9hrMG" role="2Oq$k0">
                                 <node concept="37vLTw" id="5pJnDA9hrMH" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpCzz" />
+                                  <ref role="3cqZAo" node="2hED36FpCzz" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5pJnDA9hrMI" role="2OqNvi">
                                   <ref role="3TsBF5" to="suqv:7L$rKAVfMS0" resolve="key" />
@@ -1804,7 +1804,7 @@
                         </node>
                         <node concept="2OqwBi" id="4G_iuUEdstB" role="3uHU7B">
                           <node concept="37vLTw" id="4G_iuUEdstC" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCz_" />
+                            <ref role="3cqZAo" node="2hED36FpCz_" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="4G_iuUEdstD" role="2OqNvi">
                             <ref role="37wK5l" to="89jy:4G_iuUEcuhm" resolve="getDownstreamElement" />
@@ -1826,7 +1826,7 @@
                   <node concept="3clFbF" id="4G_iuUEdstJ" role="3cqZAp">
                     <node concept="2OqwBi" id="4G_iuUEdstK" role="3clFbG">
                       <node concept="37vLTw" id="4G_iuUEdstL" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpCzB" />
+                        <ref role="3cqZAo" node="2hED36FpCzB" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="4G_iuUEdstM" role="2OqNvi">
                         <ref role="37wK5l" to="89jy:4G_iuUEcCKJ" resolve="setDownstreamElement" />
@@ -2726,7 +2726,7 @@
                       <node concept="2OqwBi" id="47PB7GsQGep" role="3clFbG">
                         <node concept="2OqwBi" id="47PB7GsQAnX" role="2Oq$k0">
                           <node concept="37vLTw" id="47PB7GsQ_kS" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCzD" />
+                            <ref role="3cqZAo" node="2hED36FpCzD" resolve="it" />
                           </node>
                           <node concept="2qgKlT" id="47PB7GsQC7c" role="2OqNvi">
                             <ref role="37wK5l" to="89jy:71GfFl7iCHN" resolve="getInboundConnections" />
@@ -4503,7 +4503,7 @@
                                           </node>
                                           <node concept="2OqwBi" id="5l6J5csMeTd" role="3uHU7B">
                                             <node concept="37vLTw" id="5l6J5csMeTe" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="2hED36FpCzF" />
+                                              <ref role="3cqZAo" node="2hED36FpCzF" resolve="it" />
                                             </node>
                                             <node concept="3TrEf2" id="5l6J5csMeTf" role="2OqNvi">
                                               <ref role="3Tt5mk" to="py52:4q8AAJKJQzF" resolve="goalDefinition" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.migration.mps
index 995bea61..94d2c124 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.migration.mps
@@ -172,7 +172,7 @@
                         <node concept="2OqwBi" id="3Px2xUV1wT4" role="3clFbG">
                           <node concept="2OqwBi" id="3Px2xUV1v2r" role="2Oq$k0">
                             <node concept="37vLTw" id="3Px2xUV1uOV" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCzH" />
+                              <ref role="3cqZAo" node="2hED36FpCzH" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="3Px2xUV1vd9" role="2OqNvi">
                               <ref role="3TtcxE" to="py52:3Px2xUV1gzV" resolve="attributes" />
@@ -181,7 +181,7 @@
                           <node concept="X8dFx" id="3Px2xUV1_lZ" role="2OqNvi">
                             <node concept="2OqwBi" id="3Px2xUV1BJk" role="25WWJ7">
                               <node concept="37vLTw" id="3Px2xUV1AP5" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36FpCzH" />
+                                <ref role="3cqZAo" node="2hED36FpCzH" resolve="it" />
                               </node>
                               <node concept="3Tsc0h" id="3Px2xUV1EIr" role="2OqNvi">
                                 <ref role="3TtcxE" to="py52:6dwPixfdDSe" resolve="attributes_old" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.plugin.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.plugin.mps
index df21263a..e1f8fcaa 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.plugin.mps
@@ -3477,7 +3477,7 @@
                   <node concept="3clFbF" id="2QkJsC6vNlj" role="3cqZAp">
                     <node concept="2OqwBi" id="2QkJsC6vNyp" role="3clFbG">
                       <node concept="37vLTw" id="2QkJsC6vNli" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpCzJ" />
+                        <ref role="3cqZAo" node="2hED36FpCzJ" resolve="it" />
                       </node>
                       <node concept="1mIQ4w" id="2QkJsC6vNQP" role="2OqNvi">
                         <node concept="chp4Y" id="2p23w$d2Va7" role="cj9EA">
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps
index 7895e44e..c658a58e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.req/models/com.mbeddr.formal.safety.req.migration.mps
@@ -239,7 +239,7 @@
                         <node concept="2OqwBi" id="6W1kQP6AX9n" role="3clFbG">
                           <node concept="2OqwBi" id="6W1kQP6AV5m" role="2Oq$k0">
                             <node concept="37vLTw" id="6W1kQP6AUVc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCzM" />
+                              <ref role="3cqZAo" node="2hED36FpCzM" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="6W1kQP6AVmm" role="2OqNvi">
                               <ref role="3TtcxE" to="30zx:6W1kQP6AMYT" resolve="hazards" />
@@ -254,7 +254,7 @@
                                   <node concept="36biLy" id="6W1kQP6B1EQ" role="28nt2d">
                                     <node concept="2OqwBi" id="6W1kQP6B57A" role="36biLW">
                                       <node concept="37vLTw" id="6W1kQP6B4LH" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2hED36FpCzM" />
+                                        <ref role="3cqZAo" node="2hED36FpCzM" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="6W1kQP6B5yC" role="2OqNvi">
                                         <ref role="3Tt5mk" to="30zx:7L33HENbhhH" resolve="hazard" />
@@ -272,7 +272,7 @@
                           <node concept="10Nm6u" id="6W1kQP6B8BP" role="37vLTx" />
                           <node concept="2OqwBi" id="6W1kQP6B6oN" role="37vLTJ">
                             <node concept="37vLTw" id="6W1kQP6B67N" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCzM" />
+                              <ref role="3cqZAo" node="2hED36FpCzM" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="6W1kQP6B6LU" role="2OqNvi">
                               <ref role="3Tt5mk" to="30zx:7L33HENbhhH" resolve="hazard" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.behavior.mps
index 374174bc..d159ddd4 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.behavior.mps
@@ -240,7 +240,7 @@
                           <node concept="13iPFW" id="7BYuSCFAt59" role="3uHU7w" />
                           <node concept="2OqwBi" id="7BYuSCFAsp5" role="3uHU7B">
                             <node concept="37vLTw" id="7BYuSCFAsal" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCzP" />
+                              <ref role="3cqZAo" node="2hED36FpCzP" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="7BYuSCFAs$D" role="2OqNvi">
                               <ref role="3Tt5mk" to="bewr:3Cm$$O2us95" resolve="source" />
@@ -262,7 +262,7 @@
                     <node concept="3clFbF" id="7BYuSCFAu8$" role="3cqZAp">
                       <node concept="2OqwBi" id="7BYuSCFAurb" role="3clFbG">
                         <node concept="37vLTw" id="7BYuSCFAu8z" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpCzR" />
+                          <ref role="3cqZAo" node="2hED36FpCzR" resolve="it" />
                         </node>
                         <node concept="3Tsc0h" id="7BYuSCFAuFI" role="2OqNvi">
                           <ref role="3TtcxE" to="bewr:3Cm$$O2vdID" resolve="actions" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.constraints.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.constraints.mps
index 7f4aa2db..16f42b8c 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.constraints.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.constraints.mps
@@ -269,7 +269,7 @@
                             </node>
                             <node concept="2OqwBi" id="1JhvKLLOC48" role="3uHU7B">
                               <node concept="37vLTw" id="1JhvKLLOC49" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36FpCzT" />
+                                <ref role="3cqZAo" node="2hED36FpCzT" resolve="it" />
                               </node>
                               <node concept="3TrEf2" id="1JhvKLLOC4a" role="2OqNvi">
                                 <ref role="3Tt5mk" to="bewr:3Cm$$O2us95" resolve="source" />
@@ -291,7 +291,7 @@
                       <node concept="3clFbF" id="1JhvKLLOC4g" role="3cqZAp">
                         <node concept="2OqwBi" id="1JhvKLLOC4h" role="3clFbG">
                           <node concept="37vLTw" id="1JhvKLLOC4i" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCzV" />
+                            <ref role="3cqZAo" node="2hED36FpCzV" resolve="it" />
                           </node>
                           <node concept="3Tsc0h" id="1JhvKLLOC4j" role="2OqNvi">
                             <ref role="3TtcxE" to="bewr:3Cm$$O2vdID" resolve="actions" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.intentions.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.intentions.mps
index ebdef1fb..3dbf23e9 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.intentions.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.intentions.mps
@@ -273,7 +273,7 @@
                         <node concept="2Sf5sV" id="1FMyjUP59Ov" role="3uHU7w" />
                         <node concept="2OqwBi" id="1FMyjUP59Ow" role="3uHU7B">
                           <node concept="37vLTw" id="1FMyjUP59Ox" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpCzX" />
+                            <ref role="3cqZAo" node="2hED36FpCzX" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="1FMyjUP59Oy" role="2OqNvi">
                             <ref role="3Tt5mk" to="bewr:3Cm$$O2us95" resolve="source" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps
index e8c236bb..d48e4ff0 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.migration.mps
@@ -466,7 +466,7 @@
                             <node concept="2OqwBi" id="6vZMoXu0WK2" role="3clFbG">
                               <node concept="2OqwBi" id="6vZMoXu0W2N" role="2Oq$k0">
                                 <node concept="37vLTw" id="6vZMoXu0VPl" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpC$7" />
+                                  <ref role="3cqZAo" node="2hED36FpC$7" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6vZMoXu0Wnf" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -583,7 +583,7 @@
                               </node>
                               <node concept="TSZUe" id="2ynKV3BIGJB" role="2OqNvi">
                                 <node concept="37vLTw" id="2ynKV3BIGUd" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2hED36FpC$9" />
+                                  <ref role="3cqZAo" node="2hED36FpC$9" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -700,7 +700,7 @@
                               </node>
                               <node concept="TSZUe" id="2ynKV3BIKZW" role="2OqNvi">
                                 <node concept="37vLTw" id="2ynKV3BILa_" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2hED36FpC$b" />
+                                  <ref role="3cqZAo" node="2hED36FpC$b" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -817,7 +817,7 @@
                               </node>
                               <node concept="TSZUe" id="2ynKV3BIYVV" role="2OqNvi">
                                 <node concept="37vLTw" id="2ynKV3BIZ6y" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2hED36FpC$d" />
+                                  <ref role="3cqZAo" node="2hED36FpC$d" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -934,7 +934,7 @@
                               </node>
                               <node concept="TSZUe" id="2ynKV3BJ1Yf" role="2OqNvi">
                                 <node concept="37vLTw" id="2ynKV3BJ1Yg" role="25WWJ7">
-                                  <ref role="3cqZAo" node="2hED36FpC$f" />
+                                  <ref role="3cqZAo" node="2hED36FpC$f" resolve="it" />
                                 </node>
                               </node>
                             </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.typesystem.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.typesystem.mps
index 40bbe80f..751248a0 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.typesystem.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/models/com.mbeddr.formal.safety.stamp.typesystem.mps
@@ -428,14 +428,14 @@
                           <ref role="1YBMHb" node="41_NtXJpd3j" resolve="iReferenceableActionDescription" />
                         </node>
                         <node concept="37vLTw" id="41_NtXJplb7" role="3uHU7B">
-                          <ref role="3cqZAo" node="2hED36FpCzZ" />
+                          <ref role="3cqZAo" node="2hED36FpCzZ" resolve="it" />
                         </node>
                       </node>
                       <node concept="1Wc70l" id="1TD_kqsQP9o" role="3uHU7B">
                         <node concept="2OqwBi" id="1TD_kqsQQeN" role="3uHU7B">
                           <node concept="2OqwBi" id="1TD_kqsQP_q" role="2Oq$k0">
                             <node concept="37vLTw" id="1TD_kqsQPmY" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCzZ" />
+                              <ref role="3cqZAo" node="2hED36FpCzZ" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="1TD_kqsQPNZ" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -446,7 +446,7 @@
                         <node concept="2OqwBi" id="41_NtXJplb8" role="3uHU7w">
                           <node concept="2OqwBi" id="41_NtXJplb9" role="2Oq$k0">
                             <node concept="37vLTw" id="41_NtXJplba" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpCzZ" />
+                              <ref role="3cqZAo" node="2hED36FpCzZ" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="41_NtXJplbb" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -709,7 +709,7 @@
                       <node concept="2OqwBi" id="5KVldFlGMBA" role="3clFbG">
                         <node concept="2OqwBi" id="5KVldFlGMg5" role="2Oq$k0">
                           <node concept="37vLTw" id="5KVldFlGLYn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpC$1" />
+                            <ref role="3cqZAo" node="2hED36FpC$1" resolve="it" />
                           </node>
                           <node concept="1mfA1w" id="5KVldFlGMwG" role="2OqNvi" />
                         </node>
@@ -755,7 +755,7 @@
                   <node concept="3clFbF" id="1FMyjUPhRZ6" role="3cqZAp">
                     <node concept="2OqwBi" id="1FMyjUPhRZ7" role="3clFbG">
                       <node concept="37vLTw" id="1FMyjUPhRZ8" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpC$3" />
+                        <ref role="3cqZAo" node="2hED36FpC$3" resolve="it" />
                       </node>
                       <node concept="3TrEf2" id="1FMyjUPhRZ9" role="2OqNvi">
                         <ref role="3Tt5mk" to="bewr:1JhvKLLO0pZ" resolve="action" />
@@ -806,7 +806,7 @@
                       <node concept="3clFbF" id="1FMyjUPhXDU" role="3cqZAp">
                         <node concept="2OqwBi" id="1FMyjUPhXT5" role="3clFbG">
                           <node concept="37vLTw" id="1FMyjUPhXDT" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpC$5" />
+                            <ref role="3cqZAo" node="2hED36FpC$5" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="1FMyjUPhY6a" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.serializers.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.serializers.mps
index 396fc285..9b404baf 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.serializers.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.safety.doc2word/models/com.fasten.safety.doc2word.serializers.mps
@@ -982,7 +982,7 @@
                               <node concept="2OqwBi" id="4ziKDEnfJIp" role="3clFbG">
                                 <node concept="2OqwBi" id="4ziKDEnfJIq" role="2Oq$k0">
                                   <node concept="37vLTw" id="4ziKDEnfJIr" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2hED36FpC$h" />
+                                    <ref role="3cqZAo" node="2hED36FpC$h" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="4ziKDEnfJIs" role="2OqNvi">
                                     <ref role="3Tt5mk" to="2c95:4E$PniRJOs_" resolve="text" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers.mps
index 2f9040de..31b3cb28 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.cbd.pluginSolution/models/com.mbeddr.formal.safety.gsn.cbd.pluginSolution.analyzers.mps
@@ -460,7 +460,7 @@
                           <node concept="3clFbF" id="3jaLROLvLcN" role="3cqZAp">
                             <node concept="2OqwBi" id="3jaLROLvLve" role="3clFbG">
                               <node concept="37vLTw" id="3jaLROLvLcM" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36FpC$j" />
+                                <ref role="3cqZAo" node="2hED36FpC$j" resolve="it" />
                               </node>
                               <node concept="liA8E" id="3jaLROLvLZ1" role="2OqNvi">
                                 <ref role="37wK5l" to="4c75:7mSH3Wn4cMX" resolve="isSuccess" />
@@ -751,7 +751,7 @@
                                   <node concept="2OqwBi" id="33qt4wr57ES" role="3uHU7B">
                                     <node concept="2OqwBi" id="33qt4wr57ET" role="2Oq$k0">
                                       <node concept="37vLTw" id="33qt4wr57EU" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2hED36FpC$l" />
+                                        <ref role="3cqZAo" node="2hED36FpC$l" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="33qt4wr57EV" role="2OqNvi">
                                         <ref role="3Tt5mk" to="vzqj:2l5A0OF7cx9" resolve="interfaceRef" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps
index 4f6d0fbd..4ebaffd6 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.smv.pluginSolution/models/com.mbeddr.formal.safety.gsn.smv.pluginSolution.plugin.mps
@@ -433,7 +433,7 @@
                   <node concept="3clFbF" id="6xNJt7lKWd8" role="3cqZAp">
                     <node concept="2OqwBi" id="6xNJt7lKZv2" role="3clFbG">
                       <node concept="37vLTw" id="6xNJt7lKZ6o" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36FpC$n" />
+                        <ref role="3cqZAo" node="2hED36FpC$n" resolve="it" />
                       </node>
                       <node concept="2qgKlT" id="6xNJt7lL0Am" role="2OqNvi">
                         <ref role="37wK5l" to="23hk:6Kf5KB77M0o" resolve="actsAsMainModule" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.plugin.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.plugin.mps
index e9cdcc9f..9daaa747 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.plugin.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.web.rt/models/com.mbeddr.formal.safety.gsn.web.rt.plugin.mps
@@ -1145,7 +1145,7 @@
                                 <node concept="2OqwBi" id="5pJnDA9inXQ" role="2Oq$k0">
                                   <node concept="2JrnkZ" id="5pJnDA9inGW" role="2Oq$k0">
                                     <node concept="37vLTw" id="5pJnDA9imJg" role="2JrQYb">
-                                      <ref role="3cqZAo" node="2hED36FpC$p" />
+                                      <ref role="3cqZAo" node="2hED36FpC$p" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5pJnDA9io9L" role="2OqNvi">
@@ -1689,7 +1689,7 @@
                                 <node concept="2OqwBi" id="5pJnDA9kC5x" role="2Oq$k0">
                                   <node concept="2JrnkZ" id="5pJnDA9kC5y" role="2Oq$k0">
                                     <node concept="37vLTw" id="5pJnDA9kC5z" role="2JrQYb">
-                                      <ref role="3cqZAo" node="2hED36FpC$r" />
+                                      <ref role="3cqZAo" node="2hED36FpC$r" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5pJnDA9kC5$" role="2OqNvi">
@@ -1749,7 +1749,7 @@
                                 <node concept="2OqwBi" id="5pJnDA9kCtf" role="2Oq$k0">
                                   <node concept="2JrnkZ" id="5pJnDA9kCtg" role="2Oq$k0">
                                     <node concept="37vLTw" id="5pJnDA9kCth" role="2JrQYb">
-                                      <ref role="3cqZAo" node="2hED36FpC$t" />
+                                      <ref role="3cqZAo" node="2hED36FpC$t" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5pJnDA9kCti" role="2OqNvi">
@@ -1970,7 +1970,7 @@
                                 <node concept="2OqwBi" id="5pJnDA9ln21" role="2Oq$k0">
                                   <node concept="2JrnkZ" id="5pJnDA9ln22" role="2Oq$k0">
                                     <node concept="37vLTw" id="5pJnDA9ln23" role="2JrQYb">
-                                      <ref role="3cqZAo" node="2hED36FpC$v" />
+                                      <ref role="3cqZAo" node="2hED36FpC$v" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5pJnDA9ln24" role="2OqNvi">
@@ -2140,7 +2140,7 @@
                                 <node concept="2OqwBi" id="2SMJEPn9Tq5" role="2Oq$k0">
                                   <node concept="2JrnkZ" id="2SMJEPn9Tq6" role="2Oq$k0">
                                     <node concept="37vLTw" id="2SMJEPn9Tq7" role="2JrQYb">
-                                      <ref role="3cqZAo" node="2hED36FpC$x" />
+                                      <ref role="3cqZAo" node="2hED36FpC$x" resolve="it" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="2SMJEPn9Tq8" role="2OqNvi">
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps
index 7dbe33c4..b9659b01 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps
@@ -1293,7 +1293,7 @@
                       <node concept="2OqwBi" id="4ziKDEn8xuG" role="3clFbG">
                         <node concept="2OqwBi" id="4ziKDEn8xuH" role="2Oq$k0">
                           <node concept="37vLTw" id="4ziKDEn8xuI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpC$z" />
+                            <ref role="3cqZAo" node="2hED36FpC$z" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4ziKDEn8xuJ" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/models/test.com.fasten.safety.ft.xfta._010_smoke_ft_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/models/test.com.fasten.safety.ft.xfta._010_smoke_ft_tests@tests.mps
index e64aee26..cb030c2a 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/models/test.com.fasten.safety.ft.xfta._010_smoke_ft_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft.xfta/models/test.com.fasten.safety.ft.xfta._010_smoke_ft_tests@tests.mps
@@ -199,7 +199,7 @@
                         <node concept="2OqwBi" id="2XVAqcw0c37" role="3clFbG">
                           <node concept="2OqwBi" id="2XVAqcw0c38" role="2Oq$k0">
                             <node concept="37vLTw" id="2XVAqcw0c39" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpC$_" />
+                              <ref role="3cqZAo" node="2hED36FpC$_" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="2XVAqcw0c3a" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -305,7 +305,7 @@
                         <node concept="2OqwBi" id="5sUzoS9G9Gr" role="3clFbG">
                           <node concept="2OqwBi" id="5sUzoS9G9Gs" role="2Oq$k0">
                             <node concept="37vLTw" id="5sUzoS9G9Gt" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36FpC$B" />
+                              <ref role="3cqZAo" node="2hED36FpC$B" resolve="it" />
                             </node>
                             <node concept="3TrcHB" id="5sUzoS9G9Gu" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps
index 6ec9f633..320729c5 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/models/test.com.fasten.safety.ft._020_cutset_propagation@tests.mps
@@ -1109,7 +1109,7 @@
                       <node concept="2OqwBi" id="4dyd$$w7lHQ" role="3clFbG">
                         <node concept="2OqwBi" id="4dyd$$w7kTF" role="2Oq$k0">
                           <node concept="37vLTw" id="4dyd$$w7kxC" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpC$D" />
+                            <ref role="3cqZAo" node="2hED36FpC$D" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4dyd$$w7llx" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1157,7 +1157,7 @@
                       <node concept="2OqwBi" id="4dyd$$w7rI0" role="3clFbG">
                         <node concept="2OqwBi" id="4dyd$$w7rI1" role="2Oq$k0">
                           <node concept="37vLTw" id="4dyd$$w7rI2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpC$F" />
+                            <ref role="3cqZAo" node="2hED36FpC$F" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4dyd$$w7rI3" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1205,7 +1205,7 @@
                       <node concept="2OqwBi" id="4dyd$$w7m_M" role="3clFbG">
                         <node concept="2OqwBi" id="4dyd$$w7m_N" role="2Oq$k0">
                           <node concept="37vLTw" id="4dyd$$w7m_O" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpC$H" />
+                            <ref role="3cqZAo" node="2hED36FpC$H" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4dyd$$w7m_P" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1253,7 +1253,7 @@
                       <node concept="2OqwBi" id="4dyd$$w7sfZ" role="3clFbG">
                         <node concept="2OqwBi" id="4dyd$$w7sg0" role="2Oq$k0">
                           <node concept="37vLTw" id="4dyd$$w7sg1" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpC$J" />
+                            <ref role="3cqZAo" node="2hED36FpC$J" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="4dyd$$w7sg2" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_atomic_components@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_atomic_components@tests.mps
index 7627f9fa..2649fcae 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_atomic_components@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._010_atomic_components@tests.mps
@@ -382,7 +382,7 @@
                       <node concept="3clFbF" id="3bh1RFvFUac" role="3cqZAp">
                         <node concept="2OqwBi" id="3bh1RFvFUad" role="3clFbG">
                           <node concept="37vLTw" id="3bh1RFvFUae" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpC$L" />
+                            <ref role="3cqZAo" node="2hED36FpC$L" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="3bh1RFvFUaf" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._020_composite_components@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._020_composite_components@tests.mps
index 78b38014..1e15addf 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._020_composite_components@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.fasten.safety.hiphops/models/test.fasten.safety.hiphops._020_composite_components@tests.mps
@@ -286,7 +286,7 @@
                       <node concept="2OqwBi" id="5g1NREKPZnz" role="3clFbG">
                         <node concept="2OqwBi" id="5g1NREKPZn$" role="2Oq$k0">
                           <node concept="37vLTw" id="5g1NREKPZn_" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpC$N" />
+                            <ref role="3cqZAo" node="2hED36FpC$N" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5g1NREKPZnA" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -460,7 +460,7 @@
                       <node concept="2OqwBi" id="5g1NREKQ5Pp" role="3clFbG">
                         <node concept="2OqwBi" id="5g1NREKQ5Pq" role="2Oq$k0">
                           <node concept="37vLTw" id="5g1NREKQ5Pr" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpC$P" />
+                            <ref role="3cqZAo" node="2hED36FpC$P" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="5g1NREKQ5Ps" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout@tests.mps
index 4106ec77..0379b166 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn.patterns/models/test.mbeddr.formal.gsn.patterns._100_goal_structure_layout@tests.mps
@@ -2367,7 +2367,7 @@
                     <node concept="2OqwBi" id="6K99IwmrL_R" role="3clFbG">
                       <node concept="2OqwBi" id="6K99IwmrL_S" role="2Oq$k0">
                         <node concept="37vLTw" id="6K99IwmrL_T" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36FpC$R" />
+                          <ref role="3cqZAo" node="2hED36FpC$R" resolve="it" />
                         </node>
                         <node concept="3TrcHB" id="6K99IwmrL_U" role="2OqNvi">
                           <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -2444,7 +2444,7 @@
                       <node concept="2OqwBi" id="6K99Iwms4pV" role="3clFbG">
                         <node concept="2OqwBi" id="6K99Iwms4pW" role="2Oq$k0">
                           <node concept="37vLTw" id="6K99Iwms4pX" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpC$T" />
+                            <ref role="3cqZAo" node="2hED36FpC$T" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6K99Iwms4pY" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._005_gsn_external_evidence_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._005_gsn_external_evidence_tests@tests.mps
index b3010478..f932dc88 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._005_gsn_external_evidence_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._005_gsn_external_evidence_tests@tests.mps
@@ -274,7 +274,7 @@
                       <node concept="2OqwBi" id="2gpUZARgSS_" role="3clFbG">
                         <node concept="2OqwBi" id="2gpUZARgSSA" role="2Oq$k0">
                           <node concept="37vLTw" id="2gpUZARgSSB" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36FpC$V" />
+                            <ref role="3cqZAo" node="2hED36FpC$V" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="2gpUZARgSSC" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_tests@tests.mps
index 40eabe03..faaecc90 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._010_gsn_smv_tests@tests.mps
@@ -568,7 +568,7 @@
                             <node concept="2OqwBi" id="6XKrTzkry3F" role="3clFbG">
                               <node concept="2OqwBi" id="6XKrTzkry3G" role="2Oq$k0">
                                 <node concept="37vLTw" id="6XKrTzkry3H" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpC$X" />
+                                  <ref role="3cqZAo" node="2hED36FpC$X" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6XKrTzkry3I" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -617,7 +617,7 @@
                             <node concept="2OqwBi" id="6XKrTzkry40" role="3clFbG">
                               <node concept="2OqwBi" id="6XKrTzkry41" role="2Oq$k0">
                                 <node concept="37vLTw" id="6XKrTzkry42" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpC$Z" />
+                                  <ref role="3cqZAo" node="2hED36FpC$Z" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="6XKrTzkry43" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps
index ade6d0b8..38f49e5d 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._020_gsn_cbd_smv_tests@tests.mps
@@ -423,7 +423,7 @@
                             <node concept="2OqwBi" id="1xpXAu11Hey" role="3clFbG">
                               <node concept="2OqwBi" id="1xpXAu11HeA" role="2Oq$k0">
                                 <node concept="37vLTw" id="1xpXAu11HeE" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpC_1" />
+                                  <ref role="3cqZAo" node="2hED36FpC_1" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="1xpXAu11HeF" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -472,7 +472,7 @@
                             <node concept="2OqwBi" id="1xpXAu11Hez" role="3clFbG">
                               <node concept="2OqwBi" id="1xpXAu11HeC" role="2Oq$k0">
                                 <node concept="37vLTw" id="1xpXAu11HeH" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpC_3" />
+                                  <ref role="3cqZAo" node="2hED36FpC_3" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="1xpXAu11HeI" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps
index 8143a324..5f0b6d66 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._050_gsn_odd_spin_tests@tests.mps
@@ -447,7 +447,7 @@
                             <node concept="2OqwBi" id="4Q$F1bo1DAr" role="3clFbG">
                               <node concept="2OqwBi" id="4Q$F1bo1DAs" role="2Oq$k0">
                                 <node concept="37vLTw" id="4Q$F1bo1DAt" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpC_5" />
+                                  <ref role="3cqZAo" node="2hED36FpC_5" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="4Q$F1bo1DAu" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -496,7 +496,7 @@
                             <node concept="2OqwBi" id="4Q$F1bo1DAK" role="3clFbG">
                               <node concept="2OqwBi" id="4Q$F1bo1DAL" role="2Oq$k0">
                                 <node concept="37vLTw" id="4Q$F1bo1DAM" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpC_7" />
+                                  <ref role="3cqZAo" node="2hED36FpC_7" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="4Q$F1bo1DAN" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_tests@tests.mps
index 078675be..7d046a82 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._100_gsn_confidence_tests@tests.mps
@@ -800,7 +800,7 @@
                             <node concept="2OqwBi" id="5WyjFZRq04u" role="3clFbG">
                               <node concept="2OqwBi" id="5WyjFZRq04v" role="2Oq$k0">
                                 <node concept="37vLTw" id="5WyjFZRq04w" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpC_9" />
+                                  <ref role="3cqZAo" node="2hED36FpC_9" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5WyjFZRq04x" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -846,7 +846,7 @@
                             <node concept="2OqwBi" id="5WyjFZRq04M" role="3clFbG">
                               <node concept="2OqwBi" id="5WyjFZRq04N" role="2Oq$k0">
                                 <node concept="37vLTw" id="5WyjFZRq04O" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpC_b" />
+                                  <ref role="3cqZAo" node="2hED36FpC_b" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5WyjFZRq04P" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -983,7 +983,7 @@
                             <node concept="2OqwBi" id="5WyjFZRq3$G" role="3clFbG">
                               <node concept="2OqwBi" id="5WyjFZRq3$H" role="2Oq$k0">
                                 <node concept="37vLTw" id="5WyjFZRq3$I" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpC_d" />
+                                  <ref role="3cqZAo" node="2hED36FpC_d" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5WyjFZRq3$J" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1029,7 +1029,7 @@
                             <node concept="2OqwBi" id="5WyjFZRq3_0" role="3clFbG">
                               <node concept="2OqwBi" id="5WyjFZRq3_1" role="2Oq$k0">
                                 <node concept="37vLTw" id="5WyjFZRq3_2" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36FpC_f" />
+                                  <ref role="3cqZAo" node="2hED36FpC_f" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="5WyjFZRq3_3" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/editor.mps b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/editor.mps
index 000765bb..3b4a9e57 100644
--- a/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/editor.mps
+++ b/code/languages/com.mbeddr.formal.smt/languages/com.mbeddr.formal.smtlib.synthesis/models/editor.mps
@@ -385,7 +385,7 @@
                             <node concept="3clFbF" id="43FRfGK5l5f" role="3cqZAp">
                               <node concept="2OqwBi" id="43FRfGK5lsa" role="3clFbG">
                                 <node concept="37vLTw" id="43FRfGK5l5e" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36Gak9s" />
+                                  <ref role="3cqZAo" node="2hED36Gak9s" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="43FRfGK5m9_" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -444,7 +444,7 @@
                             <node concept="3clFbF" id="104dc5EfDns" role="3cqZAp">
                               <node concept="2OqwBi" id="104dc5EfDnt" role="3clFbG">
                                 <node concept="37vLTw" id="104dc5EfDnu" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36Gak9u" />
+                                  <ref role="3cqZAo" node="2hED36Gak9u" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="104dc5EfDnv" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/translator.mps b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/translator.mps
index 38d8c7f7..cb6eddb9 100644
--- a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/translator.mps
+++ b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/translator.mps
@@ -522,7 +522,7 @@
                                     <ref role="37wK5l" node="104dc5E55WC" resolve="typeConverter" />
                                     <ref role="1Pybhc" node="6MrCApUsKSw" resolve="TypesTranslator" />
                                     <node concept="37vLTw" id="6cjunGy_X8q" role="37wK5m">
-                                      <ref role="3cqZAo" node="2hED36Gak9w" />
+                                      <ref role="3cqZAo" node="2hED36Gak9w" resolve="it" />
                                     </node>
                                     <node concept="37vLTw" id="6cjunGy_X8r" role="37wK5m">
                                       <ref role="3cqZAo" node="104dc5E4Rwf" resolve="ctx" />
@@ -649,7 +649,7 @@
                                     <ref role="1Pybhc" node="6MrCApUsKSw" resolve="TypesTranslator" />
                                     <node concept="2OqwBi" id="1MFSGJpa2$U" role="37wK5m">
                                       <node concept="37vLTw" id="1MFSGJpa1EP" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2hED36Gak9y" />
+                                        <ref role="3cqZAo" node="2hED36Gak9y" resolve="it" />
                                       </node>
                                       <node concept="3TrEf2" id="1MFSGJpa35O" role="2OqNvi">
                                         <ref role="3Tt5mk" to="d9cz:6cjunGyy0m8" resolve="tpe" />
@@ -880,7 +880,7 @@
                                                 <ref role="37wK5l" to="f7eu:~Context.mkSymbol(java.lang.String)" resolve="mkSymbol" />
                                                 <node concept="2OqwBi" id="6MrCApUsxdN" role="37wK5m">
                                                   <node concept="37vLTw" id="6MrCApUsxdO" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="2hED36Gak9$" />
+                                                    <ref role="3cqZAo" node="2hED36Gak9$" resolve="sd" />
                                                   </node>
                                                   <node concept="3TrcHB" id="6MrCApUsxdP" role="2OqNvi">
                                                     <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -928,7 +928,7 @@
                                               <ref role="37wK5l" node="104dc5E55WC" resolve="typeConverter" />
                                               <node concept="2OqwBi" id="7xXCuh1x53J" role="37wK5m">
                                                 <node concept="37vLTw" id="7xXCuh1x53K" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="2hED36Gak9A" />
+                                                  <ref role="3cqZAo" node="2hED36Gak9A" resolve="sd" />
                                                 </node>
                                                 <node concept="3TrEf2" id="7xXCuh1x53L" role="2OqNvi">
                                                   <ref role="3Tt5mk" to="d9cz:2l5A0OF69t$" resolve="sort" />
@@ -1356,7 +1356,7 @@
                                   <node concept="1rXfSq" id="6cjunGyxlJX" role="10QFUP">
                                     <ref role="37wK5l" node="104dc5E4T8G" resolve="translateExpression" />
                                     <node concept="37vLTw" id="6cjunGyxlJY" role="37wK5m">
-                                      <ref role="3cqZAo" node="2hED36Gak9C" />
+                                      <ref role="3cqZAo" node="2hED36Gak9C" resolve="exp" />
                                     </node>
                                     <node concept="37vLTw" id="6cjunGyxlJZ" role="37wK5m">
                                       <ref role="3cqZAo" node="104dc5E4T95" resolve="ctx" />
@@ -1433,7 +1433,7 @@
                                   <node concept="1rXfSq" id="6cjunGyxsz8" role="10QFUP">
                                     <ref role="37wK5l" node="104dc5E4T8G" resolve="translateExpression" />
                                     <node concept="37vLTw" id="6cjunGyxsz9" role="37wK5m">
-                                      <ref role="3cqZAo" node="2hED36Gak9E" />
+                                      <ref role="3cqZAo" node="2hED36Gak9E" resolve="exp" />
                                     </node>
                                     <node concept="37vLTw" id="6cjunGyxsza" role="37wK5m">
                                       <ref role="3cqZAo" node="104dc5E4T95" resolve="ctx" />
@@ -2121,7 +2121,7 @@
                                   <node concept="1rXfSq" id="6cjunGyxaae" role="10QFUP">
                                     <ref role="37wK5l" node="104dc5E4T8G" resolve="translateExpression" />
                                     <node concept="37vLTw" id="6cjunGyxaaf" role="37wK5m">
-                                      <ref role="3cqZAo" node="2hED36Gak9G" />
+                                      <ref role="3cqZAo" node="2hED36Gak9G" resolve="exp" />
                                     </node>
                                     <node concept="37vLTw" id="6cjunGyxaag" role="37wK5m">
                                       <ref role="3cqZAo" node="104dc5E4T95" resolve="ctx" />
@@ -2284,7 +2284,7 @@
                                   <node concept="1rXfSq" id="6cjunGyxvO1" role="10QFUP">
                                     <ref role="37wK5l" node="104dc5E4T8G" resolve="translateExpression" />
                                     <node concept="37vLTw" id="6cjunGyxvO2" role="37wK5m">
-                                      <ref role="3cqZAo" node="2hED36Gak9I" />
+                                      <ref role="3cqZAo" node="2hED36Gak9I" resolve="exp" />
                                     </node>
                                     <node concept="37vLTw" id="6cjunGyxvO3" role="37wK5m">
                                       <ref role="3cqZAo" node="104dc5E4T95" resolve="ctx" />
@@ -2766,7 +2766,7 @@
                                       <node concept="1rXfSq" id="6MrCApUtAYL" role="3clFbG">
                                         <ref role="37wK5l" node="104dc5E4T8G" resolve="translateExpression" />
                                         <node concept="37vLTw" id="6MrCApUtAYM" role="37wK5m">
-                                          <ref role="3cqZAo" node="2hED36Gak9K" />
+                                          <ref role="3cqZAo" node="2hED36Gak9K" resolve="par" />
                                         </node>
                                         <node concept="37vLTw" id="6MrCApUtAYN" role="37wK5m">
                                           <ref role="3cqZAo" node="104dc5E4T95" resolve="ctx" />
@@ -3315,7 +3315,7 @@
                                   <ref role="1Pybhc" node="6MrCApUsKSw" resolve="TypesTranslator" />
                                   <node concept="2OqwBi" id="7xXCuh1AqNn" role="37wK5m">
                                     <node concept="37vLTw" id="7xXCuh1AqNo" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2hED36Gak9M" />
+                                      <ref role="3cqZAo" node="2hED36Gak9M" resolve="it" />
                                     </node>
                                     <node concept="3TrEf2" id="7xXCuh1AqNp" role="2OqNvi">
                                       <ref role="3Tt5mk" to="d9cz:6cjunGyy0m8" resolve="tpe" />
@@ -3369,7 +3369,7 @@
                                     <ref role="37wK5l" to="f7eu:~Context.mkSymbol(java.lang.String)" resolve="mkSymbol" />
                                     <node concept="2OqwBi" id="7xXCuh1AyEH" role="37wK5m">
                                       <node concept="37vLTw" id="7xXCuh1Aypx" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="2hED36Gak9O" />
+                                        <ref role="3cqZAo" node="2hED36Gak9O" resolve="it" />
                                       </node>
                                       <node concept="3TrcHB" id="7xXCuh1AyVC" role="2OqNvi">
                                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/utils.mps b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/utils.mps
index 5293a76b..56513c1c 100644
--- a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/utils.mps
+++ b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/utils.mps
@@ -179,7 +179,7 @@
                       <node concept="2OqwBi" id="6cjunGyDMQG" role="3clFbG">
                         <node concept="2OqwBi" id="6cjunGyDMQH" role="2Oq$k0">
                           <node concept="37vLTw" id="6cjunGyDMQI" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36Gak9Q" />
+                            <ref role="3cqZAo" node="2hED36Gak9Q" resolve="it" />
                           </node>
                           <node concept="3TrcHB" id="6cjunGyDMQJ" role="2OqNvi">
                             <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/witness.mps b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/witness.mps
index 4d6d178e..0ef22eba 100644
--- a/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/witness.mps
+++ b/code/languages/com.mbeddr.formal.smt/solutions/com.mbeddr.formal.smtlib.z3.rt/models/witness.mps
@@ -232,7 +232,7 @@
                   <node concept="3clFbF" id="104dc5E5Xn5" role="3cqZAp">
                     <node concept="2OqwBi" id="104dc5E5Xv3" role="3clFbG">
                       <node concept="37vLTw" id="104dc5E5Xn4" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2hED36Gak9S" />
+                        <ref role="3cqZAo" node="2hED36Gak9S" resolve="it" />
                       </node>
                       <node concept="3YRAZt" id="104dc5E5XP4" role="2OqNvi" />
                     </node>
@@ -310,7 +310,7 @@
                           <node concept="2OqwBi" id="104dc5E680t" role="3clFbG">
                             <node concept="2OqwBi" id="104dc5E680u" role="2Oq$k0">
                               <node concept="37vLTw" id="104dc5E680v" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36Gak9U" />
+                                <ref role="3cqZAo" node="2hED36Gak9U" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="104dc5E680w" role="2OqNvi">
                                 <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/generator/template/_020_spin_hdl_main@generator.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/generator/template/_020_spin_hdl_main@generator.mps
index b74ef204..7ab32b48 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/generator/template/_020_spin_hdl_main@generator.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/generator/template/_020_spin_hdl_main@generator.mps
@@ -1346,7 +1346,7 @@
                         <node concept="3clFbF" id="78yKT8PMPVl" role="3cqZAp">
                           <node concept="2OqwBi" id="78yKT8PMQaL" role="3clFbG">
                             <node concept="37vLTw" id="78yKT8PMPVk" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36EYkSx" />
+                              <ref role="3cqZAo" node="2hED36EYkSx" resolve="it" />
                             </node>
                             <node concept="3TrEf2" id="78yKT8PMRGE" role="2OqNvi">
                               <ref role="3Tt5mk" to="vshk:26dfgZlSsP9" resolve="suv" />
@@ -1383,7 +1383,7 @@
                           <node concept="2OqwBi" id="78yKT8PNKoR" role="3clFbG">
                             <node concept="2OqwBi" id="78yKT8PNwCB" role="2Oq$k0">
                               <node concept="37vLTw" id="78yKT8PNwmQ" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2hED36EYkSz" />
+                                <ref role="3cqZAo" node="2hED36EYkSz" resolve="it" />
                               </node>
                               <node concept="3TrcHB" id="78yKT8PNxas" role="2OqNvi">
                                 <ref role="3TsBF5" to="68mc:5lKnBeAtODI" resolve="path" />
@@ -1482,7 +1482,7 @@
                         <node concept="3clFbF" id="5SGsxw7OBb9" role="3cqZAp">
                           <node concept="2OqwBi" id="5SGsxw7OBwd" role="3clFbG">
                             <node concept="37vLTw" id="5SGsxw7OBb8" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36EYkS_" />
+                              <ref role="3cqZAo" node="2hED36EYkS_" resolve="it" />
                             </node>
                             <node concept="3Tsc0h" id="5SGsxw7OC8J" role="2OqNvi">
                               <ref role="3TtcxE" to="y6ji:1ZejHLlNgv5" resolve="decls" />
@@ -1523,7 +1523,7 @@
                         <node concept="3fqX7Q" id="5SGsxw7Ohgx" role="3clFbG">
                           <node concept="2OqwBi" id="5SGsxw7OhLm" role="3fr31v">
                             <node concept="37vLTw" id="5SGsxw7OhrR" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36EYkSB" />
+                              <ref role="3cqZAo" node="2hED36EYkSB" resolve="it" />
                             </node>
                             <node concept="1mIQ4w" id="5SGsxw7Ojio" role="2OqNvi">
                               <node concept="chp4Y" id="5SGsxw7OjvU" role="cj9EA">
@@ -1645,7 +1645,7 @@
                                     <node concept="2OqwBi" id="7M$OvLQeVs6" role="3clFbG">
                                       <node concept="2OqwBi" id="7M$OvLQeVs7" role="2Oq$k0">
                                         <node concept="37vLTw" id="7M$OvLQeVs8" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="2hED36EYkSD" />
+                                          <ref role="3cqZAo" node="2hED36EYkSD" resolve="it" />
                                         </node>
                                         <node concept="3TrEf2" id="7M$OvLQeVs9" role="2OqNvi">
                                           <ref role="3Tt5mk" to="vshk:26dfgZlSsP9" resolve="suv" />
@@ -3878,7 +3878,7 @@
                         <node concept="3clFbF" id="5SGsxw7COHp" role="3cqZAp">
                           <node concept="2OqwBi" id="5SGsxw7COHq" role="3clFbG">
                             <node concept="37vLTw" id="5SGsxw7COHr" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2hED36EYkSF" />
+                              <ref role="3cqZAo" node="2hED36EYkSF" resolve="it" />
                             </node>
                             <node concept="2Rxl7S" id="5SGsxw7COHs" role="2OqNvi" />
                           </node>
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/plugin.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/plugin.mps
index 11209f3e..987f2d96 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin.hdl/models/plugin.mps
@@ -769,7 +769,7 @@
                             <node concept="3clFbS" id="26dfgZm0BNs" role="1bW5cS">
                               <node concept="1daRAt" id="26dfgZm0BNt" role="3cqZAp">
                                 <node concept="37vLTw" id="26dfgZm0BNu" role="1daK9t">
-                                  <ref role="3cqZAo" node="2hED36EYkSn" />
+                                  <ref role="3cqZAo" node="2hED36EYkSn" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -792,7 +792,7 @@
                               <node concept="1daRAt" id="26dfgZm0BNB" role="3cqZAp">
                                 <property role="1daRAr" value="3bEKrlZKrwH/ERROR" />
                                 <node concept="37vLTw" id="26dfgZm0BNC" role="1daK9t">
-                                  <ref role="3cqZAo" node="2hED36EYkSp" />
+                                  <ref role="3cqZAo" node="2hED36EYkSp" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -994,7 +994,7 @@
                             <node concept="3clFbS" id="6fYDdj_aR1k" role="1bW5cS">
                               <node concept="1daRAt" id="6fYDdj_aRh2" role="3cqZAp">
                                 <node concept="37vLTw" id="6fYDdj_aRp_" role="1daK9t">
-                                  <ref role="3cqZAo" node="2hED36EYkSr" />
+                                  <ref role="3cqZAo" node="2hED36EYkSr" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -1017,7 +1017,7 @@
                               <node concept="1daRAt" id="6fYDdj_aVga" role="3cqZAp">
                                 <property role="1daRAr" value="3bEKrlZKrwH/ERROR" />
                                 <node concept="37vLTw" id="6fYDdj_aVoN" role="1daK9t">
-                                  <ref role="3cqZAo" node="2hED36EYkSt" />
+                                  <ref role="3cqZAo" node="2hED36EYkSt" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -1511,7 +1511,7 @@
                       </node>
                       <node concept="2OqwBi" id="6kOHW5ftKVm" role="3uHU7B">
                         <node concept="37vLTw" id="6kOHW5ftMMd" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36EYkSv" />
+                          <ref role="3cqZAo" node="2hED36EYkSv" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6kOHW5ftKVo" role="2OqNvi">
                           <ref role="37wK5l" to="guwi:~File.lastModified()" resolve="lastModified" />
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/behavior.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/behavior.mps
index 1a710748..b652462f 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/behavior.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/behavior.mps
@@ -997,7 +997,7 @@
                     <node concept="3clFbF" id="5uFV_KLwU8Q" role="3cqZAp">
                       <node concept="2OqwBi" id="5uFV_KLwU8R" role="3clFbG">
                         <node concept="37vLTw" id="5uFV_KLwU8S" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36EYkSH" />
+                          <ref role="3cqZAo" node="2hED36EYkSH" resolve="it" />
                         </node>
                         <node concept="2Rf3mk" id="5uFV_KLwU8T" role="2OqNvi">
                           <node concept="1xMEDy" id="5uFV_KLwU8U" role="1xVPHs">
diff --git a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/plugin.mps b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/plugin.mps
index b97b1edc..08c7fbb2 100644
--- a/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.spin/languages/com.mbeddr.formal.spin/models/plugin.mps
@@ -623,7 +623,7 @@
                                 <property role="3cmrfH" value="0" />
                               </node>
                               <node concept="37vLTw" id="4_pH3zvrs6I" role="1LFl5Q">
-                                <ref role="3cqZAo" node="2hED36EYkSJ" />
+                                <ref role="3cqZAo" node="2hED36EYkSJ" resolve="it" />
                               </node>
                             </node>
                           </node>
@@ -990,7 +990,7 @@
                             <node concept="3clFbS" id="26dfgZm0BNs" role="1bW5cS">
                               <node concept="1daRAt" id="26dfgZm0BNt" role="3cqZAp">
                                 <node concept="37vLTw" id="26dfgZm0BNu" role="1daK9t">
-                                  <ref role="3cqZAo" node="2hED36EYkSL" />
+                                  <ref role="3cqZAo" node="2hED36EYkSL" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -1013,7 +1013,7 @@
                               <node concept="1daRAt" id="26dfgZm0BNB" role="3cqZAp">
                                 <property role="1daRAr" value="3bEKrlZKrwH/ERROR" />
                                 <node concept="37vLTw" id="26dfgZm0BNC" role="1daK9t">
-                                  <ref role="3cqZAo" node="2hED36EYkSN" />
+                                  <ref role="3cqZAo" node="2hED36EYkSN" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -1178,7 +1178,7 @@
                             <node concept="3clFbS" id="26dfgZm0Vir" role="1bW5cS">
                               <node concept="1daRAt" id="26dfgZm0Vis" role="3cqZAp">
                                 <node concept="37vLTw" id="26dfgZm0Vit" role="1daK9t">
-                                  <ref role="3cqZAo" node="2hED36EYkSP" />
+                                  <ref role="3cqZAo" node="2hED36EYkSP" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -1201,7 +1201,7 @@
                               <node concept="1daRAt" id="26dfgZm0ViA" role="3cqZAp">
                                 <property role="1daRAr" value="3bEKrlZKrwH/ERROR" />
                                 <node concept="37vLTw" id="26dfgZm0ViB" role="1daK9t">
-                                  <ref role="3cqZAo" node="2hED36EYkSR" />
+                                  <ref role="3cqZAo" node="2hED36EYkSR" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -2108,7 +2108,7 @@
                       <node concept="TSZUe" id="6fYDdj_7vxU" role="2OqNvi">
                         <node concept="2OqwBi" id="6fYDdj_7wtO" role="25WWJ7">
                           <node concept="37vLTw" id="6fYDdj_7vJc" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36EYkST" />
+                            <ref role="3cqZAo" node="2hED36EYkST" resolve="it" />
                           </node>
                           <node concept="liA8E" id="6fYDdj_7wQG" role="2OqNvi">
                             <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
@@ -2142,7 +2142,7 @@
                       <node concept="TSZUe" id="6fYDdj_7y0v" role="2OqNvi">
                         <node concept="2OqwBi" id="6fYDdj_7y0w" role="25WWJ7">
                           <node concept="37vLTw" id="6fYDdj_7y0x" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36EYkSV" />
+                            <ref role="3cqZAo" node="2hED36EYkSV" resolve="it" />
                           </node>
                           <node concept="liA8E" id="6fYDdj_7y0y" role="2OqNvi">
                             <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.mps
index 50cb6c4e..0762209e 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.analyzer.mps
@@ -1962,7 +1962,7 @@
                                           <node concept="3clFbF" id="71901EGHmYO" role="3cqZAp">
                                             <node concept="2OqwBi" id="71901EGHmYP" role="3clFbG">
                                               <node concept="37vLTw" id="71901EGHmYQ" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="2hED36EYkT5" />
+                                                <ref role="3cqZAo" node="2hED36EYkT5" resolve="it" />
                                               </node>
                                               <node concept="liA8E" id="71901EGHmYR" role="2OqNvi">
                                                 <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
@@ -3262,7 +3262,7 @@
                               <node concept="2OqwBi" id="2lN4cj_OeKR" role="2Oq$k0">
                                 <node concept="2JrnkZ" id="2lN4cj_OeKS" role="2Oq$k0">
                                   <node concept="37vLTw" id="2lN4cj_OeKT" role="2JrQYb">
-                                    <ref role="3cqZAo" node="2hED36EYkT7" />
+                                    <ref role="3cqZAo" node="2hED36EYkT7" resolve="it" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="2lN4cj_OeKU" role="2OqNvi">
@@ -3610,7 +3610,7 @@
                         </node>
                         <node concept="2OqwBi" id="2yuIwRziJfm" role="3uHU7B">
                           <node concept="37vLTw" id="2yuIwRziJfn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36EYkT9" />
+                            <ref role="3cqZAo" node="2hED36EYkT9" resolve="it" />
                           </node>
                           <node concept="3TrEf2" id="2yuIwRziJfo" role="2OqNvi">
                             <ref role="3Tt5mk" to="9yqz:4_pH3zvo$xG" resolve="env" />
diff --git a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.testing_utils.mps b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.testing_utils.mps
index b2abda49..a6d0edd0 100644
--- a/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.testing_utils.mps
+++ b/code/languages/com.mbeddr.formal.spin/solutions/com.mbeddr.formal.spin.pluginSolution/models/com.mbeddr.formal.spin.testing_utils.mps
@@ -331,7 +331,7 @@
                             <node concept="2OqwBi" id="4QGaVz5sUXf" role="3clFbG">
                               <node concept="2OqwBi" id="4QGaVz5sUXg" role="2Oq$k0">
                                 <node concept="37vLTw" id="4QGaVz5sUXh" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36EYkSX" />
+                                  <ref role="3cqZAo" node="2hED36EYkSX" resolve="it" />
                                 </node>
                                 <node concept="3TrcHB" id="4QGaVz5sUXi" role="2OqNvi">
                                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -553,7 +553,7 @@
                               <node concept="2OqwBi" id="5yxSA$IRT3c" role="2Oq$k0">
                                 <node concept="2OqwBi" id="5yxSA$IRT3d" role="2Oq$k0">
                                   <node concept="37vLTw" id="5yxSA$IRT3e" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="2hED36EYkSZ" />
+                                    <ref role="3cqZAo" node="2hED36EYkSZ" resolve="it" />
                                   </node>
                                   <node concept="3TrEf2" id="5yxSA$IRT3f" role="2OqNvi">
                                     <ref role="3Tt5mk" to="9yqz:4_pH3zvo$xG" resolve="env" />
@@ -801,7 +801,7 @@
                       <node concept="2OqwBi" id="63QgsF$OKWU" role="3clFbG">
                         <node concept="2OqwBi" id="63QgsF$OKWV" role="2Oq$k0">
                           <node concept="37vLTw" id="63QgsF$OKWW" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2hED36EYkT1" />
+                            <ref role="3cqZAo" node="2hED36EYkT1" resolve="it" />
                           </node>
                           <node concept="liA8E" id="63QgsF$OKWX" role="2OqNvi">
                             <ref role="37wK5l" to="imq8:7XCY$_raaAL" resolve="getUserFriendlyMessage" />
@@ -884,7 +884,7 @@
                             <node concept="3cpWs3" id="63QgsF$OQF9" role="37wK5m">
                               <node concept="2OqwBi" id="63QgsF$ORCn" role="3uHU7w">
                                 <node concept="37vLTw" id="63QgsF$ORol" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2hED36EYkT3" />
+                                  <ref role="3cqZAo" node="2hED36EYkT3" resolve="it" />
                                 </node>
                                 <node concept="liA8E" id="63QgsF$ORTO" role="2OqNvi">
                                   <ref role="37wK5l" to="imq8:7XCY$_raaAL" resolve="getUserFriendlyMessage" />
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests@tests.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests@tests.mps
index 8093dc5c..29b80b40 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_050_promela_extensions_tests@tests.mps
@@ -719,7 +719,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="4ZxQD5y5Ddv" role="1m5AlR">
                                     <node concept="37vLTw" id="4ZxQD5y5Ddw" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2hED36EYkTb" />
+                                      <ref role="3cqZAo" node="2hED36EYkTb" resolve="it" />
                                     </node>
                                     <node concept="2Rxl7S" id="4ZxQD5y5Ddx" role="2OqNvi" />
                                   </node>
diff --git a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests@tests.mps b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests@tests.mps
index 45412893..c0c4bad2 100644
--- a/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.spin/tests/test.mbeddr.formal.spin/models/_100_hdl_tests@tests.mps
@@ -2325,7 +2325,7 @@
                                   </node>
                                   <node concept="2OqwBi" id="4ZxQD5y5Ddv" role="1m5AlR">
                                     <node concept="37vLTw" id="4ZxQD5y5Ddw" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="2hED36EYkTd" />
+                                      <ref role="3cqZAo" node="2hED36EYkTd" resolve="it" />
                                     </node>
                                     <node concept="2Rxl7S" id="4ZxQD5y5Ddx" role="2OqNvi" />
                                   </node>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.word.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.word.mps
index 9fffea61..b89c597a 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.word.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.core/models/com.mpsbasics.docx4j.core.word.mps
@@ -3621,7 +3621,7 @@
                       </node>
                       <node concept="2OqwBi" id="7SQqK0Fk5KA" role="33vP2m">
                         <node concept="37vLTw" id="7SQqK0Fk5KB" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2hED36CAms1" />
+                          <ref role="3cqZAo" node="2hED36CAms1" resolve="it" />
                         </node>
                         <node concept="liA8E" id="7SQqK0Fk5KC" role="2OqNvi">
                           <ref role="37wK5l" to="exr9:~EditorCell_WithComponent.getComponent()" resolve="getComponent" />
@@ -5946,7 +5946,7 @@
                         <node concept="1rXfSq" id="38aFq1jl25G" role="3clFbG">
                           <ref role="37wK5l" node="38aFq1jlbBT" resolve="doCheckCanComputeString4DefaultEditor" />
                           <node concept="37vLTw" id="38aFq1jl25H" role="37wK5m">
-                            <ref role="3cqZAo" node="2hED36CAms3" />
+                            <ref role="3cqZAo" node="2hED36CAms3" resolve="it" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.snode.utils/models/com.mpsbasics.snode.utils.hashcode.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.snode.utils/models/com.mpsbasics.snode.utils.hashcode.mps
index 8ed9d98e..c438b232 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.snode.utils/models/com.mpsbasics.snode.utils.hashcode.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.snode.utils/models/com.mpsbasics.snode.utils.hashcode.mps
@@ -279,7 +279,7 @@
                           <node concept="1rXfSq" id="62$$j6uV7TK" role="3clFbG">
                             <ref role="37wK5l" node="62$$j6uU1iZ" resolve="doComputeHashCode" />
                             <node concept="37vLTw" id="62$$j6uV8FS" role="37wK5m">
-                              <ref role="3cqZAo" node="2hED36CAms5" />
+                              <ref role="3cqZAo" node="2hED36CAms5" resolve="it" />
                             </node>
                             <node concept="37vLTw" id="62$$j6uV8Mi" role="37wK5m">
                               <ref role="3cqZAo" node="62$$j6uV34i" resolve="builder" />