diff --git a/typescript/vrotsc/e2e/expect/all-content/workflows/MyOrg/MyProject/Test Workflow 1.xml b/typescript/vrotsc/e2e/expect/all-content/workflows/MyOrg/MyProject/Test Workflow 1.xml
index f5fa5b9e6..5c3d30757 100644
--- a/typescript/vrotsc/e2e/expect/all-content/workflows/MyOrg/MyProject/Test Workflow 1.xml	
+++ b/typescript/vrotsc/e2e/expect/all-content/workflows/MyOrg/MyProject/Test Workflow 1.xml	
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="3fd94148-9381-3524-8543-8db55ad749b7" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Test Workflow 1]]></display-name><position x="50" y="100" /><input><param name="foo" type="string" /><param name="bar" type="string" /></input><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task"><script encoded="false"><![CDATA[System.log("foo=".concat(foo, ", bar=").concat(bar));
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="3fd94148-9381-3524-8543-8db55ad749b7" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Test Workflow 1]]></display-name><position x="50" y="100" /><input><param name="foo" type="string" /><param name="bar" type="string" /></input><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task" ><script encoded="false"><![CDATA[System.log("foo=".concat(foo, ", bar=").concat(bar));
 ]]></script><display-name><![CDATA[test1]]></display-name><in-binding><bind name="foo" type="string" export-name="foo" /><bind name="bar" type="string" export-name="bar" /></in-binding><position x="100" y="100" /></workflow-item><presentation><p-param name="foo"><desc><![CDATA[foo]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual></p-param><p-param name="bar"><desc><![CDATA[bar]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Action Happy Path.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Action Happy Path.xml
index 409f409c0..f98a3e0f6 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Action Happy Path.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Action Happy Path.xml	
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="9d4c6c70-66a1-3969-9e79-513d73819e55" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Action Happy Path]]></display-name><position x="50" y="100" /><attrib name="first" type="number" read-only="false" /><attrib name="second" type="number" read-only="false" /><attrib name="actionResult" type="ActionResult" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="100" /></workflow-item><workflow-item name="item1" out-name="item2" type="task" script-module="com.vmware.pscoe.onboarding.sgenov.actions/test"><script encoded="false"><![CDATA[actionResult = System.getModule("com.vmware.pscoe.onboarding.sgenov.actions").test(first, second);
-]]></script><display-name><![CDATA[callTestAction]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="actionResult" type="ActionResult" export-name="actionResult" /></out-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task"><script encoded="false"><![CDATA[System.log("Action result: ".concat(actionResult.getResult()));
+]]></script><display-name><![CDATA[callTestAction]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="actionResult" type="ActionResult" export-name="actionResult" /></out-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task" ><script encoded="false"><![CDATA[System.log("Action result: ".concat(actionResult.getResult()));
 ]]></script><display-name><![CDATA[printActionResult]]></display-name><in-binding><bind name="actionResult" type="ActionResult" export-name="actionResult" /></in-binding><position x="200" y="100" /></workflow-item><presentation><p-param name="first"><desc><![CDATA[first]]></desc></p-param><p-param name="second"><desc><![CDATA[second]]></desc></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Async Workflow Test.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Async Workflow Test.xml
index fe8dcc188..920163b1b 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Async Workflow Test.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Async Workflow Test.xml	
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item4" object-name="workflow:name=generic" id="4b483071-6bbc-34e5-a554-f0476933f6ed" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Async Workflow Test]]></display-name><description><![CDATA[Calling another workflow asynchronously and binding values correctly]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><attrib name="first" type="number" read-only="false" /><attrib name="second" type="number" read-only="false" /><attrib name="wfToken" type="WorkflowToken" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="500" y="100" /></workflow-item><workflow-item name="item1" out-name="item3" type="task" launched-workflow-id="9e4503db-cbaa-435a-9fad-144409c08df0"><script encoded="false"><![CDATA[var workflowParameters = new Properties(), workflowToLaunch = Server.getWorkflowWithId("9e4503db-cbaa-435a-9fad-144409c08df0");
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item4" object-name="workflow:name=generic" id="4b483071-6bbc-34e5-a554-f0476933f6ed" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Async Workflow Test]]></display-name><description><![CDATA[Calling another workflow asynchronously and binding values correctly]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><attrib name="first" type="number" read-only="false" /><attrib name="second" type="number" read-only="false" /><attrib name="wfToken" type="WorkflowToken" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="500" y="100" /></workflow-item><workflow-item name="item1" out-name="item3" type="task" launched-workflow-id="9e4503db-cbaa-435a-9fad-144409c08df0" ><script encoded="false"><![CDATA[var workflowParameters = new Properties(), workflowToLaunch = Server.getWorkflowWithId("9e4503db-cbaa-435a-9fad-144409c08df0");
 if (workflowToLaunch == null) {
     throw "Workflow not found";
 }
 workflowParameters.put("first", first);
 workflowParameters.put("second", second);
 wfToken = workflowToLaunch.execute(workflowParameters);
-]]></script><display-name><![CDATA[asyncCall]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="wfToken" type="WorkflowToken" export-name="wfToken" /></out-binding><position x="300" y="100" /></workflow-item><workflow-item name="item2" out-name="item1" type="task"><script encoded="false"><![CDATA[first = 1;
+]]></script><display-name><![CDATA[asyncCall]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="wfToken" type="WorkflowToken" export-name="wfToken" /></out-binding><position x="300" y="100" /></workflow-item><workflow-item name="item2" out-name="item1" type="task" ><script encoded="false"><![CDATA[first = 1;
 second = 2;
-]]></script><display-name><![CDATA[prepareItems]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></out-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item0" type="task"><script encoded="false"><![CDATA[System.log("Workflow token: ".concat(wfToken.id, " and state: ").concat(wfToken.state));
+]]></script><display-name><![CDATA[prepareItems]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></out-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item0" type="task" ><script encoded="false"><![CDATA[System.log("Workflow token: ".concat(wfToken.id, " and state: ").concat(wfToken.state));
 System.log("Workflow finished");
-]]></script><display-name><![CDATA[printAsync]]></display-name><in-binding><bind name="wfToken" type="WorkflowToken" export-name="wfToken" /></in-binding><position x="400" y="100" /></workflow-item><workflow-item name="item4" out-name="item2" type="task"><script encoded="false"><![CDATA[System.log("Starting workflow");
+]]></script><display-name><![CDATA[printAsync]]></display-name><in-binding><bind name="wfToken" type="WorkflowToken" export-name="wfToken" /></in-binding><position x="400" y="100" /></workflow-item><workflow-item name="item4" out-name="item2" type="task" ><script encoded="false"><![CDATA[System.log("Starting workflow");
 ]]></script><display-name><![CDATA[start]]></display-name><position x="100" y="100" /></workflow-item><presentation></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Complex.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Complex.xml
index bd6c79ea4..16579f2a0 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Complex.xml
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Complex.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item3" object-name="workflow:name=generic" id="16083aae-bae5-38d8-a11e-a21445c7b9e9" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Complex]]></display-name><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="400" y="150" /></workflow-item><workflow-item name="item1" out-name="item4" type="custom-condition" alt-out-name="item0"><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="300" y="100" /></workflow-item><workflow-item name="item2" out-name="item1" type="task"><script encoded="false"><![CDATA[if (!counter) {
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item3" object-name="workflow:name=generic" id="16083aae-bae5-38d8-a11e-a21445c7b9e9" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Complex]]></display-name><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="400" y="150" /></workflow-item><workflow-item name="item1" out-name="item4" type="custom-condition" alt-out-name="item0" ><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="300" y="100" /></workflow-item><workflow-item name="item2" out-name="item1" type="task" ><script encoded="false"><![CDATA[if (!counter) {
     counter = 0;
 }
 counter++;
@@ -11,5 +11,5 @@ else {
 }
 System.log("Counter: " + counter);
 System.log("Waiting Timer: " + waitingTimer);
