diff --git a/languages/EDMM/models/EDMM.textGen.mps b/languages/EDMM/models/EDMM.textGen.mps
index a6b995a..8ecd862 100644
--- a/languages/EDMM/models/EDMM.textGen.mps
+++ b/languages/EDMM/models/EDMM.textGen.mps
@@ -12,7 +12,6 @@
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
       </concept>
@@ -51,7 +50,7 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
-      <concept id="1225271369338" name="jetbrains.mps.baseLanguage.structure.IsEmptyOperation" flags="nn" index="17RlXB" />
+      <concept id="1225271408483" name="jetbrains.mps.baseLanguage.structure.IsNotEmptyOperation" flags="nn" index="17RvpY" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -76,12 +75,6 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
-      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
-        <child id="1081516765348" name="expression" index="3fr31v" />
-      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -4778,47 +4771,81 @@
               </node>
             </node>
           </node>
-          <node concept="1Wc70l" id="44qSLCbJmd1" role="3clFbw">
-            <node concept="37vLTw" id="6hyHiy$CiJS" role="3uHU7B">
-              <ref role="3cqZAo" node="6hyHiy$CgAs" resolve="typeIsString" />
-            </node>
-            <node concept="1eOMI4" id="44qSLCbJppw" role="3uHU7w">
-              <node concept="22lmx$" id="44qSLCbMd$M" role="1eOMHV">
-                <node concept="2OqwBi" id="44qSLCbJnHi" role="3uHU7B">
-                  <node concept="2OqwBi" id="44qSLCbJmAL" role="2Oq$k0">
-                    <node concept="117lpO" id="44qSLCbJp5N" role="2Oq$k0" />
-                    <node concept="3TrcHB" id="44qSLCbJnbq" role="2OqNvi">
-                      <ref role="3TsBF5" to="9rr7:2hvaCGv18I4" resolve="value" />
-                    </node>
-                  </node>
-                  <node concept="17RlXB" id="44qSLCbMKdK" role="2OqNvi" />
-                </node>
-                <node concept="3fqX7Q" id="1Jc11aAfreC" role="3uHU7w">
-                  <node concept="2OqwBi" id="1Jc11aAfs$p" role="3fr31v">
-                    <node concept="2OqwBi" id="1Jc11aAfrGl" role="2Oq$k0">
-                      <node concept="117lpO" id="1Jc11aAfrrl" role="2Oq$k0" />
-                      <node concept="3TrcHB" id="1Jc11aAfs3j" role="2OqNvi">
-                        <ref role="3TsBF5" to="9rr7:2hvaCGv18I4" resolve="value" />
+          <node concept="37vLTw" id="6hyHiy$CiJS" role="3clFbw">
+            <ref role="3cqZAo" node="6hyHiy$CgAs" resolve="typeIsString" />
+          </node>
+        </node>
+        <node concept="3clFbJ" id="3V1KETemZf$" role="3cqZAp">
+          <node concept="3clFbS" id="3V1KETemZfA" role="3clFbx">
+            <node concept="lc7rE" id="3V1KETeheVo" role="3cqZAp">
+              <node concept="l9hG8" id="3V1KETeheVp" role="lcghm">
+                <node concept="2OqwBi" id="3V1KETehlGv" role="lb14g">
+                  <node concept="2OqwBi" id="3V1KETeqsN$" role="2Oq$k0">
+                    <node concept="2OqwBi" id="3V1KETeqrH8" role="2Oq$k0">
+                      <node concept="2OqwBi" id="3V1KETehlGw" role="2Oq$k0">
+                        <node concept="117lpO" id="3V1KETehlGx" role="2Oq$k0" />
+                        <node concept="3TrcHB" id="3V1KETehlGy" role="2OqNvi">
+                          <ref role="3TsBF5" to="9rr7:2hvaCGv18I4" resolve="value" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="3V1KETeqrUw" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~String.replaceFirst(java.lang.String,java.lang.String)" resolve="replaceFirst" />
+                        <node concept="Xl_RD" id="3V1KETeqs4g" role="37wK5m">
+                          <property role="Xl_RC" value="^\&quot;" />
+                        </node>
+                        <node concept="Xl_RD" id="3V1KETeqstH" role="37wK5m">
+                          <property role="Xl_RC" value="" />
+                        </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="1Jc11aAfthF" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
-                      <node concept="Xl_RD" id="1Jc11aAftlh" role="37wK5m">
-                        <property role="Xl_RC" value="\&quot;" />
+                    <node concept="liA8E" id="3V1KETequ2C" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~String.replaceFirst(java.lang.String,java.lang.String)" resolve="replaceFirst" />
+                      <node concept="Xl_RD" id="3V1KETequ6V" role="37wK5m">
+                        <property role="Xl_RC" value="\&quot;$" />
+                      </node>
+                      <node concept="Xl_RD" id="3V1KETequme" role="37wK5m">
+                        <property role="Xl_RC" value="" />
                       </node>
                     </node>
                   </node>
