diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps
index fce96a885..3770bf855 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps
@@ -8,7 +8,7 @@
   <imports>
     <import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
     <import index="al5i" ref="r:742f344d-4dc4-4862-992c-4bc94b094870(com.mbeddr.mpsutil.dev.build)" />
-    <import index="90a9" ref="r:fb24ac52-5985-4947-bba9-25be6fd32c1a(de.slisson.mps.all.build)" implicit="true" />
+    <import index="90a9" ref="r:fb24ac52-5985-4947-bba9-25be6fd32c1a(de.itemis.mps.extensions.build)" implicit="true" />
   </imports>
   <registry>
     <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
@@ -347,7 +347,7 @@
     <node concept="2kB4xC" id="42jqVeFkUte" role="1l3spd">
       <property role="TrG5h" value="date" />
       <node concept="hHN3E" id="42jqVeFkUtf" role="aVJcv">
-        <property role="hHN3Y" value="20180909" />
+        <property role="hHN3Y" value="20180916" />
       </node>
     </node>
     <node concept="2kB4xC" id="42jqVeFkUtg" role="1l3spd">
@@ -418,7 +418,7 @@
       <node concept="aVJcg" id="4aeOpjlAysR" role="aVJcv">
         <node concept="NbPM2" id="4aeOpjlAysQ" role="aVJcq">
           <node concept="3Mxwew" id="4aeOpjlAysP" role="3MwsjC">
-            <property role="3MwjfP" value="2018-09-09" />
+            <property role="3MwjfP" value="2018-09-16" />
           </node>
         </node>
       </node>
@@ -665,7 +665,7 @@
             <property role="3LWZYl" value="**/lib/jung/**" />
           </node>
           <node concept="3LWZYq" id="2QnUwHmUGHE" role="1juEy9">
-            <property role="3LWZYl" value="**/lib/plantuml/**" />
+            <property role="3LWZYl" value="**/com.mbeddr.mpsutil.plantuml/lib/**" />
           </node>
         </node>
         <node concept="3_I8Xc" id="4aeOpjlAaq3" role="39821P">
@@ -3064,14 +3064,17 @@
         <node concept="3rtmxn" id="5yQpAUIgQbv" role="3bR31x">
           <node concept="3LXTmp" id="5yQpAUIgQbw" role="3rtmxm">
             <node concept="3qWCbU" id="5yQpAUIgQbx" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
+              <property role="3qWCbO" value="com/mbeddr/formal/nusmv/cbd/pluginSolution/plugin/*.png" />
             </node>
             <node concept="398BVA" id="5yQpAUIgQby" role="3LXTmr">
               <ref role="398BVh" node="6mm$FLYQyYs" resolve="code" />
               <node concept="2Ry0Ak" id="5yQpAUIgQbz" role="iGT6I">
                 <property role="2Ry0Am" value="solutions" />
                 <node concept="2Ry0Ak" id="5yQpAUIgQb$" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mbeddr.formal.base.tooling" />
+                  <property role="2Ry0Am" value="com.mbeddr.formal.nusmv.cbd.pluginSolution" />
+                  <node concept="2Ry0Ak" id="7Wl2irMOA4E" role="2Ry0An">
+                    <property role="2Ry0Am" value="source_gen" />
+                  </node>
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/models/plugin.mps b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/models/plugin.mps
index 5cea8946f..17e490e58 100644
--- a/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/models/plugin.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/models/plugin.mps
@@ -24,7 +24,7 @@
     <import index="z1c4" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
-    <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
+    <import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" />
   </imports>
   <registry>
     <language id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources">
@@ -57,6 +57,7 @@
       </concept>
       <concept id="1203083511112" name="jetbrains.mps.lang.plugin.structure.ExecuteBlock" flags="in" index="tnohg" />
       <concept id="1203087890642" name="jetbrains.mps.lang.plugin.structure.ActionGroupDeclaration" flags="ng" index="tC5Ba">
+        <property id="1204991940915" name="caption" index="2f7twF" />
         <child id="1204991552650" name="modifier" index="2f5YQi" />
         <child id="1207145245948" name="contents" index="ftER_" />
       </concept>
@@ -380,14 +381,15 @@
   </node>
   <node concept="tC5Ba" id="5uW1px6ni3m">
     <property role="TrG5h" value="SolutionActionsGroup" />
+    <property role="2f7twF" value="New" />
     <node concept="ftmFs" id="5uW1px6ni3n" role="ftER_">
       <node concept="tCFHf" id="5tRIc6mlLia" role="ftvYc">
         <ref role="tCJdB" node="5tRIc6mkOfA" resolve="NewFASTENModel" />
       </node>
     </node>
-    <node concept="tT9cl" id="5uW1px6ni3q" role="2f5YQi">
-      <ref role="tU$_T" to="tprs:hyf4Jd1" resolve="SolutionActions" />
-      <ref role="2f8Tey" to="tprs:hyalGNA" resolve="solutionNew" />
+    <node concept="tT9cl" id="7Wl2irMPeJi" role="2f5YQi">
+      <ref role="tU$_T" to="tprs:hyf4Jpv" resolve="SolutionNewActions" />
+      <ref role="2f8Tey" to="tprs:1bRM4HyGTmR" resolve="newModel" />
     </node>
   </node>
 </model>
diff --git a/code/tutorial/solutions/com.mbeddr.formal.nusmv.users_guide/figures/figures.pptx b/code/tutorial/solutions/com.mbeddr.formal.nusmv.users_guide/figures/figures.pptx
index 5c72a15ee..477edb4be 100644
Binary files a/code/tutorial/solutions/com.mbeddr.formal.nusmv.users_guide/figures/figures.pptx and b/code/tutorial/solutions/com.mbeddr.formal.nusmv.users_guide/figures/figures.pptx differ