-]]></script><display-name><![CDATA[execute]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /><bind name="counter" type="number" export-name="counter" /></in-binding><out-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /><bind name="counter" type="number" export-name="counter" /></out-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item2" type="task"><script encoded="false"><![CDATA[System.log("Starting workflow");
-]]></script><display-name><![CDATA[start]]></display-name><position x="100" y="100" /></workflow-item><workflow-item name="item4" out-name="item2" type="waiting-timer"><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="timer.date" type="Date" export-name="waitingTimer" /></in-binding><position x="400" y="50" /></workflow-item><presentation></presentation></workflow>
\ No newline at end of file
+]]></script><display-name><![CDATA[execute]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /><bind name="counter" type="number" export-name="counter" /></in-binding><out-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /><bind name="counter" type="number" export-name="counter" /></out-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item2" type="task" ><script encoded="false"><![CDATA[System.log("Starting workflow");
+]]></script><display-name><![CDATA[start]]></display-name><position x="100" y="100" /></workflow-item><workflow-item name="item4" out-name="item2" type="waiting-timer" ><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="timer.date" type="Date" export-name="waitingTimer" /></in-binding><position x="400" y="50" /></workflow-item><presentation></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Decision Edge 2.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Decision Edge 2.xml
index 8dacefc9f..62fd9096a 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Decision Edge 2.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Decision Edge 2.xml	
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="065a9b48-3ed1-387b-8b04-cb881f069b7a" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Decision Edge 2]]></display-name><description><![CDATA[decisionElement is the root, it will point with target and else to shouldGoHere. shouldGoHere points to end]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="50" /></workflow-item><workflow-item name="item1" out-name="item2" type="custom-condition" alt-out-name="item2"><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task"><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="200" y="50" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="065a9b48-3ed1-387b-8b04-cb881f069b7a" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Decision Edge 2]]></display-name><description><![CDATA[decisionElement is the root, it will point with target and else to shouldGoHere. shouldGoHere points to end]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="50" /></workflow-item><workflow-item name="item1" out-name="item2" type="custom-condition" alt-out-name="item2" ><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task" ><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="200" y="50" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Decision Edge.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Decision Edge.xml
index c127911f0..700c5a0dc 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Decision Edge.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Decision Edge.xml	
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="ad34844d-4e87-3a4f-9a26-684337a94d28" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Decision Edge]]></display-name><description><![CDATA[decisionElement is the root, it will point with target to end and shouldGoHere with else. shouldGoHere points to end]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="400" y="50" /></workflow-item><workflow-item name="item1" out-name="item2" type="custom-condition" alt-out-name="item2"><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item3" type="task"><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[waitForEvent]]></display-name><position x="200" y="50" /></workflow-item><workflow-item name="item3" out-name="item0" type="task"><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="300" y="50" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="ad34844d-4e87-3a4f-9a26-684337a94d28" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Decision Edge]]></display-name><description><![CDATA[decisionElement is the root, it will point with target to end and shouldGoHere with else. shouldGoHere points to end]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="400" y="50" /></workflow-item><workflow-item name="item1" out-name="item2" type="custom-condition" alt-out-name="item2" ><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item3" type="task" ><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[waitForEvent]]></display-name><position x="200" y="50" /></workflow-item><workflow-item name="item3" out-name="item0" type="task" ><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="300" y="50" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Decision Happy.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Decision Happy.xml
index 198ad926c..d2c329fdb 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Decision Happy.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Decision Happy.xml	
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="34885410-5d9a-31ba-8f9b-65d91065cd06" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Decision Happy]]></display-name><description><![CDATA[decisionElement is the root, it will point with else to end and target to shouldGoHere. shouldGoHere will point to end too]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="50" /></workflow-item><workflow-item name="item1" out-name="item2" type="custom-condition" alt-out-name="item0"><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task"><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="200" y="50" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="34885410-5d9a-31ba-8f9b-65d91065cd06" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Decision Happy]]></display-name><description><![CDATA[decisionElement is the root, it will point with else to end and target to shouldGoHere. shouldGoHere will point to end too]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="50" /></workflow-item><workflow-item name="item1" out-name="item2" type="custom-condition" alt-out-name="item0" ><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task" ><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="200" y="50" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Default Error Handler Custom Item.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Default Error Handler Custom Item.xml
index fd92d1001..698f7fc4e 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Default Error Handler Custom Item.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Default Error Handler Custom Item.xml	
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="c1d64164-67ce-3561-a9bb-9b5a18a3075c" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Default Error Handler Custom Item]]></display-name><description><![CDATA[Default error handler workflow with error handler redirecting to a workflow item]]></description><position x="50" y="100" /><attrib name="errorMessage" type="string" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="66.66666666666667" /></workflow-item><workflow-item name="item1" out-name="item2" type="task"><script encoded="false"><![CDATA[System.log("Initiating workflow execution");
-]]></script><display-name><![CDATA[initiateWorkflow]]></display-name><position x="100" y="66.66666666666667" /></workflow-item><workflow-item name="item2" out-name="item0" type="task"><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[goToEnd]]></display-name><position x="200" y="66.66666666666667" /></workflow-item><workflow-item name="item3" out-name="item5" type="task"><script encoded="false"><![CDATA[System.log("Processing error using custom task with message '".concat(errorMessage, "'"));
-]]></script><display-name><![CDATA[processError]]></display-name><in-binding><bind name="errorMessage" type="string" export-name="errorMessage" /></in-binding><position x="200" y="133.33333333333334" /></workflow-item><error-handler name="item3"  throw-bind-name="errorMessage"><position x="100" y="133.33333333333334" /></error-handler><workflow-item name="item5" type="end" end-mode="0"  throw-bind-name="errorMessage"><out-binding><bind name="errorMessage" type="string" export-name="errorMessage" /></out-binding><position x="300" y="133.33333333333334" /></workflow-item><presentation></presentation></workflow>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="c1d64164-67ce-3561-a9bb-9b5a18a3075c" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Default Error Handler Custom Item]]></display-name><description><![CDATA[Default error handler workflow with error handler redirecting to a workflow item]]></description><position x="50" y="100" /><attrib name="errorMessage" type="string" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="66.66666666666667" /></workflow-item><workflow-item name="item1" out-name="item2" type="task" ><script encoded="false"><![CDATA[System.log("Initiating workflow execution");
+]]></script><display-name><![CDATA[initiateWorkflow]]></display-name><position x="100" y="66.66666666666667" /></workflow-item><workflow-item name="item2" out-name="item0" type="task" ><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[goToEnd]]></display-name><position x="200" y="66.66666666666667" /></workflow-item><workflow-item name="item3" out-name="item5" type="task" ><script encoded="false"><![CDATA[System.log("Processing error using custom task with message '".concat(errorMessage, "'"));
+]]></script><display-name><![CDATA[processError]]></display-name><in-binding><bind name="errorMessage" type="string" export-name="errorMessage" /></in-binding><position x="200" y="133.33333333333334" /></workflow-item><error-handler name="item3"  throw-bind-name="errorMessage" ><position x="100" y="133.33333333333334" /></error-handler><workflow-item name="item5" type="end" end-mode="0"  throw-bind-name="errorMessage" ><out-binding><bind name="errorMessage" type="string" export-name="errorMessage" /></out-binding><position x="300" y="133.33333333333334" /></workflow-item><presentation></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Default Error Handler Happy.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Default Error Handler Happy.xml
index e4a71fe2e..9d568ed84 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Default Error Handler Happy.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Default Error Handler Happy.xml	
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="e0145a6f-f13f-382f-aa56-674a70accad9" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Default Error Handler Happy]]></display-name><description><![CDATA[Default error handler workflow]]></description><position x="50" y="100" /><attrib name="errorMessage" type="string" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="66.66666666666667" /></workflow-item><workflow-item name="item1" out-name="item2" type="task"><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[initiateWorkflow]]></display-name><position x="100" y="66.66666666666667" /></workflow-item><error-handler name="item0"  throw-bind-name="errorMessage"><position x="100" y="133.33333333333334" /></error-handler><presentation></presentation></workflow>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="e0145a6f-f13f-382f-aa56-674a70accad9" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Default Error Handler Happy]]></display-name><description><![CDATA[Default error handler workflow]]></description><position x="50" y="100" /><attrib name="errorMessage" type="string" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="66.66666666666667" /></workflow-item><workflow-item name="item1" out-name="item2" type="task" ><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[initiateWorkflow]]></display-name><position x="100" y="66.66666666666667" /></workflow-item><error-handler name="item0"  throw-bind-name="errorMessage" ><position x="100" y="133.33333333333334" /></error-handler><presentation></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Root Default First.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Root Default First.xml
index 4e0d3da1b..f1c5e2e80 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Root Default First.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Root Default First.xml	
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="1b683666-95c6-3ad2-9ca3-f3dcd8077210" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Root Default First]]></display-name><description><![CDATA[default is first item]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="100" /></workflow-item><workflow-item name="item1" out-name="item2" type="task"><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task"><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="200" y="100" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="1b683666-95c6-3ad2-9ca3-f3dcd8077210" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Root Default First]]></display-name><description><![CDATA[default is first item]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="100" /></workflow-item><workflow-item name="item1" out-name="item2" type="task" ><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task" ><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="200" y="100" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Root When Set.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Root When Set.xml
index 547b03894..6a3ef3c85 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Root When Set.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Root When Set.xml	
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item2" object-name="workflow:name=generic" id="057d879f-0ecc-3bc1-9e01-8f63cb173e19" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Root When Set]]></display-name><description><![CDATA[root is shouldGoHere]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task"><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="200" y="100" /></workflow-item><workflow-item name="item2" out-name="item1" type="task"><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="100" y="100" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item2" object-name="workflow:name=generic" id="057d879f-0ecc-3bc1-9e01-8f63cb173e19" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Root When Set]]></display-name><description><![CDATA[root is shouldGoHere]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task" ><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="200" y="100" /></workflow-item><workflow-item name="item2" out-name="item1" type="task" ><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="100" y="100" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Scheduled Workflow Test.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Scheduled Workflow Test.xml
index 8f1093bcd..a7c6171a9 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Scheduled Workflow Test.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Scheduled Workflow Test.xml	
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item4" object-name="workflow:name=generic" id="18b56581-f9ac-30cb-8df2-8c1c7e5dba37" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Scheduled Workflow Test]]></display-name><description><![CDATA[Scheduling another workflow and binding values correctly]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><attrib name="first" type="number" read-only="false" /><attrib name="second" type="number" read-only="false" /><attrib name="workflowScheduleDate" type="Date" read-only="false" /><attrib name="scheduledTask" type="Task" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="500" y="100" /></workflow-item><workflow-item name="item1" out-name="item3" type="task" launched-workflow-id="9e4503db-cbaa-435a-9fad-144409c08df0"><script encoded="false"><![CDATA[var workflowParameters = new Properties(), workflowToLaunch = Server.getWorkflowWithId("9e4503db-cbaa-435a-9fad-144409c08df0");
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item4" object-name="workflow:name=generic" id="18b56581-f9ac-30cb-8df2-8c1c7e5dba37" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Scheduled Workflow Test]]></display-name><description><![CDATA[Scheduling another workflow and binding values correctly]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><attrib name="first" type="number" read-only="false" /><attrib name="second" type="number" read-only="false" /><attrib name="workflowScheduleDate" type="Date" read-only="false" /><attrib name="scheduledTask" type="Task" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="500" y="100" /></workflow-item><workflow-item name="item1" out-name="item3" type="task" launched-workflow-id="9e4503db-cbaa-435a-9fad-144409c08df0" ><script encoded="false"><![CDATA[var workflowParameters = new Properties(), workflowToLaunch = Server.getWorkflowWithId("9e4503db-cbaa-435a-9fad-144409c08df0");
 if (workflowToLaunch == null) {
     throw "Workflow not found";
 }
 workflowParameters.put("first", first);
 workflowParameters.put("second", second);
 scheduledTask = workflowToLaunch.schedule(workflowParameters, workflowScheduleDate, undefined, undefined);
-]]></script><display-name><![CDATA[scheduleOtherWf]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /><bind name="workflowScheduleDate" type="Date" export-name="workflowScheduleDate" /></in-binding><out-binding><bind name="scheduledTask" type="Task" export-name="scheduledTask" /></out-binding><position x="300" y="100" /></workflow-item><workflow-item name="item2" out-name="item1" type="task"><script encoded="false"><![CDATA[first = 1;
+]]></script><display-name><![CDATA[scheduleOtherWf]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /><bind name="workflowScheduleDate" type="Date" export-name="workflowScheduleDate" /></in-binding><out-binding><bind name="scheduledTask" type="Task" export-name="scheduledTask" /></out-binding><position x="300" y="100" /></workflow-item><workflow-item name="item2" out-name="item1" type="task" ><script encoded="false"><![CDATA[first = 1;
 second = 2;
 workflowScheduleDate = System.getDate("1 minute from now", undefined);
-]]></script><display-name><![CDATA[prepareItems]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /><bind name="workflowScheduleDate" type="Date" export-name="workflowScheduleDate" /></in-binding><out-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /><bind name="workflowScheduleDate" type="Date" export-name="workflowScheduleDate" /></out-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item0" type="task"><script encoded="false"><![CDATA[System.log("Scheduled task: ".concat(scheduledTask.id, ", [").concat(scheduledTask.state, "]"));
-]]></script><display-name><![CDATA[printScheduledDetails]]></display-name><in-binding><bind name="scheduledTask" type="Task" export-name="scheduledTask" /></in-binding><position x="400" y="100" /></workflow-item><workflow-item name="item4" out-name="item2" type="task"><script encoded="false"><![CDATA[System.log("Starting workflow");
+]]></script><display-name><![CDATA[prepareItems]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /><bind name="workflowScheduleDate" type="Date" export-name="workflowScheduleDate" /></in-binding><out-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /><bind name="workflowScheduleDate" type="Date" export-name="workflowScheduleDate" /></out-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item0" type="task" ><script encoded="false"><![CDATA[System.log("Scheduled task: ".concat(scheduledTask.id, ", [").concat(scheduledTask.state, "]"));
+]]></script><display-name><![CDATA[printScheduledDetails]]></display-name><in-binding><bind name="scheduledTask" type="Task" export-name="scheduledTask" /></in-binding><position x="400" y="100" /></workflow-item><workflow-item name="item4" out-name="item2" type="task" ><script encoded="false"><![CDATA[System.log("Starting workflow");
 ]]></script><display-name><![CDATA[start]]></display-name><position x="100" y="100" /></workflow-item><presentation></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Waiting Timer Edge.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Waiting Timer Edge.xml