+                  <node concept="liA8E" id="3V1KETehlGz" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.replace(java.lang.CharSequence,java.lang.CharSequence)" resolve="replace" />
+                    <node concept="Xl_RD" id="3V1KETehlG$" role="37wK5m">
+                      <property role="Xl_RC" value="\&quot;" />
+                    </node>
+                    <node concept="Xl_RD" id="3V1KETehlG_" role="37wK5m">
+                      <property role="Xl_RC" value="\\\&quot;" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-        </node>
-        <node concept="lc7rE" id="6hyHiy$CgjB" role="3cqZAp">
-          <node concept="l9hG8" id="6EqhN9zImbj" role="lcghm">
-            <node concept="2OqwBi" id="3A1fdsUHbAo" role="lb14g">
-              <node concept="117lpO" id="3A1fdsUHbu6" role="2Oq$k0" />
-              <node concept="3TrcHB" id="3A1fdsUHbWR" role="2OqNvi">
-                <ref role="3TsBF5" to="9rr7:2hvaCGv18I4" resolve="value" />
+          <node concept="1Wc70l" id="3V1KETemZRA" role="3clFbw">
+            <node concept="2OqwBi" id="3V1KETen1pj" role="3uHU7w">
+              <node concept="2OqwBi" id="3V1KETen0rm" role="2Oq$k0">
+                <node concept="117lpO" id="3V1KETen09B" role="2Oq$k0" />
+                <node concept="3TrcHB" id="3V1KETen0Pq" role="2OqNvi">
+                  <ref role="3TsBF5" to="9rr7:2hvaCGv18I4" resolve="value" />
+                </node>
+              </node>
+              <node concept="17RvpY" id="3V1KETen1_Y" role="2OqNvi" />
+            </node>
+            <node concept="37vLTw" id="3V1KETemZrd" role="3uHU7B">
+              <ref role="3cqZAo" node="6hyHiy$CgAs" resolve="typeIsString" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="3V1KETen24L" role="9aQIa">
+            <node concept="3clFbS" id="3V1KETen24M" role="9aQI4">
+              <node concept="lc7rE" id="3V1KETen2bR" role="3cqZAp">
+                <node concept="l9hG8" id="3V1KETen2bS" role="lcghm">
+                  <node concept="2OqwBi" id="3V1KETen2bT" role="lb14g">
+                    <node concept="117lpO" id="3V1KETen2bU" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="3V1KETen2bV" role="2OqNvi">
+                      <ref role="3TsBF5" to="9rr7:2hvaCGv18I4" resolve="value" />
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -4831,39 +4858,8 @@
               </node>
             </node>
           </node>
-          <node concept="1Wc70l" id="1Jc11aAfmXu" role="3clFbw">
-            <node concept="1eOMI4" id="44qSLCbJpCk" role="3uHU7w">
-              <node concept="22lmx$" id="44qSLCbMdIH" role="1eOMHV">
-                <node concept="2OqwBi" id="44qSLCbJrvD" role="3uHU7B">
-                  <node concept="2OqwBi" id="44qSLCbJqvw" role="2Oq$k0">
-                    <node concept="117lpO" id="44qSLCbJqhV" role="2Oq$k0" />
-                    <node concept="3TrcHB" id="44qSLCbJqXn" role="2OqNvi">
-                      <ref role="3TsBF5" to="9rr7:2hvaCGv18I4" resolve="value" />
-                    </node>
-                  </node>
-                  <node concept="17RlXB" id="44qSLCbMKBp" role="2OqNvi" />
-                </node>
-                <node concept="3fqX7Q" id="44qSLCbJpCl" role="3uHU7w">
-                  <node concept="2OqwBi" id="44qSLCbJpCm" role="3fr31v">
-                    <node concept="2OqwBi" id="44qSLCbJpCn" role="2Oq$k0">
-                      <node concept="117lpO" id="44qSLCbJpCo" role="2Oq$k0" />
-                      <node concept="3TrcHB" id="44qSLCbJpCp" role="2OqNvi">
-                        <ref role="3TsBF5" to="9rr7:2hvaCGv18I4" resolve="value" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="44qSLCbJpCq" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
-                      <node concept="Xl_RD" id="44qSLCbJpCr" role="37wK5m">
-                        <property role="Xl_RC" value="\&quot;" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="37vLTw" id="6hyHiy$Cj5B" role="3uHU7B">
-              <ref role="3cqZAo" node="6hyHiy$CgAs" resolve="typeIsString" />
-            </node>
+          <node concept="37vLTw" id="6hyHiy$Cj5B" role="3clFbw">
+            <ref role="3cqZAo" node="6hyHiy$CgAs" resolve="typeIsString" />
           </node>
         </node>
         <node concept="11p84A" id="6EqhN9zImbP" role="3cqZAp" />
diff --git a/solutions/TerraformSandbox/models/TerraformSandbox.terraformToEDMM.mps b/solutions/TerraformSandbox/models/TerraformSandbox.terraformToEDMM.mps
index 8c3c644..05b8bcb 100644
--- a/solutions/TerraformSandbox/models/TerraformSandbox.terraformToEDMM.mps
+++ b/solutions/TerraformSandbox/models/TerraformSandbox.terraformToEDMM.mps
@@ -66,7 +66,7 @@
           </node>
           <node concept="3Q103" id="7xk5uRluM4M" role="3Q1uZ">
             <property role="3Q16K" value="nestedBlockArgument2" />
-            <property role="3Q1ci" value="nestedBlockArgumentValue2" />
+            <property role="3Q1ci" value="&quot;&quot;nested&quot;BlockArgumentValue2&quot;&quot;&quot;" />
           </node>
         </node>
         <node concept="3Q1nZ" id="7xk5uRluYmN" role="2H9qWv">