diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps
index 74000a44..a0f23dad 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps
@@ -2198,57 +2198,61 @@
         </node>
       </node>
     </node>
-    <node concept="1DVJbV" id="JqEP$8s1fV" role="1DVIru">
-      <node concept="1DVIrG" id="JqEP$8s1fX" role="j9CMd">
-        <node concept="1DVIoH" id="JqEP$8s1fZ" role="1DVIrJ">
-          <property role="TrG5h" value="lb_lambda_bound" />
-        </node>
-        <node concept="1DVIrH" id="JqEP$8sf6a" role="1DVIrD">
-          <node concept="1DVIrG" id="JqEP$8sf6e" role="1DVIrE">
-            <node concept="1DVIoH" id="JqEP$8sf6f" role="1DVIrJ">
-              <property role="TrG5h" value="f" />
-            </node>
-            <node concept="1DVIrU" id="JqEP$8s1kv" role="1DVIrD">
-              <node concept="1DVIrB" id="JqEP$8s1kw" role="1DVIr_">
-                <node concept="1DVIoH" id="JqEP$8s1kx" role="1DVIrA">
-                  <property role="TrG5h" value="g" />
-                </node>
-              </node>
-              <node concept="3EUms" id="48ZGLP8pFrQ" role="1DVIrw">
-                <node concept="1DVIo5" id="48ZGLP8pFs4" role="3EUmv">
-                  <node concept="3P8MHP" id="48ZGLP8pFse" role="1DVIo8" />
-                  <node concept="t0$VC" id="48ZGLP8pFrZ" role="1DVIo4">
-                    <ref role="t0$VJ" node="JqEP$8s1kx" resolve="g" />
-                  </node>
-                  <node concept="1U20sH" id="47xL5G3iXBz" role="lGtFl">
-                    <property role="1U20sK" value="error" />
-                  </node>
-                </node>
-                <node concept="1DVIo5" id="48ZGLP8pFss" role="3EUmh">
-                  <node concept="3EUms" id="48ZGLP8pFsH" role="1DVIo8">
-                    <node concept="3P8L2H" id="48ZGLP8pFsQ" role="3EUmv" />
-                    <node concept="3P8L2H" id="48ZGLP8pFsT" role="3EUmh" />
-                  </node>
-                  <node concept="t0$VC" id="48ZGLP8pFsn" role="1DVIo4">
-                    <ref role="t0$VJ" node="JqEP$8s1kx" resolve="g" />
-                  </node>
-                </node>
-              </node>
-            </node>
+    <node concept="1X3_iC" id="73aHugggW6o" role="lGtFl">
+      <property role="3V$3am" value="clause" />
+      <property role="3V$3ak" value="af858d84-85f2-42f4-a854-0b3c6b5cd482/8739282858702982568/8739282858702982571" />
+      <node concept="1DVJbV" id="JqEP$8s1fV" role="8Wnug">
+        <node concept="1DVIrG" id="JqEP$8s1fX" role="j9CMd">
+          <node concept="1DVIoH" id="JqEP$8s1fZ" role="1DVIrJ">
+            <property role="TrG5h" value="lb_lambda_bound" />
           </node>
-          <node concept="1DVIo5" id="JqEP$8seVU" role="1DVIrk">
-            <node concept="1DVIrU" id="JqEP$8sftT" role="1DVIo8">
-              <node concept="1DVIrB" id="JqEP$8sftU" role="1DVIr_">
-                <node concept="1DVIoH" id="JqEP$8sftV" role="1DVIrA">
-                  <property role="TrG5h" value="x" />
+          <node concept="1DVIrH" id="JqEP$8sf6a" role="1DVIrD">
+            <node concept="1DVIrG" id="JqEP$8sf6e" role="1DVIrE">
+              <node concept="1DVIoH" id="JqEP$8sf6f" role="1DVIrJ">
+                <property role="TrG5h" value="f" />
+              </node>
+              <node concept="1DVIrU" id="JqEP$8s1kv" role="1DVIrD">
+                <node concept="1DVIrB" id="JqEP$8s1kw" role="1DVIr_">
+                  <node concept="1DVIoH" id="JqEP$8s1kx" role="1DVIrA">
+                    <property role="TrG5h" value="g" />
+                  </node>
+                </node>
+                <node concept="3EUms" id="48ZGLP8pFrQ" role="1DVIrw">
+                  <node concept="1DVIo5" id="48ZGLP8pFs4" role="3EUmv">
+                    <node concept="3P8MHP" id="48ZGLP8pFse" role="1DVIo8" />
+                    <node concept="t0$VC" id="48ZGLP8pFrZ" role="1DVIo4">
+                      <ref role="t0$VJ" node="JqEP$8s1kx" resolve="g" />
+                    </node>
+                    <node concept="1U20sH" id="47xL5G3iXBz" role="lGtFl">
+                      <property role="1U20sK" value="error" />
+                    </node>
+                  </node>
+                  <node concept="1DVIo5" id="48ZGLP8pFss" role="3EUmh">
+                    <node concept="3EUms" id="48ZGLP8pFsH" role="1DVIo8">
+                      <node concept="3P8L2H" id="48ZGLP8pFsQ" role="3EUmv" />
+                      <node concept="3P8L2H" id="48ZGLP8pFsT" role="3EUmh" />
+                    </node>
+                    <node concept="t0$VC" id="48ZGLP8pFsn" role="1DVIo4">
+                      <ref role="t0$VJ" node="JqEP$8s1kx" resolve="g" />
+                    </node>
+                  </node>
                 </node>
               </node>
-              <node concept="t0$VC" id="JqEP$8sftZ" role="1DVIrw">
-                <ref role="t0$VJ" node="JqEP$8sftV" resolve="x" />
-              </node>
             </node>
-            <node concept="t0$VC" id="JqEP$8sfu3" role="1DVIo4">
-              <ref role="t0$VJ" node="JqEP$8sf6f" resolve="f" />
+            <node concept="1DVIo5" id="JqEP$8seVU" role="1DVIrk">
+              <node concept="1DVIrU" id="JqEP$8sftT" role="1DVIo8">
+                <node concept="1DVIrB" id="JqEP$8sftU" role="1DVIr_">
+                  <node concept="1DVIoH" id="JqEP$8sftV" role="1DVIrA">
+                    <property role="TrG5h" value="x" />
+                  </node>
+                </node>
+                <node concept="t0$VC" id="JqEP$8sftZ" role="1DVIrw">
+                  <ref role="t0$VJ" node="JqEP$8sftV" resolve="x" />
+                </node>
+              </node>
+              <node concept="t0$VC" id="JqEP$8sfu3" role="1DVIo4">
+                <ref role="t0$VJ" node="JqEP$8sf6f" resolve="f" />
+              </node>
             </node>
           </node>
         </node>