index 53e1fcc13..ef6452cf1 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Waiting Timer Edge.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Waiting Timer Edge.xml	
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="983d90ae-55f4-3618-b049-264e66324e74" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Waiting Timer Edge]]></display-name><description><![CDATA[Waiting timer will point to shouldGoHere with target]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="100" /></workflow-item><workflow-item name="item1" out-name="item2" type="waiting-timer"><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="timer.date" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task"><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="200" y="100" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="983d90ae-55f4-3618-b049-264e66324e74" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Waiting Timer Edge]]></display-name><description><![CDATA[Waiting timer will point to shouldGoHere with target]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="100" /></workflow-item><workflow-item name="item1" out-name="item2" type="waiting-timer" ><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="timer.date" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task" ><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="200" y="100" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Waiting Timer Happy.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Waiting Timer Happy.xml
index 4ddd605a3..9b63f6069 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Waiting Timer Happy.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Waiting Timer Happy.xml	
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="fe777695-8571-3ec5-b338-fec22bc411b3" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Waiting Timer Happy]]></display-name><description><![CDATA[Waiting timer will point with target to shouldGoHere]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="100" /></workflow-item><workflow-item name="item1" out-name="item2" type="waiting-timer"><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="timer.date" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task"><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="200" y="100" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="fe777695-8571-3ec5-b338-fec22bc411b3" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Waiting Timer Happy]]></display-name><description><![CDATA[Waiting timer will point with target to shouldGoHere]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="300" y="100" /></workflow-item><workflow-item name="item1" out-name="item2" type="waiting-timer" ><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="timer.date" type="Date" export-name="waitingTimer" /></in-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item0" type="task" ><script encoded="false"><![CDATA[]]></script><display-name><![CDATA[shouldGoHere]]></display-name><position x="200" y="100" /></workflow-item><presentation><p-param name="waitingTimer"><desc><![CDATA[waitingTimer]]></desc></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Workflow End Exception.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Workflow End Exception.xml
index 7ed4c90d3..637cd841f 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Workflow End Exception.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Workflow End Exception.xml	
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="52bdb90f-2e9c-3ee7-a290-aae3156e1a25" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Workflow End Exception]]></display-name><description><![CDATA[Workflow with root and end item with end mode 1]]></description><position x="50" y="100" /><attrib name="errorMessage" type="string" read-only="false" /><attrib name="businessStatus" type="string" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="50" /></workflow-item><workflow-item name="item1" out-name="item0" type="custom-condition" alt-out-name="item2"><script encoded="false"><![CDATA[return true;]]></script><display-name><![CDATA[initiateWorkflow]]></display-name><position x="100" y="100" /></workflow-item><workflow-item name="item2" type="end" end-mode="1"  throw-bind-name="errorMessage"business-status="Bad" ><position x="200" y="150" /></workflow-item><presentation></presentation></workflow>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="52bdb90f-2e9c-3ee7-a290-aae3156e1a25" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Workflow End Exception]]></display-name><description><![CDATA[Workflow with root and end item with end mode 1]]></description><position x="50" y="100" /><attrib name="errorMessage" type="string" read-only="false" /><attrib name="businessStatus" type="string" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="50" /></workflow-item><workflow-item name="item1" out-name="item0" type="custom-condition" alt-out-name="item2" ><script encoded="false"><![CDATA[return true;]]></script><display-name><![CDATA[initiateWorkflow]]></display-name><position x="100" y="100" /></workflow-item><workflow-item name="item2" type="end" end-mode="1"  throw-bind-name="errorMessage" business-status="Bad" ><position x="200" y="150" /></workflow-item><presentation></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Workflow End Happy.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Workflow End Happy.xml
index 03e6f7e0e..5df234590 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Workflow End Happy.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Workflow End Happy.xml	
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="c30ea279-5670-385c-838f-63adb8fec45a" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Workflow End Happy]]></display-name><description><![CDATA[Workflow with root and end item]]></description><position x="50" y="100" /><attrib name="endMode" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="50" /></workflow-item><workflow-item name="item1" out-name="item0" type="custom-condition" alt-out-name="item2"><script encoded="false"><![CDATA[return true;]]></script><display-name><![CDATA[initiateWorkflow]]></display-name><position x="100" y="100" /></workflow-item><workflow-item name="item2" type="end" end-mode="0" ><position x="200" y="150" /></workflow-item><presentation></presentation></workflow>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="c30ea279-5670-385c-838f-63adb8fec45a" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Workflow End Happy]]></display-name><description><![CDATA[Workflow with root and end item]]></description><position x="50" y="100" /><attrib name="endMode" type="number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="50" /></workflow-item><workflow-item name="item1" out-name="item0" type="custom-condition" alt-out-name="item2" ><script encoded="false"><![CDATA[return true;]]></script><display-name><![CDATA[initiateWorkflow]]></display-name><position x="100" y="100" /></workflow-item><workflow-item name="item2" type="end" end-mode="0" ><position x="200" y="150" /></workflow-item><presentation></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Workflow Test.xml b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Workflow Test.xml
index a1a00afca..417ef2ee4 100644
--- a/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Workflow Test.xml	
+++ b/typescript/vrotsc/e2e/expect/canvas-items/workflows/VMware/PSCoE/Workflow Test.xml	
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item6" object-name="workflow:name=generic" id="b4f19571-ef7b-3e2a-b66d-28c16b63895a" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Workflow Test]]></display-name><description><![CDATA[Calling another workflow and binding values correctly]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><attrib name="first" type="number" read-only="false" /><attrib name="second" type="number" read-only="false" /><attrib name="result" type="number" read-only="false" /><attrib name="errorMessage" type="string" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="700" y="116.66666666666667" /></workflow-item><workflow-item name="item1" out-name="item7" type="custom-condition" alt-out-name="item2"><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="300" y="66.66666666666667" /></workflow-item><workflow-item name="item2" out-name="item3" type="task"><script encoded="false"><![CDATA[first = 1;
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item6" object-name="workflow:name=generic" id="b4f19571-ef7b-3e2a-b66d-28c16b63895a" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Workflow Test]]></display-name><description><![CDATA[Calling another workflow and binding values correctly]]></description><position x="50" y="100" /><attrib name="waitingTimer" type="Date" read-only="false" /><attrib name="counter" type="number" read-only="false" /><attrib name="first" type="number" read-only="false" /><attrib name="second" type="number" read-only="false" /><attrib name="result" type="number" read-only="false" /><attrib name="errorMessage" type="string" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="700" y="116.66666666666667" /></workflow-item><workflow-item name="item1" out-name="item7" type="custom-condition" alt-out-name="item2" ><script encoded="false"><![CDATA[return waitingTimer !== null;]]></script><display-name><![CDATA[decisionElement]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /></in-binding><position x="300" y="66.66666666666667" /></workflow-item><workflow-item name="item2" out-name="item3" type="task" ><script encoded="false"><![CDATA[first = 1;
 second = 2;
