diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/com.fasten.safety.ft.xfta_gen.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/com.fasten.safety.ft.xfta_gen.mpl
index e9248985..0dba5c10 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/com.fasten.safety.ft.xfta_gen.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/com.fasten.safety.ft.xfta_gen.mpl
@@ -26,7 +26,6 @@
       <external-templates />
       <dependencies>
         <dependency reexport="false">ab274f70-5238-4883-adc7-02df7a757829(com.fasten.safety.ft)</dependency>
-        <dependency reexport="false">001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:990507d3-3527-4c54-bfe9-0ca3c9c6247a:com.dslfoundry.plaintextgen" version="0" />
@@ -62,10 +61,7 @@
         <module reference="091b20ea-7bf0-41d6-8e6e-4460a9bd8121(com.fasten.safety.ft.xfta_gen)" version="0" />
         <module reference="0940b90d-aea1-4339-be5b-c8084d7ead33(com.fasten.safety.ft.xfta_gen#01)" version="0" />
         <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
-        <module reference="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" version="0" />
-        <module reference="001b2375-3bd5-4d5e-9958-6b3f62dc8548(com.mbeddr.formal.nusmv)" version="0" />
         <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-        <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/generator/templates/com.fasten.safety.ft.xfta_gen.templates@generator.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/generator/templates/com.fasten.safety.ft.xfta_gen.templates@generator.mps
index 614c4a70..bcc6ffd8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/generator/templates/com.fasten.safety.ft.xfta_gen.templates@generator.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft.xfta_gen/generator/templates/com.fasten.safety.ft.xfta_gen.templates@generator.mps
@@ -13,9 +13,9 @@
   <imports>
     <import index="spwl" ref="r:ea5ecccc-669e-41c1-a43d-021bc4263d33(com.fasten.safety.ft.structure)" />
     <import index="ltf9" ref="r:ce008aba-ba99-4e5f-b6e7-aee317483633(com.fasten.safety.ft.xfta_gen.util)" />
-    <import index="gioj" ref="r:a6dee7e9-c79f-4293-b631-7c366a8877df(com.mbeddr.formal.nusmv.structure)" />
-    <import index="fazf" ref="r:28cb0bbd-efcb-4c9e-94f2-4ccc928adfb4(com.fasten.safety.ft.behavior)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+    <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
+    <import index="fazf" ref="r:28cb0bbd-efcb-4c9e-94f2-4ccc928adfb4(com.fasten.safety.ft.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -33,6 +33,7 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
+      <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -94,7 +95,9 @@
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
       <concept id="1219952072943" name="jetbrains.mps.lang.generator.structure.DropRootRule" flags="lg" index="aNPBN">
         <reference id="1219952338328" name="applicableConcept" index="aOQi4" />
+        <child id="1219952317655" name="conditionFunction" index="aOLnb" />
       </concept>
+      <concept id="1219952151850" name="jetbrains.mps.lang.generator.structure.DropRootRule_Condition" flags="in" index="aO8KQ" />
       <concept id="1202776937179" name="jetbrains.mps.lang.generator.structure.AbandonInput_RuleConsequence" flags="lg" index="b5Tf3" />
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
         <child id="1219952894531" name="dropRootRule" index="aQYdv" />
@@ -152,6 +155,8 @@
       <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
         <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
       </concept>
+      <concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
+      <concept id="8866923313515890008" name="jetbrains.mps.lang.smodel.structure.AsNodeOperation" flags="nn" index="FGMqu" />
       <concept id="1883223317721008708" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfStatement" flags="nn" index="Jncv_">
         <reference id="1883223317721008712" name="nodeConcept" index="JncvD" />
         <child id="1883223317721008709" name="body" index="Jncv$" />
@@ -182,8 +187,31 @@
   </registry>
   <node concept="bUwia" id="7YOjUbFpdHa">
     <property role="TrG5h" value="main" />
-    <node concept="aNPBN" id="12q9egMH$Ii" role="aQYdv">
-      <ref role="aOQi4" to="gioj:6NmtaR1SUJl" resolve="System" />
+    <node concept="aNPBN" id="12q9egNCRBr" role="aQYdv">
+      <ref role="aOQi4" to="tpck:gw2VY9q" resolve="BaseConcept" />
+      <node concept="aO8KQ" id="12q9egNDuRj" role="aOLnb">
+        <node concept="3clFbS" id="12q9egNDuRk" role="2VODD2">
+          <node concept="3clFbF" id="12q9egNDv46" role="3cqZAp">
+            <node concept="17R0WA" id="12q9egNDyNu" role="3clFbG">
+              <node concept="Xl_RD" id="12q9egNDyVp" role="3uHU7w">
+                <property role="Xl_RC" value="com.mbeddr.formal.nusmv.structure.System" />
+              </node>
+              <node concept="2OqwBi" id="12q9egNDwN6" role="3uHU7B">
+                <node concept="2OqwBi" id="12q9egNDvT7" role="2Oq$k0">
+                  <node concept="2OqwBi" id="12q9egNDvj5" role="2Oq$k0">
+                    <node concept="30H73N" id="12q9egNDv45" role="2Oq$k0" />
+                    <node concept="2yIwOk" id="12q9egNDvAG" role="2OqNvi" />
+                  </node>
+                  <node concept="FGMqu" id="12q9egNDwp4" role="2OqNvi" />
+                </node>
+                <node concept="2qgKlT" id="12q9egNDxwq" role="2OqNvi">
+                  <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="3aamgX" id="7YOjUbFq9ZN" role="3acgRq">
       <ref role="30HIoZ" to="spwl:5rwT_JnuR3U" resolve="FaultTreeElementBase" />