-]]></script><display-name><![CDATA[prepareItems]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></out-binding><position x="400" y="116.66666666666667" /></workflow-item><workflow-item name="item3" out-name="item4" type="link" linked-workflow-id="9e4503db-cbaa-435a-9fad-144409c08df0"><display-name><![CDATA[callOtherWf]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="result" type="number" export-name="result" /></out-binding><position x="500" y="116.66666666666667" /></workflow-item><workflow-item name="item4" out-name="item0" type="task"><script encoded="false"><![CDATA[System.log("Result: " + result);
-]]></script><display-name><![CDATA[print]]></display-name><in-binding><bind name="result" type="number" export-name="result" /></in-binding><position x="600" y="116.66666666666667" /></workflow-item><workflow-item name="item5" out-name="item1" type="task"><script encoded="false"><![CDATA[if (!counter) {
+]]></script><display-name><![CDATA[prepareItems]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></out-binding><position x="400" y="116.66666666666667" /></workflow-item><workflow-item name="item3" out-name="item4" type="link" linked-workflow-id="9e4503db-cbaa-435a-9fad-144409c08df0" ><display-name><![CDATA[callOtherWf]]></display-name><in-binding><bind name="first" type="number" export-name="first" /><bind name="second" type="number" export-name="second" /></in-binding><out-binding><bind name="result" type="number" export-name="result" /></out-binding><position x="500" y="116.66666666666667" /></workflow-item><workflow-item name="item4" out-name="item0" type="task" ><script encoded="false"><![CDATA[System.log("Result: " + result);
+]]></script><display-name><![CDATA[print]]></display-name><in-binding><bind name="result" type="number" export-name="result" /></in-binding><position x="600" y="116.66666666666667" /></workflow-item><workflow-item name="item5" out-name="item1" type="task" ><script encoded="false"><![CDATA[if (!counter) {
     counter = 0;
 }
 counter++;
@@ -14,5 +14,5 @@ else {
 }
 System.log("Counter: " + counter);
 System.log("Waiting Timer: " + waitingTimer);
-]]></script><display-name><![CDATA[execute]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /><bind name="counter" type="number" export-name="counter" /></in-binding><out-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /><bind name="counter" type="number" export-name="counter" /></out-binding><position x="200" y="66.66666666666667" /></workflow-item><workflow-item name="item6" out-name="item5" type="task"><script encoded="false"><![CDATA[System.log("Starting workflow");
-]]></script><display-name><![CDATA[start]]></display-name><position x="100" y="66.66666666666667" /></workflow-item><workflow-item name="item7" out-name="item5" type="waiting-timer"><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="timer.date" type="Date" export-name="waitingTimer" /></in-binding><position x="400" y="16.66666666666667" /></workflow-item><workflow-item name="item8" type="end" end-mode="0"  throw-bind-name="errorMessage"business-status="Bad" ><position x="200" y="133.33333333333334" /></workflow-item><error-handler name="item8"  throw-bind-name="errorMessage"><position x="100" y="133.33333333333334" /></error-handler><presentation></presentation></workflow>
\ No newline at end of file
+]]></script><display-name><![CDATA[execute]]></display-name><in-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /><bind name="counter" type="number" export-name="counter" /></in-binding><out-binding><bind name="waitingTimer" type="Date" export-name="waitingTimer" /><bind name="counter" type="number" export-name="counter" /></out-binding><position x="200" y="66.66666666666667" /></workflow-item><workflow-item name="item6" out-name="item5" type="task" ><script encoded="false"><![CDATA[System.log("Starting workflow");
+]]></script><display-name><![CDATA[start]]></display-name><position x="100" y="66.66666666666667" /></workflow-item><workflow-item name="item7" out-name="item5" type="waiting-timer" ><display-name><![CDATA[waitForEvent]]></display-name><in-binding><bind name="timer.date" type="Date" export-name="waitingTimer" /></in-binding><position x="400" y="16.66666666666667" /></workflow-item><workflow-item name="item8" type="end" end-mode="0"  throw-bind-name="errorMessage" business-status="Bad" ><position x="200" y="133.33333333333334" /></workflow-item><error-handler name="item8"  throw-bind-name="errorMessage" ><position x="100" y="133.33333333333334" /></error-handler><presentation></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 2.xml b/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 2.xml
index 77624b9ab..a016bfda0 100644
--- a/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 2.xml	
+++ b/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 2.xml	
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="ecab49a8-e61a-30bf-8f34-8df6b21a4504" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Test Workflow 2]]></display-name><description><![CDATA[Test Workflow 2 Description]]></description><position x="50" y="100" /><input><param name="url" type="string" /><param name="apiVersion" type="string" /><param name="retryCount" type="number" /></input><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task"><script encoded="false"><![CDATA[System.log("url=".concat(url, ", apiVersion=").concat(apiVersion, ", retryCount=").concat(retryCount));
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="ecab49a8-e61a-30bf-8f34-8df6b21a4504" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Test Workflow 2]]></display-name><description><![CDATA[Test Workflow 2 Description]]></description><position x="50" y="100" /><input><param name="url" type="string" /><param name="apiVersion" type="string" /><param name="retryCount" type="number" /></input><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task" ><script encoded="false"><![CDATA[System.log("url=".concat(url, ", apiVersion=").concat(apiVersion, ", retryCount=").concat(retryCount));
 ]]></script><display-name><![CDATA[test1]]></display-name><in-binding><bind name="url" type="string" export-name="url" /><bind name="apiVersion" type="string" export-name="apiVersion" /><bind name="retryCount" type="number" export-name="retryCount" /></in-binding><position x="100" y="100" /></workflow-item><presentation><p-param name="url"><desc><![CDATA[Hostname or IP address]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual><p-qual kind="static" name="minStringLength" type="Number"><![CDATA[5]]></p-qual><p-qual kind="static" name="maxStringLength" type="Number"><![CDATA[50]]></p-qual></p-param><p-param name="apiVersion"><desc><![CDATA[API Version (e.g. v32.0)]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual><p-qual kind="static" name="defaultValue" type="string"><![CDATA[v32.0]]></p-qual><p-qual kind="static" name="genericEnumeration" type="Array/string"><![CDATA[#{#string#v29.0#;#string#v30.0#;#string#v31.0#;#string#v32.0#}#]]></p-qual></p-param><p-param name="retryCount"><desc><![CDATA[Number of retries?]]></desc><p-qual kind="static" name="defaultValue" type="number"><![CDATA[3.0]]></p-qual><p-qual kind="static" name="genericEnumeration" type="Array/number"><![CDATA[#{#number#0.0#;#number#1.0#;#number#2.0#;#number#3.0#}#]]></p-qual></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 3.xml b/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 3.xml
index 20a774fad..fee2112ef 100644
--- a/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 3.xml	
+++ b/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 3.xml	
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="b1f857a4-2992-4a26-8b06-33d77b94429e" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Test Workflow 3]]></display-name><position x="50" y="100" /><input><param name="p1" type="string" /><param name="p2" type="string" /><param name="p4" type="string" /></input><output><param name="p3" type="string" /><param name="p4" type="string" /></output><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task"><script encoded="false"><![CDATA[System.log("p1=".concat(p1, ", p2=").concat(p2, ", p3=").concat(p3, ", p4=").concat(p4));
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="b1f857a4-2992-4a26-8b06-33d77b94429e" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Test Workflow 3]]></display-name><position x="50" y="100" /><input><param name="p1" type="string" /><param name="p2" type="string" /><param name="p4" type="string" /></input><output><param name="p3" type="string" /><param name="p4" type="string" /></output><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task" ><script encoded="false"><![CDATA[System.log("p1=".concat(p1, ", p2=").concat(p2, ", p3=").concat(p3, ", p4=").concat(p4));
 ]]></script><display-name><![CDATA[test1]]></display-name><in-binding><bind name="p1" type="string" export-name="p1" /><bind name="p2" type="string" export-name="p2" /><bind name="p4" type="string" export-name="p4" /></in-binding><out-binding><bind name="p3" type="string" export-name="p3" /><bind name="p4" type="string" export-name="p4" /></out-binding><position x="100" y="100" /></workflow-item><presentation><p-param name="p1"><desc><![CDATA[p1]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual></p-param><p-param name="p2"><desc><![CDATA[p2]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 4.xml b/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 4.xml
index 1b8554940..49fc1575b 100644
--- a/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 4.xml	
+++ b/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 4.xml	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="63c0ec55-018e-3035-a1a8-a598fbb60fcf" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Test Workflow 4]]></display-name><position x="50" y="100" /><input><param name="param1" type="string" /><param name="param2" type="string" /><param name="param3" type="number" /><param name="param4" type="boolean" /><param name="param5" type="Array/number" /></input><output><param name="outParam1" type="string" /><param name="outParam2" type="number" /></output><attrib name="att1" type="string" read-only="false" /><attrib name="att2" type="Array/number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="500" y="100" /></workflow-item><workflow-item name="item1" out-name="item2" type="task"><script encoded="false"><![CDATA[var __global = System.getContext() || (function () {
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="63c0ec55-018e-3035-a1a8-a598fbb60fcf" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Test Workflow 4]]></display-name><position x="50" y="100" /><input><param name="param1" type="string" /><param name="param2" type="string" /><param name="param3" type="number" /><param name="param4" type="boolean" /><param name="param5" type="Array/number" /></input><output><param name="outParam1" type="string" /><param name="outParam2" type="number" /></output><attrib name="att1" type="string" read-only="false" /><attrib name="att2" type="Array/number" read-only="false" /><workflow-item name="item0" type="end" end-mode="0"><position x="500" y="100" /></workflow-item><workflow-item name="item1" out-name="item2" type="task" ><script encoded="false"><![CDATA[var __global = System.getContext() || (function () {
     return this;
 }).call(null);
 var VROES = __global.__VROES || (__global.__VROES = System.getModule("com.vmware.pscoe.library.ecmascript").VROES());
@@ -8,10 +8,10 @@ new action1_1._.default();
 new action1_1._.TestClass2();
 att1 = "Att1";
 att2 = [31, 17, 44];
-]]></script><display-name><![CDATA[action1]]></display-name><in-binding><bind name="param1" type="string" export-name="param1" /><bind name="param2" type="string" export-name="param2" /></in-binding><out-binding><bind name="att1" type="string" export-name="att1" /><bind name="att2" type="Array/number" export-name="att2" /></out-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item3" type="task"><script encoded="false"><![CDATA[System.log("[action2] param3='".concat(param3, "', att1='").concat(att1, "', att2='").concat((att2 || []).map(function (x) { return x.toString(); }).join(","), "'"));
-]]></script><display-name><![CDATA[action2]]></display-name><in-binding><bind name="param3" type="number" export-name="param3" /><bind name="att1" type="string" export-name="att1" /><bind name="att2" type="Array/number" export-name="att2" /></in-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item4" type="task"><script encoded="false"><![CDATA[att2 = (att2 || []).map(function (x) { return x << 2; });
+]]></script><display-name><![CDATA[action1]]></display-name><in-binding><bind name="param1" type="string" export-name="param1" /><bind name="param2" type="string" export-name="param2" /></in-binding><out-binding><bind name="att1" type="string" export-name="att1" /><bind name="att2" type="Array/number" export-name="att2" /></out-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item3" type="task" ><script encoded="false"><![CDATA[System.log("[action2] param3='".concat(param3, "', att1='").concat(att1, "', att2='").concat((att2 || []).map(function (x) { return x.toString(); }).join(","), "'"));
+]]></script><display-name><![CDATA[action2]]></display-name><in-binding><bind name="param3" type="number" export-name="param3" /><bind name="att1" type="string" export-name="att1" /><bind name="att2" type="Array/number" export-name="att2" /></in-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item4" type="task" ><script encoded="false"><![CDATA[att2 = (att2 || []).map(function (x) { return x << 2; });
 outParam1 = "Out Value2";
-]]></script><display-name><![CDATA[action3]]></display-name><in-binding><bind name="att2" type="Array/number" export-name="att2" /></in-binding><out-binding><bind name="att2" type="Array/number" export-name="att2" /><bind name="outParam1" type="string" export-name="outParam1" /></out-binding><position x="300" y="100" /></workflow-item><workflow-item name="item4" out-name="item0" type="task"><script encoded="false"><![CDATA[var __global = System.getContext() || (function () {
+]]></script><display-name><![CDATA[action3]]></display-name><in-binding><bind name="att2" type="Array/number" export-name="att2" /></in-binding><out-binding><bind name="att2" type="Array/number" export-name="att2" /><bind name="outParam1" type="string" export-name="outParam1" /></out-binding><position x="300" y="100" /></workflow-item><workflow-item name="item4" out-name="item0" type="task" ><script encoded="false"><![CDATA[var __global = System.getContext() || (function () {
     return this;
 }).call(null);
 var VROES = __global.__VROES || (__global.__VROES = System.getModule("com.vmware.pscoe.library.ecmascript").VROES());
diff --git a/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 5.xml b/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 5.xml
index e7e94eb6a..814736bdc 100644
--- a/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 5.xml	
+++ b/typescript/vrotsc/e2e/expect/workflow/workflows/PS CoE/Test Workflows/Test Workflow 5.xml	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="e884741f-e730-387c-a4df-0d6cdb83945b" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Test Workflow 5]]></display-name><position x="50" y="100" /><input><param name="param1" type="string" /><param name="param2" type="string" /><param name="param3" type="number" /><param name="param4" type="boolean" /><param name="param5" type="Array/number" /></input><output><param name="outParam1" type="string" /><param name="outParam2" type="number" /></output><attrib name="att1" type="string" read-only="false" /><attrib name="att2" type="Array/number" read-only="false" /><attrib name="att3" type="string" read-only="false" conf-id="2d33a702-b903-395e-9989-fd02fbb91e0d"  conf-key="variable1"  /><workflow-item name="item0" type="end" end-mode="0"><position x="500" y="100" /></workflow-item><workflow-item name="item1" out-name="item2" type="task"><script encoded="false"><![CDATA[var __global = System.getContext() || (function () {
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="e884741f-e730-387c-a4df-0d6cdb83945b" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[Test Workflow 5]]></display-name><position x="50" y="100" /><input><param name="param1" type="string" /><param name="param2" type="string" /><param name="param3" type="number" /><param name="param4" type="boolean" /><param name="param5" type="Array/number" /></input><output><param name="outParam1" type="string" /><param name="outParam2" type="number" /></output><attrib name="att1" type="string" read-only="false" /><attrib name="att2" type="Array/number" read-only="false" /><attrib name="att3" type="string" read-only="false" conf-id="2d33a702-b903-395e-9989-fd02fbb91e0d"  conf-key="variable1"  /><workflow-item name="item0" type="end" end-mode="0"><position x="500" y="100" /></workflow-item><workflow-item name="item1" out-name="item2" type="task" ><script encoded="false"><![CDATA[var __global = System.getContext() || (function () {
     return this;
 }).call(null);
 var VROES = __global.__VROES || (__global.__VROES = System.getModule("com.vmware.pscoe.library.ecmascript").VROES());
@@ -8,10 +8,10 @@ new action1_1._.default();
 new action1_1._.TestClass2();
 att1 = "Att1";
 att2 = [31, 17, 44];
-]]></script><display-name><![CDATA[action1]]></display-name><in-binding><bind name="param1" type="string" export-name="param1" /><bind name="param2" type="string" export-name="param2" /><bind name="att3" type="string" export-name="att3" /></in-binding><out-binding><bind name="att1" type="string" export-name="att1" /><bind name="att2" type="Array/number" export-name="att2" /></out-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item3" type="task"><script encoded="false"><![CDATA[System.log("[action2] param3='".concat(param3, "', att1='").concat(att1, "', att2='").concat((att2 || []).map(function (x) { return x.toString(); }).join(","), "', att3=").concat(att3));
-]]></script><display-name><![CDATA[action2]]></display-name><in-binding><bind name="param3" type="number" export-name="param3" /><bind name="att1" type="string" export-name="att1" /><bind name="att2" type="Array/number" export-name="att2" /><bind name="att3" type="string" export-name="att3" /></in-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item4" type="task"><script encoded="false"><![CDATA[att2 = (att2 || []).map(function (x) { return x << 2; });
+]]></script><display-name><![CDATA[action1]]></display-name><in-binding><bind name="param1" type="string" export-name="param1" /><bind name="param2" type="string" export-name="param2" /><bind name="att3" type="string" export-name="att3" /></in-binding><out-binding><bind name="att1" type="string" export-name="att1" /><bind name="att2" type="Array/number" export-name="att2" /></out-binding><position x="100" y="100" /></workflow-item><workflow-item name="item2" out-name="item3" type="task" ><script encoded="false"><![CDATA[System.log("[action2] param3='".concat(param3, "', att1='").concat(att1, "', att2='").concat((att2 || []).map(function (x) { return x.toString(); }).join(","), "', att3=").concat(att3));
+]]></script><display-name><![CDATA[action2]]></display-name><in-binding><bind name="param3" type="number" export-name="param3" /><bind name="att1" type="string" export-name="att1" /><bind name="att2" type="Array/number" export-name="att2" /><bind name="att3" type="string" export-name="att3" /></in-binding><position x="200" y="100" /></workflow-item><workflow-item name="item3" out-name="item4" type="task" ><script encoded="false"><![CDATA[att2 = (att2 || []).map(function (x) { return x << 2; });
 outParam1 = "Out Value2";
-]]></script><display-name><![CDATA[action3]]></display-name><in-binding><bind name="att2" type="Array/number" export-name="att2" /></in-binding><out-binding><bind name="att2" type="Array/number" export-name="att2" /><bind name="outParam1" type="string" export-name="outParam1" /></out-binding><position x="300" y="100" /></workflow-item><workflow-item name="item4" out-name="item0" type="task"><script encoded="false"><![CDATA[var __global = System.getContext() || (function () {
+]]></script><display-name><![CDATA[action3]]></display-name><in-binding><bind name="att2" type="Array/number" export-name="att2" /></in-binding><out-binding><bind name="att2" type="Array/number" export-name="att2" /><bind name="outParam1" type="string" export-name="outParam1" /></out-binding><position x="300" y="100" /></workflow-item><workflow-item name="item4" out-name="item0" type="task" ><script encoded="false"><![CDATA[var __global = System.getContext() || (function () {
     return this;
 }).call(null);
 var VROES = __global.__VROES || (__global.__VROES = System.getModule("com.vmware.pscoe.library.ecmascript").VROES());
diff --git a/typescript/vrotsc/e2e/expect/workflow/workflows/PSCoE/vRO TypeScript/TestWorkflow1.xml b/typescript/vrotsc/e2e/expect/workflow/workflows/PSCoE/vRO TypeScript/TestWorkflow1.xml
index 991a09b31..9f5b0f0a6 100644
--- a/typescript/vrotsc/e2e/expect/workflow/workflows/PSCoE/vRO TypeScript/TestWorkflow1.xml	
+++ b/typescript/vrotsc/e2e/expect/workflow/workflows/PSCoE/vRO TypeScript/TestWorkflow1.xml	
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="fac2dea4-68aa-341b-959a-26f15741bef0" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[TestWorkflow1]]></display-name><position x="50" y="100" /><input><param name="foo" type="string" /><param name="bar" type="string" /></input><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task"><script encoded="false"><![CDATA[System.log("foo=".concat(foo, ", bar=").concat(bar));
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="fac2dea4-68aa-341b-959a-26f15741bef0" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[TestWorkflow1]]></display-name><position x="50" y="100" /><input><param name="foo" type="string" /><param name="bar" type="string" /></input><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task" ><script encoded="false"><![CDATA[System.log("foo=".concat(foo, ", bar=").concat(bar));
 ]]></script><display-name><![CDATA[test1]]></display-name><in-binding><bind name="foo" type="string" export-name="foo" /><bind name="bar" type="string" export-name="bar" /></in-binding><position x="100" y="100" /></workflow-item><presentation><p-param name="foo"><desc><![CDATA[foo]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual></p-param><p-param name="bar"><desc><![CDATA[bar]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/workflow/workflows/PSCoE/vRO TypeScript/sub/TestWorkflow2.xml b/typescript/vrotsc/e2e/expect/workflow/workflows/PSCoE/vRO TypeScript/sub/TestWorkflow2.xml
index 860506483..5a0f86ee8 100644
--- a/typescript/vrotsc/e2e/expect/workflow/workflows/PSCoE/vRO TypeScript/sub/TestWorkflow2.xml	
+++ b/typescript/vrotsc/e2e/expect/workflow/workflows/PSCoE/vRO TypeScript/sub/TestWorkflow2.xml	
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="51b3712e-ccd1-33f0-a52f-2bab931c9f58" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[TestWorkflow2]]></display-name><position x="50" y="100" /><input><param name="x" type="number" /><param name="y" type="number" /></input><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task"><script encoded="false"><![CDATA[System.log("".concat(x, "+").concat(y, "=").concat(x + y));
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="51b3712e-ccd1-33f0-a52f-2bab931c9f58" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[TestWorkflow2]]></display-name><position x="50" y="100" /><input><param name="x" type="number" /><param name="y" type="number" /></input><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task" ><script encoded="false"><![CDATA[System.log("".concat(x, "+").concat(y, "=").concat(x + y));
 ]]></script><display-name><![CDATA[add]]></display-name><in-binding><bind name="x" type="number" export-name="x" /><bind name="y" type="number" export-name="y" /></in-binding><position x="100" y="100" /></workflow-item><presentation><p-param name="x"><desc><![CDATA[x]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual></p-param><p-param name="y"><desc><![CDATA[y]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/e2e/expect/workflow/workflows/PSCoE/vRO TypeScript/sub/sub2/TestWorkflow3.xml b/typescript/vrotsc/e2e/expect/workflow/workflows/PSCoE/vRO TypeScript/sub/sub2/TestWorkflow3.xml
index dc15d1b2e..5a46ade0c 100644
--- a/typescript/vrotsc/e2e/expect/workflow/workflows/PSCoE/vRO TypeScript/sub/sub2/TestWorkflow3.xml	
+++ b/typescript/vrotsc/e2e/expect/workflow/workflows/PSCoE/vRO TypeScript/sub/sub2/TestWorkflow3.xml	
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="934bb3b6-5c37-39df-844c-b7e2372570ea" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[TestWorkflow3]]></display-name><position x="50" y="100" /><input><param name="foo" type="string" /><param name="bar" type="string" /></input><output><param name="result" type="string" /></output><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task"><script encoded="false"><![CDATA[System.log("foo=".concat(foo, ", bar=").concat(bar));
+<?xml version="1.0" encoding="utf-8" ?><workflow xmlns="http://vmware.com/vco/workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://vmware.com/vco/workflow http://vmware.com/vco/workflow/Workflow-v4.xsd" root-name="item1" object-name="workflow:name=generic" id="934bb3b6-5c37-39df-844c-b7e2372570ea" version="1.0.0" api-version="6.0.0" restartMode="1" resumeFromFailedMode="0"><display-name><![CDATA[TestWorkflow3]]></display-name><position x="50" y="100" /><input><param name="foo" type="string" /><param name="bar" type="string" /></input><output><param name="result" type="string" /></output><workflow-item name="item0" type="end" end-mode="0"><position x="200" y="100" /></workflow-item><workflow-item name="item1" out-name="item0" type="task" ><script encoded="false"><![CDATA[System.log("foo=".concat(foo, ", bar=").concat(bar));
 result = "test result";
 ]]></script><display-name><![CDATA[test1]]></display-name><in-binding><bind name="foo" type="string" export-name="foo" /><bind name="bar" type="string" export-name="bar" /></in-binding><out-binding><bind name="result" type="string" export-name="result" /></out-binding><position x="100" y="100" /></workflow-item><presentation><p-param name="foo"><desc><![CDATA[foo]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual></p-param><p-param name="bar"><desc><![CDATA[bar]]></desc><p-qual kind="static" name="mandatory" type="boolean"><![CDATA[true]]></p-qual></p-param></presentation></workflow>
\ No newline at end of file
diff --git a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/actionItemDecoratorStrategy.ts b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/actionItemDecoratorStrategy.ts
index f77e43b95..b24786dc8 100644
--- a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/actionItemDecoratorStrategy.ts
+++ b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/actionItemDecoratorStrategy.ts
@@ -138,11 +138,11 @@ export default class ActionItemDecoratorStrategy implements CanvasItemDecoratorS
 		);
 
 		if (itemInfo.canvasItemPolymorphicBag.exception) {
-			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}"`);
+			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}" `);
 		}
 
 		if (itemInfo.canvasItemPolymorphicBag.exceptionBinding) {
-			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}"`);
+			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}" `);
 		}
 
 		stringBuilder.append(">");
diff --git a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/asyncWorkflowItemDecoratorStrategy.ts b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/asyncWorkflowItemDecoratorStrategy.ts
index 87dede827..6d9f59423 100644
--- a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/asyncWorkflowItemDecoratorStrategy.ts
+++ b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/asyncWorkflowItemDecoratorStrategy.ts
@@ -159,15 +159,15 @@ export default class AsyncWorkflowItemDecoratorStrategy implements CanvasItemDec
 			+ ` name="item${pos}"`
 			+ ` out-name="${targetItem}"`
 			+ ` type="${this.getCanvasType()}"`
-			+ ` launched-workflow-id="${itemInfo.canvasItemPolymorphicBag.linkedItem}"`
+			+ ` launched-workflow-id="${itemInfo.canvasItemPolymorphicBag.linkedItem}" `
 		);
 
 		if (itemInfo.canvasItemPolymorphicBag.exception) {
-			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}"`);
+			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}" `);
 		}
 
 		if (itemInfo.canvasItemPolymorphicBag.exceptionBinding) {
-			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}"`);
+			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}" `);
 		}
 
 		stringBuilder.append(">");
diff --git a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/decisionItemDecoratorStrategy.ts b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/decisionItemDecoratorStrategy.ts
index eec2fa1a0..856953fd9 100644
--- a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/decisionItemDecoratorStrategy.ts
+++ b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/decisionItemDecoratorStrategy.ts
@@ -126,15 +126,15 @@ export default class DecisionItemDecoratorStrategy implements CanvasItemDecorato
 			+ ` name="item${pos}"`
 			+ ` out-name="${targetItem}"`
 			+ ` type="${this.getCanvasType()}"`
-			+ ` alt-out-name="${findTargetItem((itemInfo.canvasItemPolymorphicBag as CanvasItemPolymorphicBagForDecision).else, pos, itemInfo)}"`
+			+ ` alt-out-name="${findTargetItem((itemInfo.canvasItemPolymorphicBag as CanvasItemPolymorphicBagForDecision).else, pos, itemInfo)}" `
 		);
 
 		if (itemInfo.canvasItemPolymorphicBag.exception) {
-			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}"`);
+			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}" `);
 		}
 
 		if (itemInfo.canvasItemPolymorphicBag.exceptionBinding) {
-			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}"`);
+			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}" `);
 		}
 
 		stringBuilder.append(">");
diff --git a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/defaultErrorHandlerDecoratorStrategy.ts b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/defaultErrorHandlerDecoratorStrategy.ts
index 9e65a2c7f..f2328977f 100644
--- a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/defaultErrorHandlerDecoratorStrategy.ts
+++ b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/defaultErrorHandlerDecoratorStrategy.ts
@@ -115,7 +115,7 @@ export default class DefaultErrorHandlerDecoratorStrategy implements CanvasItemD
 		stringBuilder.append(`<error-handler name="${targetItemName}" `);
 
 		if (itemInfo.canvasItemPolymorphicBag.exceptionBinding) {
-			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}"`);
+			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}" `);
 		}
 
 		stringBuilder.append(">").appendLine();
diff --git a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/endItemDecoratorStrategy.ts b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/endItemDecoratorStrategy.ts
index d63753452..82fa68f97 100644
--- a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/endItemDecoratorStrategy.ts
+++ b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/endItemDecoratorStrategy.ts
@@ -115,7 +115,7 @@ export default class EndItemDecoratorStrategy implements CanvasItemDecoratorStra
 		stringBuilder.append(`<workflow-item name="item${pos}" type="end" end-mode="${endMode}" `);
 
 		if (itemInfo.canvasItemPolymorphicBag.exceptionBinding) {
-			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}"`);
+			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}" `);
 		}
 
 		if (businessStatus) {
diff --git a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/itemDecoratorStrategy.ts b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/itemDecoratorStrategy.ts
index 5a5549755..8539c2ef7 100644
--- a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/itemDecoratorStrategy.ts
+++ b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/itemDecoratorStrategy.ts
@@ -100,14 +100,14 @@ export default class ItemDecoratorStrategy implements CanvasItemDecoratorStrateg
 		stringBuilder.append(`<workflow-item`
 			+ ` name="item${pos}"`
 			+ ` out-name="${targetItem}"`
-			+ ` type="${this.getCanvasType()}"`);
+			+ ` type="${this.getCanvasType()}" `);
 
 		if (itemInfo.canvasItemPolymorphicBag.exception) {
-			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}"`);
+			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}" `);
 		}
 
 		if (itemInfo.canvasItemPolymorphicBag.exceptionBinding) {
-			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}"`);
+			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}" `);
 		}
 
 		stringBuilder.append(">");
diff --git a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/scheduledWorkflowItemDecoratorStrategy.ts b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/scheduledWorkflowItemDecoratorStrategy.ts
index abe333aa8..b0044e4ed 100644
--- a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/scheduledWorkflowItemDecoratorStrategy.ts
+++ b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/scheduledWorkflowItemDecoratorStrategy.ts
@@ -159,15 +159,15 @@ export default class ScheduledWorkflowItemDecoratorStrategy implements CanvasIte
 			+ ` name="item${pos}"`
 			+ ` out-name="${targetItem}"`
 			+ ` type="${this.getCanvasType()}"`
-			+ ` launched-workflow-id="${itemInfo.canvasItemPolymorphicBag.linkedItem}"`
+			+ ` launched-workflow-id="${itemInfo.canvasItemPolymorphicBag.linkedItem}" `
 		);
 
 		if (itemInfo.canvasItemPolymorphicBag.exception) {
-			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}"`);
+			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}" `);
 		}
 
 		if (itemInfo.canvasItemPolymorphicBag.exceptionBinding) {
-			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}"`);
+			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}" `);
 		}
 
 		stringBuilder.append(">");
diff --git a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/waitingTimerItemDecoratorStrategy.ts b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/waitingTimerItemDecoratorStrategy.ts
index 35a4c3a31..8d9ae6435 100644
--- a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/waitingTimerItemDecoratorStrategy.ts
+++ b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/waitingTimerItemDecoratorStrategy.ts
@@ -114,15 +114,15 @@ export default class WaitingTimerItemDecoratorStrategy implements CanvasItemDeco
 		stringBuilder.append(`<workflow-item`
 			+ ` name="item${pos}"`
 			+ ` out-name="${targetItem}"`
-			+ ` type="${this.getCanvasType()}"`
+			+ ` type="${this.getCanvasType()}" `
 		);
 
 		if (itemInfo.canvasItemPolymorphicBag.exception) {
-			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}"`);
+			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}" `);
 		}
 
 		if (itemInfo.canvasItemPolymorphicBag.exceptionBinding) {
-			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}"`);
+			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}" `);
 		}
 
 		stringBuilder.append(">");
diff --git a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/workflowItemDecoratorStrategy.ts b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/workflowItemDecoratorStrategy.ts
index d9d83ca09..a20ff0e6e 100644
--- a/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/workflowItemDecoratorStrategy.ts
+++ b/typescript/vrotsc/src/compiler/transformer/fileTransformers/workflow/decorators/workflowItemDecoratorStrategy.ts
@@ -123,15 +123,15 @@ export default class WorkflowItemDecoratorStrategy implements CanvasItemDecorato
 			+ ` name="item${pos}"`
 			+ ` out-name="${targetItem}"`
 			+ ` type="${this.getCanvasType()}"`
-			+ ` linked-workflow-id="${itemInfo.canvasItemPolymorphicBag.linkedItem}"`
+			+ ` linked-workflow-id="${itemInfo.canvasItemPolymorphicBag.linkedItem}" `
 		);
 
 		if (itemInfo.canvasItemPolymorphicBag.exception) {
-			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}"`);
+			stringBuilder.append(` catch-name="${findTargetItem(itemInfo.canvasItemPolymorphicBag.exception, pos, itemInfo)}" `);
 		}
 
 		if (itemInfo.canvasItemPolymorphicBag.exceptionBinding) {
-			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}"`);
+			stringBuilder.append(` throw-bind-name="${itemInfo.canvasItemPolymorphicBag.exceptionBinding}" `);
 		}
 
 		stringBuilder.append